2313 files changed, 31350 insertions, 38077 deletions

diff --git a/asm/battle_frontier_1.s b/asm/battle_frontier_1.s
index 729140801..522c5d5f5 100644
--- a/asm/battle_frontier_1.s
+++ b/asm/battle_frontier_1.s
@@ -13887,7 +13887,7 @@ task_prev_quest: @ 81960A8
 	cmp r0, 0
 	bne _081960C2
 	bl ScriptContext2_Enable
-	bl FreezeMapObjects
+	bl FreezeEventObjects
 	bl sub_808B864
 	bl sub_808BCF4
 _081960C2:
@@ -14285,18 +14285,18 @@ sub_81963F0: @ 81963F0
 	movs r0, 0xFF
 	movs r1, 0
 	movs r2, 0
-	bl GetFieldObjectIdByLocalIdAndMap
+	bl GetEventObjectIdByLocalIdAndMap
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, =gMapObjects
+	ldr r1, =gEventObjects
 	adds r0, r1
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl EventObjectClearHeldMovementIfFinished
 	bl sub_80D338C
-	bl UnfreezeMapObjects
+	bl UnfreezeEventObjects
 	bl ScriptContext2_Disable
 _08196446:
 	movs r0, 0x1
diff --git a/asm/battle_frontier_2.s b/asm/battle_frontier_2.s
index 7f2dbcc73..b2b454278 100644
--- a/asm/battle_frontier_2.s
+++ b/asm/battle_frontier_2.s
@@ -12444,7 +12444,7 @@ _081A0C8E:
 sub_81A0C9C: @ 81A0C9C
 	push {lr}
 	bl ScriptContext2_Enable
-	bl FreezeMapObjects
+	bl FreezeEventObjects
 	bl sub_808B864
 	bl sub_808BCF4
 	movs r0, 0
@@ -27213,16 +27213,16 @@ _081A896E:
 	movs r0, 0xFF
 	movs r1, 0
 	movs r2, 0
-	bl GetFieldObjectIdByLocalIdAndMap
+	bl GetEventObjectIdByLocalIdAndMap
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, =gMapObjects
+	ldr r1, =gEventObjects
 	adds r0, r1
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl EventObjectClearHeldMovementIfFinished
 	bl sub_80D338C
 	pop {r4}
 	pop {r0}
@@ -27355,7 +27355,7 @@ _081A8A74:
 	ldr r2, [r6]
 	ldrb r1, [r2, 0x5]
 	ldrb r2, [r2, 0x4]
-	bl GetFieldObjectIdByLocalIdAndMap
+	bl GetEventObjectIdByLocalIdAndMap
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x10
@@ -27511,14 +27511,14 @@ _081A8BB4:
 	ldr r2, [r1]
 	ldrb r1, [r2, 0x5]
 	ldrb r2, [r2, 0x4]
-	bl GetFieldObjectIdByLocalIdAndMap
+	bl GetEventObjectIdByLocalIdAndMap
 	lsls r0, 24
 	lsrs r2, r0, 24
 	cmp r2, 0x10
 	bne _081A8BDC
 	b _081A8D32
 _081A8BDC:
-	ldr r0, =gMapObjects
+	ldr r0, =gEventObjects
 	lsls r1, r2, 3
 	adds r1, r2
 	lsls r1, 2
@@ -28521,8 +28521,8 @@ sub_81A9424: @ 81A9424
 	lsls r1, 4
 	adds r1, r0
 	mov r8, r1
-	ldr r2, =gMapObjects
-	ldr r0, =gSelectedMapObject
+	ldr r2, =gEventObjects
+	ldr r0, =gSelectedEventObject
 	ldrb r1, [r0]
 	lsls r0, r1, 3
 	adds r0, r1
@@ -28569,8 +28569,8 @@ _081A9488:
 	mov r9, r0
 _081A94AE:
 	ldr r3, =gUnknown_08613ED8
-	ldr r2, =gMapObjects
-	ldr r0, =gSelectedMapObject
+	ldr r2, =gEventObjects
+	ldr r0, =gSelectedEventObject
 	ldrb r1, [r0]
 	lsls r0, r1, 3
 	adds r0, r1
@@ -29181,7 +29181,7 @@ sub_81A9998: @ 81A9998
 	mov r8, r0
 	ldr r1, =0x0000028e
 	mov r12, r1
-	ldr r0, =gMapObjects
+	ldr r0, =gEventObjects
 	mov r9, r0
 _081A99CC:
 	movs r2, 0
@@ -29194,7 +29194,7 @@ _081A99CE:
 	cmp r0, r12
 	bne _081A9A8A
 	adds r2, 0x7
-	ldr r0, =gSelectedMapObject
+	ldr r0, =gSelectedEventObject
 	ldrb r1, [r0]
 	lsls r0, r1, 3
 	adds r0, r1
@@ -29322,7 +29322,7 @@ GetBattlePyramidTrainerFlag: @ 81A9AC4
 	ldr r1, =0x00000e2a
 	adds r2, r1
 	ldr r4, =gBitTable
-	ldr r3, =gMapObjects
+	ldr r3, =gEventObjects
 	lsls r1, r0, 3
 	adds r1, r0
 	lsls r1, 2
@@ -29354,8 +29354,8 @@ sub_81A9B04: @ 81A9B04
 	cmp r0, 0
 	beq _081A9B2E
 	movs r0, 0x1
-	bl GetChosenApproachingTrainerMapObjectId
-	ldr r1, =gSelectedMapObject
+	bl GetChosenApproachingTrainerEventObjectId
+	ldr r1, =gSelectedEventObject
 	strb r0, [r1]
 	ldr r0, =gTrainerBattleOpponent_B
 	ldrh r0, [r0]
@@ -29376,9 +29376,9 @@ sub_81A9B44: @ 81A9B44
 	lsls r0, 16
 	lsrs r5, r0, 16
 	movs r3, 0
-	ldr r0, =gMapObjects
+	ldr r0, =gEventObjects
 	mov r12, r0
-	ldr r6, =gSelectedMapObject
+	ldr r6, =gSelectedEventObject
 	ldr r1, =gSaveBlock1Ptr
 	mov r10, r1
 	ldr r7, =gSaveBlock2Ptr
diff --git a/asm/cable_car.s b/asm/cable_car.s
index bfb96cb9b..59245a1b2 100644
--- a/asm/cable_car.s
+++ b/asm/cable_car.s
@@ -1956,7 +1956,7 @@ _08150D86:
 	str r2, [sp]
 	movs r2, 0xC8
 	movs r3, 0x49
-	bl AddPseudoFieldObject
+	bl AddPseudoEventObject
 	lsls r0, 24
 	lsrs r6, r0, 24
 	cmp r6, 0x40
@@ -2062,7 +2062,7 @@ _08150E68:
 	str r2, [sp]
 	movs r2, 0x80
 	movs r3, 0x27
-	bl AddPseudoFieldObject
+	bl AddPseudoEventObject
 	lsls r0, 24
 	lsrs r6, r0, 24
 	cmp r6, 0x40
@@ -2195,7 +2195,7 @@ _08150F3E:
 	ldrsh r3, [r3, r4]
 	movs r4, 0x6A
 	str r4, [sp]
-	bl AddPseudoFieldObject
+	bl AddPseudoEventObject
 	lsls r0, 24
 	lsrs r6, r0, 24
 	cmp r6, 0x40
diff --git a/asm/easy_chat.s b/asm/easy_chat.s
index 7f2a7ca88..eb423cf4c 100644
--- a/asm/easy_chat.s
+++ b/asm/easy_chat.s
@@ -8988,7 +8988,7 @@ _0811E852:
 	adds r1, r5, 0
 	movs r2, 0x4C
 	movs r3, 0x28
-	bl AddPseudoFieldObject
+	bl AddPseudoEventObject
 	lsls r0, 24
 	lsrs r2, r0, 24
 	cmp r2, 0x40
@@ -9019,7 +9019,7 @@ _0811E8A0:
 	adds r1, r5, 0
 	movs r2, 0x34
 	movs r3, 0x28
-	bl AddPseudoFieldObject
+	bl AddPseudoEventObject
 	lsls r0, 24
 	lsrs r2, r0, 24
 	cmp r2, 0x40
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s
index 7e25c45da..c2b13e2bf 100644
--- a/asm/field_control_avatar.s
+++ b/asm/field_control_avatar.s
@@ -187,9 +187,9 @@ sub_809C014: @ 809C014
 	ldr r0, =gSpecialVar_LastTalked
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gSelectedMapObject
+	ldr r0, =gSelectedEventObject
 	strb r1, [r0]
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	lsls r0, 24
 	lsrs r6, r0, 24
 	mov r4, sp
@@ -479,13 +479,13 @@ TryGetScriptOnPressingA: @ 809C270
 	adds r7, r4, 0
 	adds r1, r5, 0
 	adds r2, r4, 0
-	bl TryGetMapObjectScript
+	bl TryGetEventObjectScript
 	cmp r0, 0
 	bne _0809C2BC
 	adds r0, r6, 0
 	adds r1, r5, 0
 	adds r2, r4, 0
-	bl TryGetInvisibleMapObjectScript
+	bl TryGetInvisibleEventObjectScript
 	cmp r0, 0
 	bne _0809C2BC
 	adds r0, r6, 0
@@ -547,12 +547,12 @@ _0809C2F0:
 	lsrs r1, 16
 _0809C30E:
 	ldrb r2, [r4, 0x4]
-	bl GetFieldObjectIdByXYZ
+	bl GetEventObjectIdByXYZ
 	lsls r0, 24
 	lsrs r3, r0, 24
 	cmp r3, 0x10
 	beq _0809C32E
-	ldr r1, =gMapObjects
+	ldr r1, =gEventObjects
 	lsls r2, r3, 3
 	adds r0, r2, r3
 	lsls r0, 2
@@ -567,7 +567,7 @@ _0809C32E:
 	.pool
 _0809C33C:
 	movs r4, 0
-	ldr r1, =gLinkPlayerMapObjects
+	ldr r1, =gLinkPlayerEventObjects
 _0809C340:
 	ldrb r0, [r1]
 	cmp r0, 0x1
@@ -580,7 +580,7 @@ _0809C34C:
 	adds r4, 0x1
 	cmp r4, 0x3
 	ble _0809C340
-	ldr r0, =gSelectedMapObject
+	ldr r0, =gSelectedEventObject
 	strb r3, [r0]
 	ldr r1, =gSpecialVar_LastTalked
 	adds r0, r2, r3
@@ -591,7 +591,7 @@ _0809C34C:
 	ldr r0, =gSpecialVar_Facing
 	strh r6, [r0]
 	adds r0, r3, 0
-	bl GetFieldObjectScriptPointerByFieldObjectId
+	bl GetEventObjectScriptPointerByEventObjectId
 _0809C36E:
 	pop {r4-r6}
 	pop {r1}
@@ -599,8 +599,8 @@ _0809C36E:
 	.pool
 	thumb_func_end sub_809C2C8
 
-	thumb_func_start TryGetMapObjectScript
-TryGetMapObjectScript: @ 809C384
+	thumb_func_start TryGetEventObjectScript
+TryGetEventObjectScript: @ 809C384
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	lsls r1, 24
@@ -610,12 +610,12 @@ TryGetMapObjectScript: @ 809C384
 	ldrh r0, [r5]
 	ldrh r1, [r5, 0x2]
 	ldrb r2, [r5, 0x4]
-	bl GetFieldObjectIdByXYZ
+	bl GetEventObjectIdByXYZ
 	lsls r0, 24
 	lsrs r4, r0, 24
 	cmp r4, 0x10
 	beq _0809C3B4
-	ldr r1, =gMapObjects
+	ldr r1, =gEventObjects
 	lsls r2, r4, 3
 	adds r0, r2, r4
 	lsls r0, 2
@@ -647,12 +647,12 @@ _0809C3B4:
 	lsls r1, 16
 	lsrs r1, 16
 	ldrb r2, [r5, 0x4]
-	bl GetFieldObjectIdByXYZ
+	bl GetEventObjectIdByXYZ
 	lsls r0, 24
 	lsrs r4, r0, 24
 	cmp r4, 0x10
 	beq _0809C400
-	ldr r1, =gMapObjects
+	ldr r1, =gEventObjects
 	lsls r2, r4, 3
 	adds r0, r2, r4
 	lsls r0, 2
@@ -666,7 +666,7 @@ _0809C400:
 	b _0809C44E
 	.pool
 _0809C40C:
-	ldr r0, =gSelectedMapObject
+	ldr r0, =gSelectedEventObject
 	strb r4, [r0]
 	ldr r1, =gSpecialVar_LastTalked
 	adds r0, r2, r4
@@ -684,7 +684,7 @@ _0809C40C:
 	.pool
 _0809C43C:
 	adds r0, r4, 0
-	bl GetFieldObjectScriptPointerByFieldObjectId
+	bl GetEventObjectScriptPointerByEventObjectId
 _0809C442:
 	adds r1, r0, 0
 	ldr r0, =gSpecialVar_LastTalked
@@ -696,11 +696,11 @@ _0809C44E:
 	pop {r1}
 	bx r1
 	.pool
-	thumb_func_end TryGetMapObjectScript
+	thumb_func_end TryGetEventObjectScript
 
-	thumb_func_start TryGetInvisibleMapObjectScript
-@ signed int TryGetInvisibleMapObjectScript(int a1, int a2, u8 playerFacingDirection)
-TryGetInvisibleMapObjectScript: @ 809C458
+	thumb_func_start TryGetInvisibleEventObjectScript
+@ signed int TryGetInvisibleEventObjectScript(int a1, int a2, u8 playerFacingDirection)
+TryGetInvisibleEventObjectScript: @ 809C458
 	push {r4,r5,lr}
 	lsls r2, 24
 	lsrs r5, r2, 24
@@ -715,7 +715,7 @@ TryGetInvisibleMapObjectScript: @ 809C458
 	lsrs r2, 16
 	ldrb r3, [r0, 0x4]
 	adds r0, r4, 0
-	bl FindInvisibleMapObjectByPosition
+	bl FindInvisibleEventObjectByPosition
 	cmp r0, 0
 	beq _0809C4CC
 	ldr r2, [r0, 0x8]
@@ -799,7 +799,7 @@ _0809C532:
 	pop {r4,r5}
 	pop {r1}
 	bx r1
-	thumb_func_end TryGetInvisibleMapObjectScript
+	thumb_func_end TryGetInvisibleEventObjectScript
 
 	thumb_func_start TryGetMetatileBehaviorScript
 TryGetMetatileBehaviorScript: @ 809C538
@@ -2261,9 +2261,9 @@ sub_809D0F4: @ 809D0F4
 	.pool
 	thumb_func_end sub_809D0F4
 
-	thumb_func_start FindInvisibleMapObjectByPosition
-@ int FindInvisibleMapObjectByPosition(struct mapheader *mapHeader, u16 x, u16 y, u8 elevation)
-FindInvisibleMapObjectByPosition: @ 809D11C
+	thumb_func_start FindInvisibleEventObjectByPosition
+@ int FindInvisibleEventObjectByPosition(struct mapheader *mapHeader, u16 x, u16 y, u8 elevation)
+FindInvisibleEventObjectByPosition: @ 809D11C
 	push {r4-r7,lr}
 	lsls r1, 16
 	lsrs r7, r1, 16
@@ -2308,7 +2308,7 @@ _0809D164:
 	pop {r4-r7}
 	pop {r1}
 	bx r1
-	thumb_func_end FindInvisibleMapObjectByPosition
+	thumb_func_end FindInvisibleEventObjectByPosition
 
 	thumb_func_start dive_warp
 dive_warp: @ 809D16C
@@ -2447,12 +2447,12 @@ _0809D276:
 	bx r1
 	thumb_func_end sub_809D1E8
 
-	thumb_func_start GetFieldObjectScriptPointerForComparison
-@ u8 *GetFieldObjectScriptPointerForComparison()
-GetFieldObjectScriptPointerForComparison: @ 809D280
+	thumb_func_start GetEventObjectScriptPointerForComparison
+@ u8 *GetEventObjectScriptPointerForComparison()
+GetEventObjectScriptPointerForComparison: @ 809D280
 	push {r4,r5,lr}
 	sub sp, 0x8
-	bl player_get_direction_upper_nybble
+	bl GetPlayerMovementDirection
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
@@ -2470,18 +2470,18 @@ GetFieldObjectScriptPointerForComparison: @ 809D280
 	lsrs r1, 24
 	mov r0, sp
 	adds r2, r4, 0
-	bl TryGetMapObjectScript
+	bl TryGetEventObjectScript
 	add sp, 0x8
 	pop {r4,r5}
 	pop {r1}
 	bx r1
-	thumb_func_end GetFieldObjectScriptPointerForComparison
+	thumb_func_end GetEventObjectScriptPointerForComparison
 
 	thumb_func_start sub_809D2BC
 sub_809D2BC: @ 809D2BC
 	push {r4,lr}
 	sub sp, 0x8
-	bl player_get_direction_upper_nybble
+	bl GetPlayerMovementDirection
 	mov r4, sp
 	mov r0, sp
 	bl player_get_pos_to_and_height
diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s
index 77f8213b3..6cf62ba8b 100644
--- a/asm/field_effect_helpers.s
+++ b/asm/field_effect_helpers.s
@@ -100,7 +100,7 @@ _08153F7A:
 sub_8153F98: @ 8153F98
 	push {lr}
 	ldrb r0, [r0, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetEventObjectGraphicsInfo
 	ldrh r0, [r0, 0xA]
 	subs r0, 0x2
 	lsls r0, 16
@@ -123,7 +123,7 @@ npc_pal_op: @ 8153FAC
 	movs r0, 0
 	strh r0, [r4, 0x32]
 	ldrb r0, [r5, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetEventObjectGraphicsInfo
 	ldrb r1, [r0, 0xC]
 	movs r0, 0x80
 	ands r0, r1
@@ -172,7 +172,7 @@ npc_pal_op_B: @ 815401C
 	lsls r1, 24
 	lsrs r4, r1, 24
 	ldrb r0, [r0, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetEventObjectGraphicsInfo
 	adds r2, r0, 0
 	ldrh r1, [r2, 0x4]
 	ldr r0, =0x000011ff
@@ -217,7 +217,7 @@ npc_pal_op_A: @ 8154078
 	lsls r1, 24
 	lsrs r4, r1, 24
 	ldrb r0, [r0, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetEventObjectGraphicsInfo
 	adds r2, r0, 0
 	ldrh r1, [r2, 0x4]
 	ldr r0, =0x000011ff
@@ -248,7 +248,7 @@ objc_reflection_maybe: @ 81540A8
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, =gMapObjects
+	ldr r1, =gEventObjects
 	adds r7, r0, r1
 	ldrb r1, [r7, 0x4]
 	lsls r0, r1, 4
@@ -578,16 +578,16 @@ oei_shadow: @ 8154340
 	ldrb r0, [r5]
 	ldrb r1, [r5, 0x4]
 	ldrb r2, [r5, 0x8]
-	bl GetFieldObjectIdByLocalIdAndMap
+	bl GetEventObjectIdByLocalIdAndMap
 	lsls r0, 24
 	lsrs r0, 24
-	ldr r2, =gMapObjects
+	ldr r2, =gEventObjects
 	lsls r1, r0, 3
 	adds r1, r0
 	lsls r1, 2
 	adds r1, r2
 	ldrb r0, [r1, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetEventObjectGraphicsInfo
 	adds r4, r0, 0
 	ldr r2, =gFieldEffectObjectTemplatePointers
 	ldr r1, =gUnknown_085CDC3E
@@ -659,7 +659,7 @@ oamc_shadow: @ 81543E4
 	lsls r2, 24
 	lsrs r2, 24
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetEventObjectIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	beq _08154412
@@ -673,7 +673,7 @@ _08154412:
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, =gMapObjects
+	ldr r1, =gEventObjects
 	adds r4, r0, r1
 	ldrb r0, [r4, 0x4]
 	lsls r1, r0, 4
@@ -877,7 +877,7 @@ _0815459C:
 	adds r1, r4, 0
 	adds r2, r7, 0
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetEventObjectIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _081545F0
@@ -909,7 +909,7 @@ _08154604:
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, =gMapObjects
+	ldr r1, =gEventObjects
 	adds r2, r0, r1
 	ldr r0, [r2, 0x10]
 	ldr r1, [r5, 0x30]
@@ -931,7 +931,7 @@ _08154624:
 _08154632:
 	adds r0, r5, 0
 	movs r1, 0
-	bl sub_80979D4
+	bl UpdateEventObjectSpriteVisibility
 	ldrh r1, [r5, 0x2E]
 	lsls r1, 24
 	lsrs r1, 24
@@ -1216,7 +1216,7 @@ _0815484C:
 	adds r1, r7, 0
 	adds r2, r6, 0
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetEventObjectIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _081548A0
@@ -1248,7 +1248,7 @@ _081548B4:
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, =gMapObjects
+	ldr r1, =gEventObjects
 	adds r2, r0, r1
 	ldr r0, [r2, 0x10]
 	ldr r1, [r5, 0x30]
@@ -1262,7 +1262,7 @@ _081548B4:
 _081548D4:
 	adds r0, r5, 0
 	movs r1, 0
-	bl sub_80979D4
+	bl UpdateEventObjectSpriteVisibility
 	ldrh r1, [r5, 0x2E]
 	lsls r1, 24
 	lsrs r1, 24
@@ -1340,13 +1340,13 @@ sub_815496C: @ 815496C
 	ldrb r0, [r6]
 	ldrb r1, [r6, 0x4]
 	ldrb r2, [r6, 0x8]
-	bl GetFieldObjectIdByLocalIdAndMap
+	bl GetEventObjectIdByLocalIdAndMap
 	lsls r0, 24
 	lsrs r0, 24
 	lsls r1, r0, 3
 	adds r1, r0
 	lsls r1, 2
-	ldr r0, =gMapObjects
+	ldr r0, =gEventObjects
 	adds r5, r1, r0
 	ldr r0, =gFieldEffectObjectTemplatePointers
 	ldr r0, [r0, 0x78]
@@ -1428,11 +1428,11 @@ sub_8154A10: @ 8154A10
 	lsls r2, 24
 	lsrs r2, 24
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetEventObjectIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _08154A4E
-	ldr r5, =gMapObjects
+	ldr r5, =gEventObjects
 	mov r0, sp
 	ldrb r1, [r0]
 	lsls r0, r1, 3
@@ -1451,7 +1451,7 @@ _08154A4E:
 	.pool
 _08154A5C:
 	ldrb r0, [r1, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetEventObjectGraphicsInfo
 	mov r8, r0
 	mov r0, sp
 	ldrb r1, [r0]
@@ -1523,7 +1523,7 @@ _08154AB2:
 	lsls r1, 29
 	lsrs r1, 31
 	adds r0, r4, 0
-	bl sub_80979D4
+	bl UpdateEventObjectSpriteVisibility
 _08154AF2:
 	add sp, 0x4
 	pop {r3}
@@ -1729,7 +1729,7 @@ sub_8154C7C: @ 8154C7C
 _08154C92:
 	adds r0, r1, 0
 	movs r1, 0
-	bl sub_80979D4
+	bl UpdateEventObjectSpriteVisibility
 	pop {r0}
 	bx r0
 	thumb_func_end sub_8154C7C
@@ -1758,7 +1758,7 @@ sub_8154CA0: @ 8154CA0
 	lsls r1, 29
 	lsrs r1, 31
 	adds r0, r4, 0
-	bl sub_80979D4
+	bl UpdateEventObjectSpriteVisibility
 	movs r1, 0x30
 	ldrsh r0, [r4, r1]
 	cmp r0, 0x38
@@ -1781,13 +1781,13 @@ sub_8154CEC: @ 8154CEC
 	ldrb r0, [r6]
 	ldrb r1, [r6, 0x4]
 	ldrb r2, [r6, 0x8]
-	bl GetFieldObjectIdByLocalIdAndMap
+	bl GetEventObjectIdByLocalIdAndMap
 	lsls r0, 24
 	lsrs r0, 24
 	lsls r1, r0, 3
 	adds r1, r0
 	lsls r1, 2
-	ldr r0, =gMapObjects
+	ldr r0, =gEventObjects
 	adds r5, r1, r0
 	ldr r0, =gFieldEffectObjectTemplatePointers
 	ldr r0, [r0, 0x34]
@@ -1800,7 +1800,7 @@ sub_8154CEC: @ 8154CEC
 	cmp r4, 0x40
 	beq _08154D76
 	ldrb r0, [r5, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetEventObjectGraphicsInfo
 	lsls r3, r4, 4
 	adds r3, r4
 	lsls r3, 2
@@ -1870,7 +1870,7 @@ sub_8154D90: @ 8154D90
 	lsls r2, 24
 	lsrs r2, 24
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetEventObjectIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	beq _08154DCA
@@ -1881,7 +1881,7 @@ _08154DC0:
 	b _08154E0A
 _08154DCA:
 	ldr r3, =gSprites
-	ldr r2, =gMapObjects
+	ldr r2, =gEventObjects
 	mov r0, sp
 	ldrb r1, [r0]
 	lsls r0, r1, 3
@@ -1910,7 +1910,7 @@ _08154DCA:
 	strh r0, [r4, 0x22]
 	adds r0, r4, 0
 	movs r1, 0
-	bl sub_80979D4
+	bl UpdateEventObjectSpriteVisibility
 _08154E0A:
 	add sp, 0x4
 	pop {r4}
@@ -2034,13 +2034,13 @@ sub_8154EFC: @ 8154EFC
 	ldrb r0, [r7]
 	ldrb r1, [r7, 0x4]
 	ldrb r2, [r7, 0x8]
-	bl GetFieldObjectIdByLocalIdAndMap
+	bl GetEventObjectIdByLocalIdAndMap
 	lsls r0, 24
 	lsrs r0, 24
 	lsls r1, r0, 3
 	adds r1, r0
 	lsls r1, 2
-	ldr r0, =gMapObjects
+	ldr r0, =gEventObjects
 	adds r6, r1, r0
 	ldr r0, =gFieldEffectObjectTemplatePointers
 	ldr r0, [r0, 0x34]
@@ -2053,7 +2053,7 @@ sub_8154EFC: @ 8154EFC
 	cmp r5, 0x40
 	beq _08154F92
 	ldrb r0, [r6, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetEventObjectGraphicsInfo
 	adds r4, r0, 0
 	lsls r0, r5, 4
 	adds r0, r5
@@ -2123,11 +2123,11 @@ sub_8154FB4: @ 8154FB4
 	lsls r2, 24
 	lsrs r2, 24
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetEventObjectIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _08154FEE
-	ldr r2, =gMapObjects
+	ldr r2, =gEventObjects
 	mov r0, sp
 	ldrb r1, [r0]
 	lsls r0, r1, 3
@@ -2162,7 +2162,7 @@ _08154FFC:
 	strb r0, [r1]
 	adds r0, r4, 0
 	movs r1, 0
-	bl sub_80979D4
+	bl UpdateEventObjectSpriteVisibility
 	ldr r1, [r5, 0x10]
 	ldr r0, [r4, 0x34]
 	cmp r1, r0
@@ -2242,13 +2242,13 @@ sub_81550B4: @ 81550B4
 	ldrb r0, [r6]
 	ldrb r1, [r6, 0x4]
 	ldrb r2, [r6, 0x8]
-	bl GetFieldObjectIdByLocalIdAndMap
+	bl GetEventObjectIdByLocalIdAndMap
 	lsls r0, 24
 	lsrs r0, 24
 	lsls r1, r0, 3
 	adds r1, r0
 	lsls r1, 2
-	ldr r0, =gMapObjects
+	ldr r0, =gEventObjects
 	adds r5, r1, r0
 	ldr r0, =gFieldEffectObjectTemplatePointers
 	ldr r0, [r0, 0x7C]
@@ -2328,11 +2328,11 @@ sub_8155158: @ 8155158
 	lsls r2, 24
 	lsrs r2, 24
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetEventObjectIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _08155192
-	ldr r5, =gMapObjects
+	ldr r5, =gEventObjects
 	mov r0, sp
 	ldrb r1, [r0]
 	lsls r0, r1, 3
@@ -2351,7 +2351,7 @@ _08155192:
 	.pool
 _081551A0:
 	ldrb r0, [r1, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetEventObjectGraphicsInfo
 	mov r1, sp
 	ldrb r2, [r1]
 	lsls r1, r2, 3
@@ -2381,7 +2381,7 @@ _081551A0:
 	strb r0, [r1]
 	adds r0, r4, 0
 	movs r1, 0
-	bl sub_80979D4
+	bl UpdateEventObjectSpriteVisibility
 _081551E4:
 	add sp, 0x4
 	pop {r4,r5}
@@ -2765,7 +2765,7 @@ sub_81554AC: @ 81554AC
 	movs r2, 0x32
 	ldrsh r1, [r4, r2]
 	bl CurrentMapDrawMetatileAt
-	ldr r2, =gMapObjects
+	ldr r2, =gEventObjects
 	ldr r0, =gPlayerAvatar
 	ldrb r1, [r0, 0x5]
 	lsls r0, r1, 3
@@ -2789,7 +2789,7 @@ sub_815550C: @ 815550C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0
-	bl sub_80979D4
+	bl UpdateEventObjectSpriteVisibility
 	adds r0, r4, 0
 	adds r0, 0x3F
 	ldrb r1, [r0]
@@ -2972,7 +2972,7 @@ sub_8155658: @ 8155658
 	lsls r4, r0, 3
 	adds r4, r0
 	lsls r4, 2
-	ldr r0, =gMapObjects
+	ldr r0, =gEventObjects
 	adds r4, r0
 	ldrb r0, [r4, 0x4]
 	lsls r5, r0, 4
@@ -3319,13 +3319,13 @@ sub_8155900: @ 8155900
 	ldrb r0, [r7]
 	ldrb r1, [r7, 0x4]
 	ldrb r2, [r7, 0x8]
-	bl GetFieldObjectIdByLocalIdAndMap
+	bl GetEventObjectIdByLocalIdAndMap
 	lsls r0, 24
 	lsrs r0, 24
 	lsls r1, r0, 3
 	adds r1, r0
 	lsls r1, 2
-	ldr r0, =gMapObjects
+	ldr r0, =gEventObjects
 	adds r6, r1, r0
 	ldr r0, =gFieldEffectObjectTemplatePointers
 	ldr r0, [r0, 0x74]
@@ -3338,7 +3338,7 @@ sub_8155900: @ 8155900
 	cmp r4, 0x40
 	beq _081559A4
 	ldrb r0, [r6, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetEventObjectGraphicsInfo
 	adds r5, r0, 0
 	lsls r0, r4, 4
 	adds r0, r4
@@ -3415,11 +3415,11 @@ sub_81559BC: @ 81559BC
 	lsls r2, 24
 	lsrs r2, 24
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetEventObjectIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _081559F6
-	ldr r2, =gMapObjects
+	ldr r2, =gEventObjects
 	mov r0, sp
 	ldrb r1, [r0]
 	lsls r0, r1, 3
@@ -3474,7 +3474,7 @@ _08155A46:
 	strh r6, [r4, 0x20]
 	strh r5, [r4, 0x22]
 	ldr r3, =gSprites
-	ldr r2, =gMapObjects
+	ldr r2, =gEventObjects
 	mov r0, sp
 	ldrb r1, [r0]
 	lsls r0, r1, 3
@@ -3493,7 +3493,7 @@ _08155A46:
 	strb r0, [r1]
 	adds r0, r4, 0
 	movs r1, 0
-	bl sub_80979D4
+	bl UpdateEventObjectSpriteVisibility
 _08155A76:
 	add sp, 0x4
 	pop {r4-r6}
@@ -3567,7 +3567,7 @@ sub_8155AEC: @ 8155AEC
 	strh r1, [r4, 0x22]
 	adds r0, r4, 0
 	movs r1, 0
-	bl sub_80979D4
+	bl UpdateEventObjectSpriteVisibility
 	ldrh r1, [r4, 0x3E]
 	ldr r0, =0x00001004
 	ands r0, r1
@@ -3694,7 +3694,7 @@ ShowDisguiseFieldEffect: @ 8155BD0
 	ldrb r1, [r5, 0x4]
 	ldrb r2, [r5, 0x8]
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetEventObjectIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	beq _08155C08
@@ -3783,7 +3783,7 @@ sub_8155C88: @ 8155C88
 	lsls r2, 24
 	lsrs r2, 24
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetEventObjectIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	beq _08155CB8
@@ -3793,7 +3793,7 @@ sub_8155C88: @ 8155C88
 	adds r0, r5, 0
 	bl FieldEffectStop
 _08155CB8:
-	ldr r4, =gMapObjects
+	ldr r4, =gEventObjects
 	mov r0, sp
 	ldrb r1, [r0]
 	lsls r0, r1, 3
@@ -3801,7 +3801,7 @@ _08155CB8:
 	lsls r0, 2
 	adds r0, r4
 	ldrb r0, [r0, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetEventObjectGraphicsInfo
 	mov r1, sp
 	ldrb r2, [r1]
 	lsls r1, r2, 3
@@ -4460,7 +4460,7 @@ sub_8156194: @ 8156194
 _081561B2:
 	adds r0, r4, 0
 	movs r1, 0
-	bl sub_80979D4
+	bl UpdateEventObjectSpriteVisibility
 	ldrh r0, [r4, 0x2E]
 	lsls r0, 24
 	lsrs r0, 24
@@ -4492,7 +4492,7 @@ sub_81561D0: @ 81561D0
 _081561EE:
 	adds r0, r2, 0
 	movs r1, 0
-	bl sub_80979D4
+	bl UpdateEventObjectSpriteVisibility
 _081561F6:
 	pop {r0}
 	bx r0
@@ -4514,14 +4514,14 @@ _08156212:
 	lsls r0, r7, 3
 	adds r0, r7
 	lsls r0, 2
-	ldr r1, =gMapObjects
+	ldr r1, =gEventObjects
 	adds r4, r0, r1
 	ldrb r0, [r4]
 	lsls r0, 31
 	cmp r0, 0
 	beq _081562B4
 	ldrb r0, [r4, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetEventObjectGraphicsInfo
 	ldrb r1, [r4, 0x4]
 	lsls r0, r1, 4
 	adds r0, r1
diff --git a/asm/field_ground_effect.s b/asm/field_ground_effect.s
deleted file mode 100644
index 2152a5c5b..000000000
--- a/asm/field_ground_effect.s
+++ /dev/null
@@ -1,1929 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start GetAllGroundEffectFlags_OnSpawn
-@ void GetAllGroundEffectFlags_OnSpawn(struct npc_state *fieldObject, u32 *flags)
-GetAllGroundEffectFlags_OnSpawn: @ 8096638
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	bl FieldObjectUpdateMetatileBehaviors
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_Reflection
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_TallGrassOnSpawn
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_LongGrassOnSpawn
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_SandHeap
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_ShallowFlowingWater
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_ShortGrass
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_HotSprings
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end GetAllGroundEffectFlags_OnSpawn
-
-	thumb_func_start GetAllGroundEffectFlags_OnBeginStep
-@ void GetAllGroundEffectFlags_OnBeginStep(struct npc_state *fieldObject, u32 *flags)
-GetAllGroundEffectFlags_OnBeginStep: @ 8096680
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	bl FieldObjectUpdateMetatileBehaviors
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_Reflection
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_TallGrassOnBeginStep
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_LongGrassOnBeginStep
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_Tracks
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_SandHeap
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_ShallowFlowingWater
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_Puddle
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_ShortGrass
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_HotSprings
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end GetAllGroundEffectFlags_OnBeginStep
-
-	thumb_func_start GetAllGroundEffectFlags_OnFinishStep
-@ void GetAllGroundEffectFlags_OnFinishStep(struct npc_state *fieldObject, u32 *flags)
-GetAllGroundEffectFlags_OnFinishStep: @ 80966D8
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	bl FieldObjectUpdateMetatileBehaviors
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_ShallowFlowingWater
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_SandHeap
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_Puddle
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_Ripple
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_ShortGrass
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_HotSprings
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_Seaweed
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl GetGroundEffectFlags_JumpLanding
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end GetAllGroundEffectFlags_OnFinishStep
-
-	thumb_func_start FieldObjectUpdateMetatileBehaviors
-@ void FieldObjectUpdateMetatileBehaviors(struct npc_state *fieldObject)
-FieldObjectUpdateMetatileBehaviors: @ 8096728
-	push {r4,lr}
-	adds r4, r0, 0
-	movs r1, 0x14
-	ldrsh r0, [r4, r1]
-	movs r2, 0x16
-	ldrsh r1, [r4, r2]
-	bl MapGridGetMetatileBehaviorAt
-	strb r0, [r4, 0x1F]
-	movs r1, 0x10
-	ldrsh r0, [r4, r1]
-	movs r2, 0x12
-	ldrsh r1, [r4, r2]
-	bl MapGridGetMetatileBehaviorAt
-	strb r0, [r4, 0x1E]
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end FieldObjectUpdateMetatileBehaviors
-
-	thumb_func_start GetGroundEffectFlags_Reflection
-@ void GetGroundEffectFlags_Reflection(struct npc_state *fieldObject, u32 *flags)
-GetGroundEffectFlags_Reflection: @ 8096750
-	push {r4,r5,lr}
-	sub sp, 0x8
-	adds r4, r0, 0
-	adds r5, r1, 0
-	ldr r0, =gUnknown_0850E5DC
-	ldr r1, [r0, 0x4]
-	ldr r0, [r0]
-	str r0, [sp]
-	str r1, [sp, 0x4]
-	adds r0, r4, 0
-	bl FieldObjectCheckForReflectiveSurface
-	lsls r0, 24
-	lsrs r2, r0, 24
-	cmp r2, 0
-	beq _08096798
-	ldrb r1, [r4, 0x2]
-	lsls r0, r1, 30
-	cmp r0, 0
-	blt _080967A2
-	movs r0, 0x3
-	negs r0, r0
-	ands r0, r1
-	movs r1, 0x2
-	orrs r0, r1
-	strb r0, [r4, 0x2]
-	subs r0, r2, 0x1
-	lsls r0, 2
-	add r0, sp
-	ldr r1, [r5]
-	ldr r0, [r0]
-	orrs r1, r0
-	str r1, [r5]
-	b _080967A2
-	.pool
-_08096798:
-	ldrb r1, [r4, 0x2]
-	movs r0, 0x3
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r4, 0x2]
-_080967A2:
-	add sp, 0x8
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end GetGroundEffectFlags_Reflection
-
-	thumb_func_start GetGroundEffectFlags_TallGrassOnSpawn
-@ void GetGroundEffectFlags_TallGrassOnSpawn(struct npc_state *fieldObject, u32 *flags)
-GetGroundEffectFlags_TallGrassOnSpawn: @ 80967AC
-	push {r4,lr}
-	adds r4, r1, 0
-	ldrb r0, [r0, 0x1E]
-	bl MetatileBehavior_IsTallGrass
-	lsls r0, 24
-	cmp r0, 0
-	beq _080967C4
-	ldr r0, [r4]
-	movs r1, 0x1
-	orrs r0, r1
-	str r0, [r4]
-_080967C4:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end GetGroundEffectFlags_TallGrassOnSpawn
-
-	thumb_func_start GetGroundEffectFlags_TallGrassOnBeginStep
-@ void GetGroundEffectFlags_TallGrassOnBeginStep(struct npc_state *fieldObject, u32 *flags)
-GetGroundEffectFlags_TallGrassOnBeginStep: @ 80967CC
-	push {r4,lr}
-	adds r4, r1, 0
-	ldrb r0, [r0, 0x1E]
-	bl MetatileBehavior_IsTallGrass
-	lsls r0, 24
-	cmp r0, 0
-	beq _080967E4
-	ldr r0, [r4]
-	movs r1, 0x2
-	orrs r0, r1
-	str r0, [r4]
-_080967E4:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end GetGroundEffectFlags_TallGrassOnBeginStep
-
-	thumb_func_start GetGroundEffectFlags_LongGrassOnSpawn
-@ void GetGroundEffectFlags_LongGrassOnSpawn(struct npc_state *fieldObject, u32 *flags)
-GetGroundEffectFlags_LongGrassOnSpawn: @ 80967EC
-	push {r4,lr}
-	adds r4, r1, 0
-	ldrb r0, [r0, 0x1E]
-	bl MetatileBehavior_IsLongGrass
-	lsls r0, 24
-	cmp r0, 0
-	beq _08096804
-	ldr r0, [r4]
-	movs r1, 0x4
-	orrs r0, r1
-	str r0, [r4]
-_08096804:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end GetGroundEffectFlags_LongGrassOnSpawn
-
-	thumb_func_start GetGroundEffectFlags_LongGrassOnBeginStep
-@ void GetGroundEffectFlags_LongGrassOnBeginStep(struct npc_state *fieldObject, u32 *flags)
-GetGroundEffectFlags_LongGrassOnBeginStep: @ 809680C
-	push {r4,lr}
-	adds r4, r1, 0
-	ldrb r0, [r0, 0x1E]
-	bl MetatileBehavior_IsLongGrass
-	lsls r0, 24
-	cmp r0, 0
-	beq _08096824
-	ldr r0, [r4]
-	movs r1, 0x8
-	orrs r0, r1
-	str r0, [r4]
-_08096824:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end GetGroundEffectFlags_LongGrassOnBeginStep
-
-	thumb_func_start GetGroundEffectFlags_Tracks
-@ void GetGroundEffectFlags_Tracks(struct npc_state *fieldObject, u32 *flags)
-GetGroundEffectFlags_Tracks: @ 809682C
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	ldrb r0, [r4, 0x1F]
-	bl MetatileBehavior_IsDeepSand
-	lsls r0, 24
-	cmp r0, 0
-	beq _08096846
-	ldr r0, [r5]
-	movs r1, 0x80
-	lsls r1, 1
-	b _08096862
-_08096846:
-	ldrb r0, [r4, 0x1F]
-	bl MetatileBehavior_IsSandOrDeepSand
-	lsls r0, 24
-	cmp r0, 0
-	bne _0809685E
-	ldrb r0, [r4, 0x1F]
-	bl MetatileBehavior_IsUnusedFootprintMetatile
-	lsls r0, 24
-	cmp r0, 0
-	beq _08096866
-_0809685E:
-	ldr r0, [r5]
-	movs r1, 0x80
-_08096862:
-	orrs r0, r1
-	str r0, [r5]
-_08096866:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end GetGroundEffectFlags_Tracks
-
-	thumb_func_start GetGroundEffectFlags_SandHeap
-@ void GetGroundEffectFlags_SandHeap(struct npc_state *fieldObject, u32 *flags)
-GetGroundEffectFlags_SandHeap: @ 809686C
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	ldrb r0, [r4, 0x1E]
-	bl MetatileBehavior_IsDeepSand
-	lsls r0, 24
-	cmp r0, 0
-	beq _080968AA
-	ldrb r0, [r4, 0x1F]
-	bl MetatileBehavior_IsDeepSand
-	lsls r0, 24
-	cmp r0, 0
-	beq _080968AA
-	ldrb r1, [r4, 0x2]
-	lsls r0, r1, 27
-	cmp r0, 0
-	blt _080968B4
-	movs r0, 0x11
-	negs r0, r0
-	ands r0, r1
-	movs r1, 0x10
-	orrs r0, r1
-	strb r0, [r4, 0x2]
-	ldr r0, [r5]
-	movs r1, 0x80
-	lsls r1, 4
-	orrs r0, r1
-	str r0, [r5]
-	b _080968B4
-_080968AA:
-	ldrb r1, [r4, 0x2]
-	movs r0, 0x11
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r4, 0x2]
-_080968B4:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end GetGroundEffectFlags_SandHeap
-
-	thumb_func_start GetGroundEffectFlags_ShallowFlowingWater
-@ void GetGroundEffectFlags_ShallowFlowingWater(struct npc_state *fieldObject, u32 *flags)
-GetGroundEffectFlags_ShallowFlowingWater: @ 80968BC
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	ldrb r0, [r4, 0x1E]
-	bl MetatileBehavior_IsShallowFlowingWater
-	lsls r0, 24
-	cmp r0, 0
-	beq _080968DA
-	ldrb r0, [r4, 0x1F]
-	bl MetatileBehavior_IsShallowFlowingWater
-	lsls r0, 24
-	cmp r0, 0
-	bne _080968F2
-_080968DA:
-	ldrb r0, [r4, 0x1E]
-	bl MetatileBehavior_IsPacifidlogLog
-	lsls r0, 24
-	cmp r0, 0
-	beq _08096910
-	ldrb r0, [r4, 0x1F]
-	bl MetatileBehavior_IsPacifidlogLog
-	lsls r0, 24
-	cmp r0, 0
-	beq _08096910
-_080968F2:
-	ldrb r1, [r4, 0x2]
-	lsls r0, r1, 28
-	cmp r0, 0
-	blt _0809691A
-	movs r0, 0x9
-	negs r0, r0
-	ands r0, r1
-	movs r1, 0x8
-	orrs r0, r1
-	strb r0, [r4, 0x2]
-	ldr r0, [r5]
-	movs r1, 0x40
-	orrs r0, r1
-	str r0, [r5]
-	b _0809691A
-_08096910:
-	ldrb r1, [r4, 0x2]
-	movs r0, 0x9
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r4, 0x2]
-_0809691A:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end GetGroundEffectFlags_ShallowFlowingWater
-
-	thumb_func_start GetGroundEffectFlags_Puddle
-@ void GetGroundEffectFlags_Puddle(struct npc_state *fieldObject, u32 *flags)
-GetGroundEffectFlags_Puddle: @ 8096920
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	ldrb r0, [r4, 0x1E]
-	bl MetatileBehavior_IsPuddle
-	lsls r0, 24
-	cmp r0, 0
-	beq _08096948
-	ldrb r0, [r4, 0x1F]
-	bl MetatileBehavior_IsPuddle
-	lsls r0, 24
-	cmp r0, 0
-	beq _08096948
-	ldr r0, [r5]
-	movs r1, 0x80
-	lsls r1, 3
-	orrs r0, r1
-	str r0, [r5]
-_08096948:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end GetGroundEffectFlags_Puddle
-
-	thumb_func_start GetGroundEffectFlags_Ripple
-@ void GetGroundEffectFlags_Ripple(struct npc_state *fieldObject, u32 *flags)
-GetGroundEffectFlags_Ripple: @ 8096950
-	push {r4,lr}
-	adds r4, r1, 0
-	ldrb r0, [r0, 0x1E]
-	bl MetatileBehavior_HasRipples
-	lsls r0, 24
-	cmp r0, 0
-	beq _0809696A
-	ldr r0, [r4]
-	movs r1, 0x80
-	lsls r1, 2
-	orrs r0, r1
-	str r0, [r4]
-_0809696A:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end GetGroundEffectFlags_Ripple
-
-	thumb_func_start GetGroundEffectFlags_ShortGrass
-@ void GetGroundEffectFlags_ShortGrass(struct npc_state *fieldObject, u32 *flags)
-GetGroundEffectFlags_ShortGrass: @ 8096970
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	ldrb r0, [r4, 0x1E]
-	bl MetatileBehavior_IsShortGrass
-	lsls r0, 24
-	cmp r0, 0
-	beq _080969AE
-	ldrb r0, [r4, 0x1F]
-	bl MetatileBehavior_IsShortGrass
-	lsls r0, 24
-	cmp r0, 0
-	beq _080969AE
-	ldrb r1, [r4, 0x2]
-	lsls r0, r1, 29
-	cmp r0, 0
-	blt _080969B8
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r1
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r4, 0x2]
-	ldr r0, [r5]
-	movs r1, 0x80
-	lsls r1, 10
-	orrs r0, r1
-	str r0, [r5]
-	b _080969B8
-_080969AE:
-	ldrb r1, [r4, 0x2]
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r4, 0x2]
-_080969B8:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end GetGroundEffectFlags_ShortGrass
-
-	thumb_func_start GetGroundEffectFlags_HotSprings
-@ void GetGroundEffectFlags_HotSprings(struct npc_state *fieldObject, u32 *flags)
-GetGroundEffectFlags_HotSprings: @ 80969C0
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	ldrb r0, [r4, 0x1E]
-	bl MetatileBehavior_IsHotSprings
-	lsls r0, 24
-	cmp r0, 0
-	beq _080969FE
-	ldrb r0, [r4, 0x1F]
-	bl MetatileBehavior_IsHotSprings
-	lsls r0, 24
-	cmp r0, 0
-	beq _080969FE
-	ldrb r1, [r4, 0x2]
-	lsls r0, r1, 26
-	cmp r0, 0
-	blt _08096A08
-	movs r0, 0x21
-	negs r0, r0
-	ands r0, r1
-	movs r1, 0x20
-	orrs r0, r1
-	strb r0, [r4, 0x2]
-	ldr r0, [r5]
-	movs r1, 0x80
-	lsls r1, 11
-	orrs r0, r1
-	str r0, [r5]
-	b _08096A08
-_080969FE:
-	ldrb r1, [r4, 0x2]
-	movs r0, 0x21
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r4, 0x2]
-_08096A08:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end GetGroundEffectFlags_HotSprings
-
-	thumb_func_start GetGroundEffectFlags_Seaweed
-@ void GetGroundEffectFlags_Seaweed(struct npc_state *fieldObject, u32 *flags)
-GetGroundEffectFlags_Seaweed: @ 8096A10
-	push {r4,lr}
-	adds r4, r1, 0
-	ldrb r0, [r0, 0x1E]
-	bl MetatileBehavior_IsSeaweed
-	lsls r0, 24
-	cmp r0, 0
-	beq _08096A2A
-	ldr r0, [r4]
-	movs r1, 0x80
-	lsls r1, 12
-	orrs r0, r1
-	str r0, [r4]
-_08096A2A:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end GetGroundEffectFlags_Seaweed
-
-	thumb_func_start GetGroundEffectFlags_JumpLanding
-@ void GetGroundEffectFlags_JumpLanding(struct npc_state *fieldObject, u32 *flags)
-GetGroundEffectFlags_JumpLanding: @ 8096A30
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	adds r7, r0, 0
-	adds r6, r1, 0
-	ldr r0, [r7]
-	ldr r1, =0x02000020
-	ands r0, r1
-	cmp r0, 0x20
-	bne _08096A82
-	movs r5, 0
-	ldr r0, =gUnknown_0850E5E4
-	mov r8, r0
-_08096A4A:
-	lsls r4, r5, 2
-	mov r0, r8
-	adds r1, r4, r0
-	ldrb r0, [r7, 0x1E]
-	ldr r1, [r1]
-	bl _call_via_r1
-	lsls r0, 24
-	cmp r0, 0
-	beq _08096A78
-	ldr r0, =gUnknown_0850E5FC
-	adds r0, r4, r0
-	ldr r1, [r6]
-	ldr r0, [r0]
-	orrs r1, r0
-	str r1, [r6]
-	b _08096A82
-	.pool
-_08096A78:
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0x5
-	bls _08096A4A
-_08096A82:
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end GetGroundEffectFlags_JumpLanding
-
-	thumb_func_start FieldObjectCheckForReflectiveSurface
-@ u8 FieldObjectCheckForReflectiveSurface(struct npc_state *fieldObject)
-FieldObjectCheckForReflectiveSurface: @ 8096A8C
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x8
-	adds r5, r0, 0
-	ldrb r0, [r5, 0x5]
-	bl GetFieldObjectGraphicsInfo
-	movs r2, 0x8
-	ldrsh r1, [r0, r2]
-	adds r1, 0x8
-	lsls r1, 12
-	lsrs r1, 16
-	str r1, [sp]
-	movs r1, 0xA
-	ldrsh r0, [r0, r1]
-	adds r0, 0x8
-	lsls r0, 12
-	movs r4, 0
-	lsrs r2, r0, 16
-	str r2, [sp, 0x4]
-	asrs r0, 16
-	cmp r4, r0
-	blt _08096AC2
-	b _08096BC8
-_08096AC2:
-	movs r0, 0x1
-	mov r10, r0
-_08096AC6:
-	movs r1, 0x10
-	ldrsh r0, [r5, r1]
-	movs r2, 0x12
-	ldrsh r1, [r5, r2]
-	add r1, r10
-	lsls r4, 16
-	asrs r6, r4, 16
-	adds r1, r6
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetReflectionTypeByMetatileBehavior
-	lsls r0, 24
-	lsrs r0, 24
-	mov r9, r4
-	cmp r0, 0
-	bne _08096BCA
-	movs r1, 0x14
-	ldrsh r0, [r5, r1]
-	movs r2, 0x16
-	ldrsh r1, [r5, r2]
-	add r1, r10
-	adds r1, r6
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetReflectionTypeByMetatileBehavior
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0
-	bne _08096BCA
-	movs r2, 0x1
-	ldr r1, [sp]
-	lsls r0, r1, 16
-	asrs r1, r0, 16
-	mov r8, r0
-	cmp r2, r1
-	bge _08096BB6
-	movs r0, 0x80
-	lsls r0, 9
-	asrs r7, r0, 16
-_08096B20:
-	movs r1, 0x10
-	ldrsh r0, [r5, r1]
-	lsls r1, r2, 16
-	asrs r4, r1, 16
-	adds r0, r4
-	movs r2, 0x12
-	ldrsh r1, [r5, r2]
-	adds r1, r7
-	adds r1, r6
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetReflectionTypeByMetatileBehavior
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0
-	bne _08096BCA
-	movs r1, 0x10
-	ldrsh r0, [r5, r1]
-	subs r0, r4
-	movs r2, 0x12
-	ldrsh r1, [r5, r2]
-	adds r1, r7
-	adds r1, r6
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetReflectionTypeByMetatileBehavior
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0
-	bne _08096BCA
-	movs r1, 0x14
-	ldrsh r0, [r5, r1]
-	adds r0, r4
-	movs r2, 0x16
-	ldrsh r1, [r5, r2]
-	adds r1, r7
-	adds r1, r6
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetReflectionTypeByMetatileBehavior
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0
-	bne _08096BCA
-	movs r1, 0x14
-	ldrsh r0, [r5, r1]
-	subs r0, r4
-	movs r2, 0x16
-	ldrsh r1, [r5, r2]
-	adds r1, r7
-	adds r1, r6
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetReflectionTypeByMetatileBehavior
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0
-	bne _08096BCA
-	adds r0, r4, 0x1
-	lsls r0, 16
-	lsrs r2, r0, 16
-	cmp r0, r8
-	blt _08096B20
-_08096BB6:
-	movs r1, 0x80
-	lsls r1, 9
-	add r1, r9
-	lsrs r4, r1, 16
-	ldr r2, [sp, 0x4]
-	lsls r0, r2, 16
-	cmp r1, r0
-	bge _08096BC8
-	b _08096AC6
-_08096BC8:
-	movs r0, 0
-_08096BCA:
-	add sp, 0x8
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end FieldObjectCheckForReflectiveSurface
-
-	thumb_func_start GetReflectionTypeByMetatileBehavior
-@ u8 GetReflectionTypeByMetatileBehavior(u8 metatileBehavior)
-GetReflectionTypeByMetatileBehavior: @ 8096BDC
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	adds r0, r4, 0
-	bl MetatileBehavior_IsIce
-	lsls r0, 24
-	cmp r0, 0
-	beq _08096BF2
-	movs r0, 0x1
-	b _08096C04
-_08096BF2:
-	adds r0, r4, 0
-	bl MetatileBehavior_IsReflective
-	lsls r0, 24
-	cmp r0, 0
-	bne _08096C02
-	movs r0, 0
-	b _08096C04
-_08096C02:
-	movs r0, 0x2
-_08096C04:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end GetReflectionTypeByMetatileBehavior
-
-	thumb_func_start GetLedgeJumpDirection
-@ u8 GetLedgeJumpDirection(u16 x, u16 y, u8 direction)
-GetLedgeJumpDirection: @ 8096C0C
-	push {r4,lr}
-	lsls r0, 16
-	lsrs r3, r0, 16
-	lsls r1, 16
-	lsrs r1, 16
-	lsls r2, 24
-	lsrs r4, r2, 24
-	cmp r4, 0
-	beq _08096C52
-	cmp r4, 0x4
-	bls _08096C28
-	subs r0, r4, 0x4
-	lsls r0, 24
-	lsrs r4, r0, 24
-_08096C28:
-	subs r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	lsls r0, r3, 16
-	asrs r0, 16
-	lsls r1, 16
-	asrs r1, 16
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, =gUnknown_0850E614
-	lsls r1, r4, 2
-	adds r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _08096C5C
-_08096C52:
-	movs r0, 0
-	b _08096C62
-	.pool
-_08096C5C:
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r0, 24
-_08096C62:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end GetLedgeJumpDirection
-
-	thumb_func_start FieldObjectSetSpriteOamTableForLongGrass
-@ void FieldObjectSetSpriteOamTableForLongGrass(struct npc_state *fieldObject, struct obj *object)
-FieldObjectSetSpriteOamTableForLongGrass: @ 8096C68
-	push {r4-r6,lr}
-	adds r5, r0, 0
-	adds r4, r1, 0
-	ldrb r0, [r5]
-	lsls r0, 27
-	cmp r0, 0
-	blt _08096CBC
-	ldrb r0, [r5, 0x1E]
-	bl MetatileBehavior_IsLongGrass
-	lsls r0, 24
-	cmp r0, 0
-	beq _08096CBC
-	ldrb r0, [r5, 0x1F]
-	bl MetatileBehavior_IsLongGrass
-	lsls r0, 24
-	cmp r0, 0
-	beq _08096CBC
-	adds r4, 0x42
-	ldrb r1, [r4]
-	movs r6, 0x40
-	negs r6, r6
-	adds r0, r6, 0
-	ands r0, r1
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r4]
-	ldrb r0, [r5, 0xB]
-	lsrs r0, 4
-	bl ZCoordToPriority
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _08096CBC
-	ldrb r0, [r4]
-	adds r1, r6, 0
-	ands r1, r0
-	movs r0, 0x5
-	orrs r1, r0
-	strb r1, [r4]
-_08096CBC:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	thumb_func_end FieldObjectSetSpriteOamTableForLongGrass
-
-	thumb_func_start IsZCoordMismatchAt
-@ bool8 IsZCoordMismatchAt(u8 z, u16 x, u16 y)
-IsZCoordMismatchAt: @ 8096CC4
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	lsls r1, 16
-	lsrs r0, r1, 16
-	lsls r2, 16
-	lsrs r1, r2, 16
-	cmp r4, 0
-	beq _08096CF2
-	lsls r0, 16
-	asrs r0, 16
-	lsls r1, 16
-	asrs r1, 16
-	bl MapGridGetZCoordAt
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0
-	beq _08096CF2
-	cmp r0, 0xF
-	beq _08096CF2
-	cmp r0, r4
-	bne _08096CF6
-_08096CF2:
-	movs r0, 0
-	b _08096CF8
-_08096CF6:
-	movs r0, 0x1
-_08096CF8:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end IsZCoordMismatchAt
-
-	thumb_func_start FieldObjectUpdateZCoordAndPriority
-@ void FieldObjectUpdateZCoordAndPriority(struct npc_state *fieldObject, struct obj *object)
-FieldObjectUpdateZCoordAndPriority: @ 8096D00
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	ldrb r0, [r4, 0x3]
-	lsls r0, 29
-	cmp r0, 0
-	blt _08096D4E
-	adds r0, r4, 0
-	bl FieldObjectUpdateZCoord
-	ldr r1, =gUnknown_0850E644
-	ldrb r2, [r4, 0xB]
-	lsls r2, 24
-	lsrs r0, r2, 28
-	adds r0, r1
-	ldrb r0, [r0]
-	adds r4, r5, 0
-	adds r4, 0x42
-	movs r1, 0x3F
-	ands r1, r0
-	ldrb r3, [r4]
-	movs r0, 0x40
-	negs r0, r0
-	ands r0, r3
-	orrs r0, r1
-	strb r0, [r4]
-	ldr r0, =gUnknown_0850E634
-	lsrs r2, 28
-	adds r2, r0
-	movs r0, 0x3
-	ldrb r1, [r2]
-	ands r1, r0
-	lsls r1, 2
-	ldrb r2, [r5, 0x5]
-	movs r0, 0xD
-	negs r0, r0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r5, 0x5]
-_08096D4E:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end FieldObjectUpdateZCoordAndPriority
-
-	thumb_func_start InitObjectPriorityByZCoord
-@ void InitObjectPriorityByZCoord(struct obj *object, u8 z)
-InitObjectPriorityByZCoord: @ 8096D5C
-	push {r4,lr}
-	lsls r1, 24
-	lsrs r1, 24
-	ldr r2, =gUnknown_0850E644
-	adds r2, r1, r2
-	ldrb r2, [r2]
-	movs r3, 0x42
-	adds r3, r0
-	mov r12, r3
-	movs r3, 0x3F
-	ands r3, r2
-	mov r2, r12
-	ldrb r4, [r2]
-	movs r2, 0x40
-	negs r2, r2
-	ands r2, r4
-	orrs r2, r3
-	mov r3, r12
-	strb r2, [r3]
-	ldr r2, =gUnknown_0850E634
-	adds r1, r2
-	movs r3, 0x3
-	ldrb r2, [r1]
-	ands r2, r3
-	lsls r2, 2
-	ldrb r3, [r0, 0x5]
-	movs r1, 0xD
-	negs r1, r1
-	ands r1, r3
-	orrs r1, r2
-	strb r1, [r0, 0x5]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end InitObjectPriorityByZCoord
-
-	thumb_func_start ZCoordToPriority
-@ u8 ZCoordToPriority(u8 z)
-ZCoordToPriority: @ 8096DA8
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, =gUnknown_0850E634
-	adds r0, r1
-	ldrb r0, [r0]
-	bx lr
-	.pool
-	thumb_func_end ZCoordToPriority
-
-	thumb_func_start FieldObjectUpdateZCoord
-@ void FieldObjectUpdateZCoord(struct npc_state *fieldObject)
-FieldObjectUpdateZCoord: @ 8096DB8
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	movs r1, 0x10
-	ldrsh r0, [r4, r1]
-	movs r2, 0x12
-	ldrsh r1, [r4, r2]
-	bl MapGridGetZCoordAt
-	lsls r0, 24
-	lsrs r5, r0, 24
-	movs r1, 0x14
-	ldrsh r0, [r4, r1]
-	movs r2, 0x16
-	ldrsh r1, [r4, r2]
-	bl MapGridGetZCoordAt
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r5, 0xF
-	beq _08096E06
-	cmp r0, 0xF
-	beq _08096E06
-	movs r3, 0xF
-	adds r0, r5, 0
-	ands r0, r3
-	ldrb r1, [r4, 0xB]
-	movs r2, 0x10
-	negs r2, r2
-	ands r2, r1
-	orrs r2, r0
-	strb r2, [r4, 0xB]
-	cmp r5, 0
-	beq _08096E06
-	cmp r5, 0xF
-	beq _08096E06
-	lsls r0, r5, 4
-	ands r2, r3
-	orrs r2, r0
-	strb r2, [r4, 0xB]
-_08096E06:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end FieldObjectUpdateZCoord
-
-	thumb_func_start SetObjectSubpriorityByZCoord
-@ void SetObjectSubpriorityByZCoord(u8 z, struct obj *object, u8 offset)
-SetObjectSubpriorityByZCoord: @ 8096E0C
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r2, 24
-	lsrs r2, 24
-	adds r3, r1, 0
-	adds r3, 0x29
-	movs r5, 0
-	ldrsb r5, [r3, r5]
-	ldrh r4, [r1, 0x22]
-	ldr r3, =gSpriteCoordOffsetY
-	subs r4, r5
-	ldrh r3, [r3]
-	adds r4, r3
-	adds r4, 0x8
-	movs r3, 0xFF
-	ands r4, r3
-	lsrs r4, 4
-	movs r3, 0x10
-	subs r3, r4
-	lsls r3, 17
-	ldr r4, =gUnknown_0850E624
-	adds r0, r4
-	lsrs r3, 16
-	ldrb r0, [r0]
-	adds r3, r0
-	adds r2, r3
-	adds r1, 0x43
-	strb r2, [r1]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end SetObjectSubpriorityByZCoord
-
-	thumb_func_start FieldObjectUpdateSubpriority
-@ void FieldObjectUpdateSubpriority(struct npc_state *fieldObject, struct obj *object)
-FieldObjectUpdateSubpriority: @ 8096E54
-	push {lr}
-	adds r2, r0, 0
-	ldrb r0, [r2, 0x3]
-	lsls r0, 29
-	cmp r0, 0
-	blt _08096E6A
-	ldrb r0, [r2, 0xB]
-	lsrs r0, 4
-	movs r2, 0x1
-	bl SetObjectSubpriorityByZCoord
-_08096E6A:
-	pop {r0}
-	bx r0
-	thumb_func_end FieldObjectUpdateSubpriority
-
-	thumb_func_start AreZCoordsCompatible
-@ bool8 AreZCoordsCompatible(u8 z1, u8 z2)
-AreZCoordsCompatible: @ 8096E70
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, 24
-	lsrs r1, 24
-	cmp r0, 0
-	beq _08096E86
-	cmp r1, 0
-	beq _08096E86
-	cmp r0, r1
-	bne _08096E8A
-_08096E86:
-	movs r0, 0x1
-	b _08096E8C
-_08096E8A:
-	movs r0, 0
-_08096E8C:
-	pop {r1}
-	bx r1
-	thumb_func_end AreZCoordsCompatible
-
-	thumb_func_start GroundEffect_SpawnOnTallGrass
-@ void GroundEffect_SpawnOnTallGrass(struct npc_state *fieldObject, struct obj *object)
-GroundEffect_SpawnOnTallGrass: @ 8096E90
-	push {lr}
-	ldr r3, =gFieldEffectArguments
-	movs r2, 0x10
-	ldrsh r1, [r0, r2]
-	str r1, [r3]
-	movs r2, 0x12
-	ldrsh r1, [r0, r2]
-	str r1, [r3, 0x4]
-	ldrb r1, [r0, 0xB]
-	lsrs r1, 4
-	str r1, [r3, 0x8]
-	movs r1, 0x2
-	str r1, [r3, 0xC]
-	ldrb r1, [r0, 0x8]
-	lsls r1, 8
-	ldrb r2, [r0, 0x9]
-	orrs r1, r2
-	str r1, [r3, 0x10]
-	ldrb r0, [r0, 0xA]
-	str r0, [r3, 0x14]
-	ldr r0, =gSaveBlock1Ptr
-	ldr r1, [r0]
-	ldrb r0, [r1, 0x5]
-	lsls r0, 8
-	ldrb r1, [r1, 0x4]
-	orrs r0, r1
-	str r0, [r3, 0x18]
-	movs r0, 0x1
-	str r0, [r3, 0x1C]
-	movs r0, 0x4
-	bl FieldEffectStart
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end GroundEffect_SpawnOnTallGrass
-
-	thumb_func_start GroundEffect_StepOnTallGrass
-@ void GroundEffect_StepOnTallGrass(struct npc_state *fieldObject, struct obj *object)
-GroundEffect_StepOnTallGrass: @ 8096EDC
-	push {lr}
-	ldr r3, =gFieldEffectArguments
-	movs r2, 0x10
-	ldrsh r1, [r0, r2]
-	str r1, [r3]
-	movs r2, 0x12
-	ldrsh r1, [r0, r2]
-	str r1, [r3, 0x4]
-	ldrb r1, [r0, 0xB]
-	lsrs r1, 4
-	str r1, [r3, 0x8]
-	movs r1, 0x2
-	str r1, [r3, 0xC]
-	ldrb r1, [r0, 0x8]
-	lsls r1, 8
-	ldrb r2, [r0, 0x9]
-	orrs r1, r2
-	str r1, [r3, 0x10]
-	ldrb r0, [r0, 0xA]
-	str r0, [r3, 0x14]
-	ldr r0, =gSaveBlock1Ptr
-	ldr r1, [r0]
-	ldrb r0, [r1, 0x5]
-	lsls r0, 8
-	ldrb r1, [r1, 0x4]
-	orrs r0, r1
-	str r0, [r3, 0x18]
-	movs r0, 0
-	str r0, [r3, 0x1C]
-	movs r0, 0x4
-	bl FieldEffectStart
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end GroundEffect_StepOnTallGrass
-
-	thumb_func_start GroundEffect_SpawnOnLongGrass
-@ void GroundEffect_SpawnOnLongGrass(struct npc_state *fieldObject, struct obj *object)
-GroundEffect_SpawnOnLongGrass: @ 8096F28
-	push {lr}
-	ldr r3, =gFieldEffectArguments
-	movs r2, 0x10
-	ldrsh r1, [r0, r2]
-	str r1, [r3]
-	movs r2, 0x12
-	ldrsh r1, [r0, r2]
-	str r1, [r3, 0x4]
-	ldrb r1, [r0, 0xB]
-	lsrs r1, 4
-	str r1, [r3, 0x8]
-	movs r1, 0x2
-	str r1, [r3, 0xC]
-	ldrb r1, [r0, 0x8]
-	lsls r1, 8
-	ldrb r2, [r0, 0x9]
-	orrs r1, r2
-	str r1, [r3, 0x10]
-	ldrb r0, [r0, 0xA]
-	str r0, [r3, 0x14]
-	ldr r0, =gSaveBlock1Ptr
-	ldr r1, [r0]
-	ldrb r0, [r1, 0x5]
-	lsls r0, 8
-	ldrb r1, [r1, 0x4]
-	orrs r0, r1
-	str r0, [r3, 0x18]
-	movs r0, 0x1
-	str r0, [r3, 0x1C]
-	movs r0, 0x11
-	bl FieldEffectStart
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end GroundEffect_SpawnOnLongGrass
-
-	thumb_func_start GroundEffect_StepOnLongGrass
-@ void GroundEffect_StepOnLongGrass(struct npc_state *fieldObject, struct obj *object)
-GroundEffect_StepOnLongGrass: @ 8096F74
-	push {lr}
-	ldr r3, =gFieldEffectArguments
-	movs r2, 0x10
-	ldrsh r1, [r0, r2]
-	str r1, [r3]
-	movs r2, 0x12
-	ldrsh r1, [r0, r2]
-	str r1, [r3, 0x4]
-	ldrb r1, [r0, 0xB]
-	lsrs r1, 4
-	str r1, [r3, 0x8]
-	movs r1, 0x2
-	str r1, [r3, 0xC]
-	ldrb r1, [r0, 0x8]
-	lsls r1, 8
-	ldrb r2, [r0, 0x9]
-	orrs r1, r2
-	str r1, [r3, 0x10]
-	ldrb r0, [r0, 0xA]
-	str r0, [r3, 0x14]
-	ldr r0, =gSaveBlock1Ptr
-	ldr r1, [r0]
-	ldrb r0, [r1, 0x5]
-	lsls r0, 8
-	ldrb r1, [r1, 0x4]
-	orrs r0, r1
-	str r0, [r3, 0x18]
-	movs r0, 0
-	str r0, [r3, 0x1C]
-	movs r0, 0x11
-	bl FieldEffectStart
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end GroundEffect_StepOnLongGrass
-
-	thumb_func_start GroundEffect_WaterReflection
-@ void GroundEffect_WaterReflection(struct npc_state *fieldObject, struct obj *object)
-GroundEffect_WaterReflection: @ 8096FC0
-	push {lr}
-	movs r2, 0
-	bl SetUpReflection
-	pop {r0}
-	bx r0
-	thumb_func_end GroundEffect_WaterReflection
-
-	thumb_func_start GroundEffect_IceReflection
-@ void GroundEffect_IceReflection(struct npc_state *fieldObject, struct obj *object)
-GroundEffect_IceReflection: @ 8096FCC
-	push {lr}
-	movs r2, 0x1
-	bl SetUpReflection
-	pop {r0}
-	bx r0
-	thumb_func_end GroundEffect_IceReflection
-
-	thumb_func_start GroundEffect_FlowingWater
-@ void GroundEffect_FlowingWater(struct npc_state *fieldObject, struct obj *object)
-GroundEffect_FlowingWater: @ 8096FD8
-	push {lr}
-	adds r1, r0, 0
-	movs r0, 0x22
-	bl oe_exec_and_other_stuff
-	pop {r0}
-	bx r0
-	thumb_func_end GroundEffect_FlowingWater
-
-	thumb_func_start GroundEffect_SandTracks
-@ void GroundEffect_SandTracks(struct npc_state *fieldObject, struct obj *object)
-GroundEffect_SandTracks: @ 8096FE8
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	ldrb r0, [r4, 0x5]
-	bl GetFieldObjectGraphicsInfo
-	ldr r1, =gUnknown_0850E654
-	ldrb r0, [r0, 0xD]
-	lsls r0, 2
-	adds r0, r1
-	ldr r3, [r0]
-	adds r0, r4, 0
-	adds r1, r5, 0
-	movs r2, 0
-	bl _call_via_r3
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end GroundEffect_SandTracks
-
-	thumb_func_start GroundEffect_DeepSandTracks
-@ void GroundEffect_DeepSandTracks(struct npc_state *fieldObject, struct obj *object)
-GroundEffect_DeepSandTracks: @ 8097014
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	ldrb r0, [r4, 0x5]
-	bl GetFieldObjectGraphicsInfo
-	ldr r1, =gUnknown_0850E654
-	ldrb r0, [r0, 0xD]
-	lsls r0, 2
-	adds r0, r1
-	ldr r3, [r0]
-	adds r0, r4, 0
-	adds r1, r5, 0
-	movs r2, 0x1
-	bl _call_via_r3
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end GroundEffect_DeepSandTracks
-
-	thumb_func_start DoTracksGroundEffect_None
-@ void DoTracksGroundEffect_None(struct npc_state *fieldObject, struct obj *object)
-DoTracksGroundEffect_None: @ 8097040
-	bx lr
-	thumb_func_end DoTracksGroundEffect_None
-
-	thumb_func_start DoTracksGroundEffect_Footprints
-@ void DoTracksGroundEffect_Footprints(struct npc_state *fieldObject, struct obj *object)
-DoTracksGroundEffect_Footprints: @ 8097044
-	push {r4,r5,lr}
-	sub sp, 0x4
-	adds r5, r0, 0
-	lsls r4, r2, 24
-	lsrs r4, 24
-	ldr r1, =gUnknown_0850E660
-	mov r0, sp
-	movs r2, 0x4
-	bl memcpy
-	ldr r1, =gFieldEffectArguments
-	movs r2, 0x14
-	ldrsh r0, [r5, r2]
-	str r0, [r1]
-	movs r2, 0x16
-	ldrsh r0, [r5, r2]
-	str r0, [r1, 0x4]
-	movs r0, 0x95
-	str r0, [r1, 0x8]
-	movs r0, 0x2
-	str r0, [r1, 0xC]
-	ldrb r0, [r5, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	str r0, [r1, 0x10]
-	lsls r4, 1
-	mov r1, sp
-	adds r0, r1, r4
-	ldrb r0, [r0]
-	bl FieldEffectStart
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end DoTracksGroundEffect_Footprints
-
-	thumb_func_start DoTracksGroundEffect_BikeTireTracks
-@ void DoTracksGroundEffect_BikeTireTracks(struct npc_state *fieldObject, struct obj *object)
-DoTracksGroundEffect_BikeTireTracks: @ 8097094
-	push {r4,lr}
-	adds r4, r0, 0
-	ldr r1, [r4, 0x10]
-	ldr r0, [r4, 0x14]
-	cmp r1, r0
-	beq _080970D6
-	ldr r2, =gFieldEffectArguments
-	movs r1, 0x14
-	ldrsh r0, [r4, r1]
-	str r0, [r2]
-	movs r1, 0x16
-	ldrsh r0, [r4, r1]
-	str r0, [r2, 0x4]
-	movs r0, 0x95
-	str r0, [r2, 0x8]
-	movs r0, 0x2
-	str r0, [r2, 0xC]
-	ldr r3, =gUnknown_0850E664
-	ldrb r1, [r4, 0x18]
-	lsls r1, 28
-	lsrs r1, 28
-	adds r0, r4, 0
-	adds r0, 0x20
-	ldrb r0, [r0]
-	lsls r0, 2
-	subs r0, 0x5
-	adds r1, r0
-	adds r1, r3
-	ldrb r0, [r1]
-	str r0, [r2, 0x10]
-	movs r0, 0x23
-	bl FieldEffectStart
-_080970D6:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end DoTracksGroundEffect_BikeTireTracks
-
-	thumb_func_start GroundEffect_Ripple
-@ void GroundEffect_Ripple(struct npc_state *fieldObject, struct obj *object)
-GroundEffect_Ripple: @ 80970E4
-	push {lr}
-	bl DoRippleFieldEffect
-	pop {r0}
-	bx r0
-	thumb_func_end GroundEffect_Ripple
-
-	thumb_func_start GroundEffect_StepOnPuddle
-@ void GroundEffect_StepOnPuddle(struct npc_state *fieldObject, struct obj *object)
-GroundEffect_StepOnPuddle: @ 80970F0
-	push {lr}
-	adds r1, r0, 0
-	movs r0, 0xF
-	bl oe_exec_and_other_stuff
-	pop {r0}
-	bx r0
-	thumb_func_end GroundEffect_StepOnPuddle
-
-	thumb_func_start GroundEffect_SandHeap
-@ void GroundEffect_SandHeap(struct npc_state *fieldObject, struct obj *object)
-GroundEffect_SandHeap: @ 8097100
-	push {lr}
-	adds r1, r0, 0
-	movs r0, 0x27
-	bl oe_exec_and_other_stuff
-	pop {r0}
-	bx r0
-	thumb_func_end GroundEffect_SandHeap
-
-	thumb_func_start GroundEffect_JumpOnTallGrass
-@ void GroundEffect_JumpOnTallGrass(struct npc_state *fieldObject, struct obj *object)
-GroundEffect_JumpOnTallGrass: @ 8097110
-	push {r4-r7,lr}
-	sub sp, 0x4
-	adds r5, r0, 0
-	adds r6, r1, 0
-	ldr r1, =gFieldEffectArguments
-	movs r2, 0x10
-	ldrsh r0, [r5, r2]
-	str r0, [r1]
-	movs r4, 0x12
-	ldrsh r0, [r5, r4]
-	str r0, [r1, 0x4]
-	ldrb r0, [r5, 0xB]
-	lsrs r0, 4
-	str r0, [r1, 0x8]
-	movs r0, 0x2
-	str r0, [r1, 0xC]
-	movs r0, 0xC
-	bl FieldEffectStart
-	ldrb r0, [r5, 0x8]
-	ldrb r1, [r5, 0x9]
-	ldrb r2, [r5, 0xA]
-	movs r7, 0x10
-	ldrsh r3, [r5, r7]
-	movs r7, 0x12
-	ldrsh r4, [r5, r7]
-	str r4, [sp]
-	bl sub_81546C8
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x40
-	bne _0809715A
-	adds r0, r5, 0
-	adds r1, r6, 0
-	bl GroundEffect_SpawnOnTallGrass
-_0809715A:
-	add sp, 0x4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end GroundEffect_JumpOnTallGrass
-
-	thumb_func_start GroundEffect_JumpOnLongGrass
-@ void GroundEffect_JumpOnLongGrass(struct npc_state *fieldObject, struct obj *object)
-GroundEffect_JumpOnLongGrass: @ 8097168
-	push {lr}
-	ldr r2, =gFieldEffectArguments
-	movs r3, 0x10
-	ldrsh r1, [r0, r3]
-	str r1, [r2]
-	movs r3, 0x12
-	ldrsh r1, [r0, r3]
-	str r1, [r2, 0x4]
-	ldrb r0, [r0, 0xB]
-	lsrs r0, 4
-	str r0, [r2, 0x8]
-	movs r0, 0x2
-	str r0, [r2, 0xC]
-	movs r0, 0x12
-	bl FieldEffectStart
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end GroundEffect_JumpOnLongGrass
-
-	thumb_func_start GroundEffect_JumpOnShallowWater
-@ void GroundEffect_JumpOnShallowWater(struct npc_state *fieldObject, struct obj *object)
-GroundEffect_JumpOnShallowWater: @ 8097190
-	push {r4,lr}
-	ldr r3, =gFieldEffectArguments
-	movs r4, 0x10
-	ldrsh r2, [r0, r4]
-	str r2, [r3]
-	movs r4, 0x12
-	ldrsh r2, [r0, r4]
-	str r2, [r3, 0x4]
-	ldrb r0, [r0, 0xB]
-	lsrs r0, 4
-	str r0, [r3, 0x8]
-	ldrb r0, [r1, 0x5]
-	lsls r0, 28
-	lsrs r0, 30
-	str r0, [r3, 0xC]
-	movs r0, 0x10
-	bl FieldEffectStart
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end GroundEffect_JumpOnShallowWater
-
-	thumb_func_start GroundEffect_JumpOnWater
-@ void GroundEffect_JumpOnWater(struct npc_state *fieldObject, struct obj *object)
-GroundEffect_JumpOnWater: @ 80971C0
-	push {r4,lr}
-	ldr r3, =gFieldEffectArguments
-	movs r4, 0x10
-	ldrsh r2, [r0, r4]
-	str r2, [r3]
-	movs r4, 0x12
-	ldrsh r2, [r0, r4]
-	str r2, [r3, 0x4]
-	ldrb r0, [r0, 0xB]
-	lsrs r0, 4
-	str r0, [r3, 0x8]
-	ldrb r0, [r1, 0x5]
-	lsls r0, 28
-	lsrs r0, 30
-	str r0, [r3, 0xC]
-	movs r0, 0xE
-	bl FieldEffectStart
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end GroundEffect_JumpOnWater
-
-	thumb_func_start GroundEffect_JumpLandingDust
-@ void GroundEffect_JumpLandingDust(struct npc_state *fieldObject, struct obj *object)
-GroundEffect_JumpLandingDust: @ 80971F0
-	push {r4,lr}
-	ldr r3, =gFieldEffectArguments
-	movs r4, 0x10
-	ldrsh r2, [r0, r4]
-	str r2, [r3]
-	movs r4, 0x12
-	ldrsh r2, [r0, r4]
-	str r2, [r3, 0x4]
-	ldrb r0, [r0, 0xB]
-	lsrs r0, 4
-	str r0, [r3, 0x8]
-	ldrb r0, [r1, 0x5]
-	lsls r0, 28
-	lsrs r0, 30
-	str r0, [r3, 0xC]
-	movs r0, 0xA
-	bl FieldEffectStart
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end GroundEffect_JumpLandingDust
-
-	thumb_func_start GroundEffect_ShortGrass
-@ void GroundEffect_ShortGrass(struct npc_state *fieldObject, struct obj *object)
-GroundEffect_ShortGrass: @ 8097220
-	push {lr}
-	adds r1, r0, 0
-	movs r0, 0x29
-	bl oe_exec_and_other_stuff
-	pop {r0}
-	bx r0
-	thumb_func_end GroundEffect_ShortGrass
-
-	thumb_func_start GroundEffect_HotSprings
-@ void GroundEffect_HotSprings(struct npc_state *fieldObject, struct obj *object)
-GroundEffect_HotSprings: @ 8097230
-	push {lr}
-	adds r1, r0, 0
-	movs r0, 0x2A
-	bl oe_exec_and_other_stuff
-	pop {r0}
-	bx r0
-	thumb_func_end GroundEffect_HotSprings
-
-	thumb_func_start GroundEffect_Seaweed
-@ void GroundEffect_Seaweed(struct npc_state *fieldObject, struct obj *object)
-GroundEffect_Seaweed: @ 8097240
-	push {lr}
-	ldr r2, =gFieldEffectArguments
-	movs r3, 0x10
-	ldrsh r1, [r0, r3]
-	str r1, [r2]
-	movs r1, 0x12
-	ldrsh r0, [r0, r1]
-	str r0, [r2, 0x4]
-	movs r0, 0x35
-	bl FieldEffectStart
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end GroundEffect_Seaweed
-
-	thumb_func_start DoFlaggedGroundEffects
-@ void DoFlaggedGroundEffects(struct npc_state *fieldObject, struct obj *object, u32 flags)
-DoFlaggedGroundEffects: @ 8097260
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	adds r6, r0, 0
-	adds r7, r1, 0
-	adds r5, r2, 0
-	bl FieldObjectIsFarawayIslandMew
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _08097284
-	adds r0, r6, 0
-	bl sub_81D4A58
-	lsls r0, 24
-	cmp r0, 0
-	beq _080972AC
-_08097284:
-	movs r4, 0
-	ldr r0, =gUnknown_0850E674
-	mov r8, r0
-_0809728A:
-	movs r0, 0x1
-	ands r0, r5
-	cmp r0, 0
-	beq _080972A0
-	lsls r0, r4, 2
-	add r0, r8
-	ldr r2, [r0]
-	adds r0, r6, 0
-	adds r1, r7, 0
-	bl _call_via_r2
-_080972A0:
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	lsrs r5, 1
-	cmp r4, 0x13
-	bls _0809728A
-_080972AC:
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end DoFlaggedGroundEffects
-
-	thumb_func_start filters_out_some_ground_effects
-@ void filters_out_some_ground_effects(struct npc_state *fieldObject, u32 *flags)
-filters_out_some_ground_effects: @ 80972BC
-	push {lr}
-	adds r2, r0, 0
-	adds r3, r1, 0
-	ldrb r0, [r2]
-	lsls r0, 27
-	cmp r0, 0
-	bge _080972EA
-	ldrb r1, [r2, 0x2]
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r1
-	movs r1, 0x11
-	negs r1, r1
-	ands r0, r1
-	adds r1, 0x8
-	ands r0, r1
-	subs r1, 0x18
-	ands r0, r1
-	strb r0, [r2, 0x2]
-	ldr r0, [r3]
-	ldr r1, =0xfff9f7bd
-	ands r0, r1
-	str r0, [r3]
-_080972EA:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end filters_out_some_ground_effects
-
-	thumb_func_start FilterOutStepOnPuddleGroundEffectIfJumping
-@ void FilterOutStepOnPuddleGroundEffectIfJumping(struct npc_state *fieldObject, u32 *flags)
-FilterOutStepOnPuddleGroundEffectIfJumping: @ 80972F4
-	push {lr}
-	adds r2, r1, 0
-	ldrb r0, [r0]
-	lsls r0, 26
-	cmp r0, 0
-	bge _08097308
-	ldr r0, [r2]
-	ldr r1, =0xfffffbff
-	ands r0, r1
-	str r0, [r2]
-_08097308:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end FilterOutStepOnPuddleGroundEffectIfJumping
-
-	thumb_func_start DoGroundEffects_OnSpawn
-@ void DoGroundEffects_OnSpawn(struct npc_state *fieldObject, struct obj *object)
-DoGroundEffects_OnSpawn: @ 8097310
-	push {r4,r5,lr}
-	sub sp, 0x4
-	adds r4, r0, 0
-	adds r5, r1, 0
-	ldrb r0, [r4]
-	lsls r0, 29
-	cmp r0, 0
-	bge _08097354
-	movs r0, 0
-	str r0, [sp]
-	adds r0, r4, 0
-	bl FieldObjectUpdateZCoordAndPriority
-	adds r0, r4, 0
-	mov r1, sp
-	bl GetAllGroundEffectFlags_OnSpawn
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl FieldObjectSetSpriteOamTableForLongGrass
-	ldr r2, [sp]
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl DoFlaggedGroundEffects
-	ldrb r1, [r4]
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r1
-	movs r1, 0x11
-	negs r1, r1
-	ands r0, r1
-	strb r0, [r4]
-_08097354:
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end DoGroundEffects_OnSpawn
-
-	thumb_func_start DoGroundEffects_OnBeginStep
-@ void DoGroundEffects_OnBeginStep(struct npc_state *fieldObject, struct obj *object)
-DoGroundEffects_OnBeginStep: @ 809735C
-	push {r4,r5,lr}
-	sub sp, 0x4
-	adds r4, r0, 0
-	adds r5, r1, 0
-	ldrb r0, [r4]
-	lsls r0, 29
-	cmp r0, 0
-	bge _080973A8
-	movs r0, 0
-	str r0, [sp]
-	adds r0, r4, 0
-	bl FieldObjectUpdateZCoordAndPriority
-	adds r0, r4, 0
-	mov r1, sp
-	bl GetAllGroundEffectFlags_OnBeginStep
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl FieldObjectSetSpriteOamTableForLongGrass
-	adds r0, r4, 0
-	mov r1, sp
-	bl filters_out_some_ground_effects
-	ldr r2, [sp]
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl DoFlaggedGroundEffects
-	ldrb r1, [r4]
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r1
-	movs r1, 0x11
-	negs r1, r1
-	ands r0, r1
-	strb r0, [r4]
-_080973A8:
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end DoGroundEffects_OnBeginStep
-
-	thumb_func_start DoGroundEffects_OnFinishStep
-@ void DoGroundEffects_OnFinishStep(struct npc_state *fieldObject, struct obj *object)
-DoGroundEffects_OnFinishStep: @ 80973B0
-	push {r4,r5,lr}
-	sub sp, 0x4
-	adds r4, r0, 0
-	adds r5, r1, 0
-	ldrb r0, [r4]
-	lsls r0, 28
-	cmp r0, 0
-	bge _080973FC
-	movs r0, 0
-	str r0, [sp]
-	adds r0, r4, 0
-	bl FieldObjectUpdateZCoordAndPriority
-	adds r0, r4, 0
-	mov r1, sp
-	bl GetAllGroundEffectFlags_OnFinishStep
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl FieldObjectSetSpriteOamTableForLongGrass
-	adds r0, r4, 0
-	mov r1, sp
-	bl FilterOutStepOnPuddleGroundEffectIfJumping
-	ldr r2, [sp]
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl DoFlaggedGroundEffects
-	ldrb r1, [r4]
-	movs r0, 0x9
-	negs r0, r0
-	ands r0, r1
-	movs r1, 0x21
-	negs r1, r1
-	ands r0, r1
-	strb r0, [r4]
-_080973FC:
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end DoGroundEffects_OnFinishStep
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s
index f5acc1e3e..c0becc6da 100644
--- a/asm/field_player_avatar.s
+++ b/asm/field_player_avatar.s
@@ -5,9 +5,9 @@
 
 	.text
 
-	thumb_func_start FieldObjectCB_NoMovement2
-@ void FieldObjectCB_NoMovement2(struct obj *object)
-FieldObjectCB_NoMovement2: @ 808A998
+	thumb_func_start MovementType_Player
+@ void MovementType_Player(struct obj *object)
+MovementType_Player: @ 808A998
 	push {lr}
 	adds r1, r0, 0
 	movs r0, 0x2E
@@ -15,20 +15,20 @@ FieldObjectCB_NoMovement2: @ 808A998
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, =gMapObjects
+	ldr r2, =gEventObjects
 	adds r0, r2
-	ldr r2, =FieldObjectCB2_NoMovement2
-	bl FieldObjectStep
+	ldr r2, =EventObjectCB2_NoMovement2
+	bl UpdateEventObjectCurrentMovement
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end FieldObjectCB_NoMovement2
+	thumb_func_end MovementType_Player
 
-	thumb_func_start FieldObjectCB2_NoMovement2
-FieldObjectCB2_NoMovement2: @ 808A9BC
+	thumb_func_start EventObjectCB2_NoMovement2
+EventObjectCB2_NoMovement2: @ 808A9BC
 	movs r0, 0
 	bx lr
-	thumb_func_end FieldObjectCB2_NoMovement2
+	thumb_func_end EventObjectCB2_NoMovement2
 
 	thumb_func_start player_step
 @ void player_step(int dpad_direction, int buttons_new, int buttons_held)
@@ -48,7 +48,7 @@ player_step: @ 808A9C0
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, =gMapObjects
+	ldr r1, =gEventObjects
 	adds r5, r0, r1
 	adds r0, r5, 0
 	bl sub_808C280
@@ -60,7 +60,7 @@ player_step: @ 808A9C0
 	bl Bike_TryAcroBikeHistoryUpdate
 	adds r0, r5, 0
 	mov r1, r8
-	bl TryInterruptFieldObjectSpecialAnim
+	bl TryInterruptEventObjectSpecialAnim
 	lsls r0, 24
 	cmp r0, 0
 	bne _0808AA26
@@ -85,25 +85,25 @@ _0808AA26:
 	.pool
 	thumb_func_end player_step
 
-	thumb_func_start TryInterruptFieldObjectSpecialAnim
-@ bool8 TryInterruptFieldObjectSpecialAnim(struct npc_state *fieldObject, u8 direction)
-TryInterruptFieldObjectSpecialAnim: @ 808AA38
+	thumb_func_start TryInterruptEventObjectSpecialAnim
+@ bool8 TryInterruptEventObjectSpecialAnim(struct npc_state *eventObject, u8 direction)
+TryInterruptEventObjectSpecialAnim: @ 808AA38
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	lsls r1, 24
 	lsrs r5, r1, 24
 	adds r6, r5, 0
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
+	bl EventObjectIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808AA92
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl EventObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	bne _0808AA92
 	adds r0, r4, 0
-	bl FieldObjectGetSpecialAnim
+	bl EventObjectGetHeldMovementActionId
 	lsls r0, 24
 	movs r1, 0xE7
 	lsls r1, 24
@@ -123,7 +123,7 @@ _0808AA74:
 	beq _0808AA84
 _0808AA7C:
 	adds r0, r4, 0
-	bl FieldObjectClearAnim
+	bl EventObjectClearHeldMovement
 	b _0808AA92
 _0808AA84:
 	adds r0, r6, 0
@@ -138,10 +138,10 @@ _0808AA94:
 	pop {r4-r6}
 	pop {r1}
 	bx r1
-	thumb_func_end TryInterruptFieldObjectSpecialAnim
+	thumb_func_end TryInterruptEventObjectSpecialAnim
 
 	thumb_func_start npc_clear_strange_bits
-@ void npc_clear_strange_bits(struct npc_state *fieldObject)
+@ void npc_clear_strange_bits(struct npc_state *eventObject)
 npc_clear_strange_bits: @ 808AA9C
 	ldrb r2, [r0, 0x1]
 	movs r1, 0x11
@@ -240,7 +240,7 @@ GetForcedMovementByMetatileBehavior: @ 808AB38
 	ands r0, r1
 	cmp r0, 0
 	bne _0808AB8A
-	ldr r2, =gMapObjects
+	ldr r2, =gEventObjects
 	ldrb r1, [r3, 0x5]
 	lsls r0, r1, 3
 	adds r0, r1
@@ -290,7 +290,7 @@ ForcedMovement_None: @ 808AB94
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, =gMapObjects
+	ldr r1, =gEventObjects
 	adds r0, r1
 	ldrb r2, [r0, 0x1]
 	movs r1, 0x3
@@ -302,7 +302,7 @@ ForcedMovement_None: @ 808AB94
 	ldrb r1, [r0, 0x18]
 	lsls r1, 28
 	lsrs r1, 28
-	bl FieldObjectSetDirection
+	bl SetEventObjectDirection
 	ldrb r1, [r4]
 	movs r0, 0xBF
 	ands r0, r1
@@ -386,7 +386,7 @@ DoForcedMovementInCurrentDirection: @ 808AC58
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, =gMapObjects
+	ldr r2, =gEventObjects
 	adds r0, r2
 	ldrb r2, [r0, 0x1]
 	movs r3, 0x4
@@ -528,7 +528,7 @@ ForcedMovement_Slide: @ 808AD60
 	lsls r2, r3, 3
 	adds r2, r3
 	lsls r2, 2
-	ldr r3, =gMapObjects
+	ldr r3, =gEventObjects
 	adds r2, r3
 	ldrb r3, [r2, 0x1]
 	movs r4, 0x4
@@ -623,7 +623,7 @@ ForcedMovement_MuddySlope: @ 808AE10
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, =gMapObjects
+	ldr r1, =gEventObjects
 	adds r4, r0, r1
 	ldrb r1, [r4, 0x18]
 	movs r0, 0xF0
@@ -697,7 +697,7 @@ CheckMovementInputNotOnBike: @ 808AE98
 	b _0808AED2
 	.pool
 _0808AEB0:
-	bl player_get_direction_upper_nybble
+	bl GetPlayerMovementDirection
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r4, r0
@@ -725,7 +725,7 @@ _0808AED2:
 @ void PlayerNotOnBikeNotMoving(u8 direction, u8 heldKeys)
 PlayerNotOnBikeNotMoving: @ 808AEDC
 	push {lr}
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	lsls r0, 24
 	lsrs r0, 24
 	bl PlayerFaceDirection
@@ -809,7 +809,7 @@ _0808AF68:
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808AFB0
-	ldr r2, =gMapObjects
+	ldr r2, =gEventObjects
 	ldrb r1, [r4, 0x5]
 	lsls r0, r1, 3
 	adds r0, r1
@@ -848,7 +848,7 @@ CheckForPlayerAvatarCollision: @ 808AFBC
 	lsls r4, r0, 3
 	adds r4, r0
 	lsls r4, 2
-	ldr r0, =gMapObjects
+	ldr r0, =gEventObjects
 	adds r4, r0
 	ldrh r1, [r4, 0x10]
 	add r0, sp, 0x4
@@ -877,7 +877,7 @@ CheckForPlayerAvatarCollision: @ 808AFBC
 	str r0, [sp]
 	adds r0, r4, 0
 	adds r3, r6, 0
-	bl CheckForFieldObjectCollision
+	bl CheckForEventObjectCollision
 	lsls r0, 24
 	lsrs r0, 24
 	add sp, 0x8
@@ -899,7 +899,7 @@ sub_808B028: @ 808B028
 	lsls r4, r0, 3
 	adds r4, r0
 	lsls r4, 2
-	ldr r0, =gMapObjects
+	ldr r0, =gEventObjects
 	adds r4, r0
 	ldrh r1, [r4, 0x10]
 	add r0, sp, 0x4
@@ -938,9 +938,9 @@ sub_808B028: @ 808B028
 	.pool
 	thumb_func_end sub_808B028
 
-	thumb_func_start CheckForFieldObjectCollision
-@ u8 CheckForFieldObjectCollision(struct npc_state *fieldObject, u16 x, u16 y, u8 direction, u8 metatileBehavior)
-CheckForFieldObjectCollision: @ 808B094
+	thumb_func_start CheckForEventObjectCollision
+@ u8 CheckForEventObjectCollision(struct npc_state *eventObject, u16 x, u16 y, u8 direction, u8 metatileBehavior)
+CheckForEventObjectCollision: @ 808B094
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -963,7 +963,7 @@ CheckForFieldObjectCollision: @ 808B094
 	adds r1, r5, 0
 	adds r2, r4, 0
 	adds r3, r6, 0
-	bl npc_block_way
+	bl GetCollisionAtCoords
 	lsls r0, 24
 	lsrs r0, 24
 	mov r1, sp
@@ -1043,7 +1043,7 @@ _0808B152:
 	pop {r4-r7}
 	pop {r1}
 	bx r1
-	thumb_func_end CheckForFieldObjectCollision
+	thumb_func_end CheckForEventObjectCollision
 
 	thumb_func_start sub_808B164
 sub_808B164: @ 808B164
@@ -1061,7 +1061,7 @@ sub_808B164: @ 808B164
 	adds r1, r5, 0
 	adds r2, r4, 0
 	adds r3, r6, 0
-	bl npc_block_way
+	bl GetCollisionAtCoords
 	lsls r0, 24
 	lsrs r0, 24
 	mov r1, sp
@@ -1120,7 +1120,7 @@ sub_808B1BC: @ 808B1BC
 	lsrs r0, r5, 16
 	lsrs r1, r4, 16
 	movs r2, 0x3
-	bl GetFieldObjectIdByXYZ
+	bl GetEventObjectIdByXYZ
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x10
@@ -1182,12 +1182,12 @@ sub_808B238: @ 808B238
 	ldrsh r0, [r0, r1]
 	movs r2, 0
 	ldrsh r1, [r5, r2]
-	bl GetFieldObjectIdByXY
+	bl GetEventObjectIdByXY
 	lsls r0, 24
 	lsrs r6, r0, 24
 	cmp r6, 0x10
 	beq _0808B2D8
-	ldr r0, =gMapObjects
+	ldr r0, =gEventObjects
 	lsls r1, r6, 3
 	adds r1, r6
 	lsls r1, 2
@@ -1211,7 +1211,7 @@ sub_808B238: @ 808B238
 	ldrsh r2, [r5, r0]
 	adds r0, r4, 0
 	adds r3, r7, 0
-	bl npc_block_way
+	bl GetCollisionAtCoords
 	lsls r0, 24
 	cmp r0, 0
 	bne _0808B2D8
@@ -1290,7 +1290,7 @@ IsPlayerCollidingWithFarawayIslandMew: @ 808B324
 	lsls r1, r2, 3
 	adds r1, r2
 	lsls r1, 2
-	ldr r5, =gMapObjects
+	ldr r5, =gEventObjects
 	adds r3, r1, r5
 	ldrh r2, [r3, 0x10]
 	mov r1, sp
@@ -1305,7 +1305,7 @@ IsPlayerCollidingWithFarawayIslandMew: @ 808B324
 	movs r0, 0x1
 	movs r1, 0x39
 	movs r2, 0x1A
-	bl GetFieldObjectIdByLocalIdAndMap
+	bl GetEventObjectIdByLocalIdAndMap
 	lsls r0, 24
 	lsrs r1, r0, 24
 	adds r6, r4, 0
@@ -1401,7 +1401,7 @@ _0808B3F4:
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, =gMapObjects
+	ldr r1, =gEventObjects
 	adds r0, r1
 	ldr r1, [r2]
 	bl _call_via_r1
@@ -1423,13 +1423,13 @@ _0808B428:
 	thumb_func_end DoPlayerAvatarTransition
 
 	thumb_func_start PlayerAvatarTransition_Dummy
-@ void PlayerAvatarTransition_Dummy(struct npc_state *fieldObject)
+@ void PlayerAvatarTransition_Dummy(struct npc_state *eventObject)
 PlayerAvatarTransition_Dummy: @ 808B43C
 	bx lr
 	thumb_func_end PlayerAvatarTransition_Dummy
 
 	thumb_func_start PlayerAvatarTransition_Normal
-@ void PlayerAvatarTransition_Normal(struct npc_state *fieldObject)
+@ void PlayerAvatarTransition_Normal(struct npc_state *eventObject)
 PlayerAvatarTransition_Normal: @ 808B440
 	push {r4,lr}
 	adds r4, r0, 0
@@ -1439,11 +1439,11 @@ PlayerAvatarTransition_Normal: @ 808B440
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetGraphicsId
+	bl EventObjectSetGraphicsId
 	ldrb r1, [r4, 0x18]
 	lsrs r1, 4
 	adds r0, r4, 0
-	bl FieldObjectTurn
+	bl EventObjectTurn
 	movs r0, 0x1
 	bl SetPlayerAvatarStateMask
 	pop {r4}
@@ -1452,7 +1452,7 @@ PlayerAvatarTransition_Normal: @ 808B440
 	thumb_func_end PlayerAvatarTransition_Normal
 
 	thumb_func_start PlayerAvatarTransition_MachBike
-@ void PlayerAvatarTransition_MachBike(struct npc_state *fieldObject)
+@ void PlayerAvatarTransition_MachBike(struct npc_state *eventObject)
 PlayerAvatarTransition_MachBike: @ 808B46C
 	push {r4,lr}
 	adds r4, r0, 0
@@ -1462,11 +1462,11 @@ PlayerAvatarTransition_MachBike: @ 808B46C
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetGraphicsId
+	bl EventObjectSetGraphicsId
 	ldrb r1, [r4, 0x18]
 	lsrs r1, 4
 	adds r0, r4, 0
-	bl FieldObjectTurn
+	bl EventObjectTurn
 	movs r0, 0x2
 	bl SetPlayerAvatarStateMask
 	movs r0, 0
@@ -1478,7 +1478,7 @@ PlayerAvatarTransition_MachBike: @ 808B46C
 	thumb_func_end PlayerAvatarTransition_MachBike
 
 	thumb_func_start PlayerAvatarTransition_AcroBike
-@ void PlayerAvatarTransition_AcroBike(struct npc_state *fieldObject)
+@ void PlayerAvatarTransition_AcroBike(struct npc_state *eventObject)
 PlayerAvatarTransition_AcroBike: @ 808B4A0
 	push {r4,lr}
 	adds r4, r0, 0
@@ -1488,11 +1488,11 @@ PlayerAvatarTransition_AcroBike: @ 808B4A0
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetGraphicsId
+	bl EventObjectSetGraphicsId
 	ldrb r1, [r4, 0x18]
 	lsrs r1, 4
 	adds r0, r4, 0
-	bl FieldObjectTurn
+	bl EventObjectTurn
 	movs r0, 0x4
 	bl SetPlayerAvatarStateMask
 	movs r0, 0
@@ -1505,7 +1505,7 @@ PlayerAvatarTransition_AcroBike: @ 808B4A0
 	thumb_func_end PlayerAvatarTransition_AcroBike
 
 	thumb_func_start PlayerAvatarTransition_Surfing
-@ void PlayerAvatarTransition_Surfing(struct npc_state *fieldObject)
+@ void PlayerAvatarTransition_Surfing(struct npc_state *eventObject)
 PlayerAvatarTransition_Surfing: @ 808B4D8
 	push {r4,lr}
 	adds r4, r0, 0
@@ -1515,11 +1515,11 @@ PlayerAvatarTransition_Surfing: @ 808B4D8
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetGraphicsId
+	bl EventObjectSetGraphicsId
 	ldrb r1, [r4, 0x18]
 	lsrs r1, 4
 	adds r0, r4, 0
-	bl FieldObjectTurn
+	bl EventObjectTurn
 	movs r0, 0x8
 	bl SetPlayerAvatarStateMask
 	ldr r1, =gFieldEffectArguments
@@ -1546,7 +1546,7 @@ PlayerAvatarTransition_Surfing: @ 808B4D8
 	thumb_func_end PlayerAvatarTransition_Surfing
 
 	thumb_func_start PlayerAvatarTransition_Underwater
-@ void PlayerAvatarTransition_Underwater(struct npc_state *fieldObject)
+@ void PlayerAvatarTransition_Underwater(struct npc_state *eventObject)
 PlayerAvatarTransition_Underwater: @ 808B534
 	push {r4,lr}
 	adds r4, r0, 0
@@ -1556,11 +1556,11 @@ PlayerAvatarTransition_Underwater: @ 808B534
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetGraphicsId
+	bl EventObjectSetGraphicsId
 	ldrb r1, [r4, 0x18]
 	lsrs r1, 4
 	adds r0, r4, 0
-	bl FieldObjectTurn
+	bl EventObjectTurn
 	movs r0, 0x10
 	bl SetPlayerAvatarStateMask
 	ldrb r0, [r4, 0x4]
@@ -1572,7 +1572,7 @@ PlayerAvatarTransition_Underwater: @ 808B534
 	thumb_func_end PlayerAvatarTransition_Underwater
 
 	thumb_func_start PlayerAvatarTransition_ReturnToField
-@ void PlayerAvatarTransition_ReturnToField(struct npc_state *fieldObject)
+@ void PlayerAvatarTransition_ReturnToField(struct npc_state *eventObject)
 PlayerAvatarTransition_ReturnToField: @ 808B568
 	ldr r2, =gPlayerAvatar
 	ldrb r1, [r2]
@@ -1621,7 +1621,7 @@ _0808B5B6:
 	thumb_func_start player_is_anim_in_certain_ranges
 player_is_anim_in_certain_ranges: @ 808B5BC
 	push {lr}
-	ldr r2, =gMapObjects
+	ldr r2, =gEventObjects
 	ldr r0, =gPlayerAvatar
 	ldrb r1, [r0, 0x5]
 	lsls r0, r1, 3
@@ -1696,9 +1696,9 @@ PlayerIsAnimActive: @ 808B63C
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, =gMapObjects
+	ldr r1, =gEventObjects
 	adds r0, r1
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
+	bl EventObjectIsMovementOverridden
 	lsls r0, 24
 	lsrs r0, 24
 	pop {r1}
@@ -1715,9 +1715,9 @@ PlayerCheckIfAnimFinishedOrInactive: @ 808B660
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, =gMapObjects
+	ldr r1, =gEventObjects
 	adds r0, r1
-	bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
+	bl EventObjectCheckHeldMovementStatus
 	lsls r0, 24
 	lsrs r0, 24
 	pop {r1}
@@ -1727,7 +1727,7 @@ PlayerCheckIfAnimFinishedOrInactive: @ 808B660
 
 	thumb_func_start player_set_x22
 player_set_x22: @ 808B684
-	ldr r3, =gMapObjects
+	ldr r3, =gEventObjects
 	ldr r1, =gPlayerAvatar
 	ldrb r2, [r1, 0x5]
 	lsls r1, r2, 3
@@ -1740,9 +1740,9 @@ player_set_x22: @ 808B684
 	.pool
 	thumb_func_end player_set_x22
 
-	thumb_func_start player_get_x22
-player_get_x22: @ 808B6A0
-	ldr r2, =gMapObjects
+	thumb_func_start PlayerGetCopyableMovement
+PlayerGetCopyableMovement: @ 808B6A0
+	ldr r2, =gEventObjects
 	ldr r0, =gPlayerAvatar
 	ldrb r1, [r0, 0x5]
 	lsls r0, r1, 3
@@ -1753,7 +1753,7 @@ player_get_x22: @ 808B6A0
 	ldrb r0, [r0]
 	bx lr
 	.pool
-	thumb_func_end player_get_x22
+	thumb_func_end PlayerGetCopyableMovement
 
 	thumb_func_start sub_808B6BC
 sub_808B6BC: @ 808B6BC
@@ -1766,9 +1766,9 @@ sub_808B6BC: @ 808B6BC
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, =gMapObjects
+	ldr r2, =gEventObjects
 	adds r0, r2
-	bl FieldObjectForceSetSpecialAnim
+	bl EventObjectForceSetHeldMovement
 	pop {r0}
 	bx r0
 	.pool
@@ -1793,10 +1793,10 @@ PlayerSetAnimId: @ 808B6E4
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, =gMapObjects
+	ldr r1, =gEventObjects
 	adds r0, r1
 	adds r1, r5, 0
-	bl FieldObjectSetSpecialAnim
+	bl EventObjectSetHeldMovement
 _0808B712:
 	pop {r4,r5}
 	pop {r0}
@@ -1810,7 +1810,7 @@ PlayerGoSpeed1: @ 808B720
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
-	bl GetGoSpeed0AnimId
+	bl GetWalkNormalMovementAction
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x2
@@ -1825,7 +1825,7 @@ PlayerGoSpeed2: @ 808B738
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
-	bl GetGoSpeed1AnimId
+	bl GetWalkFastMovementAction
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x2
@@ -1840,7 +1840,7 @@ PlayerGoSpeed3: @ 808B750
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
-	bl GetGoSpeed2AnimId
+	bl GetRideWaterCurrentMovementAction
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x2
@@ -1855,7 +1855,7 @@ PlayerGoSpeed4: @ 808B768
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
-	bl GetGoSpeed3AnimId
+	bl GetWalkFastestMovementAction
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x2
@@ -1870,7 +1870,7 @@ PlayerRun: @ 808B780
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
-	bl GetRunAnimId
+	bl GetPlayerRunMovementAction
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x2
@@ -1889,7 +1889,7 @@ PlayerOnBikeCollide: @ 808B798
 	adds r0, r4, 0
 	bl PlayCollisionSoundIfNotFacingWarp
 	adds r0, r4, 0
-	bl GetStepInPlaceDelay16AnimId
+	bl GetWalkInPlaceNormalMovementAction
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x2
@@ -1905,7 +1905,7 @@ PlayerOnBikeCollideWithFarawayIslandMew: @ 808B7BC
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
-	bl GetStepInPlaceDelay16AnimId
+	bl GetWalkInPlaceNormalMovementAction
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x2
@@ -1924,7 +1924,7 @@ PlayerNotOnBikeCollide: @ 808B7D4
 	adds r0, r4, 0
 	bl PlayCollisionSoundIfNotFacingWarp
 	adds r0, r4, 0
-	bl GetStepInPlaceDelay32AnimId
+	bl GetWalkInPlaceSlowMovementAction
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x2
@@ -1940,7 +1940,7 @@ PlayerNotOnBikeCollideWithFarawayIslandMew: @ 808B7F8
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
-	bl GetStepInPlaceDelay32AnimId
+	bl GetWalkInPlaceSlowMovementAction
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x2
@@ -1955,7 +1955,7 @@ PlayerFaceDirection: @ 808B810
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
-	bl GetFaceDirectionAnimId
+	bl GetFaceDirectionMovementAction
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x1
@@ -1970,7 +1970,7 @@ PlayerTurnInPlace: @ 808B828
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
-	bl GetStepInPlaceDelay8AnimId
+	bl GetWalkInPlaceFastMovementAction
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x1
@@ -1989,7 +1989,7 @@ PlayerJumpLedge: @ 808B840
 	movs r0, 0xA
 	bl PlaySE
 	adds r0, r4, 0
-	bl GetJumpLedgeAnimId
+	bl GetJump2MovementAction
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x8
@@ -2013,7 +2013,7 @@ _0808B872:
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808B89A
-	ldr r2, =gMapObjects
+	ldr r2, =gEventObjects
 	ldrb r1, [r4, 0x5]
 	lsls r0, r1, 3
 	adds r0, r1
@@ -2022,7 +2022,7 @@ _0808B872:
 	ldrb r0, [r0, 0x18]
 	lsls r0, 28
 	lsrs r0, 28
-	bl GetFaceDirectionAnimId
+	bl GetFaceDirectionMovementAction
 	lsls r0, 24
 	lsrs r0, 24
 	bl sub_808B6BC
@@ -2038,7 +2038,7 @@ PlayerIdleWheelie: @ 808B8A8
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
-	bl sub_8093648
+	bl GetAcroWheelieFaceDirectionMovementAction
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x1
@@ -2052,7 +2052,7 @@ PlayerStartWheelie: @ 808B8C0
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
-	bl sub_8093674
+	bl GetAcroPopWheelieFaceDirectionMovementAction
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x1
@@ -2066,7 +2066,7 @@ PlayerEndWheelie: @ 808B8D8
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
-	bl sub_80936A0
+	bl GetAcroEndWheelieFaceDirectionMovementAction
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x1
@@ -2084,7 +2084,7 @@ PlayerStandingHoppingWheelie: @ 808B8F0
 	movs r0, 0x22
 	bl PlaySE
 	adds r0, r4, 0
-	bl sub_80936CC
+	bl GetAcroWheelieHopFaceDirectionMovementAction
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x1
@@ -2103,7 +2103,7 @@ PlayerMovingHoppingWheelie: @ 808B914
 	movs r0, 0x22
 	bl PlaySE
 	adds r0, r4, 0
-	bl sub_80936F8
+	bl GetAcroWheelieHopDirectionMovementAction
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x2
@@ -2122,7 +2122,7 @@ PlayerLedgeHoppingWheelie: @ 808B938
 	movs r0, 0x22
 	bl PlaySE
 	adds r0, r4, 0
-	bl sub_8093724
+	bl GetAcroWheelieJumpDirectionMovementAction
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x8
@@ -2141,7 +2141,7 @@ PlayerAcroTurnJump: @ 808B95C
 	movs r0, 0x22
 	bl PlaySE
 	adds r0, r4, 0
-	bl sub_80934E8
+	bl GetJumpInPlaceTurnAroundMovementAction
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x1
@@ -2160,7 +2160,7 @@ sub_808B980: @ 808B980
 	movs r0, 0x7
 	bl PlaySE
 	adds r0, r4, 0
-	bl sub_8093750
+	bl GetAcroWheelieInPlaceDirectionMovementAction
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x2
@@ -2175,7 +2175,7 @@ sub_808B9A4: @ 808B9A4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
-	bl sub_809377C
+	bl GetAcroPopWheelieMoveDirectionMovementAction
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x2
@@ -2189,7 +2189,7 @@ sub_808B9BC: @ 808B9BC
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
-	bl sub_80937A8
+	bl GetAcroWheelieMoveDirectionMovementAction
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x2
@@ -2203,7 +2203,7 @@ npc_use_some_d2s: @ 808B9D4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
-	bl d2s_08064034
+	bl GetAcroEndWheelieMoveDirectionMovementAction
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x2
@@ -2219,7 +2219,7 @@ PlayCollisionSoundIfNotFacingWarp: @ 808B9EC
 	sub sp, 0x4
 	lsls r0, 24
 	lsrs r4, r0, 24
-	ldr r2, =gMapObjects
+	ldr r2, =gEventObjects
 	ldr r0, =gPlayerAvatar
 	ldrb r1, [r0, 0x5]
 	lsls r0, r1, 3
@@ -2275,7 +2275,7 @@ GetXYCoordsOneStepInFrontOfPlayer: @ 808BA68
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
-	ldr r3, =gMapObjects
+	ldr r3, =gEventObjects
 	ldr r2, =gPlayerAvatar
 	ldrb r1, [r2, 0x5]
 	lsls r0, r1, 3
@@ -2291,7 +2291,7 @@ GetXYCoordsOneStepInFrontOfPlayer: @ 808BA68
 	adds r0, r3
 	ldrh r0, [r0, 0x12]
 	strh r0, [r5]
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	lsls r0, 24
 	lsrs r0, 24
 	adds r1, r4, 0
@@ -2307,7 +2307,7 @@ GetXYCoordsOneStepInFrontOfPlayer: @ 808BA68
 @ void PlayerGetDestCoords(u16 *x, u16 *y)
 PlayerGetDestCoords: @ 808BAAC
 	push {r4,r5,lr}
-	ldr r5, =gMapObjects
+	ldr r5, =gEventObjects
 	ldr r4, =gPlayerAvatar
 	ldrb r3, [r4, 0x5]
 	lsls r2, r3, 3
@@ -2339,7 +2339,7 @@ plaer_get_pos_including_state_based_drift: @ 808BADC
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, =gMapObjects
+	ldr r1, =gEventObjects
 	adds r3, r0, r1
 	ldrb r1, [r3]
 	movs r0, 0xC0
@@ -2462,10 +2462,10 @@ _0808BC30:
 	bx r1
 	thumb_func_end plaer_get_pos_including_state_based_drift
 
-	thumb_func_start player_get_direction_lower_nybble
-@ u8 player_get_direction_lower_nybble()
-player_get_direction_lower_nybble: @ 808BC38
-	ldr r2, =gMapObjects
+	thumb_func_start GetPlayerFacingDirection
+@ u8 GetPlayerFacingDirection()
+GetPlayerFacingDirection: @ 808BC38
+	ldr r2, =gEventObjects
 	ldr r0, =gPlayerAvatar
 	ldrb r1, [r0, 0x5]
 	lsls r0, r1, 3
@@ -2477,12 +2477,12 @@ player_get_direction_lower_nybble: @ 808BC38
 	lsrs r0, 28
 	bx lr
 	.pool
-	thumb_func_end player_get_direction_lower_nybble
+	thumb_func_end GetPlayerFacingDirection
 
-	thumb_func_start player_get_direction_upper_nybble
-@ u8 player_get_direction_upper_nybble()
-player_get_direction_upper_nybble: @ 808BC58
-	ldr r2, =gMapObjects
+	thumb_func_start GetPlayerMovementDirection
+@ u8 GetPlayerMovementDirection()
+GetPlayerMovementDirection: @ 808BC58
+	ldr r2, =gEventObjects
 	ldr r0, =gPlayerAvatar
 	ldrb r1, [r0, 0x5]
 	lsls r0, r1, 3
@@ -2493,12 +2493,12 @@ player_get_direction_upper_nybble: @ 808BC58
 	lsrs r0, 4
 	bx lr
 	.pool
-	thumb_func_end player_get_direction_upper_nybble
+	thumb_func_end GetPlayerMovementDirection
 
 	thumb_func_start PlayerGetZCoord
 @ u8 PlayerGetZCoord()
 PlayerGetZCoord: @ 808BC74
-	ldr r2, =gMapObjects
+	ldr r2, =gEventObjects
 	ldr r0, =gPlayerAvatar
 	ldrb r1, [r0, 0x5]
 	lsls r0, r1, 3
@@ -2521,7 +2521,7 @@ sub_808BC90: @ 808BC90
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, =gMapObjects
+	ldr r1, =gEventObjects
 	adds r0, r1
 	lsls r3, 16
 	asrs r3, 16
@@ -2578,7 +2578,7 @@ sub_808BCF4: @ 808BCF4
 	lsls r4, r0, 3
 	adds r4, r0
 	lsls r4, 2
-	ldr r0, =gMapObjects
+	ldr r0, =gEventObjects
 	adds r4, r0
 	adds r0, r4, 0
 	bl npc_clear_strange_bits
@@ -2586,7 +2586,7 @@ sub_808BCF4: @ 808BCF4
 	lsls r1, 28
 	lsrs r1, 28
 	adds r0, r4, 0
-	bl FieldObjectSetDirection
+	bl SetEventObjectDirection
 	movs r0, 0x6
 	bl TestPlayerAvatarFlags
 	lsls r0, 24
@@ -2780,7 +2780,7 @@ _0808BE46:
 @ bool8 IsPlayerSurfingNorth()
 IsPlayerSurfingNorth: @ 808BE50
 	push {lr}
-	bl player_get_direction_upper_nybble
+	bl GetPlayerMovementDirection
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x2
@@ -2809,7 +2809,7 @@ IsPlayerFacingSurfableFishableWater: @ 808BE74
 	lsls r4, r0, 3
 	adds r4, r0
 	lsls r4, 2
-	ldr r0, =gMapObjects
+	ldr r0, =gEventObjects
 	adds r4, r0
 	ldrh r1, [r4, 0x10]
 	mov r0, sp
@@ -2833,7 +2833,7 @@ IsPlayerFacingSurfableFishableWater: @ 808BE74
 	lsls r3, 28
 	lsrs r3, 28
 	adds r0, r4, 0
-	bl npc_block_way
+	bl GetCollisionAtCoords
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x3
@@ -3053,14 +3053,14 @@ InitPlayerAvatar: @ 808BFE0
 	strh r3, [r0, 0xE]
 	str r3, [sp, 0x10]
 	strh r3, [r0, 0x14]
-	bl SpawnSpecialFieldObject
+	bl SpawnSpecialEventObject
 	adds r5, r0, 0
 	lsls r5, 24
 	lsrs r5, 24
 	lsls r4, r5, 3
 	adds r4, r5
 	lsls r4, 2
-	ldr r0, =gMapObjects
+	ldr r0, =gEventObjects
 	adds r4, r0
 	ldrb r0, [r4, 0x2]
 	movs r1, 0x1
@@ -3070,7 +3070,7 @@ InitPlayerAvatar: @ 808BFE0
 	strb r0, [r4, 0x1B]
 	adds r0, r4, 0
 	mov r1, r9
-	bl FieldObjectTurn
+	bl EventObjectTurn
 	bl ClearPlayerAvatarInfo
 	ldr r0, =gPlayerAvatar
 	strb r6, [r0, 0x2]
@@ -3097,7 +3097,7 @@ sub_808C0A8: @ 808C0A8
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	ldr r6, =gMapObjects
+	ldr r6, =gEventObjects
 	ldr r5, =gPlayerAvatar
 	ldrb r0, [r5, 0x5]
 	lsls r1, r0, 3
@@ -3152,7 +3152,7 @@ sub_808C114: @ 808C114
 	lsls r4, r0, 3
 	adds r4, r0
 	lsls r4, 2
-	ldr r0, =gMapObjects
+	ldr r0, =gEventObjects
 	adds r4, r0
 	movs r0, 0x5
 	bl GetPlayerAvatarGraphicsIdByStateId
@@ -3160,7 +3160,7 @@ sub_808C114: @ 808C114
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetGraphicsId
+	bl EventObjectSetGraphicsId
 	ldrb r1, [r5, 0x4]
 	lsls r0, r1, 4
 	adds r0, r1
@@ -3186,7 +3186,7 @@ sub_808C15C: @ 808C15C
 	lsls r4, r0, 3
 	adds r4, r0
 	lsls r4, 2
-	ldr r0, =gMapObjects
+	ldr r0, =gEventObjects
 	adds r4, r0
 	movs r0, 0x6
 	bl GetPlayerAvatarGraphicsIdByStateId
@@ -3194,7 +3194,7 @@ sub_808C15C: @ 808C15C
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetGraphicsId
+	bl EventObjectSetGraphicsId
 	ldrb r0, [r6, 0x4]
 	lsls r4, r0, 4
 	adds r4, r0
@@ -3202,7 +3202,7 @@ sub_808C15C: @ 808C15C
 	ldr r0, =gSprites
 	adds r4, r0
 	adds r0, r5, 0
-	bl sub_8092A0C
+	bl GetFishingDirectionAnimNum
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -3227,7 +3227,7 @@ sub_808C1B4: @ 808C1B4
 	lsls r4, r0, 3
 	adds r4, r0
 	lsls r4, 2
-	ldr r0, =gMapObjects
+	ldr r0, =gEventObjects
 	adds r4, r0
 	movs r0, 0x2
 	bl GetPlayerAvatarGraphicsIdByStateId
@@ -3235,7 +3235,7 @@ sub_808C1B4: @ 808C1B4
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetGraphicsId
+	bl EventObjectSetGraphicsId
 	ldrb r0, [r6, 0x4]
 	lsls r4, r0, 4
 	adds r4, r0
@@ -3244,7 +3244,7 @@ sub_808C1B4: @ 808C1B4
 	mov r8, r0
 	add r4, r8
 	adds r0, r5, 0
-	bl sub_80929BC
+	bl GetAcroWheelieDirectionAnimNum
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -3276,7 +3276,7 @@ sub_808C228: @ 808C228
 	lsls r4, r0, 3
 	adds r4, r0
 	lsls r4, 2
-	ldr r0, =gMapObjects
+	ldr r0, =gEventObjects
 	adds r4, r0
 	movs r0, 0x7
 	bl GetPlayerAvatarGraphicsIdByStateId
@@ -3284,7 +3284,7 @@ sub_808C228: @ 808C228
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetGraphicsId
+	bl EventObjectSetGraphicsId
 	ldrb r0, [r6, 0x4]
 	lsls r4, r0, 4
 	adds r4, r0
@@ -3292,7 +3292,7 @@ sub_808C228: @ 808C228
 	ldr r0, =gSprites
 	adds r4, r0
 	adds r0, r5, 0
-	bl FieldObjectDirectionToImageAnimId
+	bl GetFaceDirectionAnimNum
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -3414,7 +3414,7 @@ taskFF_bump_boulder: @ 808C34C
 	lsrs r0, 24
 	ldr r6, =gUnknown_08497530
 	ldr r2, =gTasks
-	ldr r5, =gMapObjects
+	ldr r5, =gEventObjects
 	lsls r1, r0, 2
 	adds r1, r0
 	lsls r1, 3
@@ -3474,49 +3474,49 @@ do_boulder_dust: @ 808C3C4
 	adds r5, r1, 0
 	adds r4, r2, 0
 	adds r0, r5, 0
-	bl FieldObjectIsSpecialAnimActive
+	bl EventObjectIsHeldMovementActive
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808C3DE
 	adds r0, r5, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl EventObjectClearHeldMovementIfFinished
 _0808C3DE:
 	adds r0, r4, 0
-	bl FieldObjectIsSpecialAnimActive
+	bl EventObjectIsHeldMovementActive
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808C3F0
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl EventObjectClearHeldMovementIfFinished
 _0808C3F0:
 	adds r0, r5, 0
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
+	bl EventObjectIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	bne _0808C472
 	adds r0, r4, 0
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
+	bl EventObjectIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	bne _0808C472
 	adds r0, r5, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl EventObjectClearHeldMovementIfFinished
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl EventObjectClearHeldMovementIfFinished
 	ldrb r0, [r6, 0xC]
-	bl GetStepInPlaceDelay16AnimId
+	bl GetWalkInPlaceNormalMovementAction
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r5, 0
-	bl FieldObjectSetSpecialAnim
+	bl EventObjectSetHeldMovement
 	ldrb r0, [r6, 0xC]
-	bl GetSimpleGoAnimId
+	bl GetWalkSlowMovementAction
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetSpecialAnim
+	bl EventObjectSetHeldMovement
 	ldr r2, =gFieldEffectArguments
 	movs r1, 0x10
 	ldrsh r0, [r4, r1]
@@ -3558,19 +3558,19 @@ sub_808C484: @ 808C484
 	adds r4, r1, 0
 	adds r5, r2, 0
 	adds r0, r4, 0
-	bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
+	bl EventObjectCheckHeldMovementStatus
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808C4C6
 	adds r0, r5, 0
-	bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
+	bl EventObjectCheckHeldMovementStatus
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808C4C6
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl EventObjectClearHeldMovementIfFinished
 	adds r0, r5, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl EventObjectClearHeldMovementIfFinished
 	ldr r1, =gPlayerAvatar
 	movs r0, 0
 	strb r0, [r1, 0x6]
@@ -3625,7 +3625,7 @@ _0808C50A:
 	lsls r1, r0, 3
 	adds r1, r0
 	lsls r1, 2
-	ldr r0, =gMapObjects
+	ldr r0, =gEventObjects
 	adds r1, r0
 	ldr r2, [r2]
 	adds r0, r4, 0
@@ -3648,7 +3648,7 @@ sub_808C544: @ 808C544
 	movs r0, 0x1
 	strb r0, [r5, 0x6]
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl EventObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808C5A0
@@ -3657,12 +3657,12 @@ sub_808C544: @ 808C544
 	ldrb r0, [r4, 0x18]
 	lsls r0, 28
 	lsrs r0, 28
-	bl sub_80934BC
+	bl GetJumpInPlaceMovementAction
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetSpecialAnim
+	bl EventObjectSetHeldMovement
 	ldrh r0, [r6, 0xA]
 	adds r0, 0x1
 	strh r0, [r6, 0xA]
@@ -3726,7 +3726,7 @@ _0808C5E2:
 	lsls r1, r0, 3
 	adds r1, r0
 	lsls r1, 2
-	ldr r0, =gMapObjects
+	ldr r0, =gEventObjects
 	adds r1, r0
 	ldr r2, [r2]
 	adds r0, r4, 0
@@ -3772,7 +3772,7 @@ sub_808C644: @ 808C644
 	movs r2, 0x4
 	bl memcpy
 	adds r0, r5, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl EventObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808C6AC
@@ -3782,12 +3782,12 @@ sub_808C644: @ 808C644
 	add r0, sp
 	ldrb r6, [r0]
 	adds r0, r6, 0
-	bl GetFaceDirectionAnimId
+	bl GetFaceDirectionMovementAction
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r5, 0
-	bl FieldObjectSetSpecialAnim
+	bl EventObjectSetHeldMovement
 	ldrb r0, [r4, 0xA]
 	cmp r6, r0
 	bne _0808C68A
@@ -3831,7 +3831,7 @@ sub_808C6BC: @ 808C6BC
 	movs r2, 0x5
 	bl memcpy
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl EventObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808C6EC
@@ -3840,7 +3840,7 @@ sub_808C6BC: @ 808C6BC
 	add r0, sp
 	ldrb r1, [r0]
 	adds r0, r4, 0
-	bl FieldObjectSetSpecialAnim
+	bl EventObjectSetHeldMovement
 	movs r0, 0x1
 	strh r0, [r5, 0x8]
 _0808C6EC:
@@ -3858,7 +3858,7 @@ sub_808C6FC: @ 808C6FC
 	adds r4, r0, 0
 	adds r5, r1, 0
 	adds r0, r5, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl EventObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808C740
@@ -3866,12 +3866,12 @@ sub_808C6FC: @ 808C6FC
 	bl GetOppositeDirection
 	lsls r0, 24
 	lsrs r0, 24
-	bl GetSimpleGoAnimId
+	bl GetWalkSlowMovementAction
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r5, 0
-	bl FieldObjectSetSpecialAnim
+	bl EventObjectSetHeldMovement
 	bl ScriptContext2_Disable
 	ldr r1, =gPlayerAvatar
 	movs r0, 0
@@ -3936,15 +3936,15 @@ taskFF_0805D1D4: @ 808C7A8
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, =gMapObjects
+	ldr r1, =gEventObjects
 	adds r5, r0, r1
 	adds r0, r5, 0
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
+	bl EventObjectIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808C7D4
 	adds r0, r5, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl EventObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808C7FC
@@ -3958,12 +3958,12 @@ _0808C7D4:
 	lsls r4, 3
 	adds r4, r0
 	ldrb r0, [r4, 0x8]
-	bl sub_8093540
+	bl GetJumpSpecialMovementAction
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r5, 0
-	bl FieldObjectSetSpecialAnim
+	bl EventObjectSetHeldMovement
 	ldr r0, =sub_808C814
 	str r0, [r4]
 _0808C7FC:
@@ -3983,10 +3983,10 @@ sub_808C814: @ 808C814
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, =gMapObjects
+	ldr r1, =gEventObjects
 	adds r4, r0, r1
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl EventObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808C87A
@@ -3996,16 +3996,16 @@ sub_808C814: @ 808C814
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetGraphicsId
+	bl EventObjectSetGraphicsId
 	ldrb r0, [r4, 0x18]
 	lsls r0, 28
 	lsrs r0, 28
-	bl GetFaceDirectionAnimId
+	bl GetFaceDirectionMovementAction
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetSpecialAnim
+	bl EventObjectSetHeldMovement
 	movs r0, 0
 	strb r0, [r6, 0x6]
 	bl ScriptContext2_Disable
@@ -4127,7 +4127,7 @@ fish1: @ 808C918
 	ldrh r1, [r6]
 	adds r1, r0
 	strh r1, [r5, 0x22]
-	ldr r3, =gMapObjects
+	ldr r3, =gEventObjects
 	ldr r2, =gPlayerAvatar
 	ldrb r1, [r2, 0x5]
 	lsls r0, r1, 3
@@ -4142,7 +4142,7 @@ fish1: @ 808C918
 	lsls r4, 2
 	adds r4, r3
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimActive
+	bl EventObjectClearHeldMovementIfActive
 	ldrb r0, [r4, 0x1]
 	movs r1, 0x8
 	orrs r0, r1
@@ -4373,10 +4373,10 @@ _0808CB32:
 	lsls r4, 2
 	ldr r0, =gSprites
 	adds r4, r0
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	lsls r0, 24
 	lsrs r0, 24
-	bl sub_8092A2C
+	bl GetFishingBiteDirectionAnimNum
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -4579,18 +4579,18 @@ _0808CCBC:
 	lsls r4, r0, 3
 	adds r4, r0
 	lsls r4, 2
-	ldr r0, =gMapObjects
+	ldr r0, =gEventObjects
 	mov r8, r0
 	add r4, r8
 	ldrh r1, [r5, 0x24]
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetGraphicsId
+	bl EventObjectSetGraphicsId
 	ldrb r1, [r4, 0x18]
 	lsrs r1, 4
 	adds r0, r4, 0
-	bl FieldObjectTurn
+	bl EventObjectTurn
 	ldrb r1, [r7]
 	movs r0, 0x8
 	ands r0, r1
@@ -4671,10 +4671,10 @@ fishB: @ 808CD94
 	lsls r4, 2
 	ldr r0, =gSprites
 	adds r4, r0
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	lsls r0, 24
 	lsrs r0, 24
-	bl sub_8092A1C
+	bl GetFishingNoCatchDirectionAnimNum
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -4719,10 +4719,10 @@ fishC: @ 808CE04
 	lsls r4, 2
 	ldr r0, =gSprites
 	adds r4, r0
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	lsls r0, 24
 	lsrs r0, 24
-	bl sub_8092A1C
+	bl GetFishingNoCatchDirectionAnimNum
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -4792,18 +4792,18 @@ fishE: @ 808CE8C
 	lsls r4, r0, 3
 	adds r4, r0
 	lsls r4, 2
-	ldr r0, =gMapObjects
+	ldr r0, =gEventObjects
 	mov r8, r0
 	add r4, r8
 	ldrh r1, [r6, 0x24]
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetGraphicsId
+	bl EventObjectSetGraphicsId
 	ldrb r1, [r4, 0x18]
 	lsrs r1, 4
 	adds r0, r4, 0
-	bl FieldObjectTurn
+	bl EventObjectTurn
 	ldrb r1, [r5]
 	movs r0, 0x8
 	ands r0, r1
@@ -4858,7 +4858,7 @@ fishF: @ 808CF2C
 	ldr r0, =gPlayerAvatar
 	strb r1, [r0, 0x6]
 	bl ScriptContext2_Disable
-	bl UnfreezeMapObjects
+	bl UnfreezeEventObjects
 	movs r0, 0
 	movs r1, 0x1
 	bl sub_8197434
@@ -4956,7 +4956,7 @@ _0808CFF0:
 	bhi _0808D022
 	movs r0, 0x8
 	strh r0, [r4, 0x24]
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x3
@@ -4984,7 +4984,7 @@ _0808D03A:
 	ands r0, r1
 	cmp r0, 0
 	beq _0808D05E
-	ldr r2, =gMapObjects
+	ldr r2, =gEventObjects
 	ldrb r1, [r3, 0x5]
 	lsls r0, r1, 3
 	adds r0, r1
@@ -5037,7 +5037,7 @@ sub_808D094: @ 808D094
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, =gMapObjects
+	ldr r1, =gEventObjects
 	adds r4, r0, r1
 	ldrb r1, [r4, 0x4]
 	lsls r0, r1, 4
@@ -5066,7 +5066,7 @@ _0808D0E8:
 	b _0808D18A
 _0808D0EE:
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl EventObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808D18A
@@ -5217,7 +5217,7 @@ sub_808D1FC: @ 808D1FC
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, =gMapObjects
+	ldr r1, =gEventObjects
 	adds r4, r0, r1
 	ldrb r1, [r4, 0x4]
 	lsls r0, r1, 4
@@ -5257,12 +5257,12 @@ _0808D25E:
 	ldrsh r0, [r5, r3]
 	adds r0, r1
 	ldrb r0, [r0]
-	bl GetFaceDirectionAnimId
+	bl GetFaceDirectionMovementAction
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectForceSetSpecialAnim
+	bl EventObjectForceSetHeldMovement
 	movs r0, 0
 	mov r9, r0
 	strh r6, [r5, 0x2]
@@ -5414,7 +5414,7 @@ sub_808D38C: @ 808D38C
 	ble _0808D3E4
 _0808D3A8:
 	adds r0, r5, 0
-	bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
+	bl EventObjectCheckHeldMovementStatus
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808D3E4
@@ -5424,12 +5424,12 @@ _0808D3A8:
 	lsrs r0, 28
 	adds r0, r4
 	ldrb r0, [r0]
-	bl GetFaceDirectionAnimId
+	bl GetFaceDirectionMovementAction
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r5, 0
-	bl FieldObjectForceSetSpecialAnim
+	bl EventObjectForceSetHeldMovement
 	movs r0, 0
 	strh r0, [r6]
 	ldrb r0, [r5, 0x18]
diff --git a/asm/field_screen.s b/asm/field_screen.s
index e35c768dd..08eaf949a 100644
--- a/asm/field_screen.s
+++ b/asm/field_screen.s
@@ -8382,7 +8382,7 @@ _080AF46C:
 _080AF480:
 	movs r0, 0
 	bl sub_80AF0F4
-	bl FreezeMapObjects
+	bl FreezeEventObjects
 	adds r0, r6, 0
 	adds r1, r7, 0
 	bl PlayerGetDestCoords
@@ -8403,17 +8403,17 @@ _080AF4A4:
 	movs r0, 0xFF
 	movs r1, 0
 	movs r2, 0
-	bl GetFieldObjectIdByLocalIdAndMap
+	bl GetEventObjectIdByLocalIdAndMap
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, =gMapObjects
+	ldr r1, =gEventObjects
 	adds r0, r1
 	movs r1, 0x8
-	bl FieldObjectSetSpecialAnim
+	bl EventObjectSetHeldMovement
 	movs r0, 0x2
 	strh r0, [r5, 0x8]
 	b _080AF54A
@@ -8434,16 +8434,16 @@ _080AF4DC:
 	movs r0, 0xFF
 	movs r1, 0
 	movs r2, 0
-	bl GetFieldObjectIdByLocalIdAndMap
+	bl GetEventObjectIdByLocalIdAndMap
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, =gMapObjects
+	ldr r1, =gEventObjects
 	adds r0, r1
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl EventObjectClearHeldMovementIfFinished
 	movs r0, 0x3
 	strh r0, [r5, 0x8]
 	b _080AF54A
@@ -8461,7 +8461,7 @@ _080AF520:
 	cmp r0, 0x1
 	beq _080AF54A
 _080AF536:
-	bl UnfreezeMapObjects
+	bl UnfreezeEventObjects
 	movs r0, 0x4
 	strh r0, [r5, 0x8]
 	b _080AF54A
@@ -8508,7 +8508,7 @@ _080AF580:
 _080AF58A:
 	movs r0, 0
 	bl sub_80AF0F4
-	bl FreezeMapObjects
+	bl FreezeEventObjects
 	adds r0, r6, 0
 	adds r1, r7, 0
 	bl PlayerGetDestCoords
@@ -8524,23 +8524,23 @@ _080AF5A2:
 	movs r0, 0xFF
 	movs r1, 0
 	movs r2, 0
-	bl GetFieldObjectIdByLocalIdAndMap
+	bl GetEventObjectIdByLocalIdAndMap
 	lsls r0, 24
 	lsrs r0, 24
 	lsls r4, r0, 3
 	adds r4, r0
 	lsls r4, 2
-	ldr r0, =gMapObjects
+	ldr r0, =gEventObjects
 	adds r4, r0
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	lsls r0, 24
 	lsrs r0, 24
-	bl GetGoSpeed0AnimId
+	bl GetWalkNormalMovementAction
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetSpecialAnim
+	bl EventObjectSetHeldMovement
 	movs r0, 0x2
 	strh r0, [r5, 0x8]
 	b _080AF60A
@@ -8550,7 +8550,7 @@ _080AF5EC:
 	lsls r0, 24
 	cmp r0, 0
 	beq _080AF60A
-	bl UnfreezeMapObjects
+	bl UnfreezeEventObjects
 	movs r0, 0x3
 	strh r0, [r5, 0x8]
 	b _080AF60A
@@ -8583,7 +8583,7 @@ task_map_chg_seq_0807E2CC: @ 80AF610
 	b _080AF65A
 	.pool
 _080AF634:
-	bl FreezeMapObjects
+	bl FreezeEventObjects
 	bl ScriptContext2_Enable
 	ldrh r0, [r4, 0x8]
 	adds r0, 0x1
@@ -8593,7 +8593,7 @@ _080AF644:
 	bl sub_80AF71C
 	cmp r0, 0
 	beq _080AF65A
-	bl UnfreezeMapObjects
+	bl UnfreezeEventObjects
 	bl ScriptContext2_Disable
 	adds r0, r5, 0
 	bl DestroyTask
@@ -8861,7 +8861,7 @@ sub_80AF87C: @ 80AF87C
 	movs r0, 0x1
 	bl sub_8085540
 	bl ScriptContext2_Enable
-	bl SaveMapObjects
+	bl SaveEventObjects
 	bl music_something
 	bl sub_80AF0B4
 	movs r0, 0x2D
@@ -9062,7 +9062,7 @@ _080AFA34:
 	beq _080AFA6C
 	b _080AFA7C
 _080AFA3A:
-	bl FreezeMapObjects
+	bl FreezeEventObjects
 	bl ScriptContext2_Enable
 	b _080AFA64
 _080AFA44:
@@ -9133,7 +9133,7 @@ _080AFAC0:
 	.4byte _080AFBB8
 	.4byte _080AFBD4
 _080AFAD4:
-	bl FreezeMapObjects
+	bl FreezeEventObjects
 	adds r0, r4, 0
 	adds r1, r6, 0
 	bl PlayerGetDestCoords
@@ -9174,20 +9174,20 @@ _080AFB26:
 	movs r0, 0xFF
 	movs r1, 0
 	movs r2, 0
-	bl GetFieldObjectIdByLocalIdAndMap
+	bl GetEventObjectIdByLocalIdAndMap
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r4, =gMapObjects
+	ldr r4, =gEventObjects
 	adds r0, r4
-	bl FieldObjectClearAnimIfSpecialAnimActive
+	bl EventObjectClearHeldMovementIfActive
 	movs r0, 0xFF
 	movs r1, 0
 	movs r2, 0
-	bl GetFieldObjectIdByLocalIdAndMap
+	bl GetEventObjectIdByLocalIdAndMap
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -9196,7 +9196,7 @@ _080AFB26:
 	lsls r0, 2
 	adds r0, r4
 	movs r1, 0x9
-	bl FieldObjectSetSpecialAnim
+	bl EventObjectSetHeldMovement
 	movs r0, 0x2
 	strh r0, [r5, 0x8]
 	b _080AFBE8
@@ -9218,16 +9218,16 @@ _080AFB6C:
 	movs r0, 0xFF
 	movs r1, 0
 	movs r2, 0
-	bl GetFieldObjectIdByLocalIdAndMap
+	bl GetEventObjectIdByLocalIdAndMap
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, =gMapObjects
+	ldr r1, =gEventObjects
 	adds r0, r1
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl EventObjectClearHeldMovementIfFinished
 	movs r0, 0
 	bl sub_80AF0F4
 	movs r0, 0x3
@@ -9290,7 +9290,7 @@ _080AFC1C:
 	beq _080AFC46
 	b _080AFC56
 _080AFC22:
-	bl FreezeMapObjects
+	bl FreezeEventObjects
 	bl ScriptContext2_Enable
 	b _080AFC3E
 _080AFC2C:
@@ -9982,7 +9982,7 @@ task0A_mpl_807E31C: @ 80B0160
 	b _080B01B6
 	.pool
 _080B0184:
-	bl FreezeMapObjects
+	bl FreezeEventObjects
 	bl ScriptContext2_Enable
 	bl sub_808D194
 	ldrh r0, [r4, 0x8]
@@ -9996,7 +9996,7 @@ _080B0198:
 	bl sub_808D1B4
 	cmp r0, 0x1
 	beq _080B01B6
-	bl UnfreezeMapObjects
+	bl UnfreezeEventObjects
 	bl ScriptContext2_Disable
 	adds r0, r5, 0
 	bl DestroyTask
@@ -10033,7 +10033,7 @@ _080B01E4:
 	beq _080B022A
 	b _080B023A
 _080B01EE:
-	bl FreezeMapObjects
+	bl FreezeEventObjects
 	bl ScriptContext2_Enable
 	movs r0, 0x2D
 	bl PlaySE
diff --git a/asm/field_specials.s b/asm/field_specials.s
index 852d5ce7c..3db508001 100644
--- a/asm/field_specials.s
+++ b/asm/field_specials.s
@@ -741,8 +741,8 @@ _0813828A:
 	.pool
 	thumb_func_end GetLinkPartnerNames
 
-	thumb_func_start SpawnLinkPartnerFieldObject
-SpawnLinkPartnerFieldObject: @ 81382A0
+	thumb_func_start SpawnLinkPartnerEventObject
+SpawnLinkPartnerEventObject: @ 81382A0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -766,7 +766,7 @@ SpawnLinkPartnerFieldObject: @ 81382A0
 	lsls r0, 24
 	lsrs r0, 24
 	mov r10, r0
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	lsls r0, 24
 	lsrs r0, 24
 	adds r1, r0, 0
@@ -912,7 +912,7 @@ _0813839C:
 	adds r0, r5, 0
 	adds r2, r4, 0
 	mov r3, r12
-	bl SpawnSpecialFieldObjectParametrized
+	bl SpawnSpecialEventObjectParametrized
 	adds r0, r5, 0
 	adds r1, r4, 0
 	adds r2, r6, 0
@@ -941,7 +941,7 @@ _08138410:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end SpawnLinkPartnerFieldObject
+	thumb_func_end SpawnLinkPartnerEventObject
 
 	thumb_func_start sub_813842C
 sub_813842C: @ 813842C
@@ -971,12 +971,12 @@ _08138454:
 	ldrb r1, [r0, 0x5]
 	ldrb r2, [r0, 0x4]
 	adds r0, r3, 0
-	bl GetFieldObjectIdByLocalIdAndMap
+	bl GetEventObjectIdByLocalIdAndMap
 	lsls r0, 24
 	lsrs r2, r0, 24
 	cmp r2, 0x10
 	beq _081384E6
-	ldr r1, =gMapObjects
+	ldr r1, =gEventObjects
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
@@ -1008,15 +1008,15 @@ _081384A8:
 	beq _081384BC
 	b _081384E6
 _081384B2:
-	ldr r0, =gFieldObjectPalette33
+	ldr r0, =gEventObjectPalette33
 	b _081384C6
 	.pool
 _081384BC:
-	ldr r0, =gFieldObjectPalette34
+	ldr r0, =gEventObjectPalette34
 	b _081384C6
 	.pool
 _081384C4:
-	ldr r0, =gFieldObjectPalette8
+	ldr r0, =gEventObjectPalette8
 _081384C6:
 	movs r2, 0x80
 	lsls r2, 1
@@ -1026,7 +1026,7 @@ _081384C6:
 	b _081384E6
 	.pool
 _081384D8:
-	ldr r0, =gFieldObjectPalette17
+	ldr r0, =gEventObjectPalette17
 	movs r2, 0x80
 	lsls r2, 1
 	adds r1, r3, r2
@@ -1989,7 +1989,7 @@ PCTurnOnEffect_0: @ 8138D10
 	cmp r0, 0x6
 	bne _08138D7C
 	strh r5, [r4, 0xE]
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	lsls r0, 24
 	lsrs r0, 24
 	adds r1, r0, 0
@@ -2134,7 +2134,7 @@ PCTurnOffEffect: @ 8138E2C
 	movs r6, 0
 	movs r5, 0
 	movs r4, 0
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	lsls r0, 24
 	lsrs r0, 24
 	adds r1, r0, 0
@@ -2537,8 +2537,8 @@ _0813914A:
 	.pool
 	thumb_func_end IsGrassTypeInParty
 
-	thumb_func_start SpawnScriptFieldObject
-SpawnScriptFieldObject: @ 8139158
+	thumb_func_start SpawnScriptEventObject
+SpawnScriptEventObject: @ 8139158
 	push {lr}
 	sub sp, 0x8
 	ldr r0, =gSaveBlock1Ptr
@@ -2557,10 +2557,10 @@ SpawnScriptFieldObject: @ 8139158
 	movs r0, 0x7
 	movs r1, 0x8
 	movs r2, 0x7F
-	bl SpawnSpecialFieldObjectParametrized
+	bl SpawnSpecialEventObjectParametrized
 	lsls r0, 24
 	lsrs r0, 24
-	ldr r2, =gMapObjects
+	ldr r2, =gEventObjects
 	lsls r1, r0, 3
 	adds r1, r0
 	lsls r1, 2
@@ -2575,10 +2575,10 @@ SpawnScriptFieldObject: @ 8139158
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end SpawnScriptFieldObject
+	thumb_func_end SpawnScriptEventObject
 
-	thumb_func_start RemoveScriptFieldObject
-RemoveScriptFieldObject: @ 81391AC
+	thumb_func_start RemoveScriptEventObject
+RemoveScriptEventObject: @ 81391AC
 	push {lr}
 	bl GetPlayerAvatarObjectId
 	lsls r0, 24
@@ -2589,11 +2589,11 @@ RemoveScriptFieldObject: @ 81391AC
 	ldrb r1, [r0, 0x5]
 	ldrb r2, [r0, 0x4]
 	movs r0, 0x7F
-	bl RemoveFieldObjectByLocalIdAndMap
+	bl RemoveEventObjectByLocalIdAndMap
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end RemoveScriptFieldObject
+	thumb_func_end RemoveScriptEventObject
 
 	thumb_func_start GetPokeblockNameByMonNature
 GetPokeblockNameByMonNature: @ 81391D0
@@ -6327,7 +6327,7 @@ sub_813B0B4: @ 813B0B4
 	ldrb r2, [r0, 0x4]
 	movs r0, 0x1
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetEventObjectIdByLocalIdAndMap
 	cmp r4, 0
 	bne _0813B0F0
 	movs r0, 0xC4
@@ -6377,7 +6377,7 @@ _0813B13A:
 	adds r0, r5, r0
 	ldrb r2, [r0]
 	movs r0, 0x1
-	bl Overworld_SetMapObjTemplateCoords
+	bl Overworld_SetEventObjTemplateCoords
 	add sp, 0x4
 	pop {r4,r5}
 	pop {r0}
diff --git a/asm/fldeff_80F9BCC.s b/asm/fldeff_80F9BCC.s
index 8f1e198b8..840d38f64 100644
--- a/asm/fldeff_80F9BCC.s
+++ b/asm/fldeff_80F9BCC.s
@@ -567,7 +567,7 @@ sub_80FA004: @ 80FA004
 	ldrh r0, [r0]
 	cmp r0, 0x1
 	beq _080FA0AE
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x2
@@ -1493,7 +1493,7 @@ sub_80FA794: @ 80FA794
 	lsls r1, 16
 	lsrs r4, r1, 16
 	adds r6, r4, 0
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -1722,7 +1722,7 @@ _080FA9CA:
 sub_80FA9D0: @ 80FA9D0
 	push {r4,lr}
 	sub sp, 0x4
-	ldr r3, =gMapObjects
+	ldr r3, =gEventObjects
 	ldr r2, =gPlayerAvatar
 	ldrb r1, [r2, 0x5]
 	lsls r0, r1, 3
@@ -1815,7 +1815,7 @@ sub_80FAA7C: @ 80FAA7C
 	movs r3, 0
 	ldrsh r0, [r4, r3]
 	str r0, [r1, 0x18]
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x2
@@ -2312,32 +2312,32 @@ sub_80FAEF0: @ 80FAEF0
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, =gMapObjects
+	ldr r1, =gEventObjects
 	adds r4, r0, r1
 	adds r0, r4, 0
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
+	bl EventObjectIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _080FAF1C
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl EventObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _080FAF4E
 _080FAF1C:
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	lsls r0, 24
 	lsrs r0, 24
 	bl sub_808C228
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	lsls r0, 24
 	lsrs r0, 24
-	bl GetStepInPlaceDelay16AnimId
+	bl GetWalkInPlaceNormalMovementAction
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetSpecialAnim
+	bl EventObjectSetHeldMovement
 	ldr r1, =gTasks
 	lsls r0, r5, 2
 	adds r0, r5
@@ -2362,10 +2362,10 @@ sub_80FAF64: @ 80FAF64
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, =gMapObjects
+	ldr r1, =gEventObjects
 	adds r5, r0, r1
 	adds r0, r5, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl EventObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _080FAFC8
@@ -2381,15 +2381,15 @@ sub_80FAF64: @ 80FAF64
 	asrs r0, 16
 	cmp r0, 0x9
 	bgt _080FAFC4
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	lsls r0, 24
 	lsrs r0, 24
-	bl GetStepInPlaceDelay16AnimId
+	bl GetWalkInPlaceNormalMovementAction
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r5, 0
-	bl FieldObjectSetSpecialAnim
+	bl EventObjectSetHeldMovement
 	b _080FAFC8
 	.pool
 _080FAFC4:
diff --git a/asm/macros/movement.inc b/asm/macros/movement.inc
index 5a810c497..99b5c8f84 100644
--- a/asm/macros/movement.inc
+++ b/asm/macros/movement.inc
@@ -1,4 +1,4 @@
-	.macro create_movement name
+	.macro create_movement_action name
 	enum _\name
 	.macro \name
 	.byte _\name
@@ -6,118 +6,126 @@
 	.endm
 
 	enum_start
-	create_movement step_00
-	create_movement step_01
-	create_movement step_02
-	create_movement step_03
-	create_movement slow_step_down
-	create_movement slow_step_up
-	create_movement slow_step_left
-	create_movement slow_step_right
-	create_movement step_down
-	create_movement step_up
-	create_movement step_left
-	create_movement step_right
-	create_movement fast_step_down
-	create_movement fast_step_up
-	create_movement fast_step_left
-	create_movement fast_step_right
-	create_movement step_10
-	create_movement step_11
-	create_movement step_12
-	create_movement step_13
-	create_movement step_14
-	create_movement step_15
-	create_movement step_16
-	create_movement step_17
-	create_movement step_18
-	create_movement step_19
-	create_movement step_1a
-	create_movement step_1b
-	create_movement step_1c
-	create_movement step_1d
-	create_movement step_1e
-	create_movement step_1f
-	create_movement step_20
-	create_movement step_21
-	create_movement step_22
-	create_movement step_23
-	create_movement step_24
-	create_movement step_25
-	create_movement step_26
-	create_movement step_27
-	create_movement step_28
-	create_movement step_29
-	create_movement step_2a
-	create_movement step_2b
-	create_movement step_2c
-	create_movement step_2d
-	create_movement step_2e
-	create_movement step_2f
-	create_movement step_30
-	create_movement step_31
-	create_movement step_32
-	create_movement step_33
-	create_movement step_34
-	create_movement step_35
-	create_movement step_36
-	create_movement step_37
-	create_movement step_38
-	create_movement step_39
-	create_movement step_3a
-	create_movement step_3b
-	create_movement step_3c
-	create_movement step_3d
-	create_movement step_3e
-	create_movement step_3f
-	create_movement step_40
-	create_movement step_41
-	create_movement step_42
-	create_movement step_43
-	create_movement step_44
-	create_movement step_45
-	create_movement step_46
-	create_movement step_47
-	create_movement step_48
-	create_movement step_49
-	create_movement step_4a
-	create_movement step_4b
-	create_movement step_4c
-	create_movement step_4d
-	create_movement step_4e
-	create_movement step_4f
-	create_movement step_50
-	create_movement step_51
-	create_movement step_52
-	create_movement step_53
-	create_movement step_54
-	create_movement step_55
-	create_movement step_56
-	create_movement step_57
-	create_movement step_58
-	create_movement step_59
-	create_movement step_5a
-	create_movement step_5b
-	create_movement step_5c
-	create_movement step_5d
-	create_movement step_5e
-	create_movement step_5f
-	create_movement step_60
-	create_movement step_61
-	create_movement step_62
-	create_movement step_63
+	create_movement_action face_down
+	create_movement_action face_up
+	create_movement_action face_left
+	create_movement_action face_right
+	create_movement_action walk_slow_down
+	create_movement_action walk_slow_up
+	create_movement_action walk_slow_left
+	create_movement_action walk_slow_right
+	create_movement_action walk_down
+	create_movement_action walk_up
+	create_movement_action walk_left
+	create_movement_action walk_right
+	create_movement_action jump_2_down
+	create_movement_action jump_2_up
+	create_movement_action jump_2_left
+	create_movement_action jump_2_right
+	create_movement_action delay_1
+	create_movement_action delay_2
+	create_movement_action delay_4
+	create_movement_action delay_8
+	create_movement_action delay_16
+	create_movement_action walk_fast_down
+	create_movement_action walk_fast_up
+	create_movement_action walk_fast_left
+	create_movement_action walk_fast_right
+	create_movement_action walk_in_place_slow_down
+	create_movement_action walk_in_place_slow_up
+	create_movement_action walk_in_place_slow_left
+	create_movement_action walk_in_place_slow_right
+	create_movement_action walk_in_place_down
+	create_movement_action walk_in_place_up
+	create_movement_action walk_in_place_left
+	create_movement_action walk_in_place_right
+	create_movement_action walk_in_place_fast_down
+	create_movement_action walk_in_place_fast_up
+	create_movement_action walk_in_place_fast_left
+	create_movement_action walk_in_place_fast_right
+	create_movement_action walk_in_place_fastest_down
+	create_movement_action walk_in_place_fastest_up
+	create_movement_action walk_in_place_fastest_left
+	create_movement_action walk_in_place_fastest_right
+	create_movement_action ride_water_current_down
+	create_movement_action ride_water_current_up
+	create_movement_action ride_water_current_left
+	create_movement_action ride_water_current_right
+	create_movement_action walk_fastest_down
+	create_movement_action walk_fastest_up
+	create_movement_action walk_fastest_left
+	create_movement_action walk_fastest_right
+	create_movement_action slide_down
+	create_movement_action slide_up
+	create_movement_action slide_left
+	create_movement_action slide_right
+	create_movement_action player_run_down
+	create_movement_action player_run_up
+	create_movement_action player_run_left
+	create_movement_action player_run_right
+	create_movement_action start_anim_in_direction
+	create_movement_action jump_special_down
+	create_movement_action jump_special_up
+	create_movement_action jump_special_left
+	create_movement_action jump_special_right
+	create_movement_action face_player
+	create_movement_action face_away_player
+	create_movement_action lock_facing_direction
+	create_movement_action unlock_facing_direction
+	create_movement_action jump_down
+	create_movement_action jump_up
+	create_movement_action jump_left
+	create_movement_action jump_right
+	create_movement_action jump_in_place_down
+	create_movement_action jump_in_place_up
+	create_movement_action jump_in_place_left
+	create_movement_action jump_in_place_right
+	create_movement_action jump_in_place_down_up
+	create_movement_action jump_in_place_up_down
+	create_movement_action jump_in_place_left_right
+	create_movement_action jump_in_place_right_left
+	create_movement_action face_original_direction
+	create_movement_action nurse_joy_bow
+	create_movement_action enable_jump_landing_ground_effect
+	create_movement_action disable_jump_landing_ground_effect
+	create_movement_action disable_anim
+	create_movement_action restore_anim
+	create_movement_action set_invisible
+	create_movement_action set_visible
+	create_movement_action emote_exclamation_mark
+	create_movement_action emote_question_mark
+	create_movement_action emote_heart
+	create_movement_action reveal_trainer
+	create_movement_action rock_smash_break
+	create_movement_action cut_tree
+	create_movement_action set_fixed_priority
+	create_movement_action clear_fixed_priority
+	create_movement_action init_affine_anim
+	create_movement_action clear_affine_anim
+	create_movement_action unknown_movement_1
+	create_movement_action unknown_movement_2
+	create_movement_action walk_down_start_affine
+	create_movement_action walk_down_affine
 
-	enum_start 0x91
-	create_movement step_91
-	create_movement step_92
-	create_movement step_93
-	create_movement step_94
-	create_movement step_95
-	create_movement step_96
-	create_movement step_97
-	create_movement step_98
-	create_movement step_99
-	create_movement step_9A
+	enum_start 0x8C
+	create_movement_action walk_diag_northwest
+	create_movement_action walk_diag_northeast
+	create_movement_action walk_diag_southwest
+	create_movement_action walk_diag_southeast
+	create_movement_action walk_slow_diag_northwest
+	create_movement_action walk_slow_diag_northeast
+	create_movement_action walk_slow_diag_southwest
+	create_movement_action walk_slow_diag_southeast
+	create_movement_action store_lock_anim
+	create_movement_action free_unlock_anim
+	create_movement_action walk_left_affine
+	create_movement_action walk_right_affine
+	create_movement_action levitate
+	create_movement_action stop_levitate
+	create_movement_action destroy_extra_task
+	create_movement_action figure_8
+	create_movement_action fly_up
+	create_movement_action fly_down
 
 	enum_start 0xfe
-	create_movement step_end
+	create_movement_action step_end
diff --git a/asm/pokenav.s b/asm/pokenav.s
index 2cc643547..00c8c8448 100644
--- a/asm/pokenav.s
+++ b/asm/pokenav.s
@@ -25584,7 +25584,7 @@ sub_81D4258: @ 81D4258
 	ldrb r2, [r0, 0x4]
 	movs r0, 0x1
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetEventObjectIdByLocalIdAndMap
 	mov r0, sp
 	ldrb r0, [r0]
 	add sp, 0x4
@@ -25606,7 +25606,7 @@ sub_81D427C: @ 81D427C
 	lsls r1, r0, 3
 	adds r1, r0
 	lsls r1, 2
-	ldr r2, =gMapObjects
+	ldr r2, =gEventObjects
 	adds r5, r1, r2
 	ldr r4, =gUnknown_030012F8
 	ldr r3, =gPlayerAvatar
@@ -25644,7 +25644,7 @@ _081D42CA:
 	mov r8, r0
 	cmp r0, 0x3
 	bls _081D42CA
-	ldr r2, =gMapObjects
+	ldr r2, =gEventObjects
 	ldr r0, =gPlayerAvatar
 	ldrb r1, [r0, 0x5]
 	lsls r0, r1, 3
@@ -25700,7 +25700,7 @@ _081D4356:
 _081D4360:
 	movs r4, 0
 	mov r8, r4
-	ldr r6, =gMapObjects
+	ldr r6, =gEventObjects
 	mov r10, r6
 _081D4368:
 	ldr r3, =gPlayerAvatar
@@ -25718,7 +25718,7 @@ _081D4368:
 	ldrsh r2, [r4, r6]
 	movs r6, 0
 	ldrsh r0, [r0, r6]
-	ldr r6, =gMapObjects
+	ldr r6, =gEventObjects
 	mov r9, r6
 	mov r12, r3
 	adds r7, r1, 0
@@ -25866,7 +25866,7 @@ _081D449E:
 	ldrsh r1, [r4, r3]
 	movs r3, 0
 	ldrsh r0, [r0, r3]
-	ldr r3, =gMapObjects
+	ldr r3, =gEventObjects
 	mov r9, r3
 	mov r12, r2
 	cmp r1, r0
@@ -26124,7 +26124,7 @@ _081D46D0:
 	ldrsh r0, [r0, r3]
 	cmp r0, 0
 	bne _081D476E
-	ldr r2, =gMapObjects
+	ldr r2, =gEventObjects
 	ldr r0, =gPlayerAvatar
 	ldrb r1, [r0, 0x5]
 	lsls r0, r1, 3
@@ -26149,7 +26149,7 @@ _081D46D0:
 	beq _081D470C
 	b _081D447C
 _081D470C:
-	ldr r2, =gMapObjects
+	ldr r2, =gEventObjects
 	ldr r0, =gPlayerAvatar
 	ldrb r1, [r0, 0x5]
 	lsls r0, r1, 3
@@ -26203,7 +26203,7 @@ _081D476E:
 	ldrsh r0, [r0, r2]
 	cmp r0, 0
 	bne _081D480C
-	ldr r2, =gMapObjects
+	ldr r2, =gEventObjects
 	ldr r0, =gPlayerAvatar
 	ldrb r1, [r0, 0x5]
 	lsls r0, r1, 3
@@ -26228,7 +26228,7 @@ _081D476E:
 	beq _081D47AA
 	b _081D45AA
 _081D47AA:
-	ldr r2, =gMapObjects
+	ldr r2, =gEventObjects
 	ldr r0, =gPlayerAvatar
 	ldrb r1, [r0, 0x5]
 	lsls r0, r1, 3
@@ -26299,7 +26299,7 @@ sub_81D4834: @ 81D4834
 	lsls r0, 16
 	lsls r1, 16
 	lsrs r4, r1, 16
-	ldr r3, =gMapObjects
+	ldr r3, =gEventObjects
 	ldr r1, =gPlayerAvatar
 	ldrb r2, [r1, 0x5]
 	lsls r1, r2, 3
@@ -26350,7 +26350,7 @@ sub_81D4890: @ 81D4890
 	lsls r1, r0, 3
 	adds r1, r0
 	lsls r1, 2
-	ldr r0, =gMapObjects
+	ldr r0, =gEventObjects
 	adds r4, r1, r0
 	movs r1, 0
 	ldr r3, =gUnknown_030012FC
@@ -26503,9 +26503,9 @@ _081D49E0:
 	bx r0
 	thumb_func_end sub_81D4998
 
-	thumb_func_start FieldObjectIsFarawayIslandMew
-@ bool8 FieldObjectIsFarawayIslandMew(struct npc_state *fieldObject)
-FieldObjectIsFarawayIslandMew: @ 81D49E8
+	thumb_func_start EventObjectIsFarawayIslandMew
+@ bool8 EventObjectIsFarawayIslandMew(struct npc_state *eventObject)
+EventObjectIsFarawayIslandMew: @ 81D49E8
 	push {lr}
 	adds r2, r0, 0
 	ldr r0, =gSaveBlock1Ptr
@@ -26525,7 +26525,7 @@ _081D4A0C:
 _081D4A0E:
 	pop {r1}
 	bx r1
-	thumb_func_end FieldObjectIsFarawayIslandMew
+	thumb_func_end EventObjectIsFarawayIslandMew
 
 	thumb_func_start unown_chamber_related
 unown_chamber_related: @ 81D4A14
@@ -26598,7 +26598,7 @@ sub_81D4A90: @ 81D4A90
 	lsls r1, r0, 3
 	adds r1, r0
 	lsls r1, 2
-	ldr r0, =gMapObjects
+	ldr r0, =gEventObjects
 	adds r5, r1, r0
 	ldrb r1, [r5, 0x1]
 	movs r0, 0x21
@@ -29331,7 +29331,7 @@ sub_81D6180: @ 81D6180
 	thumb_func_end sub_81D6180
 
 	thumb_func_start GetTrainerHillTrainerFlag
-@ u8 GetTrainerHillTrainerFlag(u8 fieldObjectId)
+@ u8 GetTrainerHillTrainerFlag(u8 eventObjectId)
 GetTrainerHillTrainerFlag: @ 81D619C
 	push {r4,lr}
 	adds r4, r0, 0
@@ -29340,7 +29340,7 @@ GetTrainerHillTrainerFlag: @ 81D619C
 	bl sub_81D5520
 	lsls r0, 24
 	lsrs r0, 23
-	ldr r2, =gMapObjects
+	ldr r2, =gEventObjects
 	lsls r1, r4, 3
 	adds r1, r4
 	lsls r1, 2
diff --git a/asm/rom_8011DC0.s b/asm/rom_8011DC0.s
index b7f03739a..f906304ca 100644
--- a/asm/rom_8011DC0.s
+++ b/asm/rom_8011DC0.s
@@ -10551,7 +10551,7 @@ _080181BC:
 sub_80181CC: @ 80181CC
 	push {lr}
 	bl ScriptContext2_Enable
-	bl ScriptFreezeMapObjects
+	bl ScriptFreezeEventObjects
 	pop {r0}
 	bx r0
 	thumb_func_end sub_80181CC
@@ -13578,7 +13578,7 @@ sub_8019AB8: @ 8019AB8
 	ldr r2, [r1]
 	ldrb r1, [r2, 0x5]
 	ldrb r2, [r2, 0x4]
-	bl RemoveFieldObjectByLocalIdAndMap
+	bl RemoveEventObjectByLocalIdAndMap
 	pop {r0}
 	bx r0
 	.pool
@@ -13597,7 +13597,7 @@ sub_8019AD8: @ 8019AD8
 	ldrb r1, [r2, 0x5]
 	ldrb r2, [r2, 0x4]
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetEventObjectIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _08019B30
@@ -13606,16 +13606,16 @@ sub_8019AD8: @ 8019AD8
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, =gMapObjects
+	ldr r1, =gEventObjects
 	adds r4, r0, r1
 	adds r0, r4, 0
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
+	bl EventObjectIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	bne _08019B30
 	ldrb r1, [r5]
 	adds r0, r4, 0
-	bl FieldObjectSetSpecialAnim
+	bl EventObjectSetHeldMovement
 	lsls r0, 24
 	cmp r0, 0
 	bne _08019B30
@@ -13643,7 +13643,7 @@ sub_8019B3C: @ 8019B3C
 	ldrb r1, [r2, 0x5]
 	ldrb r2, [r2, 0x4]
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetEventObjectIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _08019B9C
@@ -13652,10 +13652,10 @@ sub_8019B3C: @ 8019B3C
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, =gMapObjects
+	ldr r1, =gEventObjects
 	adds r4, r0, r1
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl EventObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	bne _08019B84
@@ -13668,11 +13668,11 @@ _08019B84:
 	cmp r0, 0
 	bne _08019B96
 	adds r0, r4, 0
-	bl npc_sync_anim_pause_bits
+	bl UnfreezeEventObject
 	b _08019B9C
 _08019B96:
 	adds r0, r4, 0
-	bl FreezeMapObject
+	bl FreezeEventObject
 _08019B9C:
 	movs r0, 0x1
 _08019B9E:
@@ -14619,7 +14619,7 @@ sub_801A2A8: @ 801A2A8
 	b _0801A396
 _0801A2C4:
 	ldr r4, =gUnknown_082F076A
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	lsls r0, 24
 	lsrs r0, 24
 	adds r0, r4
diff --git a/asm/script_pokemon_util_80F87D8.s b/asm/script_pokemon_util_80F87D8.s
index b241e3778..18a0cec88 100644
--- a/asm/script_pokemon_util_80F87D8.s
+++ b/asm/script_pokemon_util_80F87D8.s
@@ -505,10 +505,10 @@ _080F8BBA:
 	ldr r2, [r1]
 	ldrb r1, [r2, 0x5]
 	ldrb r2, [r2, 0x4]
-	bl GetFieldObjectIdByLocalIdAndMap
+	bl GetEventObjectIdByLocalIdAndMap
 	lsls r0, 24
 	lsrs r0, 24
-	ldr r2, =gMapObjects
+	ldr r2, =gEventObjects
 	lsls r1, r0, 3
 	adds r1, r0
 	lsls r1, 2
@@ -534,12 +534,12 @@ _080F8BBA:
 	cmp r0, 0
 	bne _080F8C2C
 	lsrs r1, r4, 16
-	ldr r0, =gFieldObjectPalette33
+	ldr r0, =gEventObjectPalette33
 	b _080F8C42
 	.pool
 _080F8C2C:
 	lsrs r1, r4, 16
-	ldr r0, =gFieldObjectPalette34
+	ldr r0, =gEventObjectPalette34
 	b _080F8C42
 	.pool
 _080F8C38:
@@ -547,7 +547,7 @@ _080F8C38:
 	cmp r0, 0
 	bne _080F8C50
 	lsrs r1, r4, 16
-	ldr r0, =gFieldObjectPalette8
+	ldr r0, =gEventObjectPalette8
 _080F8C42:
 	movs r2, 0x20
 	bl LoadPalette
@@ -555,7 +555,7 @@ _080F8C42:
 	.pool
 _080F8C50:
 	lsrs r1, r4, 16
-	ldr r0, =gFieldObjectPalette17
+	ldr r0, =gEventObjectPalette17
 	movs r2, 0x20
 	bl LoadPalette
 _080F8C5A:
diff --git a/asm/shop.s b/asm/shop.s
index a09d05323..b498da70d 100644
--- a/asm/shop.s
+++ b/asm/shop.s
@@ -1277,8 +1277,8 @@ BuyMenuDrawGraphics: @ 80E0524
 @ void BuyMenuDrawMapGraphics()
 BuyMenuDrawMapGraphics: @ 80E0570
 	push {lr}
-	bl BuyMenuCollectFieldObjectData
-	bl BuyMenuDrawFieldObjects
+	bl BuyMenuCollectEventObjectData
+	bl BuyMenuDrawEventObjects
 	bl BuyMenuDrawMapBg
 	pop {r0}
 	bx r0
@@ -1525,9 +1525,9 @@ BuyMenuDrawMapMetatileLayer: @ 80E0734
 	bx lr
 	thumb_func_end BuyMenuDrawMapMetatileLayer
 
-	thumb_func_start BuyMenuCollectFieldObjectData
-@ void BuyMenuCollectFieldObjectData()
-BuyMenuCollectFieldObjectData: @ 80E075C
+	thumb_func_start BuyMenuCollectEventObjectData
+@ void BuyMenuCollectEventObjectData()
+BuyMenuCollectEventObjectData: @ 80E075C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -1584,7 +1584,7 @@ _080E07AA:
 	lsls r1, 16
 	asrs r1, 16
 	str r3, [sp, 0x10]
-	bl GetFieldObjectIdByXY
+	bl GetEventObjectIdByXY
 	lsls r0, 24
 	lsrs r6, r0, 24
 	ldr r3, [sp, 0x10]
@@ -1633,7 +1633,7 @@ _080E07AA:
 	lsrs r0, 24
 	mov r1, r12
 	strh r0, [r1]
-	ldr r1, =gMapObjects
+	ldr r1, =gEventObjects
 	lsls r0, r6, 3
 	adds r0, r6
 	lsls r0, 2
@@ -1716,11 +1716,11 @@ _080E08DA:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end BuyMenuCollectFieldObjectData
+	thumb_func_end BuyMenuCollectEventObjectData
 
-	thumb_func_start BuyMenuDrawFieldObjects
-@ void BuyMenuDrawFieldObjects()
-BuyMenuDrawFieldObjects: @ 80E08F0
+	thumb_func_start BuyMenuDrawEventObjects
+@ void BuyMenuDrawEventObjects()
+BuyMenuDrawEventObjects: @ 80E08F0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -1730,7 +1730,7 @@ BuyMenuDrawFieldObjects: @ 80E08F0
 	movs r7, 0
 	ldr r0, =gUnknown_02039F70
 	mov r8, r0
-	ldr r1, =gMapObjects
+	ldr r1, =gEventObjects
 	mov r10, r1
 	ldr r2, =gSprites
 	mov r9, r2
@@ -1753,7 +1753,7 @@ _080E090A:
 	lsls r0, 2
 	add r0, r10
 	ldrb r0, [r0, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetEventObjectGraphicsInfo
 	mov r4, r8
 	ldr r3, [r4]
 	ldr r2, =0x00002010
@@ -1792,7 +1792,7 @@ _080E090A:
 	str r0, [sp]
 	adds r0, r4, 0
 	ldr r1, =SpriteCallbackDummy
-	bl AddPseudoFieldObject
+	bl AddPseudoEventObject
 	lsls r0, 24
 	lsrs r4, r0, 24
 	adds r6, r4, 0
@@ -1801,7 +1801,7 @@ _080E090A:
 	mov r3, r8
 	ldr r0, [r3]
 	adds r0, r1
-	bl BuyMenuCheckIfFieldObjectOverlapsMenuBg
+	bl BuyMenuCheckIfEventObjectOverlapsMenuBg
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -1850,10 +1850,10 @@ _080E09D8:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end BuyMenuDrawFieldObjects
+	thumb_func_end BuyMenuDrawEventObjects
 
-	thumb_func_start BuyMenuCheckIfFieldObjectOverlapsMenuBg
-BuyMenuCheckIfFieldObjectOverlapsMenuBg: @ 80E0A14
+	thumb_func_start BuyMenuCheckIfEventObjectOverlapsMenuBg
+BuyMenuCheckIfEventObjectOverlapsMenuBg: @ 80E0A14
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x2
@@ -1877,7 +1877,7 @@ _080E0A3A:
 	pop {r4}
 	pop {r1}
 	bx r1
-	thumb_func_end BuyMenuCheckIfFieldObjectOverlapsMenuBg
+	thumb_func_end BuyMenuCheckIfEventObjectOverlapsMenuBg
 
 	thumb_func_start BuyMenuCopyMenuBgToBg1TilemapBuffer
 @ void BuyMenuCopyMenuBgToBg1TilemapBuffer()
diff --git a/data/battle_frontier_2.s b/data/battle_frontier_2.s
index 8fc2939c6..ce2490579 100644
--- a/data/battle_frontier_2.s
+++ b/data/battle_frontier_2.s
@@ -1454,43 +1454,43 @@ gUnknown_08612690:: @ 8612690
 	.4byte 0x00000400, 0x00000800
 
 gUnknown_08612698:: @ 8612698
-	step_94
-	step_right
-	step_95
+	store_lock_anim
+	walk_right
+	free_unlock_anim
 	step_end
 
 gUnknown_0861269C:: @ 861269C
-	step_94
-	step_down
-	step_95
+	store_lock_anim
+	walk_down
+	free_unlock_anim
 	step_end
 
 gUnknown_086126A0:: @ 86126A0
-	step_94
-	step_left
-	step_95
+	store_lock_anim
+	walk_left
+	free_unlock_anim
 	step_end
 
 gUnknown_086126A4:: @ 86126A4
-	step_94
-	step_up
-	step_95
+	store_lock_anim
+	walk_up
+	free_unlock_anim
 	step_end
 
 gUnknown_086126A8:: @ 86126A8
-	step_03
+	face_right
 	step_end
 
 gUnknown_086126AA:: @ 86126AA
-	step_00
+	face_down
 	step_end
 
 gUnknown_086126AC:: @ 86126AC
-	step_02
+	face_left
 	step_end
 
 gUnknown_086126AE:: @ 86126AE
-	step_01
+	face_up
 	step_end
 
 @ 86126B0
diff --git a/data/cable_car.s b/data/cable_car.s
index 32a265c97..c141e593c 100644
--- a/data/cable_car.s
+++ b/data/cable_car.s
@@ -1,4 +1,4 @@
-#include "constants/map_objects.h"
+#include "constants/event_objects.h"
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"
 
@@ -80,14 +80,14 @@ gSpriteTemplate_85CDBCC:: @ 85CDBCC
 	spr_template 3, 1, gOamData_85CDB94, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, nullsub_58
 
 gCableCarPlayerGraphicsIDs:: @ 85CDBE4
-	.byte MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL
-	.byte MAP_OBJ_GFX_RIVAL_MAY_NORMAL
+	.byte EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
+	.byte EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
 
 gMtChimneyHikerGraphicsIDs:: @ 85CDBE6
-	.byte MAP_OBJ_GFX_HIKER
-	.byte MAP_OBJ_GFX_CAMPER
-	.byte MAP_OBJ_GFX_PICNICKER
-	.byte MAP_OBJ_GFX_ZIGZAGOON_1 @ not used
+	.byte EVENT_OBJ_GFX_HIKER
+	.byte EVENT_OBJ_GFX_CAMPER
+	.byte EVENT_OBJ_GFX_PICNICKER
+	.byte EVENT_OBJ_GFX_ZIGZAGOON_1 @ not used
 
 	.align 1
 gMtChimneyHikerCoords:: @ 85CDBEA
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 841a9935c..ec9ddb86a 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -946,7 +946,7 @@ EventScript_27142F:: @ 827142F
 	return
 
 Movement_27143A: @ 827143A
-	step_59
+	reveal_trainer
 	step_end
 
 EventScript_ShowTrainerIntroMsg:: @ 827143C
@@ -1523,8 +1523,8 @@ OldaleTown_PokemonCenter_1F_EventScript_271AC5:: @ 8271AC5
 	end
 
 OldaleTown_PokemonCenter_1F_Movement_271AD0: @ 8271AD0
-	step_4f
-	step_12
+	nurse_joy_bow
+	delay_4
 	step_end
 
 Std_ObtainItem:: @ 8271AD3
@@ -2329,13 +2329,13 @@ SlateportCity_Harbor_EventScript_2721E2:: @ 82721E2
 	return
 
 SlateportCity_Harbor_Movement_2721F0: @ 82721F0
-	slow_step_right
-	slow_step_right
-	slow_step_right
-	step_right
-	step_right
-	step_right
-	step_right
+	walk_slow_right
+	walk_slow_right
+	walk_slow_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 PetalburgCity_Gym_EventScript_2721F8:: @ 82721F8
@@ -2371,7 +2371,7 @@ EventScript_27222B:: @ 827222B
 	return
 
 Movement_27224E: @ 827224E
-	step_up
+	walk_up
 	step_end
 
 BattleFrontier_OutsideWest_EventScript_272250:: @ 8272250
@@ -2533,27 +2533,27 @@ Route119_EventScript_2723C1:: @ 82723C1
 FortreeCity_Movement_2723C7: @ 82723C7
 Route119_Movement_2723C7: @ 82723C7
 Route120_Movement_2723C7: @ 82723C7
-	step_55
-	step_12
-	step_54
-	step_12
-	step_55
-	step_12
-	step_54
-	step_12
-	step_55
-	step_13
-	step_54
-	step_13
-	step_55
-	step_13
-	step_54
-	step_13
-	step_55
-	step_14
-	step_54
-	step_14
-	step_55
+	set_visible
+	delay_4
+	set_invisible
+	delay_4
+	set_visible
+	delay_4
+	set_invisible
+	delay_4
+	set_visible
+	delay_8
+	set_invisible
+	delay_8
+	set_visible
+	delay_8
+	set_invisible
+	delay_8
+	set_visible
+	delay_16
+	set_invisible
+	delay_16
+	set_visible
 	step_end
 
 LittlerootTown_ProfessorBirchsLab_EventScript_2723DD:: @ 82723DD
@@ -2652,7 +2652,7 @@ EverGrandeCity_SidneysRoom_EventScript_27255F:: @ 827255F
 	return
 
 SlateportCity_Movement_272596: @ 8272596
-	step_57
+	emote_question_mark
 	step_end
 
 AquaHideout_B2F_Movement_272598: @ 8272598
@@ -2697,7 +2697,7 @@ SeafloorCavern_Room9_Movement_272598: @ 8272598
 SlateportCity_Movement_272598: @ 8272598
 SlateportCity_OceanicMuseum_1F_Movement_272598: @ 8272598
 SlateportCity_PokemonFanClub_Movement_272598: @ 8272598
-	step_56
+	emote_exclamation_mark
 	step_end
 
 BattleFrontier_BattleTowerBattleRoom_Movement_27259A: @ 827259A
@@ -2738,9 +2738,9 @@ SeafloorCavern_Room9_Movement_27259A: @ 827259A
 SlateportCity_Movement_27259A: @ 827259A
 SlateportCity_OceanicMuseum_1F_Movement_27259A: @ 827259A
 SlateportCity_PokemonFanClub_Movement_27259A: @ 827259A
-	step_14
-	step_14
-	step_14
+	delay_16
+	delay_16
+	delay_16
 	step_end
 
 AquaHideout_B2F_Movement_27259E: @ 827259E
@@ -2784,11 +2784,11 @@ SeafloorCavern_Room9_Movement_27259E: @ 827259E
 SlateportCity_Movement_27259E: @ 827259E
 SlateportCity_SternsShipyard_1F_Movement_27259E: @ 827259E
 SootopolisCity_Movement_27259E: @ 827259E
-	step_3e
+	face_player
 	step_end
 
 BattleFrontier_OutsideWest_Movement_2725A0: @ 82725A0
-	step_3f
+	face_away_player
 	step_end
 
 BattleFrontier_Lounge3_Movement_2725A2: @ 82725A2
@@ -2825,7 +2825,7 @@ SlateportCity_OceanicMuseum_2F_Movement_2725A2: @ 82725A2
 SlateportCity_SternsShipyard_1F_Movement_2725A2: @ 82725A2
 SootopolisCity_Movement_2725A2: @ 82725A2
 VerdanturfTown_Movement_2725A2: @ 82725A2
-	step_4e
+	face_original_direction
 	step_end
 
 AquaHideout_B2F_Movement_2725A4: @ 82725A4
@@ -2869,7 +2869,7 @@ SlateportCity_Movement_2725A4: @ 82725A4
 SlateportCity_OceanicMuseum_1F_Movement_2725A4: @ 82725A4
 SlateportCity_OceanicMuseum_2F_Movement_2725A4: @ 82725A4
 SootopolisCity_Movement_2725A4: @ 82725A4
-	step_27
+	walk_in_place_fastest_left
 	step_end
 
 BattleFrontier_BattleTowerCorridor2_Movement_2725A6: @ 82725A6
@@ -2916,7 +2916,7 @@ SlateportCity_Movement_2725A6: @ 82725A6
 SlateportCity_OceanicMuseum_2F_Movement_2725A6: @ 82725A6
 SootopolisCity_MysteryEventsHouse_1F_Movement_2725A6: @ 82725A6
 VerdanturfTown_BattleTentBattleRoom_Movement_2725A6: @ 82725A6
-	step_26
+	walk_in_place_fastest_up
 	step_end
 
 BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8: @ 82725A8
@@ -2959,7 +2959,7 @@ SlateportCity_OceanicMuseum_1F_Movement_2725A8: @ 82725A8
 SlateportCity_OceanicMuseum_2F_Movement_2725A8: @ 82725A8
 SootopolisCity_Movement_2725A8: @ 82725A8
 VerdanturfTown_BattleTentBattleRoom_Movement_2725A8: @ 82725A8
-	step_28
+	walk_in_place_fastest_right
 	step_end
 
 BattleFrontier_OutsideWest_Movement_2725AA: @ 82725AA
@@ -3003,20 +3003,20 @@ SlateportCity_OceanicMuseum_2F_Movement_2725AA: @ 82725AA
 SouthernIsland_Exterior_Movement_2725AA: @ 82725AA
 VerdanturfTown_BattleTentBattleRoom_Movement_2725AA: @ 82725AA
 VictoryRoad_1F_Movement_2725AA: @ 82725AA
-	step_25
+	walk_in_place_fastest_down
 	step_end
 
 RustboroCity_Movement_2725AC: @ 82725AC
-	step_03
+	face_right
 	step_end
 
 RustboroCity_Movement_2725AE: @ 82725AE
-	step_02
+	face_left
 	step_end
 
 BattleFrontier_Mart_Movement_2725B0: @ 82725B0
 MeteorFalls_1F_1R_Movement_2725B0: @ 82725B0
-	step_00
+	face_down
 	step_end
 
 MarineCave_End_Movement_2725B2: @ 82725B2
@@ -3025,51 +3025,51 @@ Route118_Movement_2725B2: @ 82725B2
 SkyPillar_Top_Movement_2725B2: @ 82725B2
 SlateportCity_Movement_2725B2: @ 82725B2
 TerraCave_End_Movement_2725B2: @ 82725B2
-	step_01
+	face_up
 	step_end
 
 BattleFrontier_BattleDomeBattleRoom_Movement_2725B4: @ 82725B4
 MeteorFalls_1F_1R_Movement_2725B4: @ 82725B4
-	step_1d
+	walk_in_place_down
 	step_end
 
 BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6: @ 82725B6
 BattleFrontier_BattleTowerBattleRoom_Movement_2725B6: @ 82725B6
-	step_1f
+	walk_in_place_left
 	step_end
 
 Route121_Movement_2725B8: @ 82725B8
-	step_20
+	walk_in_place_right
 	step_end
 
 EverGrandeCity_SidneysRoom_Movement_2725BA: @ 82725BA
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 EverGrandeCity_ChampionsRoom_Movement_2725C1: @ 82725C1
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 EverGrandeCity_SidneysRoom_Movement_2725C6: @ 82725C6
-	step_14
-	step_14
+	delay_16
+	delay_16
 	step_end
 
 Route110_TrickHouseEntrance_Movement_2725C9: @ 82725C9
-	step_up
+	walk_up
 	step_end
 
 Movement_2725CB:: @ 82725CB
-	step_up
-	step_up
+	walk_up
+	walk_up
 	step_end
 
 EventScript_2725CE:: @ 82725CE
@@ -4564,8 +4564,8 @@ SecretBase_RedCave1_EventScript_275BAB:: @ 8275BAB
 	end
 
 SecretBase_RedCave1_Movement_275BB4: @ 8275BB4
-	step_up
-	step_up
+	walk_up
+	walk_up
 	step_end
 
 EventScript_275BB7:: @ 8275BB7
@@ -6041,7 +6041,7 @@ gUnknown_082A8350:: @ 82A8350
 	end
 
 GraniteCave_B1F_Movement_2A8369: @ 82A8369
-	step_54
+	set_invisible
 	step_end
 
 LilycoveCity_PokemonCenter_1F_EventScript_2A836B:: @ 82A836B
@@ -6549,28 +6549,28 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A89AE:: @ 82A89AE
 	end
 
 LilycoveCity_PokemonCenter_1F_Movement_2A89B8: @ 82A89B8
-	step_03
-	step_13
+	face_right
+	delay_8
 	step_end
 
 LilycoveCity_PokemonCenter_1F_Movement_2A89BB: @ 82A89BB
-	step_02
-	step_13
+	face_left
+	delay_8
 	step_end
 
 LilycoveCity_PokemonCenter_1F_Movement_2A89BE: @ 82A89BE
-	step_00
+	face_down
 	step_end
 
 LilycoveCity_PokemonCenter_1F_Movement_2A89C0: @ 82A89C0
-	step_3e
+	face_player
 	step_end
 
 LilycoveCity_PokemonCenter_1F_Movement_2A89C2: @ 82A89C2
-	step_51
-	step_48
-	step_51
-	step_48
+	disable_jump_landing_ground_effect
+	jump_in_place_left
+	disable_jump_landing_ground_effect
+	jump_in_place_left
 	step_end
 
 LilycoveCity_PokemonCenter_1F_EventScript_2A89C7:: @ 82A89C7
@@ -10280,24 +10280,24 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6E93:: @ 82B6E93
 	end
 
 BattleFrontier_BattleTowerLobby_Movement_2B6E94: @ 82B6E94
-	step_18
+	walk_fast_right
 
 BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95
-	step_15
-	step_15
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_54
-	step_31
-	step_31
-	step_31
+	walk_fast_down
+	walk_fast_down
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	set_invisible
+	slide_down
+	slide_down
+	slide_down
 	step_end
 
 gText_082B6EA5:: @ 82B6EA5
@@ -13480,7 +13480,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4271:: @ 82C4271
 
 BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A: @ 82C427A
 BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A: @ 82C427A
-	step_54
+	set_invisible
 	step_end
 
 LilycoveCity_ContestLobby_Text_2C427C: @ 82C427C
@@ -14701,7 +14701,7 @@ TrainerHill_Entrance_EventScript_2C83DF:: @ 82C83DF
 	end
 
 TrainerHill_1F_Movement_2C83EE:: @ 82C83EE
-	step_54
+	set_invisible
 	step_end
 
 EventScript_2C83F0:: @ 82C83F0
diff --git a/data/field_effect_misc.s b/data/field_effect_misc.s
index ef73c3263..f1b28d906 100644
--- a/data/field_effect_misc.s
+++ b/data/field_effect_misc.s
@@ -27,7 +27,7 @@ gSpriteImage_858DB78:: @ 858DB78
 
 	.align 2
 gFieldEffectObjectPalette7:: @ 858DC18
-	.incbin "graphics/map_objects/palettes/field_effect_object_palette_07.gbapal"
+	.incbin "graphics/event_objects/palettes/field_effect_object_palette_07.gbapal"
 
     .align 2
 gSpriteImage_858DC38:: @ 858DC38
@@ -75,7 +75,7 @@ gSpriteImage_858E138:: @ 858E138
 
 	.align 2
 gFieldEffectObjectPalette8:: @ 858E1B8
-	.incbin "graphics/map_objects/palettes/field_effect_object_palette_08.gbapal"
+	.incbin "graphics/event_objects/palettes/field_effect_object_palette_08.gbapal"
 
     .align 2
 gSpriteImage_858E1D8:: @ 858E1D8
@@ -240,5 +240,5 @@ gSpriteAnimTable_858E87C:: @ 858E87C
 
     .align 2
 gUnknown_0858E880:: @ 858E880
-	spr_template 0xffff, 0x1000, gFieldObjectBaseOam_32x8, gSpriteAnimTable_858E87C, gUnknown_0858E84C, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+	spr_template 0xffff, 0x1000, gEventObjectBaseOam_32x8, gSpriteAnimTable_858E87C, gUnknown_0858E84C, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s
index 8dfbd6782..581b72e43 100644
--- a/data/field_effect_scripts.s
+++ b/data/field_effect_scripts.s
@@ -38,7 +38,7 @@ gFieldEffectScriptPointers:: @ 82DB9D4
 	.4byte gFieldEffectScript_Unknown30
 	.4byte gFieldEffectScript_UseFly
 	.4byte gFieldEffectScript_FlyIn
-	.4byte gFieldEffectScript_ExclamationMarkIcon2
+	.4byte gFieldEffectScript_QuestionMarkIcon
 	.4byte gFieldEffectScript_FeetInFlowingWater
 	.4byte gFieldEffectScript_BikeTireTracks
 	.4byte gFieldEffectScript_SandDisguisePlaceholder
@@ -74,7 +74,7 @@ gFieldEffectScriptPointers:: @ 82DB9D4
 	.4byte gFieldEffectScript_Unknown66
 
 gFieldEffectScript_ExclamationMarkIcon1:: @ 82DBAE0
-	field_eff_callnative FldEff_ExclamationMarkIcon1
+	field_eff_callnative FldEff_ExclamationMarkIcon
 	field_eff_end
 
 gFieldEffectScript_UseCutOnTallGrass:: @ 82DBAE6
@@ -206,8 +206,8 @@ gFieldEffectScript_FlyIn:: @ 82DBBE9
 	field_eff_callnative FldEff_FlyIn
 	field_eff_end
 
-gFieldEffectScript_ExclamationMarkIcon2:: @ 82DBBEF
-	field_eff_callnative FldEff_ExclamationMarkIcon2
+gFieldEffectScript_QuestionMarkIcon:: @ 82DBBEF
+	field_eff_callnative FldEff_QuestionMarkIcon
 	field_eff_end
 
 gFieldEffectScript_FeetInFlowingWater:: @ 82DBBF5
diff --git a/data/field_ground_effect.s b/data/field_ground_effect.s
index 989d2add7..686d9396b 100644
--- a/data/field_ground_effect.s
+++ b/data/field_ground_effect.s
@@ -4,66 +4,3 @@
     .section .rodata
     .align 2, 0
 
-gUnknown_0850E5DC:: @ 850E5DC
-	.4byte 0x00000020, 0x00000010
-
-gUnknown_0850E5E4:: @ 850E5E4
-	.4byte MetatileBehavior_IsTallGrass
-	.4byte MetatileBehavior_IsLongGrass
-	.4byte MetatileBehavior_IsPuddle
-	.4byte MetatileBehavior_IsSurfableWaterOrUnderwater
-	.4byte MetatileBehavior_IsShallowFlowingWater
-	.4byte ShouldDoJumpLandingDustEffect
-
-gUnknown_0850E5FC:: @ 850E5FC
-	.4byte 0x00001000, 0x00002000, 0x00004000, 0x00008000, 0x00004000, 0x00010000
-
-gUnknown_0850E614:: @ 850E614
-	.4byte MetatileBehavior_IsJumpSouth
-	.4byte MetatileBehavior_IsJumpNorth
-	.4byte MetatileBehavior_IsJumpWest
-	.4byte MetatileBehavior_IsJumpEast
-
-gUnknown_0850E624:: @ 850E624
-	.byte 0x73, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x00, 0x00, 0x73
-
-gUnknown_0850E634:: @ 850E634
-	.byte 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x00, 0x00, 0x02
-
-gUnknown_0850E644:: @ 850E644
-	.byte 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x01
-
-gUnknown_0850E654:: @ 850E654
-	.4byte DoTracksGroundEffect_None
-	.4byte DoTracksGroundEffect_Footprints
-	.4byte DoTracksGroundEffect_BikeTireTracks
-
-gUnknown_0850E660:: @ 850E660
-	.byte 13, 0
-	.byte 24, 0
-
-gUnknown_0850E664:: @ 850E664
-	.byte 0x01, 0x02, 0x07, 0x08, 0x01, 0x02, 0x06, 0x05, 0x05, 0x08, 0x03, 0x04, 0x06, 0x07, 0x03, 0x04
-
-gUnknown_0850E674:: @ 850E674
-	.4byte GroundEffect_SpawnOnTallGrass
-	.4byte GroundEffect_StepOnTallGrass
-	.4byte GroundEffect_SpawnOnLongGrass
-	.4byte GroundEffect_StepOnLongGrass
-	.4byte GroundEffect_WaterReflection
-	.4byte GroundEffect_IceReflection
-	.4byte GroundEffect_FlowingWater
-	.4byte GroundEffect_SandTracks
-	.4byte GroundEffect_DeepSandTracks
-	.4byte GroundEffect_Ripple
-	.4byte GroundEffect_StepOnPuddle
-	.4byte GroundEffect_SandHeap
-	.4byte GroundEffect_JumpOnTallGrass
-	.4byte GroundEffect_JumpOnLongGrass
-	.4byte GroundEffect_JumpOnShallowWater
-	.4byte GroundEffect_JumpOnWater
-	.4byte GroundEffect_JumpLandingDust
-	.4byte GroundEffect_ShortGrass
-	.4byte GroundEffect_HotSprings
-	.4byte GroundEffect_Seaweed
-
diff --git a/data/field_map_obj.s b/data/field_map_obj.s
deleted file mode 100644
index 844612a7c..000000000
--- a/data/field_map_obj.s
+++ /dev/null
@@ -1,1731 +0,0 @@
-#include "constants/map_objects.h"
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-gUnknown_084975C4:: @ 84975C4
-	.byte 0x01, 0x01, 0x06, 0x07, 0x08, 0x09, 0x06, 0x07, 0x08, 0x09, 0x0b, 0x0b, 0x00, 0x00, 0x00, 0x00
-
-gUnknown_084975D4:: @ 84975D4
-	spr_template 0x0000, 0xFFFF, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, ObjectCB_CameraObject
-
-gUnknown_084975EC:: @ 84975EC
-	.4byte CameraObject_0
-	.4byte CameraObject_1
-	.4byte CameraObject_2
-
-@ 84975F8
-	.include "data/graphics/field_objects/field_object_graphics.inc"
-
-gUnknown_08505438:: @ 8505438
-	.4byte FieldObjectCB_NoMovement1
-	.4byte FieldObjectCB_LookRandomDirections
-	.4byte FieldObjectCB_GoRandomDirections
-	.4byte FieldObjectCB_RandomlyGoNorthOrSouth
-	.4byte FieldObjectCB_RandomlyGoNorthOrSouth
-	.4byte FieldObjectCB_RandomlyGoEastOrWest
-	.4byte FieldObjectCB_RandomlyGoEastOrWest
-	.4byte FieldObjectCB_FaceFixedDirection
-	.4byte FieldObjectCB_FaceFixedDirection
-	.4byte FieldObjectCB_FaceFixedDirection
-	.4byte FieldObjectCB_FaceFixedDirection
-	.4byte FieldObjectCB_NoMovement2
-	.4byte FieldObjectCB_BerryTree
-	.4byte FieldObjectCB_RandomlyLookNorthOrSouth
-	.4byte FieldObjectCB_RandomlyLookEastOrWest
-	.4byte FieldObjectCB_RandomlyLookNorthOrWest
-	.4byte FieldObjectCB_RandomlyLookNorthOrEast
-	.4byte FieldObjectCB_RandomlyLookSouthOrWest
-	.4byte FieldObjectCB_RandomlyLookSouthOrEast
-	.4byte FieldObjectCB_RandomlyLookNorthOrSouthOrWest
-	.4byte FieldObjectCB_RandomlyLookNorthOrSouthOrEast
-	.4byte FieldObjectCB_RandomlyLookNorthOrEastOrWest
-	.4byte FieldObjectCB_RandomlyLookSouthOrEastOrWest
-	.4byte FieldObjectCB_LookAroundCounterclockwise
-	.4byte FieldObjectCB_LookAroundClockwise
-	.4byte FieldObjectCB_AlternatelyGoInOppositeDirections
-	.4byte FieldObjectCB_AlternatelyGoInOppositeDirections
-	.4byte FieldObjectCB_AlternatelyGoInOppositeDirections
-	.4byte FieldObjectCB_AlternatelyGoInOppositeDirections
-	.4byte FieldObjectCB_GoInDirectionSequence1
-	.4byte FieldObjectCB_GoInDirectionSequence2
-	.4byte FieldObjectCB_GoInDirectionSequence3
-	.4byte FieldObjectCB_GoInDirectionSequence4
-	.4byte FieldObjectCB_GoInDirectionSequence5
-	.4byte FieldObjectCB_GoInDirectionSequence6
-	.4byte FieldObjectCB_GoInDirectionSequence7
-	.4byte FieldObjectCB_GoInDirectionSequence8
-	.4byte FieldObjectCB_GoInDirectionSequence9
-	.4byte FieldObjectCB_GoInDirectionSequence10
-	.4byte FieldObjectCB_GoInDirectionSequence11
-	.4byte FieldObjectCB_GoInDirectionSequence12
-	.4byte FieldObjectCB_GoInDirectionSequence13
-	.4byte FieldObjectCB_GoInDirectionSequence14
-	.4byte FieldObjectCB_GoInDirectionSequence15
-	.4byte FieldObjectCB_GoInDirectionSequence16
-	.4byte FieldObjectCB_GoInDirectionSequence17
-	.4byte FieldObjectCB_GoInDirectionSequence18
-	.4byte FieldObjectCB_GoInDirectionSequence19
-	.4byte FieldObjectCB_GoInDirectionSequence20
-	.4byte FieldObjectCB_GoInDirectionSequence21
-	.4byte FieldObjectCB_GoInDirectionSequence22
-	.4byte FieldObjectCB_GoInDirectionSequence23
-	.4byte FieldObjectCB_GoInDirectionSequence24
-	.4byte FieldObjectCB_CopyPlayer1
-	.4byte FieldObjectCB_CopyPlayer1
-	.4byte FieldObjectCB_CopyPlayer1
-	.4byte FieldObjectCB_CopyPlayer1
-	.4byte FieldObjectCB_TreeDisguise
-	.4byte FieldObjectCB_MountainDisguise
-	.4byte FieldObjectCB_CopyPlayer2
-	.4byte FieldObjectCB_CopyPlayer2
-	.4byte FieldObjectCB_CopyPlayer2
-	.4byte FieldObjectCB_CopyPlayer2
-	.4byte FieldObjectCB_Hidden1
-	.4byte FieldObjectCB_WalkInPlace1
-	.4byte FieldObjectCB_WalkInPlace1
-	.4byte FieldObjectCB_WalkInPlace1
-	.4byte FieldObjectCB_WalkInPlace1
-	.4byte FieldObjectCB_WalkInPlace2
-	.4byte FieldObjectCB_WalkInPlace2
-	.4byte FieldObjectCB_WalkInPlace2
-	.4byte FieldObjectCB_WalkInPlace2
-	.4byte FieldObjectCB_WalkInPlace3
-	.4byte FieldObjectCB_WalkInPlace3
-	.4byte FieldObjectCB_WalkInPlace3
-	.4byte FieldObjectCB_WalkInPlace3
-	.4byte FieldObjectCB_Hidden2
-	.4byte FieldObjectCB_WalkInPlace4
-	.4byte FieldObjectCB_WalkInPlace4
-	.4byte FieldObjectCB_WalkInPlace4
-	.4byte FieldObjectCB_WalkInPlace4
-
-gUnknown_0850557C:: @ 850557C
-	.byte 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
-	.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
-gUnknown_085055CD:: @ 85055CD
-	.byte 0x01, 0x01, 0x01, 0x02, 0x01, 0x03, 0x04, 0x02, 0x01, 0x03, 0x04, 0x01, 0x01, 0x01, 0x03, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x02, 0x01, 0x03, 0x04, 0x02, 0x04, 0x01
-	.byte 0x03, 0x02, 0x03, 0x01, 0x04, 0x03, 0x02, 0x04, 0x01, 0x04, 0x02, 0x03, 0x01, 0x02, 0x01, 0x03, 0x04, 0x02, 0x01, 0x03, 0x04, 0x02, 0x01, 0x03, 0x04, 0x01, 0x01, 0x02, 0x01, 0x03, 0x04, 0x01
-	.byte 0x01, 0x02, 0x03, 0x04, 0x01, 0x02, 0x03, 0x04, 0x01, 0x02, 0x03, 0x04, 0x01, 0x01, 0x02, 0x03, 0x04
-
-	.align 2, 0
-@ 8505620
-	.include "data/graphics/field_objects/field_object_graphics_info_pointers.inc"
-
-@ 85059F8
-	.include "data/graphics/field_objects/field_effect_object_template_pointers.inc"
-
-@ 8505A8C
-	.include "data/graphics/field_objects/field_object_pic_tables.inc"
-
-@ 85089FC
-	.include "data/graphics/field_objects/field_object_anims.inc"
-
-gUnknown_085094AC:: @ 85094AC
-	.4byte gFieldObjectImageAnimTable_QuintyPlump
-	.byte 1, 3, 0, 2
-	.4byte gFieldObjectImageAnimTable_Standard
-	.byte 1, 3, 0, 2
-	.4byte gFieldObjectImageAnimTable_BrendanMayNormal
-	.byte 1, 3, 0, 2
-	.4byte gFieldObjectImageAnimTable_AcroBike
-	.byte 1, 3, 0, 2
-	.4byte gFieldObjectImageAnimTable_Surfing
-	.byte 1, 3, 0, 2
-	.4byte gFieldObjectImageAnimTable_Nurse
-	.byte 1, 3, 0, 2
-	.4byte gFieldObjectImageAnimTable_Fishing
-	.byte 1, 3, 0, 2
-	.4byte NULL
-	.byte 0, 0, 0, 0
-
-@ 85094EC
-	.include "data/graphics/field_objects/field_object_oam.inc"
-
-@ 8509954
-	.include "data/graphics/field_objects/field_object_graphics_info.inc"
-
-gUnknown_0850BBC8:: @ 850BBC8
-	.align 2, 0
-	.4byte gFieldObjectPalette0
-	.2byte 4355
-	.align 2, 0
-	.4byte gFieldObjectPalette1
-	.2byte 4356
-	.align 2, 0
-	.4byte gFieldObjectPalette2
-	.2byte 4357
-	.align 2, 0
-	.4byte gFieldObjectPalette3
-	.2byte 4358
-	.align 2, 0
-	.4byte gFieldObjectPalette4
-	.2byte 4359
-	.align 2, 0
-	.4byte gFieldObjectPalette5
-	.2byte 4360
-	.align 2, 0
-	.4byte gFieldObjectPalette6
-	.2byte 4361
-	.align 2, 0
-	.4byte gFieldObjectPalette7
-	.2byte 4362
-	.align 2, 0
-	.4byte gFieldObjectPalette8
-	.2byte 4352
-	.align 2, 0
-	.4byte gFieldObjectPalette9
-	.2byte 4353
-	.align 2, 0
-	.4byte gFieldObjectPalette10
-	.2byte 4354
-	.align 2, 0
-	.4byte gFieldObjectPalette11
-	.2byte 4373
-	.align 2, 0
-	.4byte gFieldObjectPalette12
-	.2byte 4363
-	.align 2, 0
-	.4byte gFieldObjectPalette13
-	.2byte 4364
-	.align 2, 0
-	.4byte gFieldObjectPalette14
-	.2byte 4365
-	.align 2, 0
-	.4byte gFieldObjectPalette15
-	.2byte 4366
-	.align 2, 0
-	.4byte gFieldObjectPalette16
-	.2byte 4367
-	.align 2, 0
-	.4byte gFieldObjectPalette17
-	.2byte 4368
-	.align 2, 0
-	.4byte gFieldObjectPalette18
-	.2byte 4369
-	.align 2, 0
-	.4byte gFieldObjectPalette19
-	.2byte 4370
-	.align 2, 0
-	.4byte gFieldObjectPalette20
-	.2byte 4371
-	.align 2, 0
-	.4byte gFieldObjectPalette21
-	.2byte 4372
-	.align 2, 0
-	.4byte gFieldObjectPalette22
-	.2byte 4374
-	.align 2, 0
-	.4byte gFieldObjectPalette23
-	.2byte 4375
-	.align 2, 0
-	.4byte gFieldObjectPalette24
-	.2byte 4376
-	.align 2, 0
-	.4byte gFieldObjectPalette25
-	.2byte 4377
-	.align 2, 0
-	.4byte gFieldObjectPalette26
-	.2byte 4379
-	.align 2, 0
-	.4byte gFieldObjectPalette27
-	.2byte 4380
-	.align 2, 0
-	.4byte gFieldObjectPalette28
-	.2byte 4381
-	.align 2, 0
-	.4byte gFieldObjectPalette29
-	.2byte 4382
-	.align 2, 0
-	.4byte gFieldObjectPalette30
-	.2byte 4383
-	.align 2, 0
-	.4byte gFieldObjectPalette31
-	.2byte 4384
-	.align 2, 0
-	.4byte gFieldObjectPalette32
-	.2byte 4385
-	.align 2, 0
-	.4byte gFieldObjectPalette33
-	.2byte 4386
-	.align 2, 0
-	.4byte gFieldObjectPalette34
-	.2byte 4387
-	.align 2, 0
-	.4byte NULL
-	.2byte 0
-	.align 2, 0
-
-Unknown_0850BCE8:: @ 0850BCE8
-.2byte 0x1101, 0x1101, 0x1101, 0x1101
-
-Unknown_0850BCF0:: @ 0850BCF0
-.2byte 0x1111, 0x1111, 0x1111, 0x1111
-
-Unknown_0850BCF8:: @ 0850BCF8
-.2byte 0x1115, 0x1115, 0x1115, 0x1115
-
-gUnknown_0850BD00:: @ 850BD00
-	.2byte 4352, 0
-	.4byte Unknown_0850BCE8
-	.2byte 4368, 0
-	.4byte Unknown_0850BCF0
-	.2byte 4373, 0
-	.4byte Unknown_0850BCF8
-	.2byte 4607, 0
-	.4byte NULL
-
-Unknown_0850BD20:: @ 0850BD20
-.2byte 0x110c, 0x110c, 0x110c, 0x110c
-
-Unknown_0850BD28:: @ 0x0850bd28
-.2byte 0x110d, 0x110d, 0x110d, 0x110d
-
-Unknown_0850BD30:: @ 0x0850bd30
-.2byte 0x110e, 0x110e, 0x110e, 0x110e
-
-Unknown_0850BD38:: @ 0x0850bd38
-.2byte 0x1112, 0x1112, 0x1112, 0x1112
-
-Unknown_0850BD40:: @ 0x0850bd40
-.2byte 0x1113, 0x1113, 0x1113, 0x1113
-
-Unknown_0850BD48:: @ 0x0850bd48
-.2byte 0x1114, 0x1114, 0x1114, 0x1114
-
-Unknown_0850BD50:: @ 0x0850bd50
-.2byte 0x111b, 0x111b, 0x111b, 0x111b
-
-Unknown_0850BD58:: @ 0x0850bd58
-.2byte 0x1117, 0x1117, 0x1117, 0x1117
-
-Unknown_0850BD60:: @ 0x0850bd60
-.2byte 0x1119, 0x1119, 0x1119, 0x1119
-
-Unknown_0850BD68:: @ 0x0850bd68
-.2byte 0x1109, 0x1109, 0x1109, 0x1109
-
-Unknown_0850BD70:: @ 0x0850bd70
-.2byte 0x111d, 0x111d, 0x111d, 0x111d
-
-gUnknown_0850BD78:: @ 850BD78
-	.2byte 4352, 0
-	.4byte Unknown_0850BCE8
-	.2byte 4368, 0
-	.4byte Unknown_0850BCF0
-	.2byte 4363, 0
-	.4byte Unknown_0850BD20
-	.2byte 4365, 0
-	.4byte Unknown_0850BD28
-	.2byte 4366, 0
-	.4byte Unknown_0850BD30
-	.2byte 4370, 0
-	.4byte Unknown_0850BD38
-	.2byte 4371, 0
-	.4byte Unknown_0850BD40
-	.2byte 4372, 0
-	.4byte Unknown_0850BD48
-	.2byte 4374, 0
-	.4byte Unknown_0850BD58
-	.2byte 4376, 0
-	.4byte Unknown_0850BD60
-	.2byte 4357, 0
-	.4byte Unknown_0850BD68
-	.2byte 4379, 0
-	.4byte Unknown_0850BD50
-	.2byte 4381, 0
-	.4byte Unknown_0850BD70
-	.2byte 4607, 0
-	.4byte NULL
-
-gUnknown_0850BDE8:: @ 850BDE8
-	.2byte 0x1100, 0x1101, 0x1103, 0x1104, 0x1105, 0x1106, 0x1107, 0x1108, 0x1109, 0x110a
-gUnknown_0850BDFC::
-	.2byte 0x1100, 0x1101, 0x1103, 0x1104, 0x1105, 0x1106, 0x1107, 0x1108, 0x1109, 0x110a
-gUnknown_0850BE10::
-	.2byte 0x1100, 0x1101, 0x1103, 0x1104, 0x1105, 0x1106, 0x1107, 0x1108, 0x1109, 0x110a
-gUnknown_0850BE24::
-	.2byte  0x1100, 0x1101, 0x1103, 0x1104, 0x1105, 0x1106, 0x1107, 0x1108, 0x1109, 0x110a
-
-gUnknown_0850BE38:: @ 850BE38
-	.4byte gUnknown_0850BDE8
-	.4byte gUnknown_0850BDFC
-	.4byte gUnknown_0850BE10
-	.4byte gUnknown_0850BE24
-
-@ 850BE48
-	.include "data/graphics/field_objects/berry_tree_graphics_tables.inc"
-
-@ 850C9C0
-	.include "data/graphics/field_objects/field_effect_objects.inc"
-
-	.align 2, 0
-	.4byte gFieldObjectPalette2
-	.2byte 4113
-
-	.align 2, 0
-gUnknown_0850D6DC:: @ 850D6DC
-	.2byte 0x0020, 0x0040, 0x0060, 0x0080, 0x0020, 0x0040, 0x0080, 0x00c0
-
-gUnknown_0850D6EC:: @ 850D6EC
-	.2byte 0x0020, 0x0030, 0x0040, 0x0050
-
-gUnknown_0850D6F4:: @ 850D6F4
-	.4byte sub_808F44C
-	.4byte sub_808F460
-	.4byte sub_808F48C
-	.4byte sub_808F4C8
-	.4byte sub_808F4E8
-	.4byte sub_808F534
-	.4byte sub_808F564
-
-gUnknown_0850D710:: @ 850D710
-	.byte 0x01, 0x02, 0x03, 0x04
-
-gUnknown_0850D714:: @ 850D714
-	.4byte GetRegularRunningPastFacingDirection
-	.4byte GetNorthSouthRunningPastFacingDirection
-	.4byte GetEastWestRunningPastFacingDirection
-	.4byte GetNorthEastRunningPastFacingDirection
-	.4byte GetNorthWestRunningPastFacingDirection
-	.4byte GetSouthEastRunningPastFacingDirection
-	.4byte GetSouthWestRunningPastFacingDirection
-	.4byte GetNonEastRunningPastFacingDirection
-	.4byte GetNonWestRunningPastFacingDirection
-	.4byte GetNonSouthRunningPastFacingDirection
-	.4byte GetNonNorthRunningPastFacingDirection
-
-gUnknown_0850D740:: @ 850D740
-	.4byte sub_808F988
-	.4byte sub_808F99C
-	.4byte sub_808F9C8
-	.4byte sub_808FA0C
-	.4byte sub_808FA3C
-
-gUnknown_0850D754:: @ 850D754
-	.4byte sub_808FAC8
-	.4byte sub_808FADC
-	.4byte sub_808FB08
-	.4byte sub_808FB44
-	.4byte sub_808FB64
-	.4byte sub_808FBB0
-	.4byte sub_808FBE0
-
-gUnknown_0850D770:: @ 850D770
-	.byte 0x01, 0x02, 0x00, 0x00
-
-gUnknown_0850D774:: @ 850D774
-	.4byte sub_808FC4C
-	.4byte sub_808FC60
-	.4byte sub_808FC8C
-	.4byte sub_808FCC8
-	.4byte sub_808FCE8
-	.4byte sub_808FD34
-	.4byte sub_808FD64
-
-gUnknown_0850D790:: @ 850D790
-	.byte 0x03, 0x04, 0x00, 0x00
-
-gUnknown_0850D794:: @ 850D794
-	.4byte sub_808FDD0
-	.4byte sub_808FDFC
-	.4byte sub_808FE1C
-
-gUnknown_0850D7A0:: @ 850D7A0
-	.4byte do_berry_tree_growth_sparkle_1
-	.4byte sub_808FF48
-	.4byte do_berry_tree_growth_sparkle_2
-	.4byte sub_808FFB4
-	.4byte sub_8090004
-
-gUnknown_0850D7B4:: @ 850D7B4
-	.4byte sub_8090094
-	.4byte sub_80900A8
-	.4byte sub_80900D4
-	.4byte sub_8090118
-	.4byte sub_8090148
-
-gUnknown_0850D7C8:: @ 850D7C8
-	.4byte sub_80901D4
-	.4byte sub_80901E8
-	.4byte sub_8090214
-	.4byte sub_8090258
-	.4byte sub_8090288
-
-gUnknown_0850D7DC:: @ 850D7DC
-	.4byte sub_8090314
-	.4byte sub_8090328
-	.4byte sub_8090354
-	.4byte sub_8090398
-	.4byte sub_80903C8
-
-gUnknown_0850D7F0:: @ 850D7F0
-	.byte 0x02, 0x03, 0x00, 0x00
-
-gUnknown_0850D7F4:: @ 850D7F4
-	.4byte sub_8090454
-	.4byte sub_8090468
-	.4byte sub_8090494
-	.4byte sub_80904D8
-	.4byte sub_8090508
-
-gUnknown_0850D808:: @ 850D808
-	.byte 0x02, 0x04, 0x00, 0x00
-
-gUnknown_0850D80C:: @ 850D80C
-	.4byte sub_8090594
-	.4byte sub_80905A8
-	.4byte sub_80905D4
-	.4byte sub_8090618
-	.4byte sub_8090648
-
-gUnknown_0850D820:: @ 850D820
-	.byte 0x01, 0x03, 0x00, 0x00
-
-gUnknown_0850D824:: @ 850D824
-	.4byte sub_80906D4
-	.4byte sub_80906E8
-	.4byte sub_8090714
-	.4byte sub_8090758
-	.4byte sub_8090788
-
-gUnknown_0850D838:: @ 850D838
-	.byte 0x01, 0x04, 0x00, 0x00
-
-gUnknown_0850D83C:: @ 850D83C
-	.4byte sub_8090814
-	.4byte sub_8090828
-	.4byte sub_8090854
-	.4byte sub_8090898
-	.4byte sub_80908C8
-
-gUnknown_0850D850:: @ 850D850
-	.byte 0x02, 0x01, 0x03, 0x01
-
-gUnknown_0850D854:: @ 850D854
-	.4byte sub_8090954
-	.4byte sub_8090968
-	.4byte sub_8090994
-	.4byte sub_80909D8
-	.4byte sub_8090A08
-
-gUnknown_0850D868:: @ 850D868
-	.byte 0x01, 0x02, 0x04, 0x01
-
-gUnknown_0850D86C:: @ 850D86C
-	.4byte sub_8090A94
-	.4byte sub_8090AA8
-	.4byte sub_8090AD4
-	.4byte sub_8090B18
-	.4byte sub_8090B48
-
-gUnknown_0850D880:: @ 850D880
-	.byte 0x02, 0x03, 0x04, 0x02
-
-gUnknown_0850D884:: @ 850D884
-	.4byte sub_8090BD4
-	.4byte sub_8090BE8
-	.4byte sub_8090C14
-	.4byte sub_8090C58
-	.4byte sub_8090C88
-
-gUnknown_0850D898:: @ 850D898
-	.byte 0x03, 0x04, 0x01, 0x01
-
-gUnknown_0850D89C:: @ 850D89C
-	.4byte sub_8090D14
-	.4byte sub_8090D40
-	.4byte sub_8090D64
-	.4byte sub_8090D90
-
-gUnknown_0850D8AC:: @ 850D8AC
-	.byte 0x01, 0x04, 0x03, 0x01, 0x02, 0x00, 0x00, 0x00
-
-gUnknown_0850D8B4:: @ 850D8B4
-	.4byte sub_8090E18
-	.4byte sub_8090E44
-	.4byte sub_8090E68
-	.4byte sub_8090E94
-
-gUnknown_0850D8C4:: @ 850D8C4
-	.byte 0x01, 0x03, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00
-
-gUnknown_0850D8CC:: @ 850D8CC
-	.4byte sub_8090F1C
-	.4byte sub_8090F30
-	.4byte sub_8090F68
-	.4byte sub_8091020
-
-gUnknown_0850D8DC:: @ 850D8DC
-	.4byte sub_8091048
-	.4byte sub_809117C
-	.4byte sub_8091110
-
-gUnknown_0850D8E8:: @ 850D8E8
-	.byte 0x02, 0x04, 0x03, 0x01
-
-gUnknown_0850D8EC:: @ 850D8EC
-	.4byte sub_8091048
-	.4byte sub_8091208
-	.4byte sub_8091110
-
-gUnknown_0850D8F8:: @ 850D8F8
-	.byte 0x04, 0x03, 0x01, 0x02
-
-gUnknown_0850D8FC:: @ 850D8FC
-	.4byte sub_8091048
-	.4byte sub_8091294
-	.4byte sub_8091110
-
-gUnknown_0850D908:: @ 850D908
-	.byte 0x01, 0x02, 0x04, 0x03
-
-gUnknown_0850D90C:: @ 850D90C
-	.4byte sub_8091048
-	.4byte sub_8091320
-	.4byte sub_8091110
-
-gUnknown_0850D918:: @ 850D918
-	.byte 0x03, 0x01, 0x02, 0x04
-
-gUnknown_0850D91C:: @ 850D91C
-	.4byte sub_8091048
-	.4byte sub_80913AC
-	.4byte sub_8091110
-
-gUnknown_0850D928:: @ 850D928
-	.byte 0x02, 0x03, 0x04, 0x01
-
-gUnknown_0850D92C:: @ 850D92C
-	.4byte sub_8091048
-	.4byte sub_8091438
-	.4byte sub_8091110
-
-gUnknown_0850D938:: @ 850D938
-	.byte 0x03, 0x04, 0x01, 0x02
-
-gUnknown_0850D93C:: @ 850D93C
-	.4byte sub_8091048
-	.4byte sub_80914C4
-	.4byte sub_8091110
-
-gUnknown_0850D948:: @ 850D948
-	.4byte sub_8091048
-	.4byte sub_8091550
-	.4byte sub_8091110
-
-gUnknown_0850D954:: @ 850D954
-	.byte 0x04, 0x01, 0x02, 0x03
-
-gUnknown_0850D958:: @ 850D958
-	.4byte sub_8091048
-	.4byte sub_80915DC
-	.4byte sub_8091110
-
-gUnknown_0850D964:: @ 850D964
-	.byte 0x03, 0x02, 0x01, 0x04
-
-gUnknown_0850D968:: @ 850D968
-	.4byte sub_8091048
-	.4byte sub_8091668
-	.4byte sub_8091110
-
-gUnknown_0850D974:: @ 850D974
-	.byte 0x02, 0x01, 0x04, 0x03
-
-gUnknown_0850D978:: @ 850D978
-	.4byte sub_8091048
-	.4byte sub_80916F4
-	.4byte sub_8091110
-
-gUnknown_0850D984:: @ 850D984
-	.byte 0x04, 0x03, 0x02, 0x01
-
-gUnknown_0850D988:: @ 850D988
-	.4byte sub_8091048
-	.4byte sub_8091780
-	.4byte sub_8091110
-
-gUnknown_0850D994:: @ 850D994
-	.byte 0x01, 0x04, 0x03, 0x02
-
-gUnknown_0850D998:: @ 850D998
-	.4byte sub_8091048
-	.4byte sub_809180C
-	.4byte sub_8091110
-
-gUnknown_0850D9A4:: @ 850D9A4
-	.byte 0x04, 0x02, 0x01, 0x03
-
-gUnknown_0850D9A8:: @ 850D9A8
-	.4byte sub_8091048
-	.4byte sub_8091898
-	.4byte sub_8091110
-
-gUnknown_0850D9B4:: @ 850D9B4
-	.byte 0x02, 0x01, 0x03, 0x04
-
-gUnknown_0850D9B8:: @ 850D9B8
-	.4byte sub_8091048
-	.4byte sub_8091924
-	.4byte sub_8091110
-
-gUnknown_0850D9C4:: @ 850D9C4
-	.byte 0x03, 0x04, 0x02, 0x01
-
-gUnknown_0850D9C8:: @ 850D9C8
-	.4byte sub_8091048
-	.4byte sub_80919B0
-	.4byte sub_8091110
-
-gUnknown_0850D9D4:: @ 850D9D4
-	.byte 0x01, 0x03, 0x04, 0x02
-
-gUnknown_0850D9D8:: @ 850D9D8
-	.4byte sub_8091048
-	.4byte sub_8091A3C
-	.4byte sub_8091110
-
-gUnknown_0850D9E4:: @ 850D9E4
-	.byte 0x02, 0x03, 0x01, 0x04
-
-gUnknown_0850D9E8:: @ 850D9E8
-	.4byte sub_8091048
-	.4byte sub_8091AC8
-	.4byte sub_8091110
-
-gUnknown_0850D9F4:: @ 850D9F4
-	.byte 0x01, 0x04, 0x02, 0x03
-
-gUnknown_0850D9F8:: @ 850D9F8
-	.4byte sub_8091048
-	.4byte sub_8091B54
-	.4byte sub_8091110
-
-gUnknown_0850DA04:: @ 850DA04
-	.byte 0x03, 0x01, 0x04, 0x02
-
-gUnknown_0850DA08:: @ 850DA08
-	.4byte sub_8091048
-	.4byte sub_8091BE0
-	.4byte sub_8091110
-
-gUnknown_0850DA14:: @ 850DA14
-	.byte 0x04, 0x02, 0x03, 0x01
-
-gUnknown_0850DA18:: @ 850DA18
-	.4byte sub_8091048
-	.4byte sub_8091C6C
-	.4byte sub_8091110
-
-gUnknown_0850DA24:: @ 850DA24
-	.byte 0x02, 0x04, 0x01, 0x03
-
-gUnknown_0850DA28:: @ 850DA28
-	.4byte sub_8091048
-	.4byte sub_8091CF8
-	.4byte sub_8091110
-
-gUnknown_0850DA34:: @ 850DA34
-	.byte 0x01, 0x03, 0x02, 0x04
-
-gUnknown_0850DA38:: @ 850DA38
-	.4byte sub_8091048
-	.4byte sub_8091D84
-	.4byte sub_8091110
-
-gUnknown_0850DA44:: @ 850DA44
-	.byte 0x03, 0x02, 0x04, 0x01
-
-gUnknown_0850DA48:: @ 850DA48
-	.4byte sub_8091048
-	.4byte sub_8091E10
-	.4byte sub_8091110
-
-gUnknown_0850DA54:: @ 850DA54
-	.byte 0x04, 0x01, 0x03, 0x02
-
-gUnknown_0850DA58:: @ 850DA58
-	.4byte mss_npc_reset_oampriv3_1_unk2_unk3
-	.4byte sub_8091EC0
-	.4byte sub_8091F20
-
-gUnknown_0850DA64:: @ 850DA64
-	.4byte sub_8091F48
-	.4byte sub_8091F4C
-	.4byte sub_8091F94
-	.4byte sub_80920A4
-	.4byte sub_809215C
-	.4byte sub_8092214
-	.4byte cph_IM_DIFFERENT
-	.4byte sub_8092314
-	.4byte oac_hopping
-	.4byte sub_8091F48
-	.4byte sub_8091F48
-
-gUnknown_0850DA90:: @ 850DA90
-	.4byte mss_npc_reset_oampriv3_1_unk2_unk3
-	.4byte mss_08062EA4
-	.4byte sub_8091F20
-
-gUnknown_0850DA9C:: @ 850DA9C
-	.4byte sub_80926AC
-
-gUnknown_0850DAA0:: @ 850DAA0
-	.4byte sub_8092718
-	.4byte sub_80926B8
-
-gUnknown_0850DAA8:: @ 850DAA8
-	.4byte sub_8092788
-	.4byte sub_80926B8
-
-gUnknown_0850DAB0:: @ 850DAB0
-	.4byte sub_80927F8
-	.4byte sub_80926B8
-
-gUnknown_0850DAB8:: @ 850DAB8
-	.4byte sub_8092868
-	.4byte sub_80926B8
-
-gUnknown_0850DAC0:: @ 850DAC0
-	.4byte sub_80928D8
-	.4byte sub_809290C
-	.4byte sub_809292C
-
-gUnknown_0850DACC:: @ 850DACC
-	.byte 0x00, 0x00, 0x01, 0x02, 0x03, 0x00, 0x00, 0x01, 0x01
-
-gUnknown_0850DAD5:: @ 850DAD5
-	.byte 0x04, 0x04, 0x05, 0x06, 0x07, 0x04, 0x04, 0x05, 0x05
-
-gUnknown_0850DADE:: @ 850DADE
-	.byte 0x08, 0x08, 0x09, 0x0a, 0x0b, 0x08, 0x08, 0x09, 0x09
-
-gUnknown_0850DAE7:: @ 850DAE7
-	.byte 0x0c, 0x0c, 0x0d, 0x0e, 0x0f, 0x0c, 0x0c, 0x0d, 0x0d
-
-gUnknown_0850DAF0:: @ 850DAF0
-	.byte 0x10, 0x10, 0x11, 0x12, 0x13, 0x10, 0x10, 0x11, 0x11
-
-gUnknown_0850DAF9:: @ 850DAF9
-	.byte 0x14, 0x14, 0x15, 0x16, 0x17, 0x14, 0x14, 0x15, 0x15
-
-gUnknown_0850DB02:: @ 850DB02
-	.byte 0x14, 0x14, 0x15, 0x16, 0x17, 0x14, 0x14, 0x15, 0x15
-
-gUnknown_0850DB0B:: @ 850DB0B
-	.byte 0x18, 0x18, 0x19, 0x1a, 0x1b, 0x18, 0x18, 0x19, 0x19
-
-gUnknown_0850DB14:: @ 850DB14
-	.byte 0x1c, 0x1c, 0x1d, 0x1e, 0x1f, 0x1c, 0x1c, 0x1d, 0x1d
-
-gUnknown_0850DB1D:: @ 850DB1D
-	.byte 0x20, 0x20, 0x21, 0x22, 0x23, 0x20, 0x20, 0x21, 0x21
-
-gUnknown_0850DB26:: @ 850DB26
-	.byte 0x24, 0x24, 0x25, 0x26, 0x27, 0x24, 0x24, 0x25, 0x25
-
-gUnknown_0850DB2F:: @ 850DB2F
-	.byte 0x00, 0x00, 0x01, 0x02, 0x03, 0x00, 0x00, 0x01, 0x01
-
-gUnknown_0850DB38:: @ 850DB38
-	.byte 0x04, 0x04, 0x05, 0x06, 0x07, 0x04, 0x04, 0x05, 0x05
-
-gUnknown_0850DB41:: @ 850DB41
-	.byte 0x08, 0x08, 0x09, 0x0a, 0x0b, 0x08, 0x08, 0x09, 0x09
-
-gUnknown_0850DB4A:: @ 850DB4A
-	.byte 0x14, 0x14, 0x15, 0x16, 0x17, 0x14, 0x14, 0x15, 0x15
-
-gUnknown_0850DB53:: @ 850DB53
-	.byte 0x08, 0x08, 0x07, 0x09, 0x0a, 0x08, 0x08, 0x07, 0x07
-
-	.align 2, 0
-gUnknown_0850DB5C:: @ 850DB5C
-	.4byte MetatileBehavior_IsSouthBlocked
-	.4byte MetatileBehavior_IsNorthBlocked
-	.4byte MetatileBehavior_IsWestBlocked
-	.4byte MetatileBehavior_IsEastBlocked
-
-gUnknown_0850DB6C:: @ 850DB6C
-	.4byte MetatileBehavior_IsNorthBlocked
-	.4byte MetatileBehavior_IsSouthBlocked
-	.4byte MetatileBehavior_IsEastBlocked
-	.4byte MetatileBehavior_IsWestBlocked
-
-gUnknown_0850DB7C:: @ 850DB7C
-	.2byte 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0xffff, 0xffff, 0x0000, 0x0001, 0x0000, 0xffff, 0x0001, 0x0001, 0x0001, 0xffff, 0xffff
-	.2byte 0x0001, 0xffff
-
-gUnknown_0850DBA0:: @ 850DBA0
-	.byte 0x00, 0x00, 0x01, 0x02, 0x03
-
-gUnknown_0850DBA5:: @ 850DBA5
-	.byte 0x04, 0x04, 0x05, 0x06, 0x07
-
-gUnknown_0850DBAA:: @ 850DBAA
-	.byte 0x08, 0x08, 0x09, 0x0a, 0x0b
-
-gUnknown_0850DBAF:: @ 850DBAF
-	.byte 0x15, 0x15, 0x16, 0x17, 0x18
-
-gUnknown_0850DBB4:: @ 850DBB4
-	.byte 0x29, 0x29, 0x2a, 0x2b, 0x2c
-
-gUnknown_0850DBB9:: @ 850DBB9
-	.byte 0x2d, 0x2d, 0x2e, 0x2f, 0x30
-
-gUnknown_0850DBBE:: @ 850DBBE
-	.byte 0x31, 0x31, 0x32, 0x33, 0x34
-
-gUnknown_0850DBC3:: @ 850DBC3
-	.byte 0x35, 0x35, 0x36, 0x37, 0x38
-
-gUnknown_0850DBC8:: @ 850DBC8
-	.byte 0x0c, 0x0c, 0x0d, 0x0e, 0x0f
-
-gUnknown_0850DBCD:: @ 850DBCD
-	.byte 0x46, 0x46, 0x47, 0x48, 0x49
-
-gUnknown_0850DBD2:: @ 850DBD2
-	.byte 0x4b, 0x4b, 0x4a, 0x4d, 0x4c
-
-gUnknown_0850DBD7:: @ 850DBD7
-	.byte 0x42, 0x42, 0x43, 0x44, 0x45
-
-gUnknown_0850DBDC:: @ 850DBDC
-	.byte 0x3a, 0x3a, 0x3b, 0x3c, 0x3d
-
-gUnknown_0850DBE1:: @ 850DBE1
-	.byte 0x19, 0x19, 0x1a, 0x1b, 0x1c
-
-gUnknown_0850DBE6:: @ 850DBE6
-	.byte 0x1d, 0x1d, 0x1e, 0x1f, 0x20
-
-gUnknown_0850DBEB:: @ 850DBEB
-	.byte 0x21, 0x21, 0x22, 0x23, 0x24
-
-gUnknown_0850DBF0:: @ 850DBF0
-	.byte 0x25, 0x25, 0x26, 0x27, 0x28
-
-gUnknown_0850DBF5:: @ 850DBF5
-	.byte 0x64, 0x64, 0x65, 0x66, 0x67
-
-gUnknown_0850DBFA:: @ 850DBFA
-	.byte 0x68, 0x68, 0x69, 0x6a, 0x6b
-
-gUnknown_0850DBFF:: @ 850DBFF
-	.byte 0x6c, 0x6c, 0x6d, 0x6e, 0x6f
-
-gUnknown_0850DC04:: @ 850DC04
-	.byte 0x70, 0x70, 0x71, 0x72, 0x73
-
-gUnknown_0850DC09:: @ 850DC09
-	.byte 0x74, 0x74, 0x75, 0x76, 0x77
-
-gUnknown_0850DC0E:: @ 850DC0E
-	.byte 0x78, 0x78, 0x79, 0x7a, 0x7b
-
-gUnknown_0850DC13:: @ 850DC13
-	.byte 0x7c, 0x7c, 0x7d, 0x7e, 0x7f
-
-gUnknown_0850DC18:: @ 850DC18
-	.byte 0x80, 0x80, 0x81, 0x82, 0x83
-
-gUnknown_0850DC1D:: @ 850DC1D
-	.byte 0x84, 0x84, 0x85, 0x86, 0x87
-
-gUnknown_0850DC22:: @ 850DC22
-	.byte 0x88, 0x88, 0x89, 0x8a, 0x8b
-
-gUnknown_0850DC27:: @ 850DC27
-	.byte 0x02, 0x01, 0x04, 0x03, 0x08, 0x07, 0x06, 0x05
-
-gUnknown_0850DC2F:: @ 850DC2F
-	.byte 0x02, 0x01, 0x04, 0x03, 0x01, 0x02, 0x03, 0x04, 0x03, 0x04, 0x02, 0x01, 0x04, 0x03, 0x01, 0x02
-
-gUnknown_0850DC3F:: @ 850DC3F
-	.byte 0x02, 0x01, 0x04, 0x03, 0x01, 0x02, 0x03, 0x04, 0x04, 0x03, 0x01, 0x02, 0x03, 0x04, 0x02, 0x01, 0x00
-
-	.align 2, 0
-gUnknown_0850DC50:: @ 850DC50
-.4byte gUnknown_0850DEC8
-.4byte gUnknown_0850DED0
-.4byte gUnknown_0850DED8
-.4byte gUnknown_0850DEE0
-.4byte gUnknown_0850DF2C
-.4byte gUnknown_0850DF38
-.4byte gUnknown_0850DF44
-.4byte gUnknown_0850DF50
-.4byte gUnknown_0850DF8C
-.4byte gUnknown_0850DF98
-.4byte gUnknown_0850DFA4
-.4byte gUnknown_0850DFB0
-.4byte gUnknown_0850DFC8
-.4byte gUnknown_0850DFD4
-.4byte gUnknown_0850DFE0
-.4byte gUnknown_0850DFEC
-.4byte gUnknown_0850DFF8
-.4byte gUnknown_0850E004
-.4byte gUnknown_0850E010
-.4byte gUnknown_0850E01C
-.4byte gUnknown_0850E028
-.4byte gUnknown_0850E034
-.4byte gUnknown_0850E040
-.4byte gUnknown_0850E04C
-.4byte gUnknown_0850E058
-.4byte gUnknown_0850E064
-.4byte gUnknown_0850E070
-.4byte gUnknown_0850E07C
-.4byte gUnknown_0850E088
-.4byte gUnknown_0850E094
-.4byte gUnknown_0850E0A0
-.4byte gUnknown_0850E0AC
-.4byte gUnknown_0850E0B8
-.4byte gUnknown_0850E0C4
-.4byte gUnknown_0850E0D0
-.4byte gUnknown_0850E0DC
-.4byte gUnknown_0850E0E8
-.4byte gUnknown_0850E0F4
-.4byte gUnknown_0850E100
-.4byte gUnknown_0850E10C
-.4byte gUnknown_0850E118
-.4byte gUnknown_0850E124
-.4byte gUnknown_0850E130
-.4byte gUnknown_0850E13C
-.4byte gUnknown_0850E148
-.4byte gUnknown_0850E154
-.4byte gUnknown_0850E160
-.4byte gUnknown_0850E16C
-.4byte gUnknown_0850E178
-.4byte gUnknown_0850E184
-.4byte gUnknown_0850E190
-.4byte gUnknown_0850E19C
-.4byte gUnknown_0850E1A8
-.4byte gUnknown_0850E1B4
-.4byte gUnknown_0850E1C0
-.4byte gUnknown_0850E1CC
-.4byte gUnknown_0850E1D8
-.4byte gUnknown_0850E1E4
-.4byte gUnknown_0850E1F0
-.4byte gUnknown_0850E1FC
-.4byte gUnknown_0850E208
-.4byte gUnknown_0850E214
-.4byte gUnknown_0850E220
-.4byte gUnknown_0850E228
-.4byte gUnknown_0850E230
-.4byte gUnknown_0850E238
-.4byte gUnknown_0850E240
-.4byte gUnknown_0850E24C
-.4byte gUnknown_0850E258
-.4byte gUnknown_0850E264
-.4byte gUnknown_0850E270
-.4byte gUnknown_0850E27C
-.4byte gUnknown_0850E288
-.4byte gUnknown_0850E294
-.4byte gUnknown_0850E2A0
-.4byte gUnknown_0850E2AC
-.4byte gUnknown_0850E2B8
-.4byte gUnknown_0850E2C4
-.4byte gUnknown_0850E2D0
-.4byte gUnknown_0850E2D8
-.4byte gUnknown_0850E2E4
-.4byte gUnknown_0850E2EC
-.4byte gUnknown_0850E2F4
-.4byte gUnknown_0850E2FC
-.4byte gUnknown_0850E304
-.4byte gUnknown_0850E30C
-.4byte gUnknown_0850E314
-.4byte gUnknown_0850E31C
-.4byte gUnknown_0850E324
-.4byte gUnknown_0850E32C
-.4byte gUnknown_0850E338
-.4byte gUnknown_0850E348
-.4byte gUnknown_0850E358
-.4byte gUnknown_0850E360
-.4byte gUnknown_0850E368
-.4byte gUnknown_0850E370
-.4byte gUnknown_0850E378
-.4byte gUnknown_0850E380
-.4byte gUnknown_0850E388
-.4byte gUnknown_0850E394
-.4byte gUnknown_0850E3B8
-.4byte gUnknown_0850E3C0
-.4byte gUnknown_0850E3C8
-.4byte gUnknown_0850E3D0
-.4byte gUnknown_0850E3D8
-.4byte gUnknown_0850E3E4
-.4byte gUnknown_0850E3F0
-.4byte gUnknown_0850E3FC
-.4byte gUnknown_0850E408
-.4byte gUnknown_0850E414
-.4byte gUnknown_0850E420
-.4byte gUnknown_0850E42C
-.4byte gUnknown_0850E474
-.4byte gUnknown_0850E480
-.4byte gUnknown_0850E48C
-.4byte gUnknown_0850E498
-.4byte gUnknown_0850E4A4
-.4byte gUnknown_0850E4B0
-.4byte gUnknown_0850E4BC
-.4byte gUnknown_0850E4C8
-.4byte gUnknown_0850E4D4
-.4byte gUnknown_0850E4E0
-.4byte gUnknown_0850E4EC
-.4byte gUnknown_0850E4F8
-.4byte gUnknown_0850E504
-.4byte gUnknown_0850E510
-.4byte gUnknown_0850E51C
-.4byte gUnknown_0850E528
-.4byte gUnknown_0850E534
-.4byte gUnknown_0850E540
-.4byte gUnknown_0850E54C
-.4byte gUnknown_0850E558
-.4byte gUnknown_0850E564
-.4byte gUnknown_0850E570
-.4byte gUnknown_0850E57C
-.4byte gUnknown_0850E588
-.4byte gUnknown_0850E594
-.4byte gUnknown_0850E5A0
-.4byte gUnknown_0850E5AC
-.4byte gUnknown_0850E5B8
-.4byte gUnknown_0850DF5C
-.4byte gUnknown_0850DF68
-.4byte gUnknown_0850DF74
-.4byte gUnknown_0850DF80
-.4byte gUnknown_0850DEFC
-.4byte gUnknown_0850DF08
-.4byte gUnknown_0850DF14
-.4byte gUnknown_0850DF20
-.4byte gUnknown_0850E854
-.4byte gUnknown_0850E85C
-.4byte gUnknown_0850E3A0
-.4byte gUnknown_0850E3AC
-.4byte gUnknown_0850E5C4
-.4byte gUnknown_0850E5CC
-.4byte gUnknown_0850E5D4
-.4byte gUnknown_0850E468
-.4byte gUnknown_0850E864
-.4byte gUnknown_0850E870
-
-gUnknown_0850DEC8:: @ 850DEC8
-	.4byte sub_8093950
-	.4byte sub_80964BC
-
-gUnknown_0850DED0::
-	.4byte sub_8093960
-	.4byte sub_80964BC
-
-gUnknown_0850DED8::
-	.4byte sub_8093970
-	.4byte sub_80964BC
-
-gUnknown_0850DEE0::
-	.4byte sub_8093980
-	.4byte sub_80964BC
-
-gUnknown_0850DEE8:: @ 850DEE8
-	.4byte get_go_image_anim_num
-	.4byte get_go_fast_image_anim_num
-	.4byte get_go_fast_image_anim_num
-	.4byte get_go_faster_image_anim_num
-	.4byte get_go_fastest_image_anim_num
-
-gUnknown_0850DEFC::
-	.4byte sub_8093BC4
-	.4byte sub_8093BC4_2
-	.4byte sub_80964BC
-gUnknown_0850DF08::
-	.4byte sub_8093C04
-	.4byte sub_8093C04_2
-	.4byte sub_80964BC
-gUnknown_0850DF14::
-	.4byte sub_8093C44
-	.4byte sub_8093C44_2
-	.4byte sub_80964BC
-gUnknown_0850DF20::
-	.4byte sub_8093C84
-	.4byte sub_8093C84_2
-	.4byte sub_80964BC
-gUnknown_0850DF2C::
-	.4byte sub_8093CC4
-	.4byte sub_8093CC4_2
-	.4byte sub_80964BC
-gUnknown_0850DF38::
-	.4byte sub_8093D04
-	.4byte sub_8093D04_2
-	.4byte sub_80964BC
-gUnknown_0850DF44::
-	.4byte sub_8093D44
-	.4byte sub_8093D44_2
-	.4byte sub_80964BC
-gUnknown_0850DF50::
-	.4byte sub_8093D84
-	.4byte sub_8093D84_2
-	.4byte sub_80964BC
-gUnknown_0850DF5C::
-	.4byte sub_8093DC4
-	.4byte sub_8093DC4_2
-	.4byte sub_80964BC
-gUnknown_0850DF68::
-	.4byte sub_8093E04
-	.4byte sub_8093E04_2
-	.4byte sub_80964BC
-gUnknown_0850DF74::
-	.4byte sub_8093E44
-	.4byte sub_8093E44_2
-	.4byte sub_80964BC
-gUnknown_0850DF80::
-	.4byte sub_8093E84
-	.4byte sub_8093E84_2
-	.4byte sub_80964BC
-gUnknown_0850DF8C::
-	.4byte sub_8093EC4
-	.4byte sub_8093EC4_2
-	.4byte sub_80964BC
-gUnknown_0850DF98::
-	.4byte sub_8093F04
-	.4byte sub_8093F04_2
-	.4byte sub_80964BC
-gUnknown_0850DFA4::
-	.4byte sub_8093F44
-	.4byte sub_8093F44_2
-	.4byte sub_80964BC
-gUnknown_0850DFB0::
-	.4byte sub_8093F84
-	.4byte sub_8093F84_2
-	.4byte sub_80964BC
-
-gUnknown_0850DFBC:: @ 850DFBC
-	.byte 0x00, 0x00, 0x01, 0x00, 0x01, 0x00
-
-gUnknown_0850DFC2:: @ 850DFC2
-	.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00
-
-gUnknown_0850DFC8:: @ 850DFC8
-	.4byte sub_8094230
-	.4byte sub_8094230_2
-	.4byte sub_80964BC
-gUnknown_0850DFD4::
-	.4byte sub_8094288
-	.4byte sub_8094288_2
-	.4byte sub_80964BC
-gUnknown_0850DFE0::
-	.4byte sub_80942E0
-	.4byte sub_80942E0_2
-	.4byte sub_80964BC
-gUnknown_0850DFEC::
-	.4byte sub_8094338
-	.4byte sub_8094338_2
-	.4byte sub_80964BC
-gUnknown_0850DFF8::
-	.4byte sub_80943B4
-	.4byte sub_8094398
-	.4byte sub_80964B8
-gUnknown_0850E004::
-	.4byte sub_80943D4
-	.4byte sub_8094398
-	.4byte sub_80964B8
-gUnknown_0850E010::
-	.4byte sub_80943F4
-	.4byte sub_8094398
-	.4byte sub_80964B8
-gUnknown_0850E01C::
-	.4byte sub_8094414
-	.4byte sub_8094398
-	.4byte sub_80964B8
-gUnknown_0850E028::
-	.4byte sub_8094434
-	.4byte sub_8094398
-	.4byte sub_80964B8
-gUnknown_0850E034::
-	.4byte sub_8094454
-	.4byte sub_8094454_2
-	.4byte sub_80964BC
-gUnknown_0850E040::
-	.4byte sub_8094494
-	.4byte sub_8094494_2
-	.4byte sub_80964BC
-gUnknown_0850E04C::
-	.4byte sub_80944D4
-	.4byte sub_80944D4_2
-	.4byte sub_80964BC
-gUnknown_0850E058::
-	.4byte sub_8094514
-	.4byte sub_8094514_2
-	.4byte sub_80964BC
-gUnknown_0850E064::
-	.4byte sub_8094600
-	.4byte sub_80945C4
-	.4byte sub_80964BC
-gUnknown_0850E070::
-	.4byte sub_8094638
-	.4byte sub_80945C4
-	.4byte sub_80964BC
-gUnknown_0850E07C::
-	.4byte sub_8094670
-	.4byte sub_80945C4
-	.4byte sub_80964BC
-gUnknown_0850E088::
-	.4byte sub_80946A8
-	.4byte sub_80945C4
-	.4byte sub_80964BC
-gUnknown_0850E094::
-	.4byte sub_80946E0
-	.4byte sub_809459C
-	.4byte sub_80964BC
-gUnknown_0850E0A0::
-	.4byte sub_8094718
-	.4byte sub_809459C
-	.4byte sub_80964BC
-gUnknown_0850E0AC::
-	.4byte sub_8094750
-	.4byte sub_809459C
-	.4byte sub_80964BC
-gUnknown_0850E0B8::
-	.4byte sub_8094788
-	.4byte sub_809459C
-	.4byte sub_80964BC
-gUnknown_0850E0C4::
-	.4byte sub_80947C0
-	.4byte sub_809459C
-	.4byte sub_80964BC
-gUnknown_0850E0D0::
-	.4byte sub_80947F8
-	.4byte sub_809459C
-	.4byte sub_80964BC
-gUnknown_0850E0DC::
-	.4byte sub_8094830
-	.4byte sub_809459C
-	.4byte sub_80964BC
-gUnknown_0850E0E8::
-	.4byte sub_8094868
-	.4byte sub_809459C
-	.4byte sub_80964BC
-gUnknown_0850E0F4::
-	.4byte sub_80948A0
-	.4byte sub_809459C
-	.4byte sub_80964BC
-gUnknown_0850E100::
-	.4byte sub_80948D8
-	.4byte sub_809459C
-	.4byte sub_80964BC
-gUnknown_0850E10C::
-	.4byte sub_8094910
-	.4byte sub_809459C
-	.4byte sub_80964BC
-gUnknown_0850E118::
-	.4byte sub_8094948
-	.4byte sub_809459C
-	.4byte sub_80964BC
-gUnknown_0850E124::
-	.4byte sub_8094980
-	.4byte sub_8094980_2
-	.4byte sub_80964BC
-gUnknown_0850E130::
-	.4byte sub_80949C0
-	.4byte sub_80949C0_2
-	.4byte sub_80964BC
-gUnknown_0850E13C::
-	.4byte sub_8094A00
-	.4byte sub_8094A00_2
-	.4byte sub_80964BC
-gUnknown_0850E148::
-	.4byte sub_8094A40
-	.4byte sub_8094A40_2
-	.4byte sub_80964BC
-gUnknown_0850E154::
-	.4byte sub_8094A80
-	.4byte sub_8094A80_2
-	.4byte sub_80964BC
-gUnknown_0850E160::
-	.4byte sub_8094AC0
-	.4byte sub_8094AC0_2
-	.4byte sub_80964BC
-gUnknown_0850E16C::
-	.4byte sub_8094B00
-	.4byte sub_8094B00_2
-	.4byte sub_80964BC
-gUnknown_0850E178::
-	.4byte sub_8094B40
-	.4byte sub_8094B40_2
-	.4byte sub_80964BC
-gUnknown_0850E184::
-	.4byte sub_8094B80
-	.4byte sub_8094B80_2
-	.4byte sub_80964BC
-gUnknown_0850E190::
-	.4byte sub_8094BC0
-	.4byte sub_8094BC0_2
-	.4byte sub_80964BC
-gUnknown_0850E19C::
-	.4byte sub_8094C00
-	.4byte sub_8094C00_2
-	.4byte sub_80964BC
-gUnknown_0850E1A8::
-	.4byte sub_8094C40
-	.4byte sub_8094C40_2
-	.4byte sub_80964BC
-gUnknown_0850E1B4::
-	.4byte sub_8094C80
-	.4byte sub_8094C80_2
-	.4byte sub_80964BC
-gUnknown_0850E1C0::
-	.4byte sub_8094CC0
-	.4byte sub_8094CC0_2
-	.4byte sub_80964BC
-gUnknown_0850E1CC::
-	.4byte sub_8094D00
-	.4byte sub_8094D00_2
-	.4byte sub_80964BC
-gUnknown_0850E1D8::
-	.4byte sub_8094D40
-	.4byte sub_8094D40_2
-	.4byte sub_80964BC
-gUnknown_0850E1E4::
-	.4byte sub_8094DAC
-	.4byte sub_8094DC4
-	.4byte sub_80964BC
-gUnknown_0850E1F0::
-	.4byte sub_8094E18
-	.4byte sub_8094E18_2
-	.4byte sub_80964BC
-gUnknown_0850E1FC::
-	.4byte sub_8094E60
-	.4byte sub_8094E60_2
-	.4byte sub_80964BC
-gUnknown_0850E208::
-	.4byte sub_8094EB8
-	.4byte sub_8094EB8_2
-	.4byte sub_80964BC
-gUnknown_0850E214::
-	.4byte sub_8094710
-	.4byte sub_8094710_2
-	.4byte sub_80964BC
-gUnknown_0850E220::
-	.4byte sub_8094F38
-	.4byte sub_80964BC
-gUnknown_0850E228::
-	.4byte sub_8094F94
-	.4byte sub_80964BC
-gUnknown_0850E230::
-	.4byte sub_8094FF8
-	.4byte sub_80964BC
-gUnknown_0850E238::
-	.4byte sub_8095008
-	.4byte sub_80964BC
-gUnknown_0850E240::
-	.4byte sub_8095018
-	.4byte sub_8095018_2
-	.4byte sub_80964BC
-gUnknown_0850E24C::
-	.4byte sub_8095070
-	.4byte sub_8095070_2
-	.4byte sub_80964BC
-gUnknown_0850E258::
-	.4byte sub_80950C8
-	.4byte sub_80950C8_2
-	.4byte sub_80964BC
-gUnknown_0850E264::
-	.4byte sub_8095120
-	.4byte sub_8095120_2
-	.4byte sub_80964BC
-gUnknown_0850E270::
-	.4byte sub_8095178
-	.4byte sub_8095178_2
-	.4byte sub_80964BC
-gUnknown_0850E27C::
-	.4byte sub_80951D0
-	.4byte sub_80951D0_2
-	.4byte sub_80964BC
-gUnknown_0850E288::
-	.4byte sub_8095228
-	.4byte sub_8095228_2
-	.4byte sub_80964BC
-gUnknown_0850E294::
-	.4byte sub_8095280
-	.4byte sub_8095280_2
-	.4byte sub_80964BC
-gUnknown_0850E2A0::
-	.4byte sub_80952D8
-	.4byte sub_80952D8_2
-	.4byte sub_80964BC
-gUnknown_0850E2AC::
-	.4byte sub_8095330
-	.4byte sub_8095330_2
-	.4byte sub_80964BC
-gUnknown_0850E2B8::
-	.4byte sub_8095388
-	.4byte sub_8095388_2
-	.4byte sub_80964BC
-gUnknown_0850E2C4::
-	.4byte sub_80953E0
-	.4byte sub_80953E0_2
-	.4byte sub_80964BC
-gUnknown_0850E2D0::
-	.4byte sub_8095438
-	.4byte sub_80964BC
-gUnknown_0850E2D8::
-	.4byte sub_8095450
-	.4byte sub_8094DC4
-	.4byte sub_80964BC
-gUnknown_0850E2E4::
-	.4byte sub_8095460
-	.4byte sub_80964B8
-gUnknown_0850E2EC::
-	.4byte sub_8095470
-	.4byte sub_80964B8
-gUnknown_0850E2F4::
-	.4byte sub_8095480
-	.4byte sub_80964B8
-gUnknown_0850E2FC::
-	.4byte sub_8095490
-	.4byte sub_80964B8
-gUnknown_0850E304::
-	.4byte sub_80954BC
-	.4byte sub_80964B8
-gUnknown_0850E30C::
-	.4byte sub_80954CC
-	.4byte sub_80964B8
-gUnknown_0850E314::
-	.4byte do_exclamation_mark_bubble_1
-	.4byte sub_80964B8
-gUnknown_0850E31C::
-	.4byte do_exclamation_mark_bubble_2
-	.4byte sub_80964B8
-gUnknown_0850E324::
-	.4byte do_heart_bubble
-	.4byte sub_80964B8
-gUnknown_0850E32C::
-	.4byte sub_8095548
-	.4byte sub_809558C
-	.4byte sub_80964B8
-gUnknown_0850E338::
-	.4byte sub_80955AC
-	.4byte sub_80955C8
-	.4byte sub_80955EC
-	.4byte sub_80964B8
-gUnknown_0850E348::
-	.4byte sub_8095628
-	.4byte sub_8095644
-	.4byte sub_8095668
-	.4byte sub_80964B8
-gUnknown_0850E358::
-	.4byte sub_80956A4
-	.4byte sub_80964B8
-gUnknown_0850E360::
-	.4byte sub_80956B4
-	.4byte sub_80964B8
-gUnknown_0850E368::
-	.4byte sub_80956C4
-	.4byte sub_80964B8
-gUnknown_0850E370::
-	.4byte sub_80956F4
-	.4byte sub_80964B8
-gUnknown_0850E378::
-	.4byte sub_8095724
-	.4byte sub_80964B8
-gUnknown_0850E380::
-	.4byte sub_8095730
-	.4byte sub_80964B8
-gUnknown_0850E388::
-	.4byte sub_8095740
-	.4byte sub_8095740_2
-	.4byte sub_80964BC
-gUnknown_0850E394::
-	.4byte sub_80957A0
-	.4byte sub_80957A0_2
-	.4byte sub_80964BC
-gUnknown_0850E3A0::
-	.4byte sub_8095800
-	.4byte sub_8095800_2
-	.4byte sub_80964BC
-gUnknown_0850E3AC::
-	.4byte sub_8095860
-	.4byte sub_8095860_2
-	.4byte sub_80964BC
-gUnknown_0850E3B8::
-	.4byte sub_8095900
-	.4byte sub_80964BC
-gUnknown_0850E3C0::
-	.4byte sub_8095910
-	.4byte sub_80964BC
-gUnknown_0850E3C8::
-	.4byte sub_8095920
-	.4byte sub_80964BC
-gUnknown_0850E3D0::
-	.4byte sub_8095930
-	.4byte sub_80964BC
-gUnknown_0850E3D8::
-	.4byte sub_8095940
-	.4byte sub_8094DC4
-	.4byte sub_80964BC
-gUnknown_0850E3E4::
-	.4byte sub_8095964
-	.4byte sub_8094DC4
-	.4byte sub_80964BC
-gUnknown_0850E3F0::
-	.4byte sub_8095988
-	.4byte sub_8094DC4
-	.4byte sub_80964BC
-gUnknown_0850E3FC::
-	.4byte sub_80959AC
-	.4byte sub_8094DC4
-	.4byte sub_80964BC
-gUnknown_0850E408::
-	.4byte sub_80959D0
-	.4byte sub_8094DC4
-	.4byte sub_80964BC
-gUnknown_0850E414::
-	.4byte sub_80959F4
-	.4byte sub_8094DC4
-	.4byte sub_80964BC
-gUnknown_0850E420::
-	.4byte sub_8095A18
-	.4byte sub_8094DC4
-	.4byte sub_80964BC
-gUnknown_0850E42C::
-	.4byte sub_8095A3C
-	.4byte sub_8094DC4
-	.4byte sub_80964BC
-	.4byte sub_8095A60
-	.4byte sub_8094DC4
-	.4byte sub_80964BC
-	.4byte sub_8095A84
-	.4byte sub_8094DC4
-	.4byte sub_80964BC
-	.4byte sub_8095AA8
-	.4byte sub_8094DC4
-	.4byte sub_80964BC
-	.4byte sub_8095ACC
-	.4byte sub_8094DC4
-	.4byte sub_80964BC
-gUnknown_0850E468::
-	.4byte sub_8095B44
-	.4byte sub_8095B64
-	.4byte sub_80964BC
-gUnknown_0850E474::
-	.4byte sub_8095BC8
-	.4byte sub_8095BC8_2
-	.4byte sub_80964BC
-gUnknown_0850E480::
-	.4byte sub_8095C20
-	.4byte sub_8095C20_2
-	.4byte sub_80964BC
-gUnknown_0850E48C::
-	.4byte sub_8095C78
-	.4byte sub_8095C78_2
-	.4byte sub_80964BC
-gUnknown_0850E498::
-	.4byte sub_8095CD0
-	.4byte sub_8095CD0_2
-	.4byte sub_80964BC
-gUnknown_0850E4A4::
-	.4byte sub_8095D28
-	.4byte sub_8095D28_2
-	.4byte sub_80964BC
-gUnknown_0850E4B0::
-	.4byte sub_8095D80
-	.4byte sub_8095D80_2
-	.4byte sub_80964BC
-gUnknown_0850E4BC::
-	.4byte sub_8095DD8
-	.4byte sub_8095DD8_2
-	.4byte sub_80964BC
-gUnknown_0850E4C8::
-	.4byte sub_8095E30
-	.4byte sub_8095E30_2
-	.4byte sub_80964BC
-gUnknown_0850E4D4::
-	.4byte sub_8095E88
-	.4byte sub_8095E88_2
-	.4byte sub_80964BC
-gUnknown_0850E4E0::
-	.4byte sub_8095EE0
-	.4byte sub_8095EE0_2
-	.4byte sub_80964BC
-gUnknown_0850E4EC::
-	.4byte sub_8095F38
-	.4byte sub_8095F38_2
-	.4byte sub_80964BC
-gUnknown_0850E4F8::
-	.4byte sub_8095F90
-	.4byte sub_8095F90_2
-	.4byte sub_80964BC
-gUnknown_0850E504::
-	.4byte sub_8095FE8
-	.4byte sub_809459C
-	.4byte sub_80964BC
-gUnknown_0850E510::
-	.4byte sub_8096020
-	.4byte sub_809459C
-	.4byte sub_80964BC
-gUnknown_0850E51C::
-	.4byte sub_8096058
-	.4byte sub_809459C
-	.4byte sub_80964BC
-gUnknown_0850E528::
-	.4byte sub_8096090
-	.4byte sub_809459C
-	.4byte sub_80964BC
-gUnknown_0850E534::
-	.4byte sub_8096100
-	.4byte sub_8096100_2
-	.4byte sub_80964BC
-gUnknown_0850E540::
-	.4byte sub_8096140
-	.4byte sub_8096140_2
-	.4byte sub_80964BC
-gUnknown_0850E54C::
-	.4byte sub_8096180
-	.4byte sub_8096180_2
-	.4byte sub_80964BC
-gUnknown_0850E558::
-	.4byte sub_80961C0
-	.4byte sub_80961C0_2
-	.4byte sub_80964BC
-gUnknown_0850E564::
-	.4byte sub_8096230
-	.4byte sub_8096230_2
-	.4byte sub_80964BC
-gUnknown_0850E570::
-	.4byte sub_8096270
-	.4byte sub_8096270_2
-	.4byte sub_80964BC
-gUnknown_0850E57C::
-	.4byte sub_80962B0
-	.4byte sub_80962B0_2
-	.4byte sub_80964BC
-gUnknown_0850E588::
-	.4byte sub_80962F0
-	.4byte sub_80962F0_2
-	.4byte sub_80964BC
-gUnknown_0850E594::
-	.4byte sub_8096368
-	.4byte sub_8096368_2
-	.4byte sub_80964BC
-gUnknown_0850E5A0::
-	.4byte sub_80963A8
-	.4byte sub_80963A8_2
-	.4byte sub_80964BC
-gUnknown_0850E5AC::
-	.4byte sub_80963E8
-	.4byte sub_80963E8_2
-	.4byte sub_80964BC
-gUnknown_0850E5B8::
-	.4byte sub_8096428
-	.4byte sub_8096428_2
-	.4byte sub_80964BC
-gUnknown_0850E5C4::
-	.4byte sub_8096468
-	.4byte sub_80964B8
-gUnknown_0850E5CC::
-	.4byte sub_809647C
-	.4byte sub_80964B8
-gUnknown_0850E5D4::
-	.4byte sub_8096494
-	.4byte sub_80964B8
-
diff --git a/data/graphics/field_objects/berry_tree_graphics_tables.inc b/data/graphics/field_objects/berry_tree_graphics_tables.inc
deleted file mode 100644
index 8d716d759..000000000
--- a/data/graphics/field_objects/berry_tree_graphics_tables.inc
+++ /dev/null
@@ -1,635 +0,0 @@
-	.align 2
-gFieldObjectPicTable_PechaBerryTree:: @ 850BE48
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_PechaBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_PechaBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_PechaBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_PechaBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_PechaBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_PechaBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Pecha:: @ 850BE90
-	berry_tree_palette_slot_table 4
-
-	.align 2
-gFieldObjectPicTable_KelpsyBerryTree:: @ 850BE98
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_KelpsyBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_KelpsyBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_KelpsyBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_KelpsyBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_KelpsyBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_KelpsyBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Kelpsy:: @ 850BEE0
-	berry_tree_palette_slot_table 2
-
-	.align 2
-gFieldObjectPicTable_WepearBerryTree:: @ 850BEE8
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_WepearBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_WepearBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_WepearBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_WepearBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_WepearBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_WepearBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Wepear:: @ 850BF30
-	berry_tree_palette_slot_table 2
-
-	.align 2
-gFieldObjectPicTable_IapapaBerryTree:: @ 850BF38
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_IapapaBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_IapapaBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_IapapaBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_IapapaBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_IapapaBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_IapapaBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Iapapa:: @ 850BF80
-	berry_tree_palette_slot_table 3
-
-	.align 2
-gFieldObjectPicTable_CheriBerryTree:: @ 850BF88
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_CheriBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_CheriBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_CheriBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_CheriBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_CheriBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_CheriBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Cheri:: @ 850BFD0
-	berry_tree_palette_slot_table 4
-
-	.align 2
-gFieldObjectPicTable_FigyBerryTree:: @ 850BFD8
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_FigyBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_FigyBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_FigyBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_FigyBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_FigyBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_FigyBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Figy:: @ 850C020
-	berry_tree_palette_slot_table 3
-
-	.align 2
-gFieldObjectPicTable_MagoBerryTree:: @ 850C028
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_MagoBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_MagoBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_MagoBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_MagoBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_MagoBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_MagoBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Mago:: @ 850C070
-	berry_tree_palette_slot_table 3
-
-	.align 2
-gFieldObjectPicTable_LumBerryTree:: @ 850C078
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_LumBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_LumBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_LumBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_LumBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_LumBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_LumBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Lum:: @ 850C0C0
-	berry_tree_palette_slot_table 4
-
-	.align 2
-gFieldObjectPicTable_RazzBerryTree:: @ 850C0C8
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_RazzBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_RazzBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_RazzBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_RazzBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_RazzBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_RazzBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Razz:: @ 850C110
-	berry_tree_palette_slot_table 4
-
-	.align 2
-gFieldObjectPicTable_GrepaBerryTree:: @ 850C118
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_GrepaBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_GrepaBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_GrepaBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_GrepaBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_GrepaBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_GrepaBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Grepa:: @ 850C160
-	berry_tree_palette_slot_table 3
-
-	.align 2
-gFieldObjectPicTable_RabutaBerryTree:: @ 850C168
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_RabutaBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_RabutaBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_RabutaBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_RabutaBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_RabutaBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_RabutaBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Rabuta:: @ 850C1B0
-	berry_tree_palette_slot_table 4
-
-	.align 2
-gFieldObjectPicTable_NomelBerryTree:: @ 850C1B8
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_NomelBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_NomelBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_NomelBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_NomelBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_NomelBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_NomelBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Nomel:: @ 850C200
-	berry_tree_palette_slot_table 3
-
-	.align 2
-gFieldObjectPicTable_LeppaBerryTree:: @ 850C208
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_LeppaBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_LeppaBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_LeppaBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_LeppaBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_LeppaBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_LeppaBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Leppa:: @ 850C250
-	berry_tree_palette_slot_table 3
-
-	.align 2
-gFieldObjectPicTable_LiechiBerryTree:: @ 850C258
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_LiechiBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_LiechiBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_LiechiBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_LiechiBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_LiechiBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_LiechiBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Liechi:: @ 850C2A0
-	berry_tree_palette_slot_table 4
-
-	.align 2
-gFieldObjectPicTable_HondewBerryTree:: @ 850C2A8
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_HondewBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_HondewBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_HondewBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_HondewBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_HondewBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_HondewBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Hondew:: @ 850C2F0
-	berry_tree_palette_slot_table 5
-
-	.align 2
-gFieldObjectPicTable_AguavBerryTree:: @ 850C2F8
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_AguavBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_AguavBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_AguavBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_AguavBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_AguavBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_AguavBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Aguav:: @ 850C340
-	berry_tree_palette_slot_table 4
-
-	.align 2
-gFieldObjectPicTable_WikiBerryTree:: @ 850C348
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_WikiBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_WikiBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_WikiBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_WikiBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_WikiBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_WikiBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Wiki:: @ 850C390
-	berry_tree_palette_slot_table 3
-
-	.align 2
-gFieldObjectPicTable_PomegBerryTree:: @ 850C398
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_PomegBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_PomegBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_PomegBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_PomegBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_PomegBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_PomegBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Pomeg:: @ 850C3E0
-	berry_tree_palette_slot_table 3
-
-	.align 2
-gFieldObjectPicTable_RawstBerryTree:: @ 850C3E8
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_RawstBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_RawstBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_RawstBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_RawstBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_RawstBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_RawstBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Rawst:: @ 850C430
-	berry_tree_palette_slot_table 4
-
-	.align 2
-gFieldObjectPicTable_SpelonBerryTree:: @ 850C438
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_SpelonBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_SpelonBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_SpelonBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_SpelonBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_SpelonBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_SpelonBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Spelon:: @ 850C480
-	berry_tree_palette_slot_table 3
-
-	.align 2
-gFieldObjectPicTable_ChestoBerryTree:: @ 850C488
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_ChestoBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_ChestoBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_ChestoBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_ChestoBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_ChestoBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_ChestoBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Chesto:: @ 850C4D0
-	berry_tree_palette_slot_table 2
-
-	.align 2
-gFieldObjectPicTable_OranBerryTree:: @ 850C4D8
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_OranBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_OranBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_OranBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_OranBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_OranBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_OranBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Oran:: @ 850C520
-	berry_tree_palette_slot_table 2
-
-	.align 2
-gFieldObjectPicTable_PersimBerryTree:: @ 850C528
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_PersimBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_PersimBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_PersimBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_PersimBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_PersimBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_PersimBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Persim:: @ 850C570
-	berry_tree_palette_slot_table 2
-
-	.align 2
-gFieldObjectPicTable_SitrusBerryTree:: @ 850C578
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_SitrusBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_SitrusBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_SitrusBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_SitrusBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_SitrusBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_SitrusBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Sitrus:: @ 850C5C0
-	berry_tree_palette_slot_table 4
-
-	.align 2
-gFieldObjectPicTable_AspearBerryTree:: @ 850C5C8
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_AspearBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_AspearBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_AspearBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_AspearBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_AspearBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_AspearBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Aspear:: @ 850C610
-	berry_tree_palette_slot_table 3
-
-	.align 2
-gFieldObjectPicTable_PamtreBerryTree:: @ 850C618
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_PamtreBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_PamtreBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_PamtreBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_PamtreBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_PamtreBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_PamtreBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Pamtre:: @ 850C660
-	berry_tree_palette_slot_table 2
-
-	.align 2
-gFieldObjectPicTable_CornnBerryTree:: @ 850C668
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_CornnBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_CornnBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_CornnBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_CornnBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_CornnBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_CornnBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Cornn:: @ 850C6B0
-	berry_tree_palette_slot_table 2
-
-	.align 2
-gFieldObjectPicTable_LansatBerryTree:: @ 850C6B8
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_LansatBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_LansatBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_LansatBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_LansatBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_LansatBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_LansatBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Lansat:: @ 850C700
-	berry_tree_palette_slot_table 2
-
-	.align 2
-gFieldObjectPicTable_DurinBerryTree:: @ 850C708
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_DurinBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_DurinBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_DurinBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_DurinBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_DurinBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_DurinBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Durin:: @ 850C750
-	berry_tree_palette_slot_table 4
-
-	.align 2
-gFieldObjectPicTable_TamatoBerryTree:: @ 850C758
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_TamatoBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_TamatoBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_TamatoBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_TamatoBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_TamatoBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_TamatoBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Tamato:: @ 850C7A0
-	berry_tree_palette_slot_table 2
-
-	.byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
-	.byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
-	.byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
-	.byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
-	.byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
-
-gBerryTreeFieldObjectGraphicsIdTable:: @ 850C7AA
-	.byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
-	.byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
-	.byte MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES
-	.byte MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES
-	.byte MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES
-
-	.align 2
-gBerryTreePicTablePointers:: @ 850C7B0
-	.4byte gFieldObjectPicTable_CheriBerryTree  @ Cheri
-	.4byte gFieldObjectPicTable_ChestoBerryTree @ Chesto
-	.4byte gFieldObjectPicTable_PechaBerryTree  @ Pecha
-	.4byte gFieldObjectPicTable_RawstBerryTree  @ Rawst
-	.4byte gFieldObjectPicTable_AspearBerryTree @ Aspear
-	.4byte gFieldObjectPicTable_LeppaBerryTree  @ Leppa
-	.4byte gFieldObjectPicTable_OranBerryTree   @ Oran
-	.4byte gFieldObjectPicTable_PersimBerryTree @ Persim
-	.4byte gFieldObjectPicTable_LumBerryTree    @ Lum
-	.4byte gFieldObjectPicTable_SitrusBerryTree @ Sitrus
-	.4byte gFieldObjectPicTable_FigyBerryTree   @ Figy
-	.4byte gFieldObjectPicTable_WikiBerryTree   @ Wiki
-	.4byte gFieldObjectPicTable_MagoBerryTree   @ Mago
-	.4byte gFieldObjectPicTable_AguavBerryTree  @ Aguav
-	.4byte gFieldObjectPicTable_IapapaBerryTree @ Iapapa
-	.4byte gFieldObjectPicTable_RazzBerryTree   @ Razz
-	.4byte gFieldObjectPicTable_RazzBerryTree   @ Bluk
-	.4byte gFieldObjectPicTable_MagoBerryTree   @ Nanab
-	.4byte gFieldObjectPicTable_WepearBerryTree @ Wepear
-	.4byte gFieldObjectPicTable_IapapaBerryTree @ Pinap
-	.4byte gFieldObjectPicTable_PomegBerryTree  @ Pomeg
-	.4byte gFieldObjectPicTable_KelpsyBerryTree @ Kelpsy
-	.4byte gFieldObjectPicTable_WepearBerryTree @ Qualot
-	.4byte gFieldObjectPicTable_HondewBerryTree @ Hondew
-	.4byte gFieldObjectPicTable_GrepaBerryTree  @ Grepa
-	.4byte gFieldObjectPicTable_TamatoBerryTree @ Tamato
-	.4byte gFieldObjectPicTable_CornnBerryTree  @ Cornn
-	.4byte gFieldObjectPicTable_PomegBerryTree  @ Magost
-	.4byte gFieldObjectPicTable_RabutaBerryTree @ Rabuta
-	.4byte gFieldObjectPicTable_NomelBerryTree  @ Nomel
-	.4byte gFieldObjectPicTable_SpelonBerryTree @ Spelon
-	.4byte gFieldObjectPicTable_PamtreBerryTree @ Pamtre
-	.4byte gFieldObjectPicTable_RabutaBerryTree @ Watmel
-	.4byte gFieldObjectPicTable_DurinBerryTree  @ Durin
-	.4byte gFieldObjectPicTable_HondewBerryTree @ Belue
-	.4byte gFieldObjectPicTable_LiechiBerryTree @ Liechi
-	.4byte gFieldObjectPicTable_HondewBerryTree @ Ganlon
-	.4byte gFieldObjectPicTable_AguavBerryTree  @ Salac
-	.4byte gFieldObjectPicTable_PomegBerryTree  @ Petaya
-	.4byte gFieldObjectPicTable_GrepaBerryTree  @ Apicot
-	.4byte gFieldObjectPicTable_LansatBerryTree @ Lansat
-	.4byte gFieldObjectPicTable_CornnBerryTree  @ Starf
-	.4byte gFieldObjectPicTable_DurinBerryTree  @ Enigma
-
-	.align 2
-gBerryTreePaletteSlotTablePointers:: @ 850C85C
-	.4byte gBerryTreePaletteSlotTable_Cheri  @ Cheri
-	.4byte gBerryTreePaletteSlotTable_Chesto @ Chesto
-	.4byte gBerryTreePaletteSlotTable_Pecha  @ Pecha
-	.4byte gBerryTreePaletteSlotTable_Rawst  @ Rawst
-	.4byte gBerryTreePaletteSlotTable_Aspear @ Aspear
-	.4byte gBerryTreePaletteSlotTable_Leppa  @ Leppa
-	.4byte gBerryTreePaletteSlotTable_Oran   @ Oran
-	.4byte gBerryTreePaletteSlotTable_Persim @ Persim
-	.4byte gBerryTreePaletteSlotTable_Lum    @ Lum
-	.4byte gBerryTreePaletteSlotTable_Sitrus @ Sitrus
-	.4byte gBerryTreePaletteSlotTable_Figy   @ Figy
-	.4byte gBerryTreePaletteSlotTable_Wiki   @ Wiki
-	.4byte gBerryTreePaletteSlotTable_Mago   @ Mago
-	.4byte gBerryTreePaletteSlotTable_Aguav  @ Aguav
-	.4byte gBerryTreePaletteSlotTable_Iapapa @ Iapapa
-	.4byte gBerryTreePaletteSlotTable_Razz   @ Razz
-	.4byte gBerryTreePaletteSlotTable_Razz   @ Bluk
-	.4byte gBerryTreePaletteSlotTable_Mago   @ Nanab
-	.4byte gBerryTreePaletteSlotTable_Wepear @ Wepear
-	.4byte gBerryTreePaletteSlotTable_Iapapa @ Pinap
-	.4byte gBerryTreePaletteSlotTable_Pomeg  @ Pomeg
-	.4byte gBerryTreePaletteSlotTable_Kelpsy @ Kelpsy
-	.4byte gBerryTreePaletteSlotTable_Wepear @ Qualot
-	.4byte gBerryTreePaletteSlotTable_Hondew @ Hondew
-	.4byte gBerryTreePaletteSlotTable_Grepa  @ Grepa
-	.4byte gBerryTreePaletteSlotTable_Tamato @ Tamato
-	.4byte gBerryTreePaletteSlotTable_Cornn  @ Cornn
-	.4byte gBerryTreePaletteSlotTable_Pomeg  @ Magost
-	.4byte gBerryTreePaletteSlotTable_Rabuta @ Rabuta
-	.4byte gBerryTreePaletteSlotTable_Nomel  @ Nomel
-	.4byte gBerryTreePaletteSlotTable_Spelon @ Spelon
-	.4byte gBerryTreePaletteSlotTable_Pamtre @ Pamtre
-	.4byte gBerryTreePaletteSlotTable_Rabuta @ Watmel
-	.4byte gBerryTreePaletteSlotTable_Durin  @ Durin
-	.4byte gBerryTreePaletteSlotTable_Hondew @ Belue
-	.4byte gBerryTreePaletteSlotTable_Liechi @ Liechi
-	.4byte gBerryTreePaletteSlotTable_Hondew @ Ganlon
-	.4byte gBerryTreePaletteSlotTable_Aguav  @ Salac
-	.4byte gBerryTreePaletteSlotTable_Pomeg  @ Petaya
-	.4byte gBerryTreePaletteSlotTable_Grepa  @ Apicot
-	.4byte gBerryTreePaletteSlotTable_Lansat @ Lansat
-	.4byte gBerryTreePaletteSlotTable_Cornn  @ Starf
-	.4byte gBerryTreePaletteSlotTable_Durin  @ Enigma
-
-	.align 2
-gBerryTreeFieldObjectGraphicsIdTablePointers:: @ 850C908
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Cheri
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Chesto
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Pecha
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Rawst
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Aspear
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Leppa
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Oran
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Persim
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Lum
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Sitrus
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Figy
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Wiki
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Mago
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Aguav
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Iapapa
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Razz
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Bluk
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Nanab
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Wepear
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Pinap
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Pomeg
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Kelpsy
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Qualot
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Hondew
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Grepa
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Tamato
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Cornn
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Magost
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Rabuta
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Nomel
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Spelon
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Pamtre
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Watmel
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Durin
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Belue
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Liechi
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Ganlon
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Salac
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Petaya
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Apicot
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Lansat
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Starf
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Enigma
-
-@ extras
-	.4byte gBerryTreeFieldObjectGraphicsIdTable
-	.4byte gBerryTreeFieldObjectGraphicsIdTable
-	.4byte gBerryTreeFieldObjectGraphicsIdTable
diff --git a/data/graphics/field_objects/field_effect_object_template_pointers.inc b/data/graphics/field_objects/field_effect_object_template_pointers.inc
deleted file mode 100644
index 846cdf6c2..000000000
--- a/data/graphics/field_objects/field_effect_object_template_pointers.inc
+++ /dev/null
@@ -1,39 +0,0 @@
-	.align 2
-gFieldEffectObjectTemplatePointers:: @ 85059F8
-	.4byte gFieldEffectObjectTemplate_ShadowSmall
-	.4byte gFieldEffectObjectTemplate_ShadowMedium
-	.4byte gFieldEffectObjectTemplate_ShadowLarge
-	.4byte gFieldEffectObjectTemplate_ShadowExtraLarge
-	.4byte gFieldEffectObjectTemplate_TallGrass
-	.4byte gFieldEffectObjectTemplate_Ripple
-	.4byte gFieldEffectObjectTemplate_Ash
-	.4byte gFieldEffectObjectTemplate_SurfBlob
-	.4byte gFieldEffectObjectTemplate_Arrow
-	.4byte gFieldEffectObjectTemplate_GroundImpactDust
-	.4byte gFieldEffectObjectTemplate_BikeHopTallGrass
-	.4byte gFieldEffectObjectTemplate_SandFootprints
-	.4byte gFieldEffectObjectTemplate_BikeHopBigSplash
-	.4byte gFieldEffectObjectTemplate_Splash
-	.4byte gFieldEffectObjectTemplate_BikeHopSmallSplash
-	.4byte gFieldEffectObjectTemplate_LongGrass
-	.4byte gFieldEffectObjectTemplate_Unknown16
-	.4byte gFieldEffectObjectTemplate_Unknown17
-	.4byte gFieldEffectObjectTemplate_Unknown18
-	.4byte gFieldEffectObjectTemplate_Unknown19
-	.4byte gFieldEffectObjectTemplate_Unknown20
-	.4byte gFieldEffectObjectTemplate_Unknown21
-	.4byte gFieldEffectObjectTemplate_BerryTreeGrowthSparkle
-	.4byte gFieldEffectObjectTemplate_DeepSandFootprints
-	.4byte gFieldEffectObjectTemplate_TreeDisguise
-	.4byte gFieldEffectObjectTemplate_MountainDisguise
-	.4byte gFieldEffectObjectTemplate_Bird
-	.4byte gFieldEffectObjectTemplate_BikeTireTracks
-	.4byte gFieldEffectObjectTemplate_SandDisguisePlaceholder
-	.4byte gFieldEffectObjectTemplate_Unknown29
-	.4byte gFieldEffectObjectTemplate_ShortGrass
-	.4byte gFieldEffectObjectTemplate_HotSpringsWater
-	.4byte gFieldEffectObjectTemplate_JumpOutOfAsh
-	.4byte gFieldEffectObjectTemplate_Unknown33
-	.4byte gFieldEffectObjectTemplate_Bubbles
-	.4byte gFieldEffectObjectTemplate_Unknown35
-	.4byte gFieldEffectObjectTemplate_Rayquaza
diff --git a/data/graphics/field_objects/field_effect_objects.inc b/data/graphics/field_objects/field_effect_objects.inc
deleted file mode 100644
index 2c1ce3c4c..000000000
--- a/data/graphics/field_objects/field_effect_objects.inc
+++ /dev/null
@@ -1,1208 +0,0 @@
-
-	.align 2
-gFieldEffectObjectPaletteInfo0:: @ 850C9C0
-	obj_pal gFieldEffectObjectPalette0, 0x1004
-
-	.align 2
-gFieldEffectObjectPaletteInfo1:: @ 850C9C8
-	obj_pal gFieldEffectObjectPalette1, 0x1005
-
-	.align 2
-gFieldEffectObjectImageAnim_850C9D0:: @ 850C9D0
-	obj_image_anim_frame 0, 1
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_Shadow:: @ 850C9D8
-	.4byte gFieldEffectObjectImageAnim_850C9D0
-
-	.align 2
-gFieldEffectObjectPicTable_ShadowSmall:: @ 850C9DC
-	obj_tiles gFieldEffectObjectPic_ShadowSmall, 0x20
-
-	.align 2
-gFieldEffectObjectPicTable_ShadowMedium:: @ 850C9E4
-	obj_tiles gFieldEffectObjectPic_ShadowMedium, 0x40
-
-	.align 2
-gFieldEffectObjectPicTable_ShadowLarge:: @ 850C9EC
-	obj_tiles gFieldEffectObjectPic_ShadowLarge, 0x80
-
-	.align 2
-gFieldEffectObjectPicTable_ShadowExtraLarge:: @ 850C9F4
-	obj_tiles gFieldEffectObjectPic_ShadowExtraLarge, 0x400
-
-	.align 2
-gFieldEffectObjectTemplate_ShadowSmall:: @ 850C9FC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0xFFFF @ palette tag
-	.4byte gFieldObjectBaseOam_8x8
-	.4byte gFieldEffectObjectImageAnimTable_Shadow
-	.4byte gFieldEffectObjectPicTable_ShadowSmall
-	.4byte gDummySpriteAffineAnimTable
-	.4byte oamc_shadow
-
-	.align 2
-gFieldEffectObjectTemplate_ShadowMedium:: @ 850CA14
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0xFFFF @ palette tag
-	.4byte gFieldObjectBaseOam_16x8
-	.4byte gFieldEffectObjectImageAnimTable_Shadow
-	.4byte gFieldEffectObjectPicTable_ShadowMedium
-	.4byte gDummySpriteAffineAnimTable
-	.4byte oamc_shadow
-
-	.align 2
-gFieldEffectObjectTemplate_ShadowLarge:: @ 850CA2C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0xFFFF @ palette tag
-	.4byte gFieldObjectBaseOam_32x8
-	.4byte gFieldEffectObjectImageAnimTable_Shadow
-	.4byte gFieldEffectObjectPicTable_ShadowLarge
-	.4byte gDummySpriteAffineAnimTable
-	.4byte oamc_shadow
-
-	.align 2
-gFieldEffectObjectTemplate_ShadowExtraLarge:: @ 850CA44
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0xFFFF @ palette tag
-	.4byte gFieldObjectBaseOam_64x32
-	.4byte gFieldEffectObjectImageAnimTable_Shadow
-	.4byte gFieldEffectObjectPicTable_ShadowExtraLarge
-	.4byte gDummySpriteAffineAnimTable
-	.4byte oamc_shadow
-
-	.align 2
-gFieldEffectObjectPicTable_TallGrass:: @ 850CA5C
-	obj_tiles gFieldEffectObjectPic_TallGrass_0, 0x80
-	obj_tiles gFieldEffectObjectPic_TallGrass_1, 0x80
-	obj_tiles gFieldEffectObjectPic_TallGrass_2, 0x80
-	obj_tiles gFieldEffectObjectPic_TallGrass_3, 0x80
-	obj_tiles gFieldEffectObjectPic_TallGrass_4, 0x80
-
-	.align 2
-gFieldEffectObjectImageAnim_850CA84:: @ 850CA84
-	obj_image_anim_frame 1, 10
-	obj_image_anim_frame 2, 10
-	obj_image_anim_frame 3, 10
-	obj_image_anim_frame 4, 10
-	obj_image_anim_frame 0, 10
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_TallGrass:: @ 850CA9C
-	.4byte gFieldEffectObjectImageAnim_850CA84
-
-	.align 2
-gFieldEffectObjectTemplate_TallGrass:: @ 850CAA0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1005 @ palette tag
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldEffectObjectImageAnimTable_TallGrass
-	.4byte gFieldEffectObjectPicTable_TallGrass
-	.4byte gDummySpriteAffineAnimTable
-	.4byte unc_grass_normal
-
-	.align 2
-gFieldEffectObjectPicTable_Ripple:: @ 850CAB8
-	obj_tiles gFieldEffectObjectPic_Ripple_0, 0x80
-	obj_tiles gFieldEffectObjectPic_Ripple_1, 0x80
-	obj_tiles gFieldEffectObjectPic_Ripple_2, 0x80
-	obj_tiles gFieldEffectObjectPic_Ripple_3, 0x80
-	obj_tiles gFieldEffectObjectPic_Ripple_4, 0x80
-
-	.align 2
-gFieldEffectObjectImageAnim_850CAE0:: @ 850CAE0
-	obj_image_anim_frame 0, 12
-	obj_image_anim_frame 1, 9
-	obj_image_anim_frame 2, 9
-	obj_image_anim_frame 3, 9
-	obj_image_anim_frame 0, 9
-	obj_image_anim_frame 1, 9
-	obj_image_anim_frame 2, 11
-	obj_image_anim_frame 4, 11
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_Ripple:: @ 850CB04
-	.4byte gFieldEffectObjectImageAnim_850CAE0
-
-	.align 2
-gFieldEffectObjectTemplate_Ripple:: @ 850CB08
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1005 @ palette tag
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldEffectObjectImageAnimTable_Ripple
-	.4byte gFieldEffectObjectPicTable_Ripple
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_81561D0
-
-	.align 2
-gFieldEffectObjectPicTable_Ash:: @ 850CB20
-	obj_tiles gFieldEffectObjectPic_Ash_0, 0x80
-	obj_tiles gFieldEffectObjectPic_Ash_1, 0x80
-	obj_tiles gFieldEffectObjectPic_Ash_2, 0x80
-	obj_tiles gFieldEffectObjectPic_Ash_3, 0x80
-	obj_tiles gFieldEffectObjectPic_Ash_4, 0x80
-
-	.align 2
-gFieldEffectObjectImageAnim_850CB48:: @ 850CB48
-	obj_image_anim_frame 0, 12
-	obj_image_anim_frame 1, 12
-	obj_image_anim_frame 2, 8
-	obj_image_anim_frame 3, 12
-	obj_image_anim_frame 4, 12
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_Ash:: @ 850CB60
-	.4byte gFieldEffectObjectImageAnim_850CB48
-
-	.align 2
-gFieldEffectObjectTemplate_Ash:: @ 850CB64
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1005 @ palette tag
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldEffectObjectImageAnimTable_Ash
-	.4byte gFieldEffectObjectPicTable_Ash
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_8155460
-
-	.align 2
-gFieldEffectObjectPicTable_SurfBlob:: @ 850CB7C
-	obj_tiles gFieldEffectObjectPic_SurfBlob_0, 0x200
-	obj_tiles gFieldEffectObjectPic_SurfBlob_1, 0x200
-	obj_tiles gFieldEffectObjectPic_SurfBlob_2, 0x200
-
-	.align 2
-gFieldEffectObjectImageAnim_850CB94:: @ 850CB94
-	obj_image_anim_frame 0, 1
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldEffectObjectImageAnim_850CB9C:: @ 850CB9C
-	obj_image_anim_frame 1, 1
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldEffectObjectImageAnim_850CBA4:: @ 850CBA4
-	obj_image_anim_frame 2, 1
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldEffectObjectImageAnim_850CBAC:: @ 850CBAC
-	obj_image_anim_frame 2, 1, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldEffectObjectImageAnimTable_SurfBlob:: @ 850CBB4
-	.4byte gFieldEffectObjectImageAnim_850CB94
-	.4byte gFieldEffectObjectImageAnim_850CB9C
-	.4byte gFieldEffectObjectImageAnim_850CBA4
-	.4byte gFieldEffectObjectImageAnim_850CBAC
-
-	.align 2
-gFieldEffectObjectTemplate_SurfBlob:: @ 850CBC4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0xFFFF @ palette tag
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldEffectObjectImageAnimTable_SurfBlob
-	.4byte gFieldEffectObjectPicTable_SurfBlob
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_8155658
-
-	.align 2
-gFieldEffectObjectPicTable_Arrow:: @ 850CBDC
-	obj_tiles gFieldEffectObjectPic_Arrow_0, 0x80
-	obj_tiles gFieldEffectObjectPic_Arrow_1, 0x80
-	obj_tiles gFieldEffectObjectPic_Arrow_2, 0x80
-	obj_tiles gFieldEffectObjectPic_Arrow_3, 0x80
-	obj_tiles gFieldEffectObjectPic_Arrow_4, 0x80
-	obj_tiles gFieldEffectObjectPic_Arrow_5, 0x80
-	obj_tiles gFieldEffectObjectPic_Arrow_6, 0x80
-	obj_tiles gFieldEffectObjectPic_Arrow_7, 0x80
-
-	.align 2
-gFieldEffectObjectImageAnim_850CC1C:: @ 850CC1C
-	obj_image_anim_frame 3, 32
-	obj_image_anim_frame 7, 32
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldEffectObjectImageAnim_850CC28:: @ 850CC28
-	obj_image_anim_frame 0, 32
-	obj_image_anim_frame 4, 32
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldEffectObjectImageAnim_850CC34:: @ 850CC34
-	obj_image_anim_frame 1, 32
-	obj_image_anim_frame 5, 32
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldEffectObjectImageAnim_850CC40:: @ 850CC40
-	obj_image_anim_frame 2, 32
-	obj_image_anim_frame 6, 32
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldEffectObjectImageAnimTable_Arrow:: @ 850CC4C
-	.4byte gFieldEffectObjectImageAnim_850CC1C
-	.4byte gFieldEffectObjectImageAnim_850CC28
-	.4byte gFieldEffectObjectImageAnim_850CC34
-	.4byte gFieldEffectObjectImageAnim_850CC40
-
-	.align 2
-gFieldEffectObjectTemplate_Arrow:: @ 850CC5C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0xFFFF @ palette tag
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldEffectObjectImageAnimTable_Arrow
-	.4byte gFieldEffectObjectPicTable_Arrow
-	.4byte gDummySpriteAffineAnimTable
-	.4byte SpriteCallbackDummy
-
-	.align 2
-gFieldEffectObjectPicTable_GroundImpactDust:: @ 850CC74
-	obj_tiles gFieldEffectObjectPic_GroundImpactDust_0, 0x40
-	obj_tiles gFieldEffectObjectPic_GroundImpactDust_1, 0x40
-	obj_tiles gFieldEffectObjectPic_GroundImpactDust_2, 0x40
-
-	.align 2
-gFieldEffectObjectImageAnim_850CC8C:: @ 850CC8C
-	obj_image_anim_frame 0, 8
-	obj_image_anim_frame 1, 8
-	obj_image_anim_frame 2, 8
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_GroundImpactDust:: @ 850CC9C
-	.4byte gFieldEffectObjectImageAnim_850CC8C
-
-	.align 2
-gFieldEffectObjectTemplate_GroundImpactDust:: @ 850CCA0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1004 @ palette tag
-	.4byte gFieldObjectBaseOam_16x8
-	.4byte gFieldEffectObjectImageAnimTable_GroundImpactDust
-	.4byte gFieldEffectObjectPicTable_GroundImpactDust
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_8156194
-
-	.align 2
-gFieldEffectObjectPicTable_BikeHopTallGrass:: @ 850CCB8
-	obj_tiles gFieldEffectObjectPic_BikeHopTallGrass_0, 0x40
-	obj_tiles gFieldEffectObjectPic_BikeHopTallGrass_1, 0x40
-	obj_tiles gFieldEffectObjectPic_BikeHopTallGrass_2, 0x40
-	obj_tiles gFieldEffectObjectPic_BikeHopTallGrass_3, 0x40
-
-	.align 2
-gFieldEffectObjectImageAnim_850CCD8:: @ 850CCD8
-	obj_image_anim_frame 0, 8
-	obj_image_anim_frame 1, 8
-	obj_image_anim_frame 2, 8
-	obj_image_anim_frame 3, 8
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_BikeHopTallGrass:: @ 850CCEC
-	.4byte gFieldEffectObjectImageAnim_850CCD8
-
-	.align 2
-gFieldEffectObjectTemplate_BikeHopTallGrass:: @ 850CCF0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1005 @ palette tag
-	.4byte gFieldObjectBaseOam_16x8
-	.4byte gFieldEffectObjectImageAnimTable_BikeHopTallGrass
-	.4byte gFieldEffectObjectPicTable_BikeHopTallGrass
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_8156194
-
-	.align 2
-gFieldEffectObjectPicTable_SandFootprints:: @ 850CD08
-	obj_tiles gFieldEffectObjectPic_SandFootprints_0, 0x80
-	obj_tiles gFieldEffectObjectPic_SandFootprints_1, 0x80
-
-	.align 2
-gFieldEffectObjectImageAnim_850CD18:: @ 850CD18
-	obj_image_anim_frame 0, 1, OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnim_850CD20:: @ 850CD20
-	obj_image_anim_frame 0, 1
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnim_850CD28:: @ 850CD28
-	obj_image_anim_frame 1, 1
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnim_850CD30:: @ 850CD30
-	obj_image_anim_frame 1, 1, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_SandFootprints:: @ 850CD38
-	.4byte gFieldEffectObjectImageAnim_850CD18
-	.4byte gFieldEffectObjectImageAnim_850CD18
-	.4byte gFieldEffectObjectImageAnim_850CD20
-	.4byte gFieldEffectObjectImageAnim_850CD28
-	.4byte gFieldEffectObjectImageAnim_850CD30
-
-	.align 2
-gFieldEffectObjectTemplate_SandFootprints:: @ 850CD4C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1004 @ palette tag
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldEffectObjectImageAnimTable_SandFootprints
-	.4byte gFieldEffectObjectPicTable_SandFootprints
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_8154C60
-
-	.align 2
-gFieldEffectObjectPicTable_DeepSandFootprints:: @ 850CD64
-	obj_tiles gFieldEffectObjectPic_DeepSandFootprints_0, 0x80
-	obj_tiles gFieldEffectObjectPic_DeepSandFootprints_1, 0x80
-
-	.align 2
-gFieldEffectObjectImageAnim_850CD74:: @ 850CD74
-	obj_image_anim_frame 0, 1, OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnim_850CD7C:: @ 850CD7C
-	obj_image_anim_frame 0, 1
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnim_850CD84:: @ 850CD84
-	obj_image_anim_frame 1, 1
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnim_850CD8C:: @ 850CD8C
-	obj_image_anim_frame 1, 1, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_DeepSandFootprints:: @ 850CD94
-	.4byte gFieldEffectObjectImageAnim_850CD74
-	.4byte gFieldEffectObjectImageAnim_850CD74
-	.4byte gFieldEffectObjectImageAnim_850CD7C
-	.4byte gFieldEffectObjectImageAnim_850CD84
-	.4byte gFieldEffectObjectImageAnim_850CD8C
-
-	.align 2
-gFieldEffectObjectTemplate_DeepSandFootprints:: @ 850CDA8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1004 @ palette tag
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldEffectObjectImageAnimTable_DeepSandFootprints
-	.4byte gFieldEffectObjectPicTable_DeepSandFootprints
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_8154C60
-
-	.align 2
-gFieldEffectObjectPicTable_BikeTireTracks:: @ 850CDC0
-	obj_tiles gFieldEffectObjectPic_BikeTireTracks_0, 0x80
-	obj_tiles gFieldEffectObjectPic_BikeTireTracks_1, 0x80
-	obj_tiles gFieldEffectObjectPic_BikeTireTracks_2, 0x80
-	obj_tiles gFieldEffectObjectPic_BikeTireTracks_3, 0x80
-
-	.align 2
-gFieldEffectObjectImageAnim_850CDE0:: @ 850CDE0
-	obj_image_anim_frame 2, 1
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnim_850CDE8:: @ 850CDE8
-	obj_image_anim_frame 2, 1
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnim_850CDF0:: @ 850CDF0
-	obj_image_anim_frame 1, 1
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnim_850CDF8:: @ 850CDF8
-	obj_image_anim_frame 1, 1
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnim_850CE00:: @ 850CE00
-	obj_image_anim_frame 0, 1
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnim_850CE08:: @ 850CE08
-	obj_image_anim_frame 0, 1, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnim_850CE10:: @ 850CE10
-	obj_image_anim_frame 3, 1, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnim_850CE18:: @ 850CE18
-	obj_image_anim_frame 3, 1
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_BikeTireTracks:: @ 850CE20
-	.4byte gFieldEffectObjectImageAnim_850CDE0
-	.4byte gFieldEffectObjectImageAnim_850CDE0
-	.4byte gFieldEffectObjectImageAnim_850CDE8
-	.4byte gFieldEffectObjectImageAnim_850CDF0
-	.4byte gFieldEffectObjectImageAnim_850CDF8
-	.4byte gFieldEffectObjectImageAnim_850CE00
-	.4byte gFieldEffectObjectImageAnim_850CE08
-	.4byte gFieldEffectObjectImageAnim_850CE10
-	.4byte gFieldEffectObjectImageAnim_850CE18
-
-	.align 2
-gFieldEffectObjectTemplate_BikeTireTracks:: @ 850CE44
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1004 @ palette tag
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldEffectObjectImageAnimTable_BikeTireTracks
-	.4byte gFieldEffectObjectPicTable_BikeTireTracks
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_8154C60
-
-	.align 2
-gFieldEffectObjectPicTable_BikeHopBigSplash:: @ 850CE5C
-	obj_tiles gFieldEffectObjectPic_BikeHopBigSplash_0, 0x80
-	obj_tiles gFieldEffectObjectPic_BikeHopBigSplash_1, 0x80
-	obj_tiles gFieldEffectObjectPic_BikeHopBigSplash_2, 0x80
-	obj_tiles gFieldEffectObjectPic_BikeHopBigSplash_3, 0x80
-
-	.align 2
-gFieldEffectObjectImageAnim_850CE7C:: @ 850CE7C
-	obj_image_anim_frame 0, 8
-	obj_image_anim_frame 1, 8
-	obj_image_anim_frame 2, 8
-	obj_image_anim_frame 3, 8
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_BikeHopBigSplash:: @ 850CE90
-	.4byte gFieldEffectObjectImageAnim_850CE7C
-
-	.align 2
-gFieldEffectObjectTemplate_BikeHopBigSplash:: @ 850CE94
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1004 @ palette tag
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldEffectObjectImageAnimTable_BikeHopBigSplash
-	.4byte gFieldEffectObjectPicTable_BikeHopBigSplash
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_8156194
-
-	.align 2
-gFieldEffectObjectPicTable_Splash:: @ 850CEAC
-	obj_tiles gFieldEffectObjectPic_Splash_0, 0x40
-	obj_tiles gFieldEffectObjectPic_Splash_1, 0x40
-
-	.align 2
-gFieldEffectObjectImageAnim_850CEBC:: @ 850CEBC
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnim_850CEC8:: @ 850CEC8
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_frame 0, 6
-	obj_image_anim_frame 1, 6
-	obj_image_anim_frame 0, 8
-	obj_image_anim_frame 1, 8
-	obj_image_anim_frame 0, 6
-	obj_image_anim_frame 1, 6
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldEffectObjectImageAnimTable_Splash:: @ 850CEEC
-	.4byte gFieldEffectObjectImageAnim_850CEBC
-	.4byte gFieldEffectObjectImageAnim_850CEC8
-
-	.align 2
-gFieldEffectObjectTemplate_Splash:: @ 850CEF4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1004 @ palette tag
-	.4byte gFieldObjectBaseOam_16x8
-	.4byte gFieldEffectObjectImageAnimTable_Splash
-	.4byte gFieldEffectObjectPicTable_Splash
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_8154D90
-
-	.align 2
-gFieldEffectObjectPicTable_BikeHopSmallSplash:: @ 850CF0C
-	obj_tiles gFieldEffectObjectPic_BikeHopSmallSplash_0, 0x40
-	obj_tiles gFieldEffectObjectPic_BikeHopSmallSplash_1, 0x40
-	obj_tiles gFieldEffectObjectPic_BikeHopSmallSplash_2, 0x40
-
-	.align 2
-gFieldEffectObjectImageAnim_850CF24:: @ 850CF24
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_frame 2, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_BikeHopSmallSplash:: @ 850CF34
-	.4byte gFieldEffectObjectImageAnim_850CF24
-
-	.align 2
-gFieldEffectObjectTemplate_BikeHopSmallSplash:: @ 850CF38
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1004 @ palette tag
-	.4byte gFieldObjectBaseOam_16x8
-	.4byte gFieldEffectObjectImageAnimTable_BikeHopSmallSplash
-	.4byte gFieldEffectObjectPicTable_BikeHopSmallSplash
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_8156194
-
-	.align 2
-gFieldEffectObjectPicTable_LongGrass:: @ 850CF50
-	obj_tiles gFieldEffectObjectPic_LongGrass_0, 0x80
-	obj_tiles gFieldEffectObjectPic_LongGrass_1, 0x80
-	obj_tiles gFieldEffectObjectPic_LongGrass_2, 0x80
-	obj_tiles gFieldEffectObjectPic_LongGrass_3, 0x80
-
-	.align 2
-gFieldEffectObjectImageAnim_850CF70:: @ 850CF70
-	obj_image_anim_frame 1, 3
-	obj_image_anim_frame 2, 3
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 3, 4
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 3, 4
-	obj_image_anim_frame 0, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_LongGrass:: @ 850CF90
-	.4byte gFieldEffectObjectImageAnim_850CF70
-
-	.align 2
-gFieldEffectObjectTemplate_LongGrass:: @ 850CF94
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1005 @ palette tag
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldEffectObjectImageAnimTable_LongGrass
-	.4byte gFieldEffectObjectPicTable_LongGrass
-	.4byte gDummySpriteAffineAnimTable
-	.4byte unc_grass_tall
-
-	.align 2
-gFieldEffectObjectPicTable_Unknown16:: @ 850CFAC
-	obj_tiles gFieldEffectObjectPic_Unknown16_0, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown16_1, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown16_2, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown16_3, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown16_4, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown16_5, 0x80
-
-	.align 2
-gFieldEffectObjectImageAnim_850CFDC:: @ 850CFDC
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_frame 2, 8
-	obj_image_anim_frame 3, 8
-	obj_image_anim_frame 4, 8
-	obj_image_anim_frame 5, 8
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_Unknown16:: @ 850CFF8
-	.4byte gFieldEffectObjectImageAnim_850CFDC
-
-	.align 2
-gFieldEffectObjectTemplate_Unknown16:: @ 850CFFC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1005 @ palette tag
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldEffectObjectImageAnimTable_Unknown16
-	.4byte gFieldEffectObjectPicTable_Unknown16
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_8156194
-
-	.align 2
-gFieldEffectObjectPicTable_Unknown17:: @ 850D014
-	obj_tiles gFieldEffectObjectPic_Unknown16_5, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown17_0, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown17_1, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown17_2, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown17_3, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown17_4, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown17_5, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown17_6, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown17_7, 0x80
-
-	.align 2
-gFieldEffectObjectImageAnim_850D05C:: @ 850D05C
-	obj_image_anim_frame 0, 10
-	obj_image_anim_frame 1, 4
-	obj_image_anim_frame 2, 4
-	obj_image_anim_frame 3, 4
-	obj_image_anim_frame 4, 4
-	obj_image_anim_frame 5, 4
-	obj_image_anim_frame 6, 4
-	obj_image_anim_frame 7, 4
-	obj_image_anim_frame 8, 4
-	obj_image_anim_jump 7
-
-	.align 2
-gFieldEffectObjectImageAnimTable_Unknown17:: @ 850D084
-	.4byte gFieldEffectObjectImageAnim_850D05C
-
-	.align 2
-gFieldEffectObjectTemplate_Unknown17:: @ 850D088
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1005 @ palette tag
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldEffectObjectImageAnimTable_Unknown17
-	.4byte gFieldEffectObjectPicTable_Unknown17
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_81561D0
-
-	.align 2
-gFieldEffectObjectPicTable_Unknown18:: @ 850D0A0
-	obj_tiles gFieldEffectObjectPic_Unknown18_0, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown18_1, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown18_2, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown18_3, 0x80
-
-	.align 2
-gFieldEffectObjectImageAnim_850D0C0:: @ 850D0C0
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_frame 2, 4
-	obj_image_anim_frame 3, 4
-	obj_image_anim_frame 2, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldEffectObjectImageAnimTable_Unknown18:: @ 850D0DC
-	.4byte gFieldEffectObjectImageAnim_850D0C0
-
-	.align 2
-gFieldEffectObjectTemplate_Unknown18:: @ 850D0E0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1005 @ palette tag
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldEffectObjectImageAnimTable_Unknown18
-	.4byte gFieldEffectObjectPicTable_Unknown18
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_81561D0
-
-	.align 2
-gFieldEffectObjectPicTable_Unknown19:: @ 850D0F8
-	obj_tiles gFieldEffectObjectPic_Unknown19_0, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown19_1, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown19_2, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown19_3, 0x80
-
-	.align 2
-gFieldEffectObjectImageAnim_850D118:: @ 850D118
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_frame 2, 4
-	obj_image_anim_frame 3, 4
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldEffectObjectImageAnimTable_Unknown19:: @ 850D12C
-	.4byte gFieldEffectObjectImageAnim_850D118
-
-	.align 2
-gFieldEffectObjectTemplate_Unknown19:: @ 850D130
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1004 @ palette tag
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldEffectObjectImageAnimTable_Unknown19
-	.4byte gFieldEffectObjectPicTable_Unknown19
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_81561D0
-
-	.align 2
-gFieldEffectObjectPicTable_Unknown29:: @ 850D148
-	obj_tiles gFieldEffectObjectPic_Unknown29_0, 0x40
-	obj_tiles gFieldEffectObjectPic_Unknown29_1, 0x40
-	obj_tiles gFieldEffectObjectPic_Unknown29_2, 0x40
-
-	.align 2
-gFieldEffectObjectImageAnim_850D160:: @ 850D160
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_frame 2, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_Unknown29:: @ 850D170
-	.4byte gFieldEffectObjectImageAnim_850D160
-
-	.align 2
-gFieldEffectObjectTemplate_Unknown29:: @ 850D174
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1004 @ palette tag
-	.4byte gFieldObjectBaseOam_16x8
-	.4byte gFieldEffectObjectImageAnimTable_Unknown29
-	.4byte gFieldEffectObjectPicTable_Unknown29
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_81559BC
-
-	.align 2
-gFieldEffectObjectPicTable_Unknown20:: @ 850D18C
-	obj_tiles gFieldEffectObjectPic_Unknown20_0, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown20_1, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown20_2, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown20_3, 0x80
-
-	.align 2
-gFieldEffectObjectImageAnim_850D1AC:: @ 850D1AC
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_frame 2, 4
-	obj_image_anim_frame 3, 4
-	obj_image_anim_frame 2, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldEffectObjectImageAnimTable_Unknown20:: @ 850D1C8
-	.4byte gFieldEffectObjectImageAnim_850D1AC
-
-	.align 2
-gFieldEffectObjectTemplate_Unknown20:: @ 850D1CC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1004 @ palette tag
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldEffectObjectImageAnimTable_Unknown20
-	.4byte gFieldEffectObjectPicTable_Unknown20
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_81561D0
-
-	.align 2
-gFieldEffectObjectRotScalAnim_850D1E4:: @ 850D1E4
-	obj_rot_scal_anim_frame 0xFF00, 0x100, -128, 0
-	obj_rot_scal_anim_frame 0x1, 0x0, 0, 4
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 8
-	obj_rot_scal_anim_frame 0xFFFF, 0x0, 0, 4
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 8
-	obj_rot_scal_anim_frame 0xFFFF, 0x0, 0, 4
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 8
-	obj_rot_scal_anim_frame 0x1, 0x0, 0, 4
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 8
-	obj_rot_scal_anim_jump 1
-
-	.align 2
-gFieldEffectObjectRotScalAnim_850D234:: @ 850D234
-	obj_rot_scal_anim_frame 0x100, 0x100, -128, 0
-	obj_rot_scal_anim_frame 0xFFFF, 0x0, 0, 4
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 8
-	obj_rot_scal_anim_frame 0x1, 0x0, 0, 4
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 8
-	obj_rot_scal_anim_frame 0x1, 0x0, 0, 4
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 8
-	obj_rot_scal_anim_frame 0xFFFF, 0x0, 0, 4
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 8
-	obj_rot_scal_anim_jump 1
-
-	.align 2
-gFieldEffectObjectRotScalAnimTable_Unknown21:: @ 850D284
-	.4byte gFieldEffectObjectRotScalAnim_850D1E4
-	.4byte gFieldEffectObjectRotScalAnim_850D234
-
-	.align 2
-gFieldEffectObjectTemplate_Unknown21:: @ 850D28C
-	.2byte 0x0 @ tiles tag
-	.2byte 0xFFFF @ palette tag
-	.4byte gDummyOamData
-	.4byte gDummySpriteAnimTable
-	.4byte NULL
-	.4byte gFieldEffectObjectRotScalAnimTable_Unknown21
-	.4byte SpriteCallbackDummy
-
-	.align 2
-gFieldEffectObjectPicTable_BerryTreeGrowthSparkle:: @ 850D2A4
-	obj_tiles gFieldEffectObjectPic_BerryTreeGrowthSparkle_0, 0x80
-	obj_tiles gFieldEffectObjectPic_BerryTreeGrowthSparkle_1, 0x80
-	obj_tiles gFieldEffectObjectPic_BerryTreeGrowthSparkle_2, 0x80
-	obj_tiles gFieldEffectObjectPic_BerryTreeGrowthSparkle_3, 0x80
-	obj_tiles gFieldEffectObjectPic_BerryTreeGrowthSparkle_4, 0x80
-	obj_tiles gFieldEffectObjectPic_BerryTreeGrowthSparkle_5, 0x80
-
-	.align 2
-gFieldEffectObjectImageAnim_850D2D4:: @ 850D2D4
-	obj_image_anim_frame 0, 8
-	obj_image_anim_frame 1, 8
-	obj_image_anim_frame 2, 8
-	obj_image_anim_frame 3, 8
-	obj_image_anim_frame 4, 8
-	obj_image_anim_frame 5, 8
-	obj_image_anim_loop 0
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_frame 2, 4
-	obj_image_anim_frame 3, 4
-	obj_image_anim_frame 4, 4
-	obj_image_anim_frame 5, 4
-	obj_image_anim_loop 3
-	obj_image_anim_frame 0, 8
-	obj_image_anim_frame 1, 8
-	obj_image_anim_frame 2, 8
-	obj_image_anim_frame 3, 8
-	obj_image_anim_frame 4, 8
-	obj_image_anim_frame 5, 8
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_BerryTreeGrowthSparkle:: @ 850D328
-	.4byte gFieldEffectObjectImageAnim_850D2D4
-
-	.align 2
-gFieldEffectObjectTemplate_BerryTreeGrowthSparkle:: @ 850D32C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0xFFFF @ palette tag
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldEffectObjectImageAnimTable_BerryTreeGrowthSparkle
-	.4byte gFieldEffectObjectPicTable_BerryTreeGrowthSparkle
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_81561D0
-
-	.align 2
-gFieldEffectObjectPicTable_TreeDisguise:: @ 850D344
-	obj_tiles gFieldEffectObjectPic_TreeDisguise_0, 0x100
-	obj_tiles gFieldEffectObjectPic_TreeDisguise_1, 0x100
-	obj_tiles gFieldEffectObjectPic_TreeDisguise_2, 0x100
-	obj_tiles gFieldEffectObjectPic_TreeDisguise_3, 0x100
-	obj_tiles gFieldEffectObjectPic_TreeDisguise_4, 0x100
-	obj_tiles gFieldEffectObjectPic_TreeDisguise_5, 0x100
-	obj_tiles gFieldEffectObjectPic_TreeDisguise_6, 0x100
-
-	.align 2
-gFieldEffectObjectImageAnim_850D37C:: @ 850D37C
-	obj_image_anim_frame 0, 16
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnim_850D384:: @ 850D384
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_frame 2, 4
-	obj_image_anim_frame 3, 4
-	obj_image_anim_frame 4, 4
-	obj_image_anim_frame 5, 4
-	obj_image_anim_frame 6, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_TreeDisguise:: @ 850D3A4
-	.4byte gFieldEffectObjectImageAnim_850D37C
-	.4byte gFieldEffectObjectImageAnim_850D384
-
-	.align 2
-gFieldEffectObjectTemplate_TreeDisguise:: @ 850D3AC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0xFFFF @ palette tag
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldEffectObjectImageAnimTable_TreeDisguise
-	.4byte gFieldEffectObjectPicTable_TreeDisguise
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_8155C88
-
-	.align 2
-gFieldEffectObjectPicTable_MountainDisguise:: @ 850D3C4
-	obj_tiles gFieldEffectObjectPic_MountainDisguise_0, 0x100
-	obj_tiles gFieldEffectObjectPic_MountainDisguise_1, 0x100
-	obj_tiles gFieldEffectObjectPic_MountainDisguise_2, 0x100
-	obj_tiles gFieldEffectObjectPic_MountainDisguise_3, 0x100
-	obj_tiles gFieldEffectObjectPic_MountainDisguise_4, 0x100
-	obj_tiles gFieldEffectObjectPic_MountainDisguise_5, 0x100
-	obj_tiles gFieldEffectObjectPic_MountainDisguise_6, 0x100
-
-	.align 2
-gFieldEffectObjectImageAnim_850D3FC:: @ 850D3FC
-	obj_image_anim_frame 0, 16
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnim_850D404:: @ 850D404
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_frame 2, 4
-	obj_image_anim_frame 3, 4
-	obj_image_anim_frame 4, 4
-	obj_image_anim_frame 5, 4
-	obj_image_anim_frame 6, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_MountainDisguise:: @ 850D424
-	.4byte gFieldEffectObjectImageAnim_850D3FC
-	.4byte gFieldEffectObjectImageAnim_850D404
-
-	.align 2
-gFieldEffectObjectTemplate_MountainDisguise:: @ 850D42C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0xFFFF @ palette tag
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldEffectObjectImageAnimTable_MountainDisguise
-	.4byte gFieldEffectObjectPicTable_MountainDisguise
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_8155C88
-
-	.align 2
-gFieldEffectObjectPicTable_SandDisguisePlaceholder:: @ 850D444
-	obj_tiles gFieldEffectObjectPic_SandDisguisePlaceholder_0, 0x100
-	obj_tiles gFieldEffectObjectPic_SandDisguisePlaceholder_1, 0x100
-	obj_tiles gFieldEffectObjectPic_SandDisguisePlaceholder_2, 0x100
-	obj_tiles gFieldEffectObjectPic_SandDisguisePlaceholder_3, 0x100
-	obj_tiles gFieldEffectObjectPic_SandDisguisePlaceholder_4, 0x100
-	obj_tiles gFieldEffectObjectPic_SandDisguisePlaceholder_5, 0x100
-	obj_tiles gFieldEffectObjectPic_SandDisguisePlaceholder_6, 0x100
-
-	.align 2
-gFieldEffectObjectTemplate_SandDisguisePlaceholder:: @ 850D47C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0xFFFF @ palette tag
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldEffectObjectImageAnimTable_TreeDisguise
-	.4byte gFieldEffectObjectPicTable_SandDisguisePlaceholder
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_8155C88
-
-	.align 2
-gFieldEffectObjectPicTable_Bird:: @ 850D494
-	obj_tiles gFieldEffectObjectPic_Bird, 0x200
-
-	.align 2
-gFieldEffectObjectImageAnim_850D49C:: @ 850D49C
-	obj_image_anim_frame 0, 1
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_Bird:: @ 850D4A4
-	.4byte gFieldEffectObjectImageAnim_850D49C
-
-	.align 2
-gFieldEffectObjectTemplate_Bird:: @ 850D4A8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0xFFFF @ palette tag
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldEffectObjectImageAnimTable_Bird
-	.4byte gFieldEffectObjectPicTable_Bird
-	.4byte gDummySpriteAffineAnimTable
-	.4byte SpriteCallbackDummy
-
-	.align 2
-gFieldEffectObjectPicTable_ShortGrass:: @ 850D4C0
-	obj_tiles gFieldEffectObjectPic_ShortGrass_0, 0x80
-	obj_tiles gFieldEffectObjectPic_ShortGrass_1, 0x80
-
-	.align 2
-gFieldEffectObjectImageAnim_850D4D0:: @ 850D4D0
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_ShortGrass:: @ 850D4DC
-	.4byte gFieldEffectObjectImageAnim_850D4D0
-
-	.align 2
-gFieldEffectObjectTemplate_ShortGrass:: @ 850D4E0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1005 @ palette tag
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldEffectObjectImageAnimTable_ShortGrass
-	.4byte gFieldEffectObjectPicTable_ShortGrass
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_8154A10
-
-	.align 2
-gFieldEffectObjectPicTable_HotSpringsWater:: @ 850D4F8
-	obj_tiles gFieldEffectObjectPic_HotSpringsWater, 0x80
-
-	.align 2
-gFieldEffectObjectImageAnim_850D500:: @ 850D500
-	obj_image_anim_frame 0, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_HotSpringsWater:: @ 850D508
-	.4byte gFieldEffectObjectImageAnim_850D500
-
-	.align 2
-gFieldEffectObjectTemplate_HotSpringsWater:: @ 850D50C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1005 @ palette tag
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldEffectObjectImageAnimTable_HotSpringsWater
-	.4byte gFieldEffectObjectPicTable_HotSpringsWater
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_8155158
-
-	.align 2
-gFieldEffectObjectPicTable_JumpOutOfAsh:: @ 850D524
-	obj_tiles gFieldEffectObjectPic_JumpOutOfAsh_0, 0x80
-	obj_tiles gFieldEffectObjectPic_JumpOutOfAsh_1, 0x80
-	obj_tiles gFieldEffectObjectPic_JumpOutOfAsh_2, 0x80
-	obj_tiles gFieldEffectObjectPic_JumpOutOfAsh_3, 0x80
-	obj_tiles gFieldEffectObjectPic_JumpOutOfAsh_4, 0x80
-
-	.align 2
-gFieldEffectObjectImageAnim_850D54C:: @ 850D54C
-	obj_image_anim_frame 0, 6
-	obj_image_anim_frame 1, 6
-	obj_image_anim_frame 2, 6
-	obj_image_anim_frame 3, 6
-	obj_image_anim_frame 4, 6
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_JumpOutOfAsh:: @ 850D564
-	.4byte gFieldEffectObjectImageAnim_850D54C
-
-	.align 2
-gFieldEffectObjectTemplate_JumpOutOfAsh:: @ 850D568
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x100D @ palette tag
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldEffectObjectImageAnimTable_JumpOutOfAsh
-	.4byte gFieldEffectObjectPicTable_JumpOutOfAsh
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_80B7CAC
-
-	.align 2
-gFieldEffectObjectPaletteInfo2:: @ 850D580
-	obj_pal gFieldEffectObjectPalette2, 0x100D
-
-	.align 2
-gFieldEffectObjectPicTable_Unknown33:: @ 850D588
-	obj_tiles gFieldEffectObjectPic_Unknown33_0, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown33_1, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown33_2, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown33_3, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown33_4, 0x80
-
-	.align 2
-gFieldEffectObjectImageAnim_850D5B0:: @ 850D5B0
-	obj_image_anim_frame 0, 6
-	obj_image_anim_frame 1, 6
-	obj_image_anim_frame 2, 6
-	obj_image_anim_frame 3, 6
-	obj_image_anim_frame 4, 6
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_Unknown33:: @ 850D5C8
-	.4byte gFieldEffectObjectImageAnim_850D5B0
-
-	.align 2
-gFieldEffectObjectTemplate_Unknown33:: @ 850D5CC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x100D @ palette tag
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldEffectObjectImageAnimTable_Unknown33
-	.4byte gFieldEffectObjectPicTable_Unknown33
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_80B7A58
-
-	.align 2
-gFieldEffectObjectPicTable_Bubbles:: @ 850D5E4
-	obj_tiles gFieldEffectObjectPic_Bubbles_0, 0x100
-	obj_tiles gFieldEffectObjectPic_Bubbles_1, 0x100
-	obj_tiles gFieldEffectObjectPic_Bubbles_2, 0x100
-	obj_tiles gFieldEffectObjectPic_Bubbles_3, 0x100
-	obj_tiles gFieldEffectObjectPic_Bubbles_4, 0x100
-	obj_tiles gFieldEffectObjectPic_Bubbles_5, 0x100
-	obj_tiles gFieldEffectObjectPic_Bubbles_6, 0x100
-	obj_tiles gFieldEffectObjectPic_Bubbles_7, 0x100
-
-	.align 2
-gFieldEffectObjectImageAnim_850D624:: @ 850D624
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_frame 2, 4
-	obj_image_anim_frame 3, 6
-	obj_image_anim_frame 4, 6
-	obj_image_anim_frame 5, 4
-	obj_image_anim_frame 6, 4
-	obj_image_anim_frame 7, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_Bubbles:: @ 850D648
-	.4byte gFieldEffectObjectImageAnim_850D624
-
-	.align 2
-gFieldEffectObjectTemplate_Bubbles:: @ 850D64C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1004 @ palette tag
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldEffectObjectImageAnimTable_Bubbles
-	.4byte gFieldEffectObjectPicTable_Bubbles
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_8155AEC
-
-	.align 2
-gFieldEffectObjectPicTable_Unknown35:: @ 850D664
-	obj_tiles gFieldEffectObjectPic_Unknown35_0, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown35_1, 0x80
-
-	.align 2
-gFieldEffectObjectImageAnim_850D674:: @ 850D674
-	obj_image_anim_frame 0, 3
-	obj_image_anim_frame 1, 5
-	obj_image_anim_frame 0, 5
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_Unknown35:: @ 850D684
-	.4byte gFieldEffectObjectImageAnim_850D674
-
-	.align 2
-gFieldEffectObjectTemplate_Unknown35:: @ 850D688
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x100F @ palette tag
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldEffectObjectImageAnimTable_Unknown35
-	.4byte gFieldEffectObjectPicTable_Unknown35
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_8155E50
-
-	.align 2
-gFieldEffectObjectPaletteInfo3:: @ 850D6A0
-	obj_pal gFieldEffectObjectPalette3, 0x100F
-
-	.align 2
-gFieldEffectObjectImageAnim_850D6A8:: @ 850D6A8
-	obj_image_anim_frame 0, 1
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_Rayquaza:: @ 850D6B0
-	.4byte gFieldEffectObjectImageAnim_850D6A8
-
-	.align 2
-gFieldEffectObjectPicTable_Rayquaza:: @ 850D6B4
-	obj_tiles gFieldObjectPic_Rayquaza_0, 0x200
-
-	.align 2
-gFieldEffectObjectTemplate_Rayquaza:: @ 850D6BC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0xFFFF @ palette tag
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldEffectObjectImageAnimTable_Rayquaza
-	.4byte gFieldEffectObjectPicTable_Rayquaza
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_8155F80
diff --git a/data/graphics/field_objects/field_object_anims.inc b/data/graphics/field_objects/field_object_anims.inc
deleted file mode 100644
index d75df6d9d..000000000
--- a/data/graphics/field_objects/field_object_anims.inc
+++ /dev/null
@@ -1,1029 +0,0 @@
-	.align 2
-gFieldObjectImageAnim_StayStill:: @ 85089FC
-	obj_image_anim_frame 0, 8
-	obj_image_anim_frame 0, 8
-	obj_image_anim_frame 0, 8
-	obj_image_anim_frame 0, 8
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_QuintyPlumpFaceSouth:: @ 8508A10
-	obj_image_anim_frame 0, 16
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_QuintyPlumpFaceNorth:: @ 8508A18
-	obj_image_anim_frame 1, 16
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_QuintyPlumpFaceWest:: @ 8508A20
-	obj_image_anim_frame 2, 16
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_QuintyPlumpFaceEast:: @ 8508A28
-	obj_image_anim_frame 2, 16, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_QuintyPlumpGoSouth:: @ 8508A30
-	obj_image_anim_frame 3, 8
-	obj_image_anim_frame 0, 8
-	obj_image_anim_frame 3, 8, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 0, 8
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_QuintyPlumpGoNorth:: @ 8508A44
-	obj_image_anim_frame 4, 8
-	obj_image_anim_frame 1, 8
-	obj_image_anim_frame 4, 8, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 1, 8
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_QuintyPlumpGoWest:: @ 8508A58
-	obj_image_anim_frame 5, 8
-	obj_image_anim_frame 2, 8
-	obj_image_anim_frame 6, 8
-	obj_image_anim_frame 2, 8
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_QuintyPlumpGoEast:: @ 8508A6C
-	obj_image_anim_frame 5, 8, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 2, 8, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 6, 8, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 2, 8, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_QuintyPlumpGoFastSouth:: @ 8508A80
-	obj_image_anim_frame 3, 4
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 3, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 0, 4
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_QuintyPlumpGoFastNorth:: @ 8508A94
-	obj_image_anim_frame 4, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_frame 4, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 1, 4
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_QuintyPlumpGoFastWest:: @ 8508AA8
-	obj_image_anim_frame 5, 4
-	obj_image_anim_frame 2, 4
-	obj_image_anim_frame 6, 4
-	obj_image_anim_frame 2, 4
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_QuintyPlumpGoFastEast:: @ 8508ABC
-	obj_image_anim_frame 5, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 6, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_QuintyPlumpGoFasterSouth:: @ 8508AD0
-	obj_image_anim_frame 3, 2
-	obj_image_anim_frame 0, 2
-	obj_image_anim_frame 3, 2, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 0, 2
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_QuintyPlumpGoFasterNorth:: @ 8508AE4
-	obj_image_anim_frame 4, 2
-	obj_image_anim_frame 1, 2
-	obj_image_anim_frame 4, 2, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 1, 2
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_QuintyPlumpGoFasterWest:: @ 8508AF8
-	obj_image_anim_frame 5, 2
-	obj_image_anim_frame 2, 2
-	obj_image_anim_frame 6, 2
-	obj_image_anim_frame 2, 2
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_QuintyPlumpGoFasterEast:: @ 8508B0C
-	obj_image_anim_frame 5, 2, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 2, 2, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 6, 2, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 2, 2, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_QuintyPlumpGoFastestSouth:: @ 8508B20
-	obj_image_anim_frame 3, 1
-	obj_image_anim_frame 0, 1
-	obj_image_anim_frame 3, 1, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 0, 1
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_QuintyPlumpGoFastestNorth:: @ 8508B34
-	obj_image_anim_frame 4, 1
-	obj_image_anim_frame 1, 1
-	obj_image_anim_frame 4, 1, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 1, 1
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_QuintyPlumpGoFastestWest:: @ 8508B48
-	obj_image_anim_frame 5, 1
-	obj_image_anim_frame 2, 1
-	obj_image_anim_frame 6, 1
-	obj_image_anim_frame 2, 1
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_QuintyPlumpGoFastestEast:: @ 8508B5C
-	obj_image_anim_frame 5, 1, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 2, 1, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 6, 1, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 2, 1, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_FaceSouth:: @ 8508B70
-	obj_image_anim_frame 0, 16
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_FaceNorth:: @ 8508B78
-	obj_image_anim_frame 1, 16
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_FaceWest:: @ 8508B80
-	obj_image_anim_frame 2, 16
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_FaceEast:: @ 8508B88
-	obj_image_anim_frame 2, 16, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_GoSouth:: @ 8508B90
-	obj_image_anim_frame 3, 8
-	obj_image_anim_frame 0, 8
-	obj_image_anim_frame 4, 8
-	obj_image_anim_frame 0, 8
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_GoNorth:: @ 8508BA4
-	obj_image_anim_frame 5, 8
-	obj_image_anim_frame 1, 8
-	obj_image_anim_frame 6, 8
-	obj_image_anim_frame 1, 8
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_GoWest:: @ 8508BB8
-	obj_image_anim_frame 7, 8
-	obj_image_anim_frame 2, 8
-	obj_image_anim_frame 8, 8
-	obj_image_anim_frame 2, 8
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_GoEast:: @ 8508BCC
-	obj_image_anim_frame 7, 8, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 2, 8, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 8, 8, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 2, 8, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_GoFastSouth:: @ 8508BE0
-	obj_image_anim_frame 3, 4
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 4, 4
-	obj_image_anim_frame 0, 4
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_GoFastNorth:: @ 8508BF4
-	obj_image_anim_frame 5, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_frame 6, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_GoFastWest:: @ 8508C08
-	obj_image_anim_frame 7, 4
-	obj_image_anim_frame 2, 4
-	obj_image_anim_frame 8, 4
-	obj_image_anim_frame 2, 4
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_GoFastEast:: @ 8508C1C
-	obj_image_anim_frame 7, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 8, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_GoFasterSouth:: @ 8508C30
-	obj_image_anim_frame 3, 2
-	obj_image_anim_frame 0, 2
-	obj_image_anim_frame 4, 2
-	obj_image_anim_frame 0, 2
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_GoFasterNorth:: @ 8508C44
-	obj_image_anim_frame 5, 2
-	obj_image_anim_frame 1, 2
-	obj_image_anim_frame 6, 2
-	obj_image_anim_frame 1, 2
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_GoFasterWest:: @ 8508C58
-	obj_image_anim_frame 7, 2
-	obj_image_anim_frame 2, 2
-	obj_image_anim_frame 8, 2
-	obj_image_anim_frame 2, 2
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_GoFasterEast:: @ 8508C6C
-	obj_image_anim_frame 7, 2, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 2, 2, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 8, 2, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 2, 2, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_GoFastestSouth:: @ 8508C80
-	obj_image_anim_frame 3, 1
-	obj_image_anim_frame 0, 1
-	obj_image_anim_frame 4, 1
-	obj_image_anim_frame 0, 1
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_GoFastestNorth:: @ 8508C94
-	obj_image_anim_frame 5, 1
-	obj_image_anim_frame 1, 1
-	obj_image_anim_frame 6, 1
-	obj_image_anim_frame 1, 1
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_GoFastestWest:: @ 8508CA8
-	obj_image_anim_frame 7, 1
-	obj_image_anim_frame 2, 1
-	obj_image_anim_frame 8, 1
-	obj_image_anim_frame 2, 1
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_GoFastestEast:: @ 8508CBC
-	obj_image_anim_frame 7, 1, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 2, 1, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 8, 1, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 2, 1, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_RunSouth:: @ 8508CD0
-	obj_image_anim_frame 12, 5
-	obj_image_anim_frame 9, 3
-	obj_image_anim_frame 13, 5
-	obj_image_anim_frame 9, 3
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_RunNorth:: @ 8508CE4
-	obj_image_anim_frame 14, 5
-	obj_image_anim_frame 10, 3
-	obj_image_anim_frame 15, 5
-	obj_image_anim_frame 10, 3
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_RunWest:: @ 8508CF8
-	obj_image_anim_frame 16, 5
-	obj_image_anim_frame 11, 3
-	obj_image_anim_frame 17, 5
-	obj_image_anim_frame 11, 3
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_RunEast:: @ 8508D0C
-	obj_image_anim_frame 16, 5, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 11, 3, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 17, 5, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 11, 3, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_FieldMove:: @ 8508D20
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_frame 2, 4
-	obj_image_anim_frame 3, 4
-	obj_image_anim_frame 4, 8
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_GetOnOffSurfBlobSouth:: @ 8508D38
-	obj_image_anim_frame 9, 32
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_GetOnOffSurfBlobNorth:: @ 8508D40
-	obj_image_anim_frame 10, 32
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_GetOnOffSurfBlobWest:: @ 8508D48
-	obj_image_anim_frame 11, 32
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_GetOnOffSurfBlobEast:: @ 8508D50
-	obj_image_anim_frame 11, 32, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_BunnyHoppyBackWheelSouth:: @ 8508D58
-	obj_image_anim_frame 9, 4
-	obj_image_anim_frame 10, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_BunnyHoppyBackWheelNorth:: @ 8508D64
-	obj_image_anim_frame 13, 4
-	obj_image_anim_frame 14, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_BunnyHoppyBackWheelWest:: @ 8508D70
-	obj_image_anim_frame 17, 4
-	obj_image_anim_frame 18, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_BunnyHoppyBackWheelEast:: @ 8508D7C
-	obj_image_anim_frame 17, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 18, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_BunnyHoppyFrontWheelSouth:: @ 8508D88
-	obj_image_anim_frame 11, 4
-	obj_image_anim_frame 12, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_BunnyHoppyFrontWheelNorth:: @ 8508D94
-	obj_image_anim_frame 15, 4
-	obj_image_anim_frame 16, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_BunnyHoppyFrontWheelWest:: @ 8508DA0
-	obj_image_anim_frame 19, 4
-	obj_image_anim_frame 20, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_BunnyHoppyFrontWheelEast:: @ 8508DAC
-	obj_image_anim_frame 19, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 20, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_StandingWheelieBackWheelSouth:: @ 8508DB8
-	obj_image_anim_frame 9, 4
-	obj_image_anim_frame 0, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_StandingWheelieBackWheelNorth:: @ 8508DC4
-	obj_image_anim_frame 13, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_StandingWheelieBackWheelWest:: @ 8508DD0
-	obj_image_anim_frame 17, 4
-	obj_image_anim_frame 2, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_StandingWheelieBackWheelEast:: @ 8508DDC
-	obj_image_anim_frame 17, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_StandingWheelieFrontWheelSouth:: @ 8508DE8
-	obj_image_anim_frame 11, 4
-	obj_image_anim_frame 0, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_StandingWheelieFrontWheelNorth:: @ 8508DF4
-	obj_image_anim_frame 15, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_StandingWheelieFrontWheelWest:: @ 8508E00
-	obj_image_anim_frame 19, 4
-	obj_image_anim_frame 2, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_StandingWheelieFrontWheelEast:: @ 8508E0C
-	obj_image_anim_frame 19, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_MovingWheelieSouth:: @ 8508E18
-	obj_image_anim_frame 21, 4
-	obj_image_anim_frame 10, 4
-	obj_image_anim_frame 22, 4
-	obj_image_anim_frame 10, 4
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_MovingWheelieNorth:: @ 8508E2C
-	obj_image_anim_frame 23, 4
-	obj_image_anim_frame 14, 4
-	obj_image_anim_frame 24, 4
-	obj_image_anim_frame 14, 4
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_MovingWheelieWest:: @ 8508E40
-	obj_image_anim_frame 25, 4
-	obj_image_anim_frame 18, 4
-	obj_image_anim_frame 26, 4
-	obj_image_anim_frame 18, 4
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_MovingWheelieEast:: @ 8508E54
-	obj_image_anim_frame 25, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 18, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 26, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 18, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_BerryTreeStage0:: @ 8508E68
-	obj_image_anim_frame 0, 32
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_BerryTreeStage1:: @ 8508E70
-	obj_image_anim_frame 1, 32
-	obj_image_anim_frame 2, 32
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_BerryTreeStage2:: @ 8508E7C
-	obj_image_anim_frame 3, 48
-	obj_image_anim_frame 4, 48
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_BerryTreeStage3:: @ 8508E88
-	obj_image_anim_frame 5, 32
-	obj_image_anim_frame 5, 32
-	obj_image_anim_frame 6, 32
-	obj_image_anim_frame 6, 32
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_BerryTreeStage4:: @ 8508E9C
-	obj_image_anim_frame 7, 48
-	obj_image_anim_frame 7, 48
-	obj_image_anim_frame 8, 48
-	obj_image_anim_frame 8, 48
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_NurseBow:: @ 8508EB0
-	obj_image_anim_frame 0, 8
-	obj_image_anim_frame 9, 32
-	obj_image_anim_frame 0, 8
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_RockBreak:: @ 8508EC0
-	obj_image_anim_frame 0, 8
-	obj_image_anim_frame 1, 8
-	obj_image_anim_frame 2, 8
-	obj_image_anim_frame 3, 8
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_TreeCut:: @ 8508ED4
-	obj_image_anim_frame 0, 6
-	obj_image_anim_frame 1, 6
-	obj_image_anim_frame 2, 6
-	obj_image_anim_frame 3, 6
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_TakeOutRodSouth:: @ 8508EE8
-	obj_image_anim_frame 8, 4
-	obj_image_anim_frame 9, 4
-	obj_image_anim_frame 10, 4
-	obj_image_anim_frame 11, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_TakeOutRodNorth:: @ 8508EFC
-	obj_image_anim_frame 4, 4
-	obj_image_anim_frame 5, 4
-	obj_image_anim_frame 6, 4
-	obj_image_anim_frame 7, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_TakeOutRodWest:: @ 8508F10
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_frame 2, 4
-	obj_image_anim_frame 3, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_TakeOutRodEast:: @ 8508F24
-	obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 1, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 3, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_PutAwayRodSouth:: @ 8508F38
-	obj_image_anim_frame 11, 4
-	obj_image_anim_frame 10, 6
-	obj_image_anim_frame 9, 6
-	obj_image_anim_frame 8, 6
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_PutAwayRodNorth:: @ 8508F4C
-	obj_image_anim_frame 7, 4
-	obj_image_anim_frame 6, 6
-	obj_image_anim_frame 5, 6
-	obj_image_anim_frame 4, 6
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_PutAwayRodWest:: @ 8508F60
-	obj_image_anim_frame 3, 4
-	obj_image_anim_frame 2, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_frame 0, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_PutAwayRodEast:: @ 8508F74
-	obj_image_anim_frame 3, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 1, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_HookedPokemonSouth:: @ 8508F88
-	obj_image_anim_frame 10, 6
-	obj_image_anim_frame 11, 6
-	obj_image_anim_loop 1
-	obj_image_anim_frame 11, 30
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_HookedPokemonNorth:: @ 8508F9C
-	obj_image_anim_frame 6, 6
-	obj_image_anim_frame 7, 6
-	obj_image_anim_loop 1
-	obj_image_anim_frame 7, 30
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_HookedPokemonWest:: @ 8508FB0
-	obj_image_anim_frame 2, 6
-	obj_image_anim_frame 3, 6
-	obj_image_anim_loop 1
-	obj_image_anim_frame 3, 30
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_HookedPokemonEast:: @ 8508FC4
-	obj_image_anim_frame 2, 6, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 3, 6, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_loop 1
-	obj_image_anim_frame 3, 30, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectRotScalAnim_8508FD8:: @ 8508FD8
-	obj_rot_scal_anim_frame 0x0, 0x0, 1, 1
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 1
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 1
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 1
-	obj_rot_scal_anim_loop 7
-	obj_rot_scal_anim_jump 0
-
-	.align 2
-gFieldObjectRotScalAnim_8509008:: @ 8509008
-	obj_rot_scal_anim_frame 0x0, 0x0, -1, 1
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 1
-	obj_rot_scal_anim_loop 15
-	obj_rot_scal_anim_frame 0x0, 0x0, 1, 1
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 1
-	obj_rot_scal_anim_loop 15
-	obj_rot_scal_anim_jump 0
-
-	.align 2
-gFieldObjectRotScalAnim_8509040:: @ 8509040
-	obj_rot_scal_anim_frame 0x100, 0x100, 10, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gFieldObjectRotScalAnim_8509050:: @ 8509050
-	obj_rot_scal_anim_frame 0x100, 0x100, 10, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gFieldObjectRotScalAnim_8509060:: @ 8509060
-	obj_rot_scal_anim_frame 0x0, 0x0, -1, 1
-	obj_rot_scal_anim_loop 8
-	obj_rot_scal_anim_end
-
-	.align 2
-gFieldObjectRotScalAnim_8509078:: @ 8509078
-	obj_rot_scal_anim_frame 0x0, 0x0, 1, 1
-	obj_rot_scal_anim_loop 8
-	obj_rot_scal_anim_end
-
-	.align 2
-gFieldObjectImageAnim_HoOhFlapWings:: @ 8509090
-	obj_image_anim_frame 3, 8
-	obj_image_anim_frame 4, 8
-	obj_image_anim_frame 3, 8
-	obj_image_anim_frame 4, 8
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_HoOhStayStill:: @ 85090A4
-	obj_image_anim_frame 3, 16
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnimTable_Inanimate:: @ 85090AC
-	.4byte gFieldObjectImageAnim_StayStill
-
-	.align 2
-gFieldObjectImageAnimTable_QuintyPlump:: @ 85090B0
-	.4byte gFieldObjectImageAnim_QuintyPlumpFaceSouth
-	.4byte gFieldObjectImageAnim_QuintyPlumpFaceNorth
-	.4byte gFieldObjectImageAnim_QuintyPlumpFaceWest
-	.4byte gFieldObjectImageAnim_QuintyPlumpFaceEast
-	.4byte gFieldObjectImageAnim_QuintyPlumpGoSouth
-	.4byte gFieldObjectImageAnim_QuintyPlumpGoNorth
-	.4byte gFieldObjectImageAnim_QuintyPlumpGoWest
-	.4byte gFieldObjectImageAnim_QuintyPlumpGoEast
-	.4byte gFieldObjectImageAnim_QuintyPlumpGoFastSouth
-	.4byte gFieldObjectImageAnim_QuintyPlumpGoFastNorth
-	.4byte gFieldObjectImageAnim_QuintyPlumpGoFastWest
-	.4byte gFieldObjectImageAnim_QuintyPlumpGoFastEast
-	.4byte gFieldObjectImageAnim_QuintyPlumpGoFasterSouth
-	.4byte gFieldObjectImageAnim_QuintyPlumpGoFasterNorth
-	.4byte gFieldObjectImageAnim_QuintyPlumpGoFasterWest
-	.4byte gFieldObjectImageAnim_QuintyPlumpGoFasterEast
-	.4byte gFieldObjectImageAnim_QuintyPlumpGoFastestSouth
-	.4byte gFieldObjectImageAnim_QuintyPlumpGoFastestNorth
-	.4byte gFieldObjectImageAnim_QuintyPlumpGoFastestWest
-	.4byte gFieldObjectImageAnim_QuintyPlumpGoFastestEast
-
-	.align 2
-gFieldObjectImageAnimTable_Standard:: @ 8509100
-	.4byte gFieldObjectImageAnim_FaceSouth
-	.4byte gFieldObjectImageAnim_FaceNorth
-	.4byte gFieldObjectImageAnim_FaceWest
-	.4byte gFieldObjectImageAnim_FaceEast
-	.4byte gFieldObjectImageAnim_GoSouth
-	.4byte gFieldObjectImageAnim_GoNorth
-	.4byte gFieldObjectImageAnim_GoWest
-	.4byte gFieldObjectImageAnim_GoEast
-	.4byte gFieldObjectImageAnim_GoFastSouth
-	.4byte gFieldObjectImageAnim_GoFastNorth
-	.4byte gFieldObjectImageAnim_GoFastWest
-	.4byte gFieldObjectImageAnim_GoFastEast
-	.4byte gFieldObjectImageAnim_GoFasterSouth
-	.4byte gFieldObjectImageAnim_GoFasterNorth
-	.4byte gFieldObjectImageAnim_GoFasterWest
-	.4byte gFieldObjectImageAnim_GoFasterEast
-	.4byte gFieldObjectImageAnim_GoFastestSouth
-	.4byte gFieldObjectImageAnim_GoFastestNorth
-	.4byte gFieldObjectImageAnim_GoFastestWest
-	.4byte gFieldObjectImageAnim_GoFastestEast
-
-	.align 2
-gFieldObjectImageAnimTable_HoOh:: @ 8509150
-	.4byte gFieldObjectImageAnim_FaceSouth
-	.4byte gFieldObjectImageAnim_FaceNorth
-	.4byte gFieldObjectImageAnim_FaceWest
-	.4byte gFieldObjectImageAnim_FaceEast
-	.4byte gFieldObjectImageAnim_HoOhFlapWings
-	.4byte gFieldObjectImageAnim_HoOhStayStill
-	.4byte gFieldObjectImageAnim_GoWest
-	.4byte gFieldObjectImageAnim_GoEast
-	.4byte gFieldObjectImageAnim_GoFastSouth
-	.4byte gFieldObjectImageAnim_GoFastNorth
-	.4byte gFieldObjectImageAnim_GoFastWest
-	.4byte gFieldObjectImageAnim_GoFastEast
-	.4byte gFieldObjectImageAnim_GoFasterSouth
-	.4byte gFieldObjectImageAnim_GoFasterNorth
-	.4byte gFieldObjectImageAnim_GoFasterWest
-	.4byte gFieldObjectImageAnim_GoFasterEast
-	.4byte gFieldObjectImageAnim_GoFastestSouth
-	.4byte gFieldObjectImageAnim_GoFastestNorth
-	.4byte gFieldObjectImageAnim_GoFastestWest
-	.4byte gFieldObjectImageAnim_GoFastestEast
-
-	.align 2
-gFieldObjectImageAnimTable_Groudon3:: @ 85091A0
-	.4byte gFieldObjectImageAnim_FaceSouth
-	.4byte gFieldObjectImageAnim_FaceNorth
-	.4byte gFieldObjectImageAnim_FaceWest
-	.4byte gFieldObjectImageAnim_FaceEast
-	.4byte gFieldObjectImageAnim_GoSouth
-	.4byte gFieldObjectImageAnim_GoEast
-	.4byte gFieldObjectImageAnim_GoWest
-	.4byte gFieldObjectImageAnim_GoEast
-	.4byte gFieldObjectImageAnim_GoFastSouth
-	.4byte gFieldObjectImageAnim_GoFastEast
-	.4byte gFieldObjectImageAnim_GoFastWest
-	.4byte gFieldObjectImageAnim_GoFastEast
-	.4byte gFieldObjectImageAnim_GoFasterSouth
-	.4byte gFieldObjectImageAnim_GoFasterEast
-	.4byte gFieldObjectImageAnim_GoFasterWest
-	.4byte gFieldObjectImageAnim_GoFasterEast
-	.4byte gFieldObjectImageAnim_GoFastestSouth
-	.4byte gFieldObjectImageAnim_GoFastestEast
-	.4byte gFieldObjectImageAnim_GoFastestWest
-	.4byte gFieldObjectImageAnim_GoFastestEast
-
-	.align 2
-gFieldObjectImageAnim_85091F0:: @ 85091F0
-	obj_image_anim_frame 1, 1
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_85091F8:: @ 85091F8
-	obj_image_anim_frame 4, 1
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_8509200:: @ 8509200
-	obj_image_anim_frame 0, 1
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_8509208:: @ 8509208
-	obj_image_anim_frame 2, 1
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_8509210:: @ 8509210
-	obj_image_anim_frame 3, 1
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_8509218:: @ 8509218
-	obj_image_anim_frame 0, 1
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_8509220:: @ 8509220
-	obj_image_anim_frame 0, 1
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_8509228:: @ 8509228
-	obj_image_anim_frame 0, 1
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_8509230:: @ 8509230
-	obj_image_anim_frame 3, 1
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnimTable_Rayquaza2:: @ 8509238
-	.4byte gFieldObjectImageAnim_8509218
-	.4byte gFieldObjectImageAnim_8509220
-	.4byte gFieldObjectImageAnim_8509228
-	.4byte gFieldObjectImageAnim_8509230
-	.4byte gFieldObjectImageAnim_8509200
-	.4byte gFieldObjectImageAnim_85091F8
-	.4byte gFieldObjectImageAnim_8509208
-	.4byte gFieldObjectImageAnim_8509210
-	.4byte gFieldObjectImageAnim_8509200
-	.4byte gFieldObjectImageAnim_85091F8
-	.4byte gFieldObjectImageAnim_85091F0
-	.4byte gFieldObjectImageAnim_8509210
-	.4byte gFieldObjectImageAnim_8509200
-	.4byte gFieldObjectImageAnim_85091F8
-	.4byte gFieldObjectImageAnim_8509208
-	.4byte gFieldObjectImageAnim_8509210
-	.4byte gFieldObjectImageAnim_8509200
-	.4byte gFieldObjectImageAnim_85091F8
-	.4byte gFieldObjectImageAnim_8509208
-	.4byte gFieldObjectImageAnim_8509210
-
-	.align 2
-gFieldObjectImageAnimTable_BrendanMayNormal:: @ 8509288
-	.4byte gFieldObjectImageAnim_FaceSouth
-	.4byte gFieldObjectImageAnim_FaceNorth
-	.4byte gFieldObjectImageAnim_FaceWest
-	.4byte gFieldObjectImageAnim_FaceEast
-	.4byte gFieldObjectImageAnim_GoSouth
-	.4byte gFieldObjectImageAnim_GoNorth
-	.4byte gFieldObjectImageAnim_GoWest
-	.4byte gFieldObjectImageAnim_GoEast
-	.4byte gFieldObjectImageAnim_GoFastSouth
-	.4byte gFieldObjectImageAnim_GoFastNorth
-	.4byte gFieldObjectImageAnim_GoFastWest
-	.4byte gFieldObjectImageAnim_GoFastEast
-	.4byte gFieldObjectImageAnim_GoFasterSouth
-	.4byte gFieldObjectImageAnim_GoFasterNorth
-	.4byte gFieldObjectImageAnim_GoFasterWest
-	.4byte gFieldObjectImageAnim_GoFasterEast
-	.4byte gFieldObjectImageAnim_GoFastestSouth
-	.4byte gFieldObjectImageAnim_GoFastestNorth
-	.4byte gFieldObjectImageAnim_GoFastestWest
-	.4byte gFieldObjectImageAnim_GoFastestEast
-	.4byte gFieldObjectImageAnim_RunSouth
-	.4byte gFieldObjectImageAnim_RunNorth
-	.4byte gFieldObjectImageAnim_RunWest
-	.4byte gFieldObjectImageAnim_RunEast
-
-	.align 2
-gFieldObjectImageAnimTable_AcroBike:: @ 85092E8
-	.4byte gFieldObjectImageAnim_FaceSouth
-	.4byte gFieldObjectImageAnim_FaceNorth
-	.4byte gFieldObjectImageAnim_FaceWest
-	.4byte gFieldObjectImageAnim_FaceEast
-	.4byte gFieldObjectImageAnim_GoSouth
-	.4byte gFieldObjectImageAnim_GoNorth
-	.4byte gFieldObjectImageAnim_GoWest
-	.4byte gFieldObjectImageAnim_GoEast
-	.4byte gFieldObjectImageAnim_GoFastSouth
-	.4byte gFieldObjectImageAnim_GoFastNorth
-	.4byte gFieldObjectImageAnim_GoFastWest
-	.4byte gFieldObjectImageAnim_GoFastEast
-	.4byte gFieldObjectImageAnim_GoFasterSouth
-	.4byte gFieldObjectImageAnim_GoFasterNorth
-	.4byte gFieldObjectImageAnim_GoFasterWest
-	.4byte gFieldObjectImageAnim_GoFasterEast
-	.4byte gFieldObjectImageAnim_GoFastestSouth
-	.4byte gFieldObjectImageAnim_GoFastestNorth
-	.4byte gFieldObjectImageAnim_GoFastestWest
-	.4byte gFieldObjectImageAnim_GoFastestEast
-	.4byte gFieldObjectImageAnim_BunnyHoppyBackWheelSouth
-	.4byte gFieldObjectImageAnim_BunnyHoppyBackWheelNorth
-	.4byte gFieldObjectImageAnim_BunnyHoppyBackWheelWest
-	.4byte gFieldObjectImageAnim_BunnyHoppyBackWheelEast
-	.4byte gFieldObjectImageAnim_BunnyHoppyFrontWheelSouth
-	.4byte gFieldObjectImageAnim_BunnyHoppyFrontWheelNorth
-	.4byte gFieldObjectImageAnim_BunnyHoppyFrontWheelWest
-	.4byte gFieldObjectImageAnim_BunnyHoppyFrontWheelEast
-	.4byte gFieldObjectImageAnim_StandingWheelieBackWheelSouth
-	.4byte gFieldObjectImageAnim_StandingWheelieBackWheelNorth
-	.4byte gFieldObjectImageAnim_StandingWheelieBackWheelWest
-	.4byte gFieldObjectImageAnim_StandingWheelieBackWheelEast
-	.4byte gFieldObjectImageAnim_StandingWheelieFrontWheelSouth
-	.4byte gFieldObjectImageAnim_StandingWheelieFrontWheelNorth
-	.4byte gFieldObjectImageAnim_StandingWheelieFrontWheelWest
-	.4byte gFieldObjectImageAnim_StandingWheelieFrontWheelEast
-	.4byte gFieldObjectImageAnim_MovingWheelieSouth
-	.4byte gFieldObjectImageAnim_MovingWheelieNorth
-	.4byte gFieldObjectImageAnim_MovingWheelieWest
-	.4byte gFieldObjectImageAnim_MovingWheelieEast
-
-	.align 2
-gFieldObjectImageAnimTable_Surfing:: @ 8509388
-	.4byte gFieldObjectImageAnim_FaceSouth
-	.4byte gFieldObjectImageAnim_FaceNorth
-	.4byte gFieldObjectImageAnim_FaceWest
-	.4byte gFieldObjectImageAnim_FaceEast
-	.4byte gFieldObjectImageAnim_GoSouth
-	.4byte gFieldObjectImageAnim_GoNorth
-	.4byte gFieldObjectImageAnim_GoWest
-	.4byte gFieldObjectImageAnim_GoEast
-	.4byte gFieldObjectImageAnim_GoFastSouth
-	.4byte gFieldObjectImageAnim_GoFastNorth
-	.4byte gFieldObjectImageAnim_GoFastWest
-	.4byte gFieldObjectImageAnim_GoFastEast
-	.4byte gFieldObjectImageAnim_GoFasterSouth
-	.4byte gFieldObjectImageAnim_GoFasterNorth
-	.4byte gFieldObjectImageAnim_GoFasterWest
-	.4byte gFieldObjectImageAnim_GoFasterEast
-	.4byte gFieldObjectImageAnim_GoFastestSouth
-	.4byte gFieldObjectImageAnim_GoFastestNorth
-	.4byte gFieldObjectImageAnim_GoFastestWest
-	.4byte gFieldObjectImageAnim_GoFastestEast
-	.4byte gFieldObjectImageAnim_GetOnOffSurfBlobSouth
-	.4byte gFieldObjectImageAnim_GetOnOffSurfBlobNorth
-	.4byte gFieldObjectImageAnim_GetOnOffSurfBlobWest
-	.4byte gFieldObjectImageAnim_GetOnOffSurfBlobEast
-
-	.align 2
-gFieldObjectImageAnimTable_Nurse:: @ 85093E8
-	.4byte gFieldObjectImageAnim_FaceSouth
-	.4byte gFieldObjectImageAnim_FaceNorth
-	.4byte gFieldObjectImageAnim_FaceWest
-	.4byte gFieldObjectImageAnim_FaceEast
-	.4byte gFieldObjectImageAnim_GoSouth
-	.4byte gFieldObjectImageAnim_GoNorth
-	.4byte gFieldObjectImageAnim_GoWest
-	.4byte gFieldObjectImageAnim_GoEast
-	.4byte gFieldObjectImageAnim_GoFastSouth
-	.4byte gFieldObjectImageAnim_GoFastNorth
-	.4byte gFieldObjectImageAnim_GoFastWest
-	.4byte gFieldObjectImageAnim_GoFastEast
-	.4byte gFieldObjectImageAnim_GoFasterSouth
-	.4byte gFieldObjectImageAnim_GoFasterNorth
-	.4byte gFieldObjectImageAnim_GoFasterWest
-	.4byte gFieldObjectImageAnim_GoFasterEast
-	.4byte gFieldObjectImageAnim_GoFastestSouth
-	.4byte gFieldObjectImageAnim_GoFastestNorth
-	.4byte gFieldObjectImageAnim_GoFastestWest
-	.4byte gFieldObjectImageAnim_GoFastestEast
-	.4byte gFieldObjectImageAnim_NurseBow
-
-	.align 2
-gFieldObjectImageAnimTable_FieldMove:: @ 850943C
-	.4byte gFieldObjectImageAnim_FieldMove
-
-	.align 2
-gFieldObjectImageAnimTable_BerryTree:: @ 8509440
-	.4byte gFieldObjectImageAnim_BerryTreeStage0
-	.4byte gFieldObjectImageAnim_BerryTreeStage1
-	.4byte gFieldObjectImageAnim_BerryTreeStage2
-	.4byte gFieldObjectImageAnim_BerryTreeStage3
-	.4byte gFieldObjectImageAnim_BerryTreeStage4
-
-	.align 2
-gFieldObjectImageAnimTable_BreakableRock:: @ 8509454
-	.4byte gFieldObjectImageAnim_StayStill
-	.4byte gFieldObjectImageAnim_RockBreak
-
-	.align 2
-gFieldObjectImageAnimTable_CuttableTree:: @ 850945C
-	.4byte gFieldObjectImageAnim_StayStill
-	.4byte gFieldObjectImageAnim_TreeCut
-
-	.align 2
-gFieldObjectImageAnimTable_Fishing:: @ 8509464
-	.4byte gFieldObjectImageAnim_TakeOutRodSouth
-	.4byte gFieldObjectImageAnim_TakeOutRodNorth
-	.4byte gFieldObjectImageAnim_TakeOutRodWest
-	.4byte gFieldObjectImageAnim_TakeOutRodEast
-	.4byte gFieldObjectImageAnim_PutAwayRodSouth
-	.4byte gFieldObjectImageAnim_PutAwayRodNorth
-	.4byte gFieldObjectImageAnim_PutAwayRodWest
-	.4byte gFieldObjectImageAnim_PutAwayRodEast
-	.4byte gFieldObjectImageAnim_HookedPokemonSouth
-	.4byte gFieldObjectImageAnim_HookedPokemonNorth
-	.4byte gFieldObjectImageAnim_HookedPokemonWest
-	.4byte gFieldObjectImageAnim_HookedPokemonEast
-
-	.align 2
-gFieldObjectRotScalAnimTable_KyogreGroudon:: @ 8509494
-	.4byte gFieldObjectRotScalAnim_8508FD8
-	.4byte gFieldObjectRotScalAnim_8509008
-	.4byte gFieldObjectRotScalAnim_8509050
-	.4byte gFieldObjectRotScalAnim_8509040
-	.4byte gFieldObjectRotScalAnim_8509078
-	.4byte gFieldObjectRotScalAnim_8509060
diff --git a/data/graphics/field_objects/field_object_graphics.inc b/data/graphics/field_objects/field_object_graphics.inc
deleted file mode 100644
index 59333b9a4..000000000
--- a/data/graphics/field_objects/field_object_graphics.inc
+++ /dev/null
@@ -1,6530 +0,0 @@
-	.align 2
-gFieldObjectPic_BrendanNormal_0:: @ 84975F8
-	.incbin "graphics/map_objects/pics/people/brendan/normal/00.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanNormal_1:: @ 84976F8
-	.incbin "graphics/map_objects/pics/people/brendan/normal/01.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanNormal_2:: @ 84977F8
-	.incbin "graphics/map_objects/pics/people/brendan/normal/02.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanNormal_3:: @ 84978F8
-	.incbin "graphics/map_objects/pics/people/brendan/normal/03.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanNormal_4:: @ 84979F8
-	.incbin "graphics/map_objects/pics/people/brendan/normal/04.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanNormal_5:: @ 8497AF8
-	.incbin "graphics/map_objects/pics/people/brendan/normal/05.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanNormal_6:: @ 8497BF8
-	.incbin "graphics/map_objects/pics/people/brendan/normal/06.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanNormal_7:: @ 8497CF8
-	.incbin "graphics/map_objects/pics/people/brendan/normal/07.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanNormal_8:: @ 8497DF8
-	.incbin "graphics/map_objects/pics/people/brendan/normal/08.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanNormal_9:: @ 8497EF8
-	.incbin "graphics/map_objects/pics/people/brendan/normal/09.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanNormal_10:: @ 8497FF8
-	.incbin "graphics/map_objects/pics/people/brendan/normal/10.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanNormal_11:: @ 84980F8
-	.incbin "graphics/map_objects/pics/people/brendan/normal/11.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanNormal_12:: @ 84981F8
-	.incbin "graphics/map_objects/pics/people/brendan/normal/12.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanNormal_13:: @ 84982F8
-	.incbin "graphics/map_objects/pics/people/brendan/normal/13.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanNormal_14:: @ 84983F8
-	.incbin "graphics/map_objects/pics/people/brendan/normal/14.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanNormal_15:: @ 84984F8
-	.incbin "graphics/map_objects/pics/people/brendan/normal/15.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanNormal_16:: @ 84985F8
-	.incbin "graphics/map_objects/pics/people/brendan/normal/16.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanNormal_17:: @ 84986F8
-	.incbin "graphics/map_objects/pics/people/brendan/normal/17.4bpp"
-
-	.align 2
-gFieldObjectPalette8:: @ 84987F8
-	.incbin "graphics/map_objects/palettes/field_object_palette_08.gbapal"
-
-	.align 2
-gFieldObjectPic_RubySapphireBrendan_0:: @ 8498818
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/00.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireBrendan_1:: @ 8498918
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/01.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireBrendan_2:: @ 8498A18
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/02.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireBrendan_3:: @ 8498B18
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/03.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireBrendan_4:: @ 8498C18
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/04.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireBrendan_5:: @ 8498D18
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/05.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireBrendan_6:: @ 8498E18
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/06.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireBrendan_7:: @ 8498F18
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/07.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireBrendan_8:: @ 8499018
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/08.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireBrendan_9:: @ 8499118
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/09.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireBrendan_10:: @ 8499218
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/10.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireBrendan_11:: @ 8499318
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/11.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireBrendan_12:: @ 8499418
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/12.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireBrendan_13:: @ 8499518
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/13.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireBrendan_14:: @ 8499618
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/14.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireBrendan_15:: @ 8499718
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/15.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireBrendan_16:: @ 8499818
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/16.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireBrendan_17:: @ 8499918
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/17.4bpp"
-
-	.align 2
-gFieldObjectPalette33:: @ 8499A18
-	.incbin "graphics/map_objects/palettes/field_object_palette_33.gbapal"
-
-	.space 0x1E0
-
-	.align 2
-gFieldObjectPalette9:: @ 8499C18
-	.incbin "graphics/map_objects/palettes/field_object_palette_09.gbapal"
-
-	.align 2
-gFieldObjectPalette10:: @ 8499C38
-	.incbin "graphics/map_objects/palettes/field_object_palette_10.gbapal"
-
-	.align 2
-gFieldObjectPic_BrendanFieldMove_0:: @ 8499C58
-	.incbin "graphics/map_objects/pics/people/brendan/field_move/0.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanFieldMove_1:: @ 8499E58
-	.incbin "graphics/map_objects/pics/people/brendan/field_move/1.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanFieldMove_2:: @ 849A058
-	.incbin "graphics/map_objects/pics/people/brendan/field_move/2.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanFieldMove_3:: @ 849A258
-	.incbin "graphics/map_objects/pics/people/brendan/field_move/3.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanFieldMove_4:: @ 849A458
-	.incbin "graphics/map_objects/pics/people/brendan/field_move/4.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanSurfing_0:: @ 849A658
-	.incbin "graphics/map_objects/pics/people/brendan/surfing/0.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanSurfing_3:: @ 849A858
-	.incbin "graphics/map_objects/pics/people/brendan/surfing/3.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanSurfing_1:: @ 849AA58
-	.incbin "graphics/map_objects/pics/people/brendan/surfing/1.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanSurfing_4:: @ 849AC58
-	.incbin "graphics/map_objects/pics/people/brendan/surfing/4.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanSurfing_2:: @ 849AE58
-	.incbin "graphics/map_objects/pics/people/brendan/surfing/2.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanSurfing_5:: @ 849B058
-	.incbin "graphics/map_objects/pics/people/brendan/surfing/5.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanMachBike_0:: @ 849B258
-	.incbin "graphics/map_objects/pics/people/brendan/mach_bike/0.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanMachBike_1:: @ 849B458
-	.incbin "graphics/map_objects/pics/people/brendan/mach_bike/1.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanMachBike_2:: @ 849B658
-	.incbin "graphics/map_objects/pics/people/brendan/mach_bike/2.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanMachBike_3:: @ 849B858
-	.incbin "graphics/map_objects/pics/people/brendan/mach_bike/3.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanMachBike_4:: @ 849BA58
-	.incbin "graphics/map_objects/pics/people/brendan/mach_bike/4.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanMachBike_5:: @ 849BC58
-	.incbin "graphics/map_objects/pics/people/brendan/mach_bike/5.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanMachBike_6:: @ 849BE58
-	.incbin "graphics/map_objects/pics/people/brendan/mach_bike/6.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanMachBike_7:: @ 849C058
-	.incbin "graphics/map_objects/pics/people/brendan/mach_bike/7.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanMachBike_8:: @ 849C258
-	.incbin "graphics/map_objects/pics/people/brendan/mach_bike/8.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_0:: @ 849C458
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/00.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_1:: @ 849C658
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/01.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_2:: @ 849C858
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/02.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_3:: @ 849CA58
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/03.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_4:: @ 849CC58
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/04.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_5:: @ 849CE58
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/05.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_6:: @ 849D058
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/06.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_7:: @ 849D258
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/07.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_8:: @ 849D458
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/08.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_9:: @ 849D658
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/09.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_10:: @ 849D858
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/10.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_11:: @ 849DA58
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/11.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_12:: @ 849DC58
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/12.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_13:: @ 849DE58
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/13.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_14:: @ 849E058
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/14.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_15:: @ 849E258
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/15.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_16:: @ 849E458
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/16.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_17:: @ 849E658
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/17.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_18:: @ 849E858
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/18.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_19:: @ 849EA58
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/19.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_20:: @ 849EC58
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/20.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_21:: @ 849EE58
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/21.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_22:: @ 849F058
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/22.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_23:: @ 849F258
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/23.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_24:: @ 849F458
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/24.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_25:: @ 849F658
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/25.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_26:: @ 849F858
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/26.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanFishing_0:: @ 849FA58
-	.incbin "graphics/map_objects/pics/people/brendan/fishing/00.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanFishing_1:: @ 849FC58
-	.incbin "graphics/map_objects/pics/people/brendan/fishing/01.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanFishing_2:: @ 849FE58
-	.incbin "graphics/map_objects/pics/people/brendan/fishing/02.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanFishing_3:: @ 84A0058
-	.incbin "graphics/map_objects/pics/people/brendan/fishing/03.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanFishing_4:: @ 84A0258
-	.incbin "graphics/map_objects/pics/people/brendan/fishing/04.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanFishing_5:: @ 84A0458
-	.incbin "graphics/map_objects/pics/people/brendan/fishing/05.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanFishing_6:: @ 84A0658
-	.incbin "graphics/map_objects/pics/people/brendan/fishing/06.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanFishing_7:: @ 84A0858
-	.incbin "graphics/map_objects/pics/people/brendan/fishing/07.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanFishing_8:: @ 84A0A58
-	.incbin "graphics/map_objects/pics/people/brendan/fishing/08.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanFishing_9:: @ 84A0C58
-	.incbin "graphics/map_objects/pics/people/brendan/fishing/09.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanFishing_10:: @ 84A0E58
-	.incbin "graphics/map_objects/pics/people/brendan/fishing/10.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanFishing_11:: @ 84A1058
-	.incbin "graphics/map_objects/pics/people/brendan/fishing/11.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanWatering_0:: @ 84A1258
-	.incbin "graphics/map_objects/pics/people/brendan/watering/0.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanWatering_3:: @ 84A1458
-	.incbin "graphics/map_objects/pics/people/brendan/watering/3.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanWatering_1:: @ 84A1658
-	.incbin "graphics/map_objects/pics/people/brendan/watering/1.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanWatering_4:: @ 84A1858
-	.incbin "graphics/map_objects/pics/people/brendan/watering/4.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanWatering_2:: @ 84A1A58
-	.incbin "graphics/map_objects/pics/people/brendan/watering/2.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanWatering_5:: @ 84A1C58
-	.incbin "graphics/map_objects/pics/people/brendan/watering/5.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanDecorating:: @ 84A1E58
-	.incbin "graphics/map_objects/pics/people/brendan/decorating.4bpp"
-
-	.align 2
-gFieldObjectPic_MayDecorating:: @ 84A1F58
-	.incbin "graphics/map_objects/pics/people/may/decorating.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanUnderwater_0:: @ 84A2058
-	.incbin "graphics/map_objects/pics/people/brendan/underwater/0.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanUnderwater_1:: @ 84A2258
-	.incbin "graphics/map_objects/pics/people/brendan/underwater/1.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanUnderwater_2:: @ 84A2458
-	.incbin "graphics/map_objects/pics/people/brendan/underwater/2.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanUnderwater_3:: @ 84A2658
-	.incbin "graphics/map_objects/pics/people/brendan/underwater/3.4bpp"
-
-	.align 2
-gFieldObjectPic_MayUnderwater_0:: @ 84A2858
-	.incbin "graphics/map_objects/pics/people/may/underwater/0.4bpp"
-
-	.align 2
-gFieldObjectPic_MayUnderwater_1:: @ 84A2A58
-	.incbin "graphics/map_objects/pics/people/may/underwater/1.4bpp"
-
-	.align 2
-gFieldObjectPic_MayUnderwater_2:: @ 84A2C58
-	.incbin "graphics/map_objects/pics/people/may/underwater/2.4bpp"
-
-	.align 2
-gFieldObjectPic_MayUnderwater_3:: @ 84A2E58
-	.incbin "graphics/map_objects/pics/people/may/underwater/3.4bpp"
-
-	.align 2
-gFieldObjectPalette11:: @ 84A3058
-	.incbin "graphics/map_objects/palettes/field_object_palette_11.gbapal"
-
-	.align 2
-gFieldObjectPic_MayNormal_0:: @ 84A3078
-	.incbin "graphics/map_objects/pics/people/may/normal/00.4bpp"
-
-	.align 2
-gFieldObjectPic_MayNormal_1:: @ 84A3178
-	.incbin "graphics/map_objects/pics/people/may/normal/01.4bpp"
-
-	.align 2
-gFieldObjectPic_MayNormal_2:: @ 84A3278
-	.incbin "graphics/map_objects/pics/people/may/normal/02.4bpp"
-
-	.align 2
-gFieldObjectPic_MayNormal_3:: @ 84A3378
-	.incbin "graphics/map_objects/pics/people/may/normal/03.4bpp"
-
-	.align 2
-gFieldObjectPic_MayNormal_4:: @ 84A3478
-	.incbin "graphics/map_objects/pics/people/may/normal/04.4bpp"
-
-	.align 2
-gFieldObjectPic_MayNormal_5:: @ 84A3578
-	.incbin "graphics/map_objects/pics/people/may/normal/05.4bpp"
-
-	.align 2
-gFieldObjectPic_MayNormal_6:: @ 84A3678
-	.incbin "graphics/map_objects/pics/people/may/normal/06.4bpp"
-
-	.align 2
-gFieldObjectPic_MayNormal_7:: @ 84A3778
-	.incbin "graphics/map_objects/pics/people/may/normal/07.4bpp"
-
-	.align 2
-gFieldObjectPic_MayNormal_8:: @ 84A3878
-	.incbin "graphics/map_objects/pics/people/may/normal/08.4bpp"
-
-	.align 2
-gFieldObjectPic_MayNormal_9:: @ 84A3978
-	.incbin "graphics/map_objects/pics/people/may/normal/09.4bpp"
-
-	.align 2
-gFieldObjectPic_MayNormal_10:: @ 84A3A78
-	.incbin "graphics/map_objects/pics/people/may/normal/10.4bpp"
-
-	.align 2
-gFieldObjectPic_MayNormal_11:: @ 84A3B78
-	.incbin "graphics/map_objects/pics/people/may/normal/11.4bpp"
-
-	.align 2
-gFieldObjectPic_MayNormal_12:: @ 84A3C78
-	.incbin "graphics/map_objects/pics/people/may/normal/12.4bpp"
-
-	.align 2
-gFieldObjectPic_MayNormal_13:: @ 84A3D78
-	.incbin "graphics/map_objects/pics/people/may/normal/13.4bpp"
-
-	.align 2
-gFieldObjectPic_MayNormal_14:: @ 84A3E78
-	.incbin "graphics/map_objects/pics/people/may/normal/14.4bpp"
-
-	.align 2
-gFieldObjectPic_MayNormal_15:: @ 84A3F78
-	.incbin "graphics/map_objects/pics/people/may/normal/15.4bpp"
-
-	.align 2
-gFieldObjectPic_MayNormal_16:: @ 84A4078
-	.incbin "graphics/map_objects/pics/people/may/normal/16.4bpp"
-
-	.align 2
-gFieldObjectPic_MayNormal_17:: @ 84A4178
-	.incbin "graphics/map_objects/pics/people/may/normal/17.4bpp"
-
-	.align 2
-gFieldObjectPalette17:: @ 84A4278
-	.incbin "graphics/map_objects/palettes/field_object_palette_17.gbapal"
-
-	.align 2
-gFieldObjectPalette18:: @ 84A4298
-	.incbin "graphics/map_objects/palettes/field_object_palette_18.gbapal"
-
-	.align 2
-gFieldObjectPic_RubySapphireMay_0:: @ 84A42B8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_may/00.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireMay_1:: @ 84A43B8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_may/01.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireMay_2:: @ 84A44B8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_may/02.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireMay_3:: @ 84A45B8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_may/03.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireMay_4:: @ 84A46B8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_may/04.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireMay_5:: @ 84A47B8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_may/05.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireMay_6:: @ 84A48B8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_may/06.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireMay_7:: @ 84A49B8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_may/07.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireMay_8:: @ 84A4AB8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_may/08.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireMay_9:: @ 84A4BB8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_may/09.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireMay_10:: @ 84A4CB8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_may/10.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireMay_11:: @ 84A4DB8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_may/11.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireMay_12:: @ 84A4EB8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_may/12.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireMay_13:: @ 84A4FB8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_may/13.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireMay_14:: @ 84A50B8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_may/14.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireMay_15:: @ 84A51B8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_may/15.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireMay_16:: @ 84A52B8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_may/16.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireMay_17:: @ 84A53B8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_may/17.4bpp"
-
-	.align 2
-gFieldObjectPalette34:: @ 84A54B8
-	.incbin "graphics/map_objects/palettes/field_object_palette_34.gbapal"
-
-	.align 2
-gUnusedFieldObjectPalette:: @ 84A54D8
-	.incbin "graphics/map_objects/palettes/unused_palette.gbapal"
-
-	.space 0x1C0
-
-	.align 2
-gFieldObjectPic_MayMachBike_0:: @ 84A56B8
-	.incbin "graphics/map_objects/pics/people/may/mach_bike/0.4bpp"
-
-	.align 2
-gFieldObjectPic_MayMachBike_1:: @ 84A58B8
-	.incbin "graphics/map_objects/pics/people/may/mach_bike/1.4bpp"
-
-	.align 2
-gFieldObjectPic_MayMachBike_2:: @ 84A5AB8
-	.incbin "graphics/map_objects/pics/people/may/mach_bike/2.4bpp"
-
-	.align 2
-gFieldObjectPic_MayMachBike_3:: @ 84A5CB8
-	.incbin "graphics/map_objects/pics/people/may/mach_bike/3.4bpp"
-
-	.align 2
-gFieldObjectPic_MayMachBike_4:: @ 84A5EB8
-	.incbin "graphics/map_objects/pics/people/may/mach_bike/4.4bpp"
-
-	.align 2
-gFieldObjectPic_MayMachBike_5:: @ 84A60B8
-	.incbin "graphics/map_objects/pics/people/may/mach_bike/5.4bpp"
-
-	.align 2
-gFieldObjectPic_MayMachBike_6:: @ 84A62B8
-	.incbin "graphics/map_objects/pics/people/may/mach_bike/6.4bpp"
-
-	.align 2
-gFieldObjectPic_MayMachBike_7:: @ 84A64B8
-	.incbin "graphics/map_objects/pics/people/may/mach_bike/7.4bpp"
-
-	.align 2
-gFieldObjectPic_MayMachBike_8:: @ 84A66B8
-	.incbin "graphics/map_objects/pics/people/may/mach_bike/8.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_0:: @ 84A68B8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/00.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_1:: @ 84A6AB8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/01.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_2:: @ 84A6CB8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/02.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_3:: @ 84A6EB8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/03.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_4:: @ 84A70B8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/04.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_5:: @ 84A72B8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/05.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_6:: @ 84A74B8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/06.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_7:: @ 84A76B8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/07.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_8:: @ 84A78B8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/08.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_9:: @ 84A7AB8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/09.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_10:: @ 84A7CB8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/10.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_11:: @ 84A7EB8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/11.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_12:: @ 84A80B8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/12.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_13:: @ 84A82B8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/13.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_14:: @ 84A84B8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/14.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_15:: @ 84A86B8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/15.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_16:: @ 84A88B8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/16.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_17:: @ 84A8AB8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/17.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_18:: @ 84A8CB8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/18.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_19:: @ 84A8EB8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/19.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_20:: @ 84A90B8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/20.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_21:: @ 84A92B8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/21.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_22:: @ 84A94B8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/22.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_23:: @ 84A96B8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/23.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_24:: @ 84A98B8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/24.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_25:: @ 84A9AB8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/25.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_26:: @ 84A9CB8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/26.4bpp"
-
-	.align 2
-gFieldObjectPic_MaySurfing_0:: @ 84A9EB8
-	.incbin "graphics/map_objects/pics/people/may/surfing/0.4bpp"
-
-	.align 2
-gFieldObjectPic_MaySurfing_3:: @ 84AA0B8
-	.incbin "graphics/map_objects/pics/people/may/surfing/3.4bpp"
-
-	.align 2
-gFieldObjectPic_MaySurfing_1:: @ 84AA2B8
-	.incbin "graphics/map_objects/pics/people/may/surfing/1.4bpp"
-
-	.align 2
-gFieldObjectPic_MaySurfing_4:: @ 84AA4B8
-	.incbin "graphics/map_objects/pics/people/may/surfing/4.4bpp"
-
-	.align 2
-gFieldObjectPic_MaySurfing_2:: @ 84AA6B8
-	.incbin "graphics/map_objects/pics/people/may/surfing/2.4bpp"
-
-	.align 2
-gFieldObjectPic_MaySurfing_5:: @ 84AA8B8
-	.incbin "graphics/map_objects/pics/people/may/surfing/5.4bpp"
-
-	.align 2
-gFieldObjectPic_MayFieldMove_0:: @ 84AAAB8
-	.incbin "graphics/map_objects/pics/people/may/field_move/0.4bpp"
-
-	.align 2
-gFieldObjectPic_MayFieldMove_1:: @ 84AACB8
-	.incbin "graphics/map_objects/pics/people/may/field_move/1.4bpp"
-
-	.align 2
-gFieldObjectPic_MayFieldMove_2:: @ 84AAEB8
-	.incbin "graphics/map_objects/pics/people/may/field_move/2.4bpp"
-
-	.align 2
-gFieldObjectPic_MayFieldMove_3:: @ 84AB0B8
-	.incbin "graphics/map_objects/pics/people/may/field_move/3.4bpp"
-
-	.align 2
-gFieldObjectPic_MayFieldMove_4:: @ 84AB2B8
-	.incbin "graphics/map_objects/pics/people/may/field_move/4.4bpp"
-
-	.align 2
-gFieldObjectPic_MayFishing_0:: @ 84AB4B8
-	.incbin "graphics/map_objects/pics/people/may/fishing/00.4bpp"
-
-	.align 2
-gFieldObjectPic_MayFishing_1:: @ 84AB6B8
-	.incbin "graphics/map_objects/pics/people/may/fishing/01.4bpp"
-
-	.align 2
-gFieldObjectPic_MayFishing_2:: @ 84AB8B8
-	.incbin "graphics/map_objects/pics/people/may/fishing/02.4bpp"
-
-	.align 2
-gFieldObjectPic_MayFishing_3:: @ 84ABAB8
-	.incbin "graphics/map_objects/pics/people/may/fishing/03.4bpp"
-
-	.align 2
-gFieldObjectPic_MayFishing_4:: @ 84ABCB8
-	.incbin "graphics/map_objects/pics/people/may/fishing/04.4bpp"
-
-	.align 2
-gFieldObjectPic_MayFishing_5:: @ 84ABEB8
-	.incbin "graphics/map_objects/pics/people/may/fishing/05.4bpp"
-
-	.align 2
-gFieldObjectPic_MayFishing_6:: @ 84AC0B8
-	.incbin "graphics/map_objects/pics/people/may/fishing/06.4bpp"
-
-	.align 2
-gFieldObjectPic_MayFishing_7:: @ 84AC2B8
-	.incbin "graphics/map_objects/pics/people/may/fishing/07.4bpp"
-
-	.align 2
-gFieldObjectPic_MayFishing_8:: @ 84AC4B8
-	.incbin "graphics/map_objects/pics/people/may/fishing/08.4bpp"
-
-	.align 2
-gFieldObjectPic_MayFishing_9:: @ 84AC6B8
-	.incbin "graphics/map_objects/pics/people/may/fishing/09.4bpp"
-
-	.align 2
-gFieldObjectPic_MayFishing_10:: @ 84AC8B8
-	.incbin "graphics/map_objects/pics/people/may/fishing/10.4bpp"
-
-	.align 2
-gFieldObjectPic_MayFishing_11:: @ 84ACAB8
-	.incbin "graphics/map_objects/pics/people/may/fishing/11.4bpp"
-
-	.align 2
-gFieldObjectPic_MayWatering_0:: @ 84ACCB8
-	.incbin "graphics/map_objects/pics/people/may/watering/0.4bpp"
-
-	.align 2
-gFieldObjectPic_MayWatering_3:: @ 84ACEB8
-	.incbin "graphics/map_objects/pics/people/may/watering/3.4bpp"
-
-	.align 2
-gFieldObjectPic_MayWatering_1:: @ 84AD0B8
-	.incbin "graphics/map_objects/pics/people/may/watering/1.4bpp"
-
-	.align 2
-gFieldObjectPic_MayWatering_4:: @ 84AD2B8
-	.incbin "graphics/map_objects/pics/people/may/watering/4.4bpp"
-
-	.align 2
-gFieldObjectPic_MayWatering_2:: @ 84AD4B8
-	.incbin "graphics/map_objects/pics/people/may/watering/2.4bpp"
-
-	.align 2
-gFieldObjectPic_MayWatering_5:: @ 84AD6B8
-	.incbin "graphics/map_objects/pics/people/may/watering/5.4bpp"
-
-	.align 2
-gFieldObjectPalette0:: @ 84AD8B8
-	.incbin "graphics/map_objects/palettes/field_object_palette_00.gbapal"
-
-	.align 2
-gFieldObjectPalette1:: @ 84AD8D8
-	.incbin "graphics/map_objects/palettes/field_object_palette_01.gbapal"
-
-	.align 2
-gFieldObjectPalette2:: @ 84AD8F8
-	.incbin "graphics/map_objects/palettes/field_object_palette_02.gbapal"
-
-	.align 2
-gFieldObjectPalette3:: @ 84AD918
-	.incbin "graphics/map_objects/palettes/field_object_palette_03.gbapal"
-
-	.align 2
-gFieldObjectPalette4:: @ 84AD938
-	.incbin "graphics/map_objects/palettes/field_object_palette_04.gbapal"
-
-	.align 2
-gFieldObjectPalette5:: @ 84AD958
-	.incbin "graphics/map_objects/palettes/field_object_palette_05.gbapal"
-
-	.align 2
-gFieldObjectPalette6:: @ 84AD978
-	.incbin "graphics/map_objects/palettes/field_object_palette_06.gbapal"
-
-	.align 2
-gFieldObjectPalette7:: @ 84AD998
-	.incbin "graphics/map_objects/palettes/field_object_palette_07.gbapal"
-
-	.align 2
-gFieldObjectPic_LittleBoy1_0:: @ 84AD9B8
-	.incbin "graphics/map_objects/pics/people/little_boy_1/0.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleBoy1_1:: @ 84ADA38
-	.incbin "graphics/map_objects/pics/people/little_boy_1/1.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleBoy1_2:: @ 84ADAB8
-	.incbin "graphics/map_objects/pics/people/little_boy_1/2.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleBoy1_3:: @ 84ADB38
-	.incbin "graphics/map_objects/pics/people/little_boy_1/3.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleBoy1_4:: @ 84ADBB8
-	.incbin "graphics/map_objects/pics/people/little_boy_1/4.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleBoy1_5:: @ 84ADC38
-	.incbin "graphics/map_objects/pics/people/little_boy_1/5.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleBoy1_6:: @ 84ADCB8
-	.incbin "graphics/map_objects/pics/people/little_boy_1/6.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleBoy1_7:: @ 84ADD38
-	.incbin "graphics/map_objects/pics/people/little_boy_1/7.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleBoy1_8:: @ 84ADDB8
-	.incbin "graphics/map_objects/pics/people/little_boy_1/8.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleGirl1_0:: @ 84ADE38
-	.incbin "graphics/map_objects/pics/people/little_girl_1/0.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleGirl1_1:: @ 84ADF38
-	.incbin "graphics/map_objects/pics/people/little_girl_1/1.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleGirl1_2:: @ 84AE038
-	.incbin "graphics/map_objects/pics/people/little_girl_1/2.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleGirl1_3:: @ 84AE138
-	.incbin "graphics/map_objects/pics/people/little_girl_1/3.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleGirl1_4:: @ 84AE238
-	.incbin "graphics/map_objects/pics/people/little_girl_1/4.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleGirl1_5:: @ 84AE338
-	.incbin "graphics/map_objects/pics/people/little_girl_1/5.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleGirl1_6:: @ 84AE438
-	.incbin "graphics/map_objects/pics/people/little_girl_1/6.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleGirl1_7:: @ 84AE538
-	.incbin "graphics/map_objects/pics/people/little_girl_1/7.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleGirl1_8:: @ 84AE638
-	.incbin "graphics/map_objects/pics/people/little_girl_1/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy1_0:: @ 84AE738
-	.incbin "graphics/map_objects/pics/people/boy_1/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy1_1:: @ 84AE838
-	.incbin "graphics/map_objects/pics/people/boy_1/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy1_2:: @ 84AE938
-	.incbin "graphics/map_objects/pics/people/boy_1/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy1_3:: @ 84AEA38
-	.incbin "graphics/map_objects/pics/people/boy_1/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy1_4:: @ 84AEB38
-	.incbin "graphics/map_objects/pics/people/boy_1/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy1_5:: @ 84AEC38
-	.incbin "graphics/map_objects/pics/people/boy_1/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy1_6:: @ 84AED38
-	.incbin "graphics/map_objects/pics/people/boy_1/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy1_7:: @ 84AEE38
-	.incbin "graphics/map_objects/pics/people/boy_1/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy1_8:: @ 84AEF38
-	.incbin "graphics/map_objects/pics/people/boy_1/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl1_0:: @ 84AF038
-	.incbin "graphics/map_objects/pics/people/girl_1/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl1_1:: @ 84AF138
-	.incbin "graphics/map_objects/pics/people/girl_1/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl1_2:: @ 84AF238
-	.incbin "graphics/map_objects/pics/people/girl_1/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl1_3:: @ 84AF338
-	.incbin "graphics/map_objects/pics/people/girl_1/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl1_4:: @ 84AF438
-	.incbin "graphics/map_objects/pics/people/girl_1/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl1_5:: @ 84AF538
-	.incbin "graphics/map_objects/pics/people/girl_1/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl1_6:: @ 84AF638
-	.incbin "graphics/map_objects/pics/people/girl_1/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl1_7:: @ 84AF738
-	.incbin "graphics/map_objects/pics/people/girl_1/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl1_8:: @ 84AF838
-	.incbin "graphics/map_objects/pics/people/girl_1/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy2_0:: @ 84AF938
-	.incbin "graphics/map_objects/pics/people/boy_2/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy2_1:: @ 84AFA38
-	.incbin "graphics/map_objects/pics/people/boy_2/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy2_2:: @ 84AFB38
-	.incbin "graphics/map_objects/pics/people/boy_2/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy2_3:: @ 84AFC38
-	.incbin "graphics/map_objects/pics/people/boy_2/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy2_4:: @ 84AFD38
-	.incbin "graphics/map_objects/pics/people/boy_2/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy2_5:: @ 84AFE38
-	.incbin "graphics/map_objects/pics/people/boy_2/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy2_6:: @ 84AFF38
-	.incbin "graphics/map_objects/pics/people/boy_2/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy2_7:: @ 84B0038
-	.incbin "graphics/map_objects/pics/people/boy_2/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy2_8:: @ 84B0138
-	.incbin "graphics/map_objects/pics/people/boy_2/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl2_0:: @ 84B0238
-	.incbin "graphics/map_objects/pics/people/girl_2/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl2_1:: @ 84B0338
-	.incbin "graphics/map_objects/pics/people/girl_2/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl2_2:: @ 84B0438
-	.incbin "graphics/map_objects/pics/people/girl_2/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl2_3:: @ 84B0538
-	.incbin "graphics/map_objects/pics/people/girl_2/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl2_4:: @ 84B0638
-	.incbin "graphics/map_objects/pics/people/girl_2/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl2_5:: @ 84B0738
-	.incbin "graphics/map_objects/pics/people/girl_2/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl2_6:: @ 84B0838
-	.incbin "graphics/map_objects/pics/people/girl_2/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl2_7:: @ 84B0938
-	.incbin "graphics/map_objects/pics/people/girl_2/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl2_8:: @ 84B0A38
-	.incbin "graphics/map_objects/pics/people/girl_2/8.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleBoy2_0:: @ 84B0B38
-	.incbin "graphics/map_objects/pics/people/little_boy_2/0.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleBoy2_1:: @ 84B0BB8
-	.incbin "graphics/map_objects/pics/people/little_boy_2/1.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleBoy2_2:: @ 84B0C38
-	.incbin "graphics/map_objects/pics/people/little_boy_2/2.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleBoy2_3:: @ 84B0CB8
-	.incbin "graphics/map_objects/pics/people/little_boy_2/3.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleBoy2_4:: @ 84B0D38
-	.incbin "graphics/map_objects/pics/people/little_boy_2/4.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleBoy2_5:: @ 84B0DB8
-	.incbin "graphics/map_objects/pics/people/little_boy_2/5.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleBoy2_6:: @ 84B0E38
-	.incbin "graphics/map_objects/pics/people/little_boy_2/6.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleBoy2_7:: @ 84B0EB8
-	.incbin "graphics/map_objects/pics/people/little_boy_2/7.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleBoy2_8:: @ 84B0F38
-	.incbin "graphics/map_objects/pics/people/little_boy_2/8.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleGirl2_0:: @ 84B0FB8
-	.incbin "graphics/map_objects/pics/people/little_girl_2/0.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleGirl2_1:: @ 84B1038
-	.incbin "graphics/map_objects/pics/people/little_girl_2/1.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleGirl2_2:: @ 84B10B8
-	.incbin "graphics/map_objects/pics/people/little_girl_2/2.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleGirl2_3:: @ 84B1138
-	.incbin "graphics/map_objects/pics/people/little_girl_2/3.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleGirl2_4:: @ 84B11B8
-	.incbin "graphics/map_objects/pics/people/little_girl_2/4.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleGirl2_5:: @ 84B1238
-	.incbin "graphics/map_objects/pics/people/little_girl_2/5.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleGirl2_6:: @ 84B12B8
-	.incbin "graphics/map_objects/pics/people/little_girl_2/6.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleGirl2_7:: @ 84B1338
-	.incbin "graphics/map_objects/pics/people/little_girl_2/7.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleGirl2_8:: @ 84B13B8
-	.incbin "graphics/map_objects/pics/people/little_girl_2/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy3_0:: @ 84B1438
-	.incbin "graphics/map_objects/pics/people/boy_3/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy3_1:: @ 84B1538
-	.incbin "graphics/map_objects/pics/people/boy_3/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy3_2:: @ 84B1638
-	.incbin "graphics/map_objects/pics/people/boy_3/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy3_3:: @ 84B1738
-	.incbin "graphics/map_objects/pics/people/boy_3/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy3_4:: @ 84B1838
-	.incbin "graphics/map_objects/pics/people/boy_3/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy3_5:: @ 84B1938
-	.incbin "graphics/map_objects/pics/people/boy_3/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy3_6:: @ 84B1A38
-	.incbin "graphics/map_objects/pics/people/boy_3/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy3_7:: @ 84B1B38
-	.incbin "graphics/map_objects/pics/people/boy_3/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy3_8:: @ 84B1C38
-	.incbin "graphics/map_objects/pics/people/boy_3/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl3_0:: @ 84B1D38
-	.incbin "graphics/map_objects/pics/people/girl_3/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl3_1:: @ 84B1E38
-	.incbin "graphics/map_objects/pics/people/girl_3/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl3_2:: @ 84B1F38
-	.incbin "graphics/map_objects/pics/people/girl_3/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl3_3:: @ 84B2038
-	.incbin "graphics/map_objects/pics/people/girl_3/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl3_4:: @ 84B2138
-	.incbin "graphics/map_objects/pics/people/girl_3/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl3_5:: @ 84B2238
-	.incbin "graphics/map_objects/pics/people/girl_3/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl3_6:: @ 84B2338
-	.incbin "graphics/map_objects/pics/people/girl_3/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl3_7:: @ 84B2438
-	.incbin "graphics/map_objects/pics/people/girl_3/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl3_8:: @ 84B2538
-	.incbin "graphics/map_objects/pics/people/girl_3/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy4_0:: @ 84B2638
-	.incbin "graphics/map_objects/pics/people/boy_4/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy4_1:: @ 84B2738
-	.incbin "graphics/map_objects/pics/people/boy_4/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy4_2:: @ 84B2838
-	.incbin "graphics/map_objects/pics/people/boy_4/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy4_3:: @ 84B2938
-	.incbin "graphics/map_objects/pics/people/boy_4/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy4_4:: @ 84B2A38
-	.incbin "graphics/map_objects/pics/people/boy_4/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy4_5:: @ 84B2B38
-	.incbin "graphics/map_objects/pics/people/boy_4/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy4_6:: @ 84B2C38
-	.incbin "graphics/map_objects/pics/people/boy_4/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy4_7:: @ 84B2D38
-	.incbin "graphics/map_objects/pics/people/boy_4/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy4_8:: @ 84B2E38
-	.incbin "graphics/map_objects/pics/people/boy_4/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman1_0:: @ 84B2F38
-	.incbin "graphics/map_objects/pics/people/woman_1/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman1_1:: @ 84B3038
-	.incbin "graphics/map_objects/pics/people/woman_1/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman1_2:: @ 84B3138
-	.incbin "graphics/map_objects/pics/people/woman_1/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman1_3:: @ 84B3238
-	.incbin "graphics/map_objects/pics/people/woman_1/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman1_4:: @ 84B3338
-	.incbin "graphics/map_objects/pics/people/woman_1/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman1_5:: @ 84B3438
-	.incbin "graphics/map_objects/pics/people/woman_1/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman1_6:: @ 84B3538
-	.incbin "graphics/map_objects/pics/people/woman_1/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman1_7:: @ 84B3638
-	.incbin "graphics/map_objects/pics/people/woman_1/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman1_8:: @ 84B3738
-	.incbin "graphics/map_objects/pics/people/woman_1/8.4bpp"
-
-	.align 2
-gFieldObjectPic_FatMan_0:: @ 84B3838
-	.incbin "graphics/map_objects/pics/people/fat_man/0.4bpp"
-
-	.align 2
-gFieldObjectPic_FatMan_1:: @ 84B3938
-	.incbin "graphics/map_objects/pics/people/fat_man/1.4bpp"
-
-	.align 2
-gFieldObjectPic_FatMan_2:: @ 84B3A38
-	.incbin "graphics/map_objects/pics/people/fat_man/2.4bpp"
-
-	.align 2
-gFieldObjectPic_FatMan_3:: @ 84B3B38
-	.incbin "graphics/map_objects/pics/people/fat_man/3.4bpp"
-
-	.align 2
-gFieldObjectPic_FatMan_4:: @ 84B3C38
-	.incbin "graphics/map_objects/pics/people/fat_man/4.4bpp"
-
-	.align 2
-gFieldObjectPic_FatMan_5:: @ 84B3D38
-	.incbin "graphics/map_objects/pics/people/fat_man/5.4bpp"
-
-	.align 2
-gFieldObjectPic_FatMan_6:: @ 84B3E38
-	.incbin "graphics/map_objects/pics/people/fat_man/6.4bpp"
-
-	.align 2
-gFieldObjectPic_FatMan_7:: @ 84B3F38
-	.incbin "graphics/map_objects/pics/people/fat_man/7.4bpp"
-
-	.align 2
-gFieldObjectPic_FatMan_8:: @ 84B4038
-	.incbin "graphics/map_objects/pics/people/fat_man/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman2_0:: @ 84B4138
-	.incbin "graphics/map_objects/pics/people/woman_2/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman2_1:: @ 84B4238
-	.incbin "graphics/map_objects/pics/people/woman_2/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman2_2:: @ 84B4338
-	.incbin "graphics/map_objects/pics/people/woman_2/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman2_3:: @ 84B4438
-	.incbin "graphics/map_objects/pics/people/woman_2/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman2_4:: @ 84B4538
-	.incbin "graphics/map_objects/pics/people/woman_2/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman2_5:: @ 84B4638
-	.incbin "graphics/map_objects/pics/people/woman_2/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman2_6:: @ 84B4738
-	.incbin "graphics/map_objects/pics/people/woman_2/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman2_7:: @ 84B4838
-	.incbin "graphics/map_objects/pics/people/woman_2/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman2_8:: @ 84B4938
-	.incbin "graphics/map_objects/pics/people/woman_2/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Man1_0:: @ 84B4A38
-	.incbin "graphics/map_objects/pics/people/man_1/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Man1_1:: @ 84B4B38
-	.incbin "graphics/map_objects/pics/people/man_1/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Man1_2:: @ 84B4C38
-	.incbin "graphics/map_objects/pics/people/man_1/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Man1_3:: @ 84B4D38
-	.incbin "graphics/map_objects/pics/people/man_1/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Man1_4:: @ 84B4E38
-	.incbin "graphics/map_objects/pics/people/man_1/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Man1_5:: @ 84B4F38
-	.incbin "graphics/map_objects/pics/people/man_1/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Man1_6:: @ 84B5038
-	.incbin "graphics/map_objects/pics/people/man_1/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Man1_7:: @ 84B5138
-	.incbin "graphics/map_objects/pics/people/man_1/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Man1_8:: @ 84B5238
-	.incbin "graphics/map_objects/pics/people/man_1/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman3_0:: @ 84B5338
-	.incbin "graphics/map_objects/pics/people/woman_3/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman3_1:: @ 84B5438
-	.incbin "graphics/map_objects/pics/people/woman_3/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman3_2:: @ 84B5538
-	.incbin "graphics/map_objects/pics/people/woman_3/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman3_3:: @ 84B5638
-	.incbin "graphics/map_objects/pics/people/woman_3/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman3_4:: @ 84B5738
-	.incbin "graphics/map_objects/pics/people/woman_3/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman3_5:: @ 84B5838
-	.incbin "graphics/map_objects/pics/people/woman_3/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman3_6:: @ 84B5938
-	.incbin "graphics/map_objects/pics/people/woman_3/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman3_7:: @ 84B5A38
-	.incbin "graphics/map_objects/pics/people/woman_3/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman3_8:: @ 84B5B38
-	.incbin "graphics/map_objects/pics/people/woman_3/8.4bpp"
-
-	.align 2
-gFieldObjectPic_OldMan1_0:: @ 84B5C38
-	.incbin "graphics/map_objects/pics/people/old_man_1/0.4bpp"
-
-	.align 2
-gFieldObjectPic_OldMan1_1:: @ 84B5D38
-	.incbin "graphics/map_objects/pics/people/old_man_1/1.4bpp"
-
-	.align 2
-gFieldObjectPic_OldMan1_2:: @ 84B5E38
-	.incbin "graphics/map_objects/pics/people/old_man_1/2.4bpp"
-
-	.align 2
-gFieldObjectPic_OldMan1_3:: @ 84B5F38
-	.incbin "graphics/map_objects/pics/people/old_man_1/3.4bpp"
-
-	.align 2
-gFieldObjectPic_OldMan1_4:: @ 84B6038
-	.incbin "graphics/map_objects/pics/people/old_man_1/4.4bpp"
-
-	.align 2
-gFieldObjectPic_OldMan1_5:: @ 84B6138
-	.incbin "graphics/map_objects/pics/people/old_man_1/5.4bpp"
-
-	.align 2
-gFieldObjectPic_OldMan1_6:: @ 84B6238
-	.incbin "graphics/map_objects/pics/people/old_man_1/6.4bpp"
-
-	.align 2
-gFieldObjectPic_OldMan1_7:: @ 84B6338
-	.incbin "graphics/map_objects/pics/people/old_man_1/7.4bpp"
-
-	.align 2
-gFieldObjectPic_OldMan1_8:: @ 84B6438
-	.incbin "graphics/map_objects/pics/people/old_man_1/8.4bpp"
-
-	.align 2
-gFieldObjectPic_OldWoman1_0:: @ 84B6538
-	.incbin "graphics/map_objects/pics/people/old_woman_1/0.4bpp"
-
-	.align 2
-gFieldObjectPic_OldWoman1_1:: @ 84B6638
-	.incbin "graphics/map_objects/pics/people/old_woman_1/1.4bpp"
-
-	.align 2
-gFieldObjectPic_OldWoman1_2:: @ 84B6738
-	.incbin "graphics/map_objects/pics/people/old_woman_1/2.4bpp"
-
-	.align 2
-gFieldObjectPic_OldWoman1_3:: @ 84B6838
-	.incbin "graphics/map_objects/pics/people/old_woman_1/3.4bpp"
-
-	.align 2
-gFieldObjectPic_OldWoman1_4:: @ 84B6938
-	.incbin "graphics/map_objects/pics/people/old_woman_1/4.4bpp"
-
-	.align 2
-gFieldObjectPic_OldWoman1_5:: @ 84B6A38
-	.incbin "graphics/map_objects/pics/people/old_woman_1/5.4bpp"
-
-	.align 2
-gFieldObjectPic_OldWoman1_6:: @ 84B6B38
-	.incbin "graphics/map_objects/pics/people/old_woman_1/6.4bpp"
-
-	.align 2
-gFieldObjectPic_OldWoman1_7:: @ 84B6C38
-	.incbin "graphics/map_objects/pics/people/old_woman_1/7.4bpp"
-
-	.align 2
-gFieldObjectPic_OldWoman1_8:: @ 84B6D38
-	.incbin "graphics/map_objects/pics/people/old_woman_1/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Man2_0:: @ 84B6E38
-	.incbin "graphics/map_objects/pics/people/man_2/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Man2_1:: @ 84B6F38
-	.incbin "graphics/map_objects/pics/people/man_2/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Man2_2:: @ 84B7038
-	.incbin "graphics/map_objects/pics/people/man_2/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Man2_3:: @ 84B7138
-	.incbin "graphics/map_objects/pics/people/man_2/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Man2_4:: @ 84B7238
-	.incbin "graphics/map_objects/pics/people/man_2/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Man2_5:: @ 84B7338
-	.incbin "graphics/map_objects/pics/people/man_2/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Man2_6:: @ 84B7438
-	.incbin "graphics/map_objects/pics/people/man_2/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Man2_7:: @ 84B7538
-	.incbin "graphics/map_objects/pics/people/man_2/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Man2_8:: @ 84B7638
-	.incbin "graphics/map_objects/pics/people/man_2/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman4_0:: @ 84B7738
-	.incbin "graphics/map_objects/pics/people/woman_4/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman4_1:: @ 84B7838
-	.incbin "graphics/map_objects/pics/people/woman_4/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman4_2:: @ 84B7938
-	.incbin "graphics/map_objects/pics/people/woman_4/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman4_3:: @ 84B7A38
-	.incbin "graphics/map_objects/pics/people/woman_4/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman4_4:: @ 84B7B38
-	.incbin "graphics/map_objects/pics/people/woman_4/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman4_5:: @ 84B7C38
-	.incbin "graphics/map_objects/pics/people/woman_4/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman4_6:: @ 84B7D38
-	.incbin "graphics/map_objects/pics/people/woman_4/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman4_7:: @ 84B7E38
-	.incbin "graphics/map_objects/pics/people/woman_4/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman4_8:: @ 84B7F38
-	.incbin "graphics/map_objects/pics/people/woman_4/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Man3_0:: @ 84B8038
-	.incbin "graphics/map_objects/pics/people/man_3/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Man3_1:: @ 84B8138
-	.incbin "graphics/map_objects/pics/people/man_3/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Man3_2:: @ 84B8238
-	.incbin "graphics/map_objects/pics/people/man_3/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Man3_3:: @ 84B8338
-	.incbin "graphics/map_objects/pics/people/man_3/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Man3_4:: @ 84B8438
-	.incbin "graphics/map_objects/pics/people/man_3/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Man3_5:: @ 84B8538
-	.incbin "graphics/map_objects/pics/people/man_3/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Man3_6:: @ 84B8638
-	.incbin "graphics/map_objects/pics/people/man_3/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Man3_7:: @ 84B8738
-	.incbin "graphics/map_objects/pics/people/man_3/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Man3_8:: @ 84B8838
-	.incbin "graphics/map_objects/pics/people/man_3/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman5_0:: @ 84B8938
-	.incbin "graphics/map_objects/pics/people/woman_5/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman5_1:: @ 84B8A38
-	.incbin "graphics/map_objects/pics/people/woman_5/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman5_2:: @ 84B8B38
-	.incbin "graphics/map_objects/pics/people/woman_5/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman5_3:: @ 84B8C38
-	.incbin "graphics/map_objects/pics/people/woman_5/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman5_4:: @ 84B8D38
-	.incbin "graphics/map_objects/pics/people/woman_5/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman5_5:: @ 84B8E38
-	.incbin "graphics/map_objects/pics/people/woman_5/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman5_6:: @ 84B8F38
-	.incbin "graphics/map_objects/pics/people/woman_5/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman5_7:: @ 84B9038
-	.incbin "graphics/map_objects/pics/people/woman_5/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman5_8:: @ 84B9138
-	.incbin "graphics/map_objects/pics/people/woman_5/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Cook_0:: @ 84B9238
-	.incbin "graphics/map_objects/pics/people/cook/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Cook_1:: @ 84B9338
-	.incbin "graphics/map_objects/pics/people/cook/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Cook_2:: @ 84B9438
-	.incbin "graphics/map_objects/pics/people/cook/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman6_0:: @ 84B9538
-	.incbin "graphics/map_objects/pics/people/woman_6/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman6_1:: @ 84B9638
-	.incbin "graphics/map_objects/pics/people/woman_6/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman6_2:: @ 84B9738
-	.incbin "graphics/map_objects/pics/people/woman_6/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman6_3:: @ 84B9838
-	.incbin "graphics/map_objects/pics/people/woman_6/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman6_4:: @ 84B9938
-	.incbin "graphics/map_objects/pics/people/woman_6/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman6_5:: @ 84B9A38
-	.incbin "graphics/map_objects/pics/people/woman_6/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman6_6:: @ 84B9B38
-	.incbin "graphics/map_objects/pics/people/woman_6/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman6_7:: @ 84B9C38
-	.incbin "graphics/map_objects/pics/people/woman_6/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman6_8:: @ 84B9D38
-	.incbin "graphics/map_objects/pics/people/woman_6/8.4bpp"
-
-	.align 2
-gFieldObjectPic_OldMan2_0:: @ 84B9E38
-	.incbin "graphics/map_objects/pics/people/old_man_2/0.4bpp"
-
-	.align 2
-gFieldObjectPic_OldMan2_1:: @ 84B9F38
-	.incbin "graphics/map_objects/pics/people/old_man_2/1.4bpp"
-
-	.align 2
-gFieldObjectPic_OldMan2_2:: @ 84BA038
-	.incbin "graphics/map_objects/pics/people/old_man_2/2.4bpp"
-
-	.align 2
-gFieldObjectPic_OldWoman2_0:: @ 84BA138
-	.incbin "graphics/map_objects/pics/people/old_woman_2/0.4bpp"
-
-	.align 2
-gFieldObjectPic_OldWoman2_1:: @ 84BA238
-	.incbin "graphics/map_objects/pics/people/old_woman_2/1.4bpp"
-
-	.align 2
-gFieldObjectPic_OldWoman2_2:: @ 84BA338
-	.incbin "graphics/map_objects/pics/people/old_woman_2/2.4bpp"
-
-	.align 2
-gFieldObjectPic_OldWoman2_3:: @ 84BA438
-	.incbin "graphics/map_objects/pics/people/old_woman_2/3.4bpp"
-
-	.align 2
-gFieldObjectPic_OldWoman2_4:: @ 84BA538
-	.incbin "graphics/map_objects/pics/people/old_woman_2/4.4bpp"
-
-	.align 2
-gFieldObjectPic_OldWoman2_5:: @ 84BA638
-	.incbin "graphics/map_objects/pics/people/old_woman_2/5.4bpp"
-
-	.align 2
-gFieldObjectPic_OldWoman2_6:: @ 84BA738
-	.incbin "graphics/map_objects/pics/people/old_woman_2/6.4bpp"
-
-	.align 2
-gFieldObjectPic_OldWoman2_7:: @ 84BA838
-	.incbin "graphics/map_objects/pics/people/old_woman_2/7.4bpp"
-
-	.align 2
-gFieldObjectPic_OldWoman2_8:: @ 84BA938
-	.incbin "graphics/map_objects/pics/people/old_woman_2/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Camper_0:: @ 84BAA38
-	.incbin "graphics/map_objects/pics/people/camper/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Camper_1:: @ 84BAB38
-	.incbin "graphics/map_objects/pics/people/camper/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Camper_2:: @ 84BAC38
-	.incbin "graphics/map_objects/pics/people/camper/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Camper_3:: @ 84BAD38
-	.incbin "graphics/map_objects/pics/people/camper/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Camper_4:: @ 84BAE38
-	.incbin "graphics/map_objects/pics/people/camper/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Camper_5:: @ 84BAF38
-	.incbin "graphics/map_objects/pics/people/camper/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Camper_6:: @ 84BB038
-	.incbin "graphics/map_objects/pics/people/camper/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Camper_7:: @ 84BB138
-	.incbin "graphics/map_objects/pics/people/camper/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Camper_8:: @ 84BB238
-	.incbin "graphics/map_objects/pics/people/camper/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Picnicker_0:: @ 84BB338
-	.incbin "graphics/map_objects/pics/people/picnicker/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Picnicker_1:: @ 84BB438
-	.incbin "graphics/map_objects/pics/people/picnicker/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Picnicker_2:: @ 84BB538
-	.incbin "graphics/map_objects/pics/people/picnicker/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Picnicker_3:: @ 84BB638
-	.incbin "graphics/map_objects/pics/people/picnicker/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Picnicker_4:: @ 84BB738
-	.incbin "graphics/map_objects/pics/people/picnicker/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Picnicker_5:: @ 84BB838
-	.incbin "graphics/map_objects/pics/people/picnicker/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Picnicker_6:: @ 84BB938
-	.incbin "graphics/map_objects/pics/people/picnicker/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Picnicker_7:: @ 84BBA38
-	.incbin "graphics/map_objects/pics/people/picnicker/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Picnicker_8:: @ 84BBB38
-	.incbin "graphics/map_objects/pics/people/picnicker/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Man4_0:: @ 84BBC38
-	.incbin "graphics/map_objects/pics/people/man_4/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Man4_1:: @ 84BBD38
-	.incbin "graphics/map_objects/pics/people/man_4/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Man4_2:: @ 84BBE38
-	.incbin "graphics/map_objects/pics/people/man_4/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Man4_3:: @ 84BBF38
-	.incbin "graphics/map_objects/pics/people/man_4/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Man4_4:: @ 84BC038
-	.incbin "graphics/map_objects/pics/people/man_4/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Man4_5:: @ 84BC138
-	.incbin "graphics/map_objects/pics/people/man_4/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Man4_6:: @ 84BC238
-	.incbin "graphics/map_objects/pics/people/man_4/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Man4_7:: @ 84BC338
-	.incbin "graphics/map_objects/pics/people/man_4/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Man4_8:: @ 84BC438
-	.incbin "graphics/map_objects/pics/people/man_4/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman7_0:: @ 84BC538
-	.incbin "graphics/map_objects/pics/people/woman_7/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman7_1:: @ 84BC638
-	.incbin "graphics/map_objects/pics/people/woman_7/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman7_2:: @ 84BC738
-	.incbin "graphics/map_objects/pics/people/woman_7/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman7_3:: @ 84BC838
-	.incbin "graphics/map_objects/pics/people/woman_7/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman7_4:: @ 84BC938
-	.incbin "graphics/map_objects/pics/people/woman_7/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman7_5:: @ 84BCA38
-	.incbin "graphics/map_objects/pics/people/woman_7/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman7_6:: @ 84BCB38
-	.incbin "graphics/map_objects/pics/people/woman_7/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman7_7:: @ 84BCC38
-	.incbin "graphics/map_objects/pics/people/woman_7/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman7_8:: @ 84BCD38
-	.incbin "graphics/map_objects/pics/people/woman_7/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Youngster_0:: @ 84BCE38
-	.incbin "graphics/map_objects/pics/people/youngster/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Youngster_1:: @ 84BCF38
-	.incbin "graphics/map_objects/pics/people/youngster/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Youngster_2:: @ 84BD038
-	.incbin "graphics/map_objects/pics/people/youngster/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Youngster_3:: @ 84BD138
-	.incbin "graphics/map_objects/pics/people/youngster/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Youngster_4:: @ 84BD238
-	.incbin "graphics/map_objects/pics/people/youngster/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Youngster_5:: @ 84BD338
-	.incbin "graphics/map_objects/pics/people/youngster/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Youngster_6:: @ 84BD438
-	.incbin "graphics/map_objects/pics/people/youngster/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Youngster_7:: @ 84BD538
-	.incbin "graphics/map_objects/pics/people/youngster/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Youngster_8:: @ 84BD638
-	.incbin "graphics/map_objects/pics/people/youngster/8.4bpp"
-
-	.align 2
-gFieldObjectPic_BugCatcher_0:: @ 84BD738
-	.incbin "graphics/map_objects/pics/people/bug_catcher/0.4bpp"
-
-	.align 2
-gFieldObjectPic_BugCatcher_1:: @ 84BD838
-	.incbin "graphics/map_objects/pics/people/bug_catcher/1.4bpp"
-
-	.align 2
-gFieldObjectPic_BugCatcher_2:: @ 84BD938
-	.incbin "graphics/map_objects/pics/people/bug_catcher/2.4bpp"
-
-	.align 2
-gFieldObjectPic_BugCatcher_3:: @ 84BDA38
-	.incbin "graphics/map_objects/pics/people/bug_catcher/3.4bpp"
-
-	.align 2
-gFieldObjectPic_BugCatcher_4:: @ 84BDB38
-	.incbin "graphics/map_objects/pics/people/bug_catcher/4.4bpp"
-
-	.align 2
-gFieldObjectPic_BugCatcher_5:: @ 84BDC38
-	.incbin "graphics/map_objects/pics/people/bug_catcher/5.4bpp"
-
-	.align 2
-gFieldObjectPic_BugCatcher_6:: @ 84BDD38
-	.incbin "graphics/map_objects/pics/people/bug_catcher/6.4bpp"
-
-	.align 2
-gFieldObjectPic_BugCatcher_7:: @ 84BDE38
-	.incbin "graphics/map_objects/pics/people/bug_catcher/7.4bpp"
-
-	.align 2
-gFieldObjectPic_BugCatcher_8:: @ 84BDF38
-	.incbin "graphics/map_objects/pics/people/bug_catcher/8.4bpp"
-
-	.align 2
-gFieldObjectPic_PsychicM_0:: @ 84BE038
-	.incbin "graphics/map_objects/pics/people/psychic_m/0.4bpp"
-
-	.align 2
-gFieldObjectPic_PsychicM_1:: @ 84BE138
-	.incbin "graphics/map_objects/pics/people/psychic_m/1.4bpp"
-
-	.align 2
-gFieldObjectPic_PsychicM_2:: @ 84BE238
-	.incbin "graphics/map_objects/pics/people/psychic_m/2.4bpp"
-
-	.align 2
-gFieldObjectPic_PsychicM_3:: @ 84BE338
-	.incbin "graphics/map_objects/pics/people/psychic_m/3.4bpp"
-
-	.align 2
-gFieldObjectPic_PsychicM_4:: @ 84BE438
-	.incbin "graphics/map_objects/pics/people/psychic_m/4.4bpp"
-
-	.align 2
-gFieldObjectPic_PsychicM_5:: @ 84BE538
-	.incbin "graphics/map_objects/pics/people/psychic_m/5.4bpp"
-
-	.align 2
-gFieldObjectPic_PsychicM_6:: @ 84BE638
-	.incbin "graphics/map_objects/pics/people/psychic_m/6.4bpp"
-
-	.align 2
-gFieldObjectPic_PsychicM_7:: @ 84BE738
-	.incbin "graphics/map_objects/pics/people/psychic_m/7.4bpp"
-
-	.align 2
-gFieldObjectPic_PsychicM_8:: @ 84BE838
-	.incbin "graphics/map_objects/pics/people/psychic_m/8.4bpp"
-
-	.align 2
-gFieldObjectPic_SchoolKidM_0:: @ 84BE938
-	.incbin "graphics/map_objects/pics/people/school_kid_m/0.4bpp"
-
-	.align 2
-gFieldObjectPic_SchoolKidM_1:: @ 84BEA38
-	.incbin "graphics/map_objects/pics/people/school_kid_m/1.4bpp"
-
-	.align 2
-gFieldObjectPic_SchoolKidM_2:: @ 84BEB38
-	.incbin "graphics/map_objects/pics/people/school_kid_m/2.4bpp"
-
-	.align 2
-gFieldObjectPic_SchoolKidM_3:: @ 84BEC38
-	.incbin "graphics/map_objects/pics/people/school_kid_m/3.4bpp"
-
-	.align 2
-gFieldObjectPic_SchoolKidM_4:: @ 84BED38
-	.incbin "graphics/map_objects/pics/people/school_kid_m/4.4bpp"
-
-	.align 2
-gFieldObjectPic_SchoolKidM_5:: @ 84BEE38
-	.incbin "graphics/map_objects/pics/people/school_kid_m/5.4bpp"
-
-	.align 2
-gFieldObjectPic_SchoolKidM_6:: @ 84BEF38
-	.incbin "graphics/map_objects/pics/people/school_kid_m/6.4bpp"
-
-	.align 2
-gFieldObjectPic_SchoolKidM_7:: @ 84BF038
-	.incbin "graphics/map_objects/pics/people/school_kid_m/7.4bpp"
-
-	.align 2
-gFieldObjectPic_SchoolKidM_8:: @ 84BF138
-	.incbin "graphics/map_objects/pics/people/school_kid_m/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Maniac_0:: @ 84BF238
-	.incbin "graphics/map_objects/pics/people/maniac/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Maniac_1:: @ 84BF338
-	.incbin "graphics/map_objects/pics/people/maniac/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Maniac_2:: @ 84BF438
-	.incbin "graphics/map_objects/pics/people/maniac/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Maniac_3:: @ 84BF538
-	.incbin "graphics/map_objects/pics/people/maniac/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Maniac_4:: @ 84BF638
-	.incbin "graphics/map_objects/pics/people/maniac/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Maniac_5:: @ 84BF738
-	.incbin "graphics/map_objects/pics/people/maniac/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Maniac_6:: @ 84BF838
-	.incbin "graphics/map_objects/pics/people/maniac/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Maniac_7:: @ 84BF938
-	.incbin "graphics/map_objects/pics/people/maniac/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Maniac_8:: @ 84BFA38
-	.incbin "graphics/map_objects/pics/people/maniac/8.4bpp"
-
-	.align 2
-gFieldObjectPic_HexManiac_0:: @ 84BFB38
-	.incbin "graphics/map_objects/pics/people/hex_maniac/0.4bpp"
-
-	.align 2
-gFieldObjectPic_HexManiac_1:: @ 84BFC38
-	.incbin "graphics/map_objects/pics/people/hex_maniac/1.4bpp"
-
-	.align 2
-gFieldObjectPic_HexManiac_2:: @ 84BFD38
-	.incbin "graphics/map_objects/pics/people/hex_maniac/2.4bpp"
-
-	.align 2
-gFieldObjectPic_HexManiac_3:: @ 84BFE38
-	.incbin "graphics/map_objects/pics/people/hex_maniac/3.4bpp"
-
-	.align 2
-gFieldObjectPic_HexManiac_4:: @ 84BFF38
-	.incbin "graphics/map_objects/pics/people/hex_maniac/4.4bpp"
-
-	.align 2
-gFieldObjectPic_HexManiac_5:: @ 84C0038
-	.incbin "graphics/map_objects/pics/people/hex_maniac/5.4bpp"
-
-	.align 2
-gFieldObjectPic_HexManiac_6:: @ 84C0138
-	.incbin "graphics/map_objects/pics/people/hex_maniac/6.4bpp"
-
-	.align 2
-gFieldObjectPic_HexManiac_7:: @ 84C0238
-	.incbin "graphics/map_objects/pics/people/hex_maniac/7.4bpp"
-
-	.align 2
-gFieldObjectPic_HexManiac_8:: @ 84C0338
-	.incbin "graphics/map_objects/pics/people/hex_maniac/8.4bpp"
-
-	.align 2
-gFieldObjectPic_UnusedWoman_0:: @ 84C0438
-	.incbin "graphics/map_objects/pics/people/unused_woman/0.4bpp"
-
-	.align 2
-gFieldObjectPic_UnusedWoman_1:: @ 84C0538
-	.incbin "graphics/map_objects/pics/people/unused_woman/1.4bpp"
-
-	.align 2
-gFieldObjectPic_UnusedWoman_2:: @ 84C0638
-	.incbin "graphics/map_objects/pics/people/unused_woman/2.4bpp"
-
-	.align 2
-gFieldObjectPic_UnusedWoman_3:: @ 84C0738
-	.incbin "graphics/map_objects/pics/people/unused_woman/3.4bpp"
-
-	.align 2
-gFieldObjectPic_UnusedWoman_4:: @ 84C0838
-	.incbin "graphics/map_objects/pics/people/unused_woman/4.4bpp"
-
-	.align 2
-gFieldObjectPic_UnusedWoman_5:: @ 84C0938
-	.incbin "graphics/map_objects/pics/people/unused_woman/5.4bpp"
-
-	.align 2
-gFieldObjectPic_UnusedWoman_6:: @ 84C0A38
-	.incbin "graphics/map_objects/pics/people/unused_woman/6.4bpp"
-
-	.align 2
-gFieldObjectPic_UnusedWoman_7:: @ 84C0B38
-	.incbin "graphics/map_objects/pics/people/unused_woman/7.4bpp"
-
-	.align 2
-gFieldObjectPic_UnusedWoman_8:: @ 84C0C38
-	.incbin "graphics/map_objects/pics/people/unused_woman/8.4bpp"
-
-	.align 2
-gFieldObjectPic_SwimmerM_0:: @ 84C0D38
-	.incbin "graphics/map_objects/pics/people/swimmer_m/0.4bpp"
-
-	.align 2
-gFieldObjectPic_SwimmerM_1:: @ 84C0E38
-	.incbin "graphics/map_objects/pics/people/swimmer_m/1.4bpp"
-
-	.align 2
-gFieldObjectPic_SwimmerM_2:: @ 84C0F38
-	.incbin "graphics/map_objects/pics/people/swimmer_m/2.4bpp"
-
-	.align 2
-gFieldObjectPic_SwimmerM_3:: @ 84C1038
-	.incbin "graphics/map_objects/pics/people/swimmer_m/3.4bpp"
-
-	.align 2
-gFieldObjectPic_SwimmerM_4:: @ 84C1138
-	.incbin "graphics/map_objects/pics/people/swimmer_m/4.4bpp"
-
-	.align 2
-gFieldObjectPic_SwimmerM_5:: @ 84C1238
-	.incbin "graphics/map_objects/pics/people/swimmer_m/5.4bpp"
-
-	.align 2
-gFieldObjectPic_SwimmerM_6:: @ 84C1338
-	.incbin "graphics/map_objects/pics/people/swimmer_m/6.4bpp"
-
-	.align 2
-gFieldObjectPic_SwimmerM_7:: @ 84C1438
-	.incbin "graphics/map_objects/pics/people/swimmer_m/7.4bpp"
-
-	.align 2
-gFieldObjectPic_SwimmerM_8:: @ 84C1538
-	.incbin "graphics/map_objects/pics/people/swimmer_m/8.4bpp"
-
-	.align 2
-gFieldObjectPic_SwimmerF_0:: @ 84C1638
-	.incbin "graphics/map_objects/pics/people/swimmer_f/0.4bpp"
-
-	.align 2
-gFieldObjectPic_SwimmerF_1:: @ 84C1738
-	.incbin "graphics/map_objects/pics/people/swimmer_f/1.4bpp"
-
-	.align 2
-gFieldObjectPic_SwimmerF_2:: @ 84C1838
-	.incbin "graphics/map_objects/pics/people/swimmer_f/2.4bpp"
-
-	.align 2
-gFieldObjectPic_SwimmerF_3:: @ 84C1938
-	.incbin "graphics/map_objects/pics/people/swimmer_f/3.4bpp"
-
-	.align 2
-gFieldObjectPic_SwimmerF_4:: @ 84C1A38
-	.incbin "graphics/map_objects/pics/people/swimmer_f/4.4bpp"
-
-	.align 2
-gFieldObjectPic_SwimmerF_5:: @ 84C1B38
-	.incbin "graphics/map_objects/pics/people/swimmer_f/5.4bpp"
-
-	.align 2
-gFieldObjectPic_SwimmerF_6:: @ 84C1C38
-	.incbin "graphics/map_objects/pics/people/swimmer_f/6.4bpp"
-
-	.align 2
-gFieldObjectPic_SwimmerF_7:: @ 84C1D38
-	.incbin "graphics/map_objects/pics/people/swimmer_f/7.4bpp"
-
-	.align 2
-gFieldObjectPic_SwimmerF_8:: @ 84C1E38
-	.incbin "graphics/map_objects/pics/people/swimmer_f/8.4bpp"
-
-	.align 2
-gFieldObjectPic_BlackBelt_0:: @ 84C1F38
-	.incbin "graphics/map_objects/pics/people/black_belt/0.4bpp"
-
-	.align 2
-gFieldObjectPic_BlackBelt_1:: @ 84C2038
-	.incbin "graphics/map_objects/pics/people/black_belt/1.4bpp"
-
-	.align 2
-gFieldObjectPic_BlackBelt_2:: @ 84C2138
-	.incbin "graphics/map_objects/pics/people/black_belt/2.4bpp"
-
-	.align 2
-gFieldObjectPic_BlackBelt_3:: @ 84C2238
-	.incbin "graphics/map_objects/pics/people/black_belt/3.4bpp"
-
-	.align 2
-gFieldObjectPic_BlackBelt_4:: @ 84C2338
-	.incbin "graphics/map_objects/pics/people/black_belt/4.4bpp"
-
-	.align 2
-gFieldObjectPic_BlackBelt_5:: @ 84C2438
-	.incbin "graphics/map_objects/pics/people/black_belt/5.4bpp"
-
-	.align 2
-gFieldObjectPic_BlackBelt_6:: @ 84C2538
-	.incbin "graphics/map_objects/pics/people/black_belt/6.4bpp"
-
-	.align 2
-gFieldObjectPic_BlackBelt_7:: @ 84C2638
-	.incbin "graphics/map_objects/pics/people/black_belt/7.4bpp"
-
-	.align 2
-gFieldObjectPic_BlackBelt_8:: @ 84C2738
-	.incbin "graphics/map_objects/pics/people/black_belt/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Beauty_0:: @ 84C2838
-	.incbin "graphics/map_objects/pics/people/beauty/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Beauty_1:: @ 84C2938
-	.incbin "graphics/map_objects/pics/people/beauty/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Beauty_2:: @ 84C2A38
-	.incbin "graphics/map_objects/pics/people/beauty/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Beauty_3:: @ 84C2B38
-	.incbin "graphics/map_objects/pics/people/beauty/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Beauty_4:: @ 84C2C38
-	.incbin "graphics/map_objects/pics/people/beauty/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Beauty_5:: @ 84C2D38
-	.incbin "graphics/map_objects/pics/people/beauty/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Beauty_6:: @ 84C2E38
-	.incbin "graphics/map_objects/pics/people/beauty/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Beauty_7:: @ 84C2F38
-	.incbin "graphics/map_objects/pics/people/beauty/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Beauty_8:: @ 84C3038
-	.incbin "graphics/map_objects/pics/people/beauty/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Scientist1_0:: @ 84C3138
-	.incbin "graphics/map_objects/pics/people/scientist_1/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Scientist1_1:: @ 84C3238
-	.incbin "graphics/map_objects/pics/people/scientist_1/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Scientist1_2:: @ 84C3338
-	.incbin "graphics/map_objects/pics/people/scientist_1/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Scientist1_3:: @ 84C3438
-	.incbin "graphics/map_objects/pics/people/scientist_1/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Scientist1_4:: @ 84C3538
-	.incbin "graphics/map_objects/pics/people/scientist_1/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Scientist1_5:: @ 84C3638
-	.incbin "graphics/map_objects/pics/people/scientist_1/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Scientist1_6:: @ 84C3738
-	.incbin "graphics/map_objects/pics/people/scientist_1/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Scientist1_7:: @ 84C3838
-	.incbin "graphics/map_objects/pics/people/scientist_1/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Scientist1_8:: @ 84C3938
-	.incbin "graphics/map_objects/pics/people/scientist_1/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Lass_0:: @ 84C3A38
-	.incbin "graphics/map_objects/pics/people/lass/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Lass_1:: @ 84C3B38
-	.incbin "graphics/map_objects/pics/people/lass/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Lass_2:: @ 84C3C38
-	.incbin "graphics/map_objects/pics/people/lass/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Lass_3:: @ 84C3D38
-	.incbin "graphics/map_objects/pics/people/lass/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Lass_4:: @ 84C3E38
-	.incbin "graphics/map_objects/pics/people/lass/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Lass_5:: @ 84C3F38
-	.incbin "graphics/map_objects/pics/people/lass/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Lass_6:: @ 84C4038
-	.incbin "graphics/map_objects/pics/people/lass/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Lass_7:: @ 84C4138
-	.incbin "graphics/map_objects/pics/people/lass/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Lass_8:: @ 84C4238
-	.incbin "graphics/map_objects/pics/people/lass/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Gentleman_0:: @ 84C4338
-	.incbin "graphics/map_objects/pics/people/gentleman/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Gentleman_1:: @ 84C4438
-	.incbin "graphics/map_objects/pics/people/gentleman/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Gentleman_2:: @ 84C4538
-	.incbin "graphics/map_objects/pics/people/gentleman/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Gentleman_3:: @ 84C4638
-	.incbin "graphics/map_objects/pics/people/gentleman/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Gentleman_4:: @ 84C4738
-	.incbin "graphics/map_objects/pics/people/gentleman/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Gentleman_5:: @ 84C4838
-	.incbin "graphics/map_objects/pics/people/gentleman/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Gentleman_6:: @ 84C4938
-	.incbin "graphics/map_objects/pics/people/gentleman/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Gentleman_7:: @ 84C4A38
-	.incbin "graphics/map_objects/pics/people/gentleman/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Gentleman_8:: @ 84C4B38
-	.incbin "graphics/map_objects/pics/people/gentleman/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Sailor_0:: @ 84C4C38
-	.incbin "graphics/map_objects/pics/people/sailor/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Sailor_1:: @ 84C4D38
-	.incbin "graphics/map_objects/pics/people/sailor/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Sailor_2:: @ 84C4E38
-	.incbin "graphics/map_objects/pics/people/sailor/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Sailor_3:: @ 84C4F38
-	.incbin "graphics/map_objects/pics/people/sailor/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Sailor_4:: @ 84C5038
-	.incbin "graphics/map_objects/pics/people/sailor/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Sailor_5:: @ 84C5138
-	.incbin "graphics/map_objects/pics/people/sailor/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Sailor_6:: @ 84C5238
-	.incbin "graphics/map_objects/pics/people/sailor/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Sailor_7:: @ 84C5338
-	.incbin "graphics/map_objects/pics/people/sailor/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Sailor_8:: @ 84C5438
-	.incbin "graphics/map_objects/pics/people/sailor/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Fisherman_0:: @ 84C5538
-	.incbin "graphics/map_objects/pics/people/fisherman/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Fisherman_1:: @ 84C5638
-	.incbin "graphics/map_objects/pics/people/fisherman/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Fisherman_2:: @ 84C5738
-	.incbin "graphics/map_objects/pics/people/fisherman/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Fisherman_3:: @ 84C5838
-	.incbin "graphics/map_objects/pics/people/fisherman/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Fisherman_4:: @ 84C5938
-	.incbin "graphics/map_objects/pics/people/fisherman/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Fisherman_5:: @ 84C5A38
-	.incbin "graphics/map_objects/pics/people/fisherman/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Fisherman_6:: @ 84C5B38
-	.incbin "graphics/map_objects/pics/people/fisherman/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Fisherman_7:: @ 84C5C38
-	.incbin "graphics/map_objects/pics/people/fisherman/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Fisherman_8:: @ 84C5D38
-	.incbin "graphics/map_objects/pics/people/fisherman/8.4bpp"
-
-	.align 2
-gFieldObjectPic_RunningTriathleteM_0:: @ 84C5E38
-	.incbin "graphics/map_objects/pics/people/running_triathlete_m/0.4bpp"
-
-	.align 2
-gFieldObjectPic_RunningTriathleteM_1:: @ 84C5F38
-	.incbin "graphics/map_objects/pics/people/running_triathlete_m/1.4bpp"
-
-	.align 2
-gFieldObjectPic_RunningTriathleteM_2:: @ 84C6038
-	.incbin "graphics/map_objects/pics/people/running_triathlete_m/2.4bpp"
-
-	.align 2
-gFieldObjectPic_RunningTriathleteM_3:: @ 84C6138
-	.incbin "graphics/map_objects/pics/people/running_triathlete_m/3.4bpp"
-
-	.align 2
-gFieldObjectPic_RunningTriathleteM_4:: @ 84C6238
-	.incbin "graphics/map_objects/pics/people/running_triathlete_m/4.4bpp"
-
-	.align 2
-gFieldObjectPic_RunningTriathleteM_5:: @ 84C6338
-	.incbin "graphics/map_objects/pics/people/running_triathlete_m/5.4bpp"
-
-	.align 2
-gFieldObjectPic_RunningTriathleteM_6:: @ 84C6438
-	.incbin "graphics/map_objects/pics/people/running_triathlete_m/6.4bpp"
-
-	.align 2
-gFieldObjectPic_RunningTriathleteM_7:: @ 84C6538
-	.incbin "graphics/map_objects/pics/people/running_triathlete_m/7.4bpp"
-
-	.align 2
-gFieldObjectPic_RunningTriathleteM_8:: @ 84C6638
-	.incbin "graphics/map_objects/pics/people/running_triathlete_m/8.4bpp"
-
-	.align 2
-gFieldObjectPic_RunningTriathleteF_0:: @ 84C6738
-	.incbin "graphics/map_objects/pics/people/running_triathlete_f/0.4bpp"
-
-	.align 2
-gFieldObjectPic_RunningTriathleteF_1:: @ 84C6838
-	.incbin "graphics/map_objects/pics/people/running_triathlete_f/1.4bpp"
-
-	.align 2
-gFieldObjectPic_RunningTriathleteF_2:: @ 84C6938
-	.incbin "graphics/map_objects/pics/people/running_triathlete_f/2.4bpp"
-
-	.align 2
-gFieldObjectPic_RunningTriathleteF_3:: @ 84C6A38
-	.incbin "graphics/map_objects/pics/people/running_triathlete_f/3.4bpp"
-
-	.align 2
-gFieldObjectPic_RunningTriathleteF_4:: @ 84C6B38
-	.incbin "graphics/map_objects/pics/people/running_triathlete_f/4.4bpp"
-
-	.align 2
-gFieldObjectPic_RunningTriathleteF_5:: @ 84C6C38
-	.incbin "graphics/map_objects/pics/people/running_triathlete_f/5.4bpp"
-
-	.align 2
-gFieldObjectPic_RunningTriathleteF_6:: @ 84C6D38
-	.incbin "graphics/map_objects/pics/people/running_triathlete_f/6.4bpp"
-
-	.align 2
-gFieldObjectPic_RunningTriathleteF_7:: @ 84C6E38
-	.incbin "graphics/map_objects/pics/people/running_triathlete_f/7.4bpp"
-
-	.align 2
-gFieldObjectPic_RunningTriathleteF_8:: @ 84C6F38
-	.incbin "graphics/map_objects/pics/people/running_triathlete_f/8.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberF_0:: @ 84C7038
-	.incbin "graphics/map_objects/pics/people/tuber_f/0.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberF_1:: @ 84C70B8
-	.incbin "graphics/map_objects/pics/people/tuber_f/1.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberF_2:: @ 84C7138
-	.incbin "graphics/map_objects/pics/people/tuber_f/2.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberF_3:: @ 84C71B8
-	.incbin "graphics/map_objects/pics/people/tuber_f/3.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberF_4:: @ 84C7238
-	.incbin "graphics/map_objects/pics/people/tuber_f/4.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberF_5:: @ 84C72B8
-	.incbin "graphics/map_objects/pics/people/tuber_f/5.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberF_6:: @ 84C7338
-	.incbin "graphics/map_objects/pics/people/tuber_f/6.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberF_7:: @ 84C73B8
-	.incbin "graphics/map_objects/pics/people/tuber_f/7.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberF_8:: @ 84C7438
-	.incbin "graphics/map_objects/pics/people/tuber_f/8.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberM_0:: @ 84C74B8
-	.incbin "graphics/map_objects/pics/people/tuber_m/0.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberM_1:: @ 84C7538
-	.incbin "graphics/map_objects/pics/people/tuber_m/1.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberM_2:: @ 84C75B8
-	.incbin "graphics/map_objects/pics/people/tuber_m/2.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberM_3:: @ 84C7638
-	.incbin "graphics/map_objects/pics/people/tuber_m/3.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberM_4:: @ 84C76B8
-	.incbin "graphics/map_objects/pics/people/tuber_m/4.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberM_5:: @ 84C7738
-	.incbin "graphics/map_objects/pics/people/tuber_m/5.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberM_6:: @ 84C77B8
-	.incbin "graphics/map_objects/pics/people/tuber_m/6.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberM_7:: @ 84C7838
-	.incbin "graphics/map_objects/pics/people/tuber_m/7.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberM_8:: @ 84C78B8
-	.incbin "graphics/map_objects/pics/people/tuber_m/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Hiker_0:: @ 84C7938
-	.incbin "graphics/map_objects/pics/people/hiker/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Hiker_1:: @ 84C7A38
-	.incbin "graphics/map_objects/pics/people/hiker/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Hiker_2:: @ 84C7B38
-	.incbin "graphics/map_objects/pics/people/hiker/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Hiker_3:: @ 84C7C38
-	.incbin "graphics/map_objects/pics/people/hiker/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Hiker_4:: @ 84C7D38
-	.incbin "graphics/map_objects/pics/people/hiker/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Hiker_5:: @ 84C7E38
-	.incbin "graphics/map_objects/pics/people/hiker/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Hiker_6:: @ 84C7F38
-	.incbin "graphics/map_objects/pics/people/hiker/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Hiker_7:: @ 84C8038
-	.incbin "graphics/map_objects/pics/people/hiker/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Hiker_8:: @ 84C8138
-	.incbin "graphics/map_objects/pics/people/hiker/8.4bpp"
-
-	.align 2
-gFieldObjectPic_CyclingTriathleteM_0:: @ 84C8238
-	.incbin "graphics/map_objects/pics/people/cycling_triathlete_m/0.4bpp"
-
-	.align 2
-gFieldObjectPic_CyclingTriathleteM_1:: @ 84C8438
-	.incbin "graphics/map_objects/pics/people/cycling_triathlete_m/1.4bpp"
-
-	.align 2
-gFieldObjectPic_CyclingTriathleteM_2:: @ 84C8638
-	.incbin "graphics/map_objects/pics/people/cycling_triathlete_m/2.4bpp"
-
-	.align 2
-gFieldObjectPic_CyclingTriathleteM_3:: @ 84C8838
-	.incbin "graphics/map_objects/pics/people/cycling_triathlete_m/3.4bpp"
-
-	.align 2
-gFieldObjectPic_CyclingTriathleteM_4:: @ 84C8A38
-	.incbin "graphics/map_objects/pics/people/cycling_triathlete_m/4.4bpp"
-
-	.align 2
-gFieldObjectPic_CyclingTriathleteM_5:: @ 84C8C38
-	.incbin "graphics/map_objects/pics/people/cycling_triathlete_m/5.4bpp"
-
-	.align 2
-gFieldObjectPic_CyclingTriathleteM_6:: @ 84C8E38
-	.incbin "graphics/map_objects/pics/people/cycling_triathlete_m/6.4bpp"
-
-	.align 2
-gFieldObjectPic_CyclingTriathleteM_7:: @ 84C9038
-	.incbin "graphics/map_objects/pics/people/cycling_triathlete_m/7.4bpp"
-
-	.align 2
-gFieldObjectPic_CyclingTriathleteM_8:: @ 84C9238
-	.incbin "graphics/map_objects/pics/people/cycling_triathlete_m/8.4bpp"
-
-	.align 2
-gFieldObjectPic_CyclingTriathleteF_0:: @ 84C9438
-	.incbin "graphics/map_objects/pics/people/cycling_triathlete_f/0.4bpp"
-
-	.align 2
-gFieldObjectPic_CyclingTriathleteF_1:: @ 84C9638
-	.incbin "graphics/map_objects/pics/people/cycling_triathlete_f/1.4bpp"
-
-	.align 2
-gFieldObjectPic_CyclingTriathleteF_2:: @ 84C9838
-	.incbin "graphics/map_objects/pics/people/cycling_triathlete_f/2.4bpp"
-
-	.align 2
-gFieldObjectPic_CyclingTriathleteF_3:: @ 84C9A38
-	.incbin "graphics/map_objects/pics/people/cycling_triathlete_f/3.4bpp"
-
-	.align 2
-gFieldObjectPic_CyclingTriathleteF_4:: @ 84C9C38
-	.incbin "graphics/map_objects/pics/people/cycling_triathlete_f/4.4bpp"
-
-	.align 2
-gFieldObjectPic_CyclingTriathleteF_5:: @ 84C9E38
-	.incbin "graphics/map_objects/pics/people/cycling_triathlete_f/5.4bpp"
-
-	.align 2
-gFieldObjectPic_CyclingTriathleteF_6:: @ 84CA038
-	.incbin "graphics/map_objects/pics/people/cycling_triathlete_f/6.4bpp"
-
-	.align 2
-gFieldObjectPic_CyclingTriathleteF_7:: @ 84CA238
-	.incbin "graphics/map_objects/pics/people/cycling_triathlete_f/7.4bpp"
-
-	.align 2
-gFieldObjectPic_CyclingTriathleteF_8:: @ 84CA438
-	.incbin "graphics/map_objects/pics/people/cycling_triathlete_f/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Man5_0:: @ 84CA638
-	.incbin "graphics/map_objects/pics/people/man_5/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Man5_1:: @ 84CA738
-	.incbin "graphics/map_objects/pics/people/man_5/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Man5_2:: @ 84CA838
-	.incbin "graphics/map_objects/pics/people/man_5/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Man5_3:: @ 84CA938
-	.incbin "graphics/map_objects/pics/people/man_5/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Man5_4:: @ 84CAA38
-	.incbin "graphics/map_objects/pics/people/man_5/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Man5_5:: @ 84CAB38
-	.incbin "graphics/map_objects/pics/people/man_5/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Man5_6:: @ 84CAC38
-	.incbin "graphics/map_objects/pics/people/man_5/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Man5_7:: @ 84CAD38
-	.incbin "graphics/map_objects/pics/people/man_5/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Man5_8:: @ 84CAE38
-	.incbin "graphics/map_objects/pics/people/man_5/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Man6_0:: @ 84CAF38
-	.incbin "graphics/map_objects/pics/people/man_6/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Man6_1:: @ 84CB038
-	.incbin "graphics/map_objects/pics/people/man_6/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Man6_2:: @ 84CB138
-	.incbin "graphics/map_objects/pics/people/man_6/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Man6_3:: @ 84CB238
-	.incbin "graphics/map_objects/pics/people/man_6/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Man6_4:: @ 84CB338
-	.incbin "graphics/map_objects/pics/people/man_6/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Man6_5:: @ 84CB438
-	.incbin "graphics/map_objects/pics/people/man_6/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Man6_6:: @ 84CB538
-	.incbin "graphics/map_objects/pics/people/man_6/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Man6_7:: @ 84CB638
-	.incbin "graphics/map_objects/pics/people/man_6/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Man6_8:: @ 84CB738
-	.incbin "graphics/map_objects/pics/people/man_6/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Nurse_0:: @ 84CB838
-	.incbin "graphics/map_objects/pics/people/nurse/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Nurse_1:: @ 84CB938
-	.incbin "graphics/map_objects/pics/people/nurse/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Nurse_2:: @ 84CBA38
-	.incbin "graphics/map_objects/pics/people/nurse/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Nurse_3:: @ 84CBB38
-	.incbin "graphics/map_objects/pics/people/nurse/3.4bpp"
-
-	.align 2
-gFieldObjectPic_ItemBall:: @ 84CBC38
-	.incbin "graphics/map_objects/pics/misc/item_ball.4bpp"
-
-	.align 2
-gFieldObjectPic_ProfBirch_0:: @ 84CBCB8
-	.incbin "graphics/map_objects/pics/people/prof_birch/0.4bpp"
-
-	.align 2
-gFieldObjectPic_ProfBirch_1:: @ 84CBDB8
-	.incbin "graphics/map_objects/pics/people/prof_birch/1.4bpp"
-
-	.align 2
-gFieldObjectPic_ProfBirch_2:: @ 84CBEB8
-	.incbin "graphics/map_objects/pics/people/prof_birch/2.4bpp"
-
-	.align 2
-gFieldObjectPic_ProfBirch_3:: @ 84CBFB8
-	.incbin "graphics/map_objects/pics/people/prof_birch/3.4bpp"
-
-	.align 2
-gFieldObjectPic_ProfBirch_4:: @ 84CC0B8
-	.incbin "graphics/map_objects/pics/people/prof_birch/4.4bpp"
-
-	.align 2
-gFieldObjectPic_ProfBirch_5:: @ 84CC1B8
-	.incbin "graphics/map_objects/pics/people/prof_birch/5.4bpp"
-
-	.align 2
-gFieldObjectPic_ProfBirch_6:: @ 84CC2B8
-	.incbin "graphics/map_objects/pics/people/prof_birch/6.4bpp"
-
-	.align 2
-gFieldObjectPic_ProfBirch_7:: @ 84CC3B8
-	.incbin "graphics/map_objects/pics/people/prof_birch/7.4bpp"
-
-	.align 2
-gFieldObjectPic_ProfBirch_8:: @ 84CC4B8
-	.incbin "graphics/map_objects/pics/people/prof_birch/8.4bpp"
-
-	.align 2
-gFieldObjectPic_ReporterM_0:: @ 84CC5B8
-	.incbin "graphics/map_objects/pics/people/reporter_m/0.4bpp"
-
-	.align 2
-gFieldObjectPic_ReporterM_1:: @ 84CC6B8
-	.incbin "graphics/map_objects/pics/people/reporter_m/1.4bpp"
-
-	.align 2
-gFieldObjectPic_ReporterM_2:: @ 84CC7B8
-	.incbin "graphics/map_objects/pics/people/reporter_m/2.4bpp"
-
-	.align 2
-gFieldObjectPic_ReporterM_3:: @ 84CC8B8
-	.incbin "graphics/map_objects/pics/people/reporter_m/3.4bpp"
-
-	.align 2
-gFieldObjectPic_ReporterM_4:: @ 84CC9B8
-	.incbin "graphics/map_objects/pics/people/reporter_m/4.4bpp"
-
-	.align 2
-gFieldObjectPic_ReporterM_5:: @ 84CCAB8
-	.incbin "graphics/map_objects/pics/people/reporter_m/5.4bpp"
-
-	.align 2
-gFieldObjectPic_ReporterM_6:: @ 84CCBB8
-	.incbin "graphics/map_objects/pics/people/reporter_m/6.4bpp"
-
-	.align 2
-gFieldObjectPic_ReporterM_7:: @ 84CCCB8
-	.incbin "graphics/map_objects/pics/people/reporter_m/7.4bpp"
-
-	.align 2
-gFieldObjectPic_ReporterM_8:: @ 84CCDB8
-	.incbin "graphics/map_objects/pics/people/reporter_m/8.4bpp"
-
-	.align 2
-gFieldObjectPic_ReporterF_0:: @ 84CCEB8
-	.incbin "graphics/map_objects/pics/people/reporter_f/0.4bpp"
-
-	.align 2
-gFieldObjectPic_ReporterF_1:: @ 84CCFB8
-	.incbin "graphics/map_objects/pics/people/reporter_f/1.4bpp"
-
-	.align 2
-gFieldObjectPic_ReporterF_2:: @ 84CD0B8
-	.incbin "graphics/map_objects/pics/people/reporter_f/2.4bpp"
-
-	.align 2
-gFieldObjectPic_ReporterF_3:: @ 84CD1B8
-	.incbin "graphics/map_objects/pics/people/reporter_f/3.4bpp"
-
-	.align 2
-gFieldObjectPic_ReporterF_4:: @ 84CD2B8
-	.incbin "graphics/map_objects/pics/people/reporter_f/4.4bpp"
-
-	.align 2
-gFieldObjectPic_ReporterF_5:: @ 84CD3B8
-	.incbin "graphics/map_objects/pics/people/reporter_f/5.4bpp"
-
-	.align 2
-gFieldObjectPic_ReporterF_6:: @ 84CD4B8
-	.incbin "graphics/map_objects/pics/people/reporter_f/6.4bpp"
-
-	.align 2
-gFieldObjectPic_ReporterF_7:: @ 84CD5B8
-	.incbin "graphics/map_objects/pics/people/reporter_f/7.4bpp"
-
-	.align 2
-gFieldObjectPic_ReporterF_8:: @ 84CD6B8
-	.incbin "graphics/map_objects/pics/people/reporter_f/8.4bpp"
-
-	.align 2
-gFieldObjectPic_MauvilleOldMan1_0:: @ 84CD7B8
-	.incbin "graphics/map_objects/pics/people/mauville_old_man_1/0.4bpp"
-
-	.align 2
-gFieldObjectPic_MauvilleOldMan1_1:: @ 84CD8B8
-	.incbin "graphics/map_objects/pics/people/mauville_old_man_1/1.4bpp"
-
-	.align 2
-gFieldObjectPic_MauvilleOldMan1_2:: @ 84CD9B8
-	.incbin "graphics/map_objects/pics/people/mauville_old_man_1/2.4bpp"
-
-	.align 2
-gFieldObjectPic_MauvilleOldMan1_3:: @ 84CDAB8
-	.incbin "graphics/map_objects/pics/people/mauville_old_man_1/3.4bpp"
-
-	.align 2
-gFieldObjectPic_MauvilleOldMan1_4:: @ 84CDBB8
-	.incbin "graphics/map_objects/pics/people/mauville_old_man_1/4.4bpp"
-
-	.align 2
-gFieldObjectPic_MauvilleOldMan1_5:: @ 84CDCB8
-	.incbin "graphics/map_objects/pics/people/mauville_old_man_1/5.4bpp"
-
-	.align 2
-gFieldObjectPic_MauvilleOldMan1_6:: @ 84CDDB8
-	.incbin "graphics/map_objects/pics/people/mauville_old_man_1/6.4bpp"
-
-	.align 2
-gFieldObjectPic_MauvilleOldMan1_7:: @ 84CDEB8
-	.incbin "graphics/map_objects/pics/people/mauville_old_man_1/7.4bpp"
-
-	.align 2
-gFieldObjectPic_MauvilleOldMan1_8:: @ 84CDFB8
-	.incbin "graphics/map_objects/pics/people/mauville_old_man_1/8.4bpp"
-
-	.align 2
-gFieldObjectPic_MauvilleOldMan2_0:: @ 84CE0B8
-	.incbin "graphics/map_objects/pics/people/mauville_old_man_2/0.4bpp"
-
-	.align 2
-gFieldObjectPic_MauvilleOldMan2_1:: @ 84CE1B8
-	.incbin "graphics/map_objects/pics/people/mauville_old_man_2/1.4bpp"
-
-	.align 2
-gFieldObjectPic_MauvilleOldMan2_2:: @ 84CE2B8
-	.incbin "graphics/map_objects/pics/people/mauville_old_man_2/2.4bpp"
-
-	.align 2
-gFieldObjectPic_MauvilleOldMan2_3:: @ 84CE3B8
-	.incbin "graphics/map_objects/pics/people/mauville_old_man_2/3.4bpp"
-
-	.align 2
-gFieldObjectPic_MauvilleOldMan2_4:: @ 84CE4B8
-	.incbin "graphics/map_objects/pics/people/mauville_old_man_2/4.4bpp"
-
-	.align 2
-gFieldObjectPic_MauvilleOldMan2_5:: @ 84CE5B8
-	.incbin "graphics/map_objects/pics/people/mauville_old_man_2/5.4bpp"
-
-	.align 2
-gFieldObjectPic_MauvilleOldMan2_6:: @ 84CE6B8
-	.incbin "graphics/map_objects/pics/people/mauville_old_man_2/6.4bpp"
-
-	.align 2
-gFieldObjectPic_MauvilleOldMan2_7:: @ 84CE7B8
-	.incbin "graphics/map_objects/pics/people/mauville_old_man_2/7.4bpp"
-
-	.align 2
-gFieldObjectPic_MauvilleOldMan2_8:: @ 84CE8B8
-	.incbin "graphics/map_objects/pics/people/mauville_old_man_2/8.4bpp"
-
-	.align 2
-gFieldObjectPic_MartEmployee_0:: @ 84CE9B8
-	.incbin "graphics/map_objects/pics/people/mart_employee/0.4bpp"
-
-	.align 2
-gFieldObjectPic_MartEmployee_1:: @ 84CEAB8
-	.incbin "graphics/map_objects/pics/people/mart_employee/1.4bpp"
-
-	.align 2
-gFieldObjectPic_MartEmployee_2:: @ 84CEBB8
-	.incbin "graphics/map_objects/pics/people/mart_employee/2.4bpp"
-
-	.align 2
-gFieldObjectPic_MartEmployee_3:: @ 84CECB8
-	.incbin "graphics/map_objects/pics/people/mart_employee/3.4bpp"
-
-	.align 2
-gFieldObjectPic_MartEmployee_4:: @ 84CEDB8
-	.incbin "graphics/map_objects/pics/people/mart_employee/4.4bpp"
-
-	.align 2
-gFieldObjectPic_MartEmployee_5:: @ 84CEEB8
-	.incbin "graphics/map_objects/pics/people/mart_employee/5.4bpp"
-
-	.align 2
-gFieldObjectPic_MartEmployee_6:: @ 84CEFB8
-	.incbin "graphics/map_objects/pics/people/mart_employee/6.4bpp"
-
-	.align 2
-gFieldObjectPic_MartEmployee_7:: @ 84CF0B8
-	.incbin "graphics/map_objects/pics/people/mart_employee/7.4bpp"
-
-	.align 2
-gFieldObjectPic_MartEmployee_8:: @ 84CF1B8
-	.incbin "graphics/map_objects/pics/people/mart_employee/8.4bpp"
-
-	.align 2
-gFieldObjectPic_RooftopSaleWoman_0:: @ 84CF2B8
-	.incbin "graphics/map_objects/pics/people/rooftop_sale_woman/0.4bpp"
-
-	.align 2
-gFieldObjectPic_RooftopSaleWoman_1:: @ 84CF3B8
-	.incbin "graphics/map_objects/pics/people/rooftop_sale_woman/1.4bpp"
-
-	.align 2
-gFieldObjectPic_RooftopSaleWoman_2:: @ 84CF4B8
-	.incbin "graphics/map_objects/pics/people/rooftop_sale_woman/2.4bpp"
-
-	.align 2
-gFieldObjectPic_RooftopSaleWoman_3:: @ 84CF5B8
-	.incbin "graphics/map_objects/pics/people/rooftop_sale_woman/3.4bpp"
-
-	.align 2
-gFieldObjectPic_RooftopSaleWoman_4:: @ 84CF6B8
-	.incbin "graphics/map_objects/pics/people/rooftop_sale_woman/4.4bpp"
-
-	.align 2
-gFieldObjectPic_RooftopSaleWoman_5:: @ 84CF7B8
-	.incbin "graphics/map_objects/pics/people/rooftop_sale_woman/5.4bpp"
-
-	.align 2
-gFieldObjectPic_RooftopSaleWoman_6:: @ 84CF8B8
-	.incbin "graphics/map_objects/pics/people/rooftop_sale_woman/6.4bpp"
-
-	.align 2
-gFieldObjectPic_RooftopSaleWoman_7:: @ 84CF9B8
-	.incbin "graphics/map_objects/pics/people/rooftop_sale_woman/7.4bpp"
-
-	.align 2
-gFieldObjectPic_RooftopSaleWoman_8:: @ 84CFAB8
-	.incbin "graphics/map_objects/pics/people/rooftop_sale_woman/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Teala_0:: @ 84CFBB8
-	.incbin "graphics/map_objects/pics/people/teala/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Teala_1:: @ 84CFCB8
-	.incbin "graphics/map_objects/pics/people/teala/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Teala_2:: @ 84CFDB8
-	.incbin "graphics/map_objects/pics/people/teala/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Teala_3:: @ 84CFEB8
-	.incbin "graphics/map_objects/pics/people/teala/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Teala_4:: @ 84CFFB8
-	.incbin "graphics/map_objects/pics/people/teala/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Teala_5:: @ 84D00B8
-	.incbin "graphics/map_objects/pics/people/teala/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Teala_6:: @ 84D01B8
-	.incbin "graphics/map_objects/pics/people/teala/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Teala_7:: @ 84D02B8
-	.incbin "graphics/map_objects/pics/people/teala/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Teala_8:: @ 84D03B8
-	.incbin "graphics/map_objects/pics/people/teala/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Artist_0:: @ 84D04B8
-	.incbin "graphics/map_objects/pics/people/artist/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Artist_1:: @ 84D05B8
-	.incbin "graphics/map_objects/pics/people/artist/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Artist_2:: @ 84D06B8
-	.incbin "graphics/map_objects/pics/people/artist/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Artist_3:: @ 84D07B8
-	.incbin "graphics/map_objects/pics/people/artist/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Artist_4:: @ 84D08B8
-	.incbin "graphics/map_objects/pics/people/artist/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Artist_5:: @ 84D09B8
-	.incbin "graphics/map_objects/pics/people/artist/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Artist_6:: @ 84D0AB8
-	.incbin "graphics/map_objects/pics/people/artist/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Artist_7:: @ 84D0BB8
-	.incbin "graphics/map_objects/pics/people/artist/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Artist_8:: @ 84D0CB8
-	.incbin "graphics/map_objects/pics/people/artist/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Cameraman_0:: @ 84D0DB8
-	.incbin "graphics/map_objects/pics/people/cameraman/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Cameraman_1:: @ 84D0EB8
-	.incbin "graphics/map_objects/pics/people/cameraman/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Cameraman_2:: @ 84D0FB8
-	.incbin "graphics/map_objects/pics/people/cameraman/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Cameraman_3:: @ 84D10B8
-	.incbin "graphics/map_objects/pics/people/cameraman/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Cameraman_4:: @ 84D11B8
-	.incbin "graphics/map_objects/pics/people/cameraman/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Cameraman_5:: @ 84D12B8
-	.incbin "graphics/map_objects/pics/people/cameraman/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Cameraman_6:: @ 84D13B8
-	.incbin "graphics/map_objects/pics/people/cameraman/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Cameraman_7:: @ 84D14B8
-	.incbin "graphics/map_objects/pics/people/cameraman/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Cameraman_8:: @ 84D15B8
-	.incbin "graphics/map_objects/pics/people/cameraman/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Scientist2_0:: @ 84D16B8
-	.incbin "graphics/map_objects/pics/people/scientist_2/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Scientist2_1:: @ 84D17B8
-	.incbin "graphics/map_objects/pics/people/scientist_2/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Scientist2_2:: @ 84D18B8
-	.incbin "graphics/map_objects/pics/people/scientist_2/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Scientist2_3:: @ 84D19B8
-	.incbin "graphics/map_objects/pics/people/scientist_2/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Scientist2_4:: @ 84D1AB8
-	.incbin "graphics/map_objects/pics/people/scientist_2/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Scientist2_5:: @ 84D1BB8
-	.incbin "graphics/map_objects/pics/people/scientist_2/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Scientist2_6:: @ 84D1CB8
-	.incbin "graphics/map_objects/pics/people/scientist_2/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Scientist2_7:: @ 84D1DB8
-	.incbin "graphics/map_objects/pics/people/scientist_2/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Scientist2_8:: @ 84D1EB8
-	.incbin "graphics/map_objects/pics/people/scientist_2/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Man7_0:: @ 84D1FB8
-	.incbin "graphics/map_objects/pics/people/man_7/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Man7_1:: @ 84D20B8
-	.incbin "graphics/map_objects/pics/people/man_7/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Man7_2:: @ 84D21B8
-	.incbin "graphics/map_objects/pics/people/man_7/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Man7_3:: @ 84D22B8
-	.incbin "graphics/map_objects/pics/people/man_7/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Man7_4:: @ 84D23B8
-	.incbin "graphics/map_objects/pics/people/man_7/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Man7_5:: @ 84D24B8
-	.incbin "graphics/map_objects/pics/people/man_7/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Man7_6:: @ 84D25B8
-	.incbin "graphics/map_objects/pics/people/man_7/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Man7_7:: @ 84D26B8
-	.incbin "graphics/map_objects/pics/people/man_7/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Man7_8:: @ 84D27B8
-	.incbin "graphics/map_objects/pics/people/man_7/8.4bpp"
-
-	.align 2
-gFieldObjectPic_AquaMemberM_0:: @ 84D28B8
-	.incbin "graphics/map_objects/pics/people/aqua_member_m/0.4bpp"
-
-	.align 2
-gFieldObjectPic_AquaMemberM_1:: @ 84D29B8
-	.incbin "graphics/map_objects/pics/people/aqua_member_m/1.4bpp"
-
-	.align 2
-gFieldObjectPic_AquaMemberM_2:: @ 84D2AB8
-	.incbin "graphics/map_objects/pics/people/aqua_member_m/2.4bpp"
-
-	.align 2
-gFieldObjectPic_AquaMemberM_3:: @ 84D2BB8
-	.incbin "graphics/map_objects/pics/people/aqua_member_m/3.4bpp"
-
-	.align 2
-gFieldObjectPic_AquaMemberM_4:: @ 84D2CB8
-	.incbin "graphics/map_objects/pics/people/aqua_member_m/4.4bpp"
-
-	.align 2
-gFieldObjectPic_AquaMemberM_5:: @ 84D2DB8
-	.incbin "graphics/map_objects/pics/people/aqua_member_m/5.4bpp"
-
-	.align 2
-gFieldObjectPic_AquaMemberM_6:: @ 84D2EB8
-	.incbin "graphics/map_objects/pics/people/aqua_member_m/6.4bpp"
-
-	.align 2
-gFieldObjectPic_AquaMemberM_7:: @ 84D2FB8
-	.incbin "graphics/map_objects/pics/people/aqua_member_m/7.4bpp"
-
-	.align 2
-gFieldObjectPic_AquaMemberM_8:: @ 84D30B8
-	.incbin "graphics/map_objects/pics/people/aqua_member_m/8.4bpp"
-
-	.align 2
-gFieldObjectPic_AquaMemberF_0:: @ 84D31B8
-	.incbin "graphics/map_objects/pics/people/aqua_member_f/0.4bpp"
-
-	.align 2
-gFieldObjectPic_AquaMemberF_1:: @ 84D32B8
-	.incbin "graphics/map_objects/pics/people/aqua_member_f/1.4bpp"
-
-	.align 2
-gFieldObjectPic_AquaMemberF_2:: @ 84D33B8
-	.incbin "graphics/map_objects/pics/people/aqua_member_f/2.4bpp"
-
-	.align 2
-gFieldObjectPic_AquaMemberF_3:: @ 84D34B8
-	.incbin "graphics/map_objects/pics/people/aqua_member_f/3.4bpp"
-
-	.align 2
-gFieldObjectPic_AquaMemberF_4:: @ 84D35B8
-	.incbin "graphics/map_objects/pics/people/aqua_member_f/4.4bpp"
-
-	.align 2
-gFieldObjectPic_AquaMemberF_5:: @ 84D36B8
-	.incbin "graphics/map_objects/pics/people/aqua_member_f/5.4bpp"
-
-	.align 2
-gFieldObjectPic_AquaMemberF_6:: @ 84D37B8
-	.incbin "graphics/map_objects/pics/people/aqua_member_f/6.4bpp"
-
-	.align 2
-gFieldObjectPic_AquaMemberF_7:: @ 84D38B8
-	.incbin "graphics/map_objects/pics/people/aqua_member_f/7.4bpp"
-
-	.align 2
-gFieldObjectPic_AquaMemberF_8:: @ 84D39B8
-	.incbin "graphics/map_objects/pics/people/aqua_member_f/8.4bpp"
-
-	.align 2
-gFieldObjectPic_MagmaMemberM_0:: @ 84D3AB8
-	.incbin "graphics/map_objects/pics/people/magma_member_m/0.4bpp"
-
-	.align 2
-gFieldObjectPic_MagmaMemberM_1:: @ 84D3BB8
-	.incbin "graphics/map_objects/pics/people/magma_member_m/1.4bpp"
-
-	.align 2
-gFieldObjectPic_MagmaMemberM_2:: @ 84D3CB8
-	.incbin "graphics/map_objects/pics/people/magma_member_m/2.4bpp"
-
-	.align 2
-gFieldObjectPic_MagmaMemberM_3:: @ 84D3DB8
-	.incbin "graphics/map_objects/pics/people/magma_member_m/3.4bpp"
-
-	.align 2
-gFieldObjectPic_MagmaMemberM_4:: @ 84D3EB8
-	.incbin "graphics/map_objects/pics/people/magma_member_m/4.4bpp"
-
-	.align 2
-gFieldObjectPic_MagmaMemberM_5:: @ 84D3FB8
-	.incbin "graphics/map_objects/pics/people/magma_member_m/5.4bpp"
-
-	.align 2
-gFieldObjectPic_MagmaMemberM_6:: @ 84D40B8
-	.incbin "graphics/map_objects/pics/people/magma_member_m/6.4bpp"
-
-	.align 2
-gFieldObjectPic_MagmaMemberM_7:: @ 84D41B8
-	.incbin "graphics/map_objects/pics/people/magma_member_m/7.4bpp"
-
-	.align 2
-gFieldObjectPic_MagmaMemberM_8:: @ 84D42B8
-	.incbin "graphics/map_objects/pics/people/magma_member_m/8.4bpp"
-
-	.align 2
-gFieldObjectPic_MagmaMemberF_0:: @ 84D43B8
-	.incbin "graphics/map_objects/pics/people/magma_member_f/0.4bpp"
-
-	.align 2
-gFieldObjectPic_MagmaMemberF_1:: @ 84D44B8
-	.incbin "graphics/map_objects/pics/people/magma_member_f/1.4bpp"
-
-	.align 2
-gFieldObjectPic_MagmaMemberF_2:: @ 84D45B8
-	.incbin "graphics/map_objects/pics/people/magma_member_f/2.4bpp"
-
-	.align 2
-gFieldObjectPic_MagmaMemberF_3:: @ 84D46B8
-	.incbin "graphics/map_objects/pics/people/magma_member_f/3.4bpp"
-
-	.align 2
-gFieldObjectPic_MagmaMemberF_4:: @ 84D47B8
-	.incbin "graphics/map_objects/pics/people/magma_member_f/4.4bpp"
-
-	.align 2
-gFieldObjectPic_MagmaMemberF_5:: @ 84D48B8
-	.incbin "graphics/map_objects/pics/people/magma_member_f/5.4bpp"
-
-	.align 2
-gFieldObjectPic_MagmaMemberF_6:: @ 84D49B8
-	.incbin "graphics/map_objects/pics/people/magma_member_f/6.4bpp"
-
-	.align 2
-gFieldObjectPic_MagmaMemberF_7:: @ 84D4AB8
-	.incbin "graphics/map_objects/pics/people/magma_member_f/7.4bpp"
-
-	.align 2
-gFieldObjectPic_MagmaMemberF_8:: @ 84D4BB8
-	.incbin "graphics/map_objects/pics/people/magma_member_f/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Sidney_0:: @ 84D4CB8
-	.incbin "graphics/map_objects/pics/people/sidney/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Sidney_1:: @ 84D4DB8
-	.incbin "graphics/map_objects/pics/people/sidney/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Sidney_2:: @ 84D4EB8
-	.incbin "graphics/map_objects/pics/people/sidney/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Phoebe_0:: @ 84D4FB8
-	.incbin "graphics/map_objects/pics/people/phoebe/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Phoebe_1:: @ 84D50B8
-	.incbin "graphics/map_objects/pics/people/phoebe/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Phoebe_2:: @ 84D51B8
-	.incbin "graphics/map_objects/pics/people/phoebe/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Glacia_0:: @ 84D52B8
-	.incbin "graphics/map_objects/pics/people/glacia/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Glacia_1:: @ 84D53B8
-	.incbin "graphics/map_objects/pics/people/glacia/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Glacia_2:: @ 84D54B8
-	.incbin "graphics/map_objects/pics/people/glacia/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Drake_0:: @ 84D55B8
-	.incbin "graphics/map_objects/pics/people/drake/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Drake_1:: @ 84D56B8
-	.incbin "graphics/map_objects/pics/people/drake/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Drake_2:: @ 84D57B8
-	.incbin "graphics/map_objects/pics/people/drake/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Roxanne_0:: @ 84D58B8
-	.incbin "graphics/map_objects/pics/people/roxanne/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Roxanne_1:: @ 84D59B8
-	.incbin "graphics/map_objects/pics/people/roxanne/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Roxanne_2:: @ 84D5AB8
-	.incbin "graphics/map_objects/pics/people/roxanne/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Brawly_0:: @ 84D5BB8
-	.incbin "graphics/map_objects/pics/people/brawly/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Brawly_1:: @ 84D5CB8
-	.incbin "graphics/map_objects/pics/people/brawly/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Brawly_2:: @ 84D5DB8
-	.incbin "graphics/map_objects/pics/people/brawly/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Wattson_0:: @ 84D5EB8
-	.incbin "graphics/map_objects/pics/people/wattson/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Wattson_1:: @ 84D5FB8
-	.incbin "graphics/map_objects/pics/people/wattson/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Wattson_2:: @ 84D60B8
-	.incbin "graphics/map_objects/pics/people/wattson/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Flannery_0:: @ 84D61B8
-	.incbin "graphics/map_objects/pics/people/flannery/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Flannery_1:: @ 84D62B8
-	.incbin "graphics/map_objects/pics/people/flannery/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Flannery_2:: @ 84D63B8
-	.incbin "graphics/map_objects/pics/people/flannery/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Norman_0:: @ 84D64B8
-	.incbin "graphics/map_objects/pics/people/norman/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Norman_1:: @ 84D65B8
-	.incbin "graphics/map_objects/pics/people/norman/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Norman_2:: @ 84D66B8
-	.incbin "graphics/map_objects/pics/people/norman/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Norman_3:: @ 84D67B8
-	.incbin "graphics/map_objects/pics/people/norman/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Norman_4:: @ 84D68B8
-	.incbin "graphics/map_objects/pics/people/norman/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Norman_5:: @ 84D69B8
-	.incbin "graphics/map_objects/pics/people/norman/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Norman_6:: @ 84D6AB8
-	.incbin "graphics/map_objects/pics/people/norman/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Norman_7:: @ 84D6BB8
-	.incbin "graphics/map_objects/pics/people/norman/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Norman_8:: @ 84D6CB8
-	.incbin "graphics/map_objects/pics/people/norman/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Winona_0:: @ 84D6DB8
-	.incbin "graphics/map_objects/pics/people/winona/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Winona_1:: @ 84D6EB8
-	.incbin "graphics/map_objects/pics/people/winona/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Winona_2:: @ 84D6FB8
-	.incbin "graphics/map_objects/pics/people/winona/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Liza_0:: @ 84D70B8
-	.incbin "graphics/map_objects/pics/people/liza/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Liza_1:: @ 84D71B8
-	.incbin "graphics/map_objects/pics/people/liza/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Liza_2:: @ 84D72B8
-	.incbin "graphics/map_objects/pics/people/liza/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Tate_0:: @ 84D73B8
-	.incbin "graphics/map_objects/pics/people/tate/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Tate_1:: @ 84D74B8
-	.incbin "graphics/map_objects/pics/people/tate/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Tate_2:: @ 84D75B8
-	.incbin "graphics/map_objects/pics/people/tate/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Wallace_0:: @ 84D76B8
-	.incbin "graphics/map_objects/pics/people/wallace/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Wallace_1:: @ 84D77B8
-	.incbin "graphics/map_objects/pics/people/wallace/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Wallace_2:: @ 84D78B8
-	.incbin "graphics/map_objects/pics/people/wallace/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Wallace_3:: @ 84D79B8
-	.incbin "graphics/map_objects/pics/people/wallace/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Wallace_4:: @ 84D7AB8
-	.incbin "graphics/map_objects/pics/people/wallace/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Wallace_5:: @ 84D7BB8
-	.incbin "graphics/map_objects/pics/people/wallace/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Wallace_6:: @ 84D7CB8
-	.incbin "graphics/map_objects/pics/people/wallace/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Wallace_7:: @ 84D7DB8
-	.incbin "graphics/map_objects/pics/people/wallace/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Wallace_8:: @ 84D7EB8
-	.incbin "graphics/map_objects/pics/people/wallace/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Steven_0:: @ 84D7FB8
-	.incbin "graphics/map_objects/pics/people/steven/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Steven_1:: @ 84D80B8
-	.incbin "graphics/map_objects/pics/people/steven/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Steven_2:: @ 84D81B8
-	.incbin "graphics/map_objects/pics/people/steven/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Steven_3:: @ 84D82B8
-	.incbin "graphics/map_objects/pics/people/steven/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Steven_4:: @ 84D83B8
-	.incbin "graphics/map_objects/pics/people/steven/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Steven_5:: @ 84D84B8
-	.incbin "graphics/map_objects/pics/people/steven/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Steven_6:: @ 84D85B8
-	.incbin "graphics/map_objects/pics/people/steven/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Steven_7:: @ 84D86B8
-	.incbin "graphics/map_objects/pics/people/steven/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Steven_8:: @ 84D87B8
-	.incbin "graphics/map_objects/pics/people/steven/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Wally_0:: @ 84D88B8
-	.incbin "graphics/map_objects/pics/people/wally/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Wally_1:: @ 84D89B8
-	.incbin "graphics/map_objects/pics/people/wally/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Wally_2:: @ 84D8AB8
-	.incbin "graphics/map_objects/pics/people/wally/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Wally_3:: @ 84D8BB8
-	.incbin "graphics/map_objects/pics/people/wally/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Wally_4:: @ 84D8CB8
-	.incbin "graphics/map_objects/pics/people/wally/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Wally_5:: @ 84D8DB8
-	.incbin "graphics/map_objects/pics/people/wally/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Wally_6:: @ 84D8EB8
-	.incbin "graphics/map_objects/pics/people/wally/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Wally_7:: @ 84D8FB8
-	.incbin "graphics/map_objects/pics/people/wally/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Wally_8:: @ 84D90B8
-	.incbin "graphics/map_objects/pics/people/wally/8.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireLittleBoy_0:: @ 84D91B8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_little_boy/0.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireLittleBoy_1:: @ 84D9238
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_little_boy/1.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireLittleBoy_2:: @ 84D92B8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_little_boy/2.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireLittleBoy_3:: @ 84D9338
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_little_boy/3.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireLittleBoy_4:: @ 84D93B8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_little_boy/4.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireLittleBoy_5:: @ 84D9438
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_little_boy/5.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireLittleBoy_6:: @ 84D94B8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_little_boy/6.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireLittleBoy_7:: @ 84D9538
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_little_boy/7.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireLittleBoy_8:: @ 84D95B8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_little_boy/8.4bpp"
-
-	.align 2
-gFieldObjectPic_HotSpringsOldWoman_0:: @ 84D9638
-	.incbin "graphics/map_objects/pics/people/hot_springs_old_woman/0.4bpp"
-
-	.align 2
-gFieldObjectPic_HotSpringsOldWoman_1:: @ 84D9738
-	.incbin "graphics/map_objects/pics/people/hot_springs_old_woman/1.4bpp"
-
-	.align 2
-gFieldObjectPic_HotSpringsOldWoman_2:: @ 84D9838
-	.incbin "graphics/map_objects/pics/people/hot_springs_old_woman/2.4bpp"
-
-	.align 2
-gFieldObjectPic_HotSpringsOldWoman_3:: @ 84D9938
-	.incbin "graphics/map_objects/pics/people/hot_springs_old_woman/3.4bpp"
-
-	.align 2
-gFieldObjectPic_HotSpringsOldWoman_4:: @ 84D9A38
-	.incbin "graphics/map_objects/pics/people/hot_springs_old_woman/4.4bpp"
-
-	.align 2
-gFieldObjectPic_HotSpringsOldWoman_5:: @ 84D9B38
-	.incbin "graphics/map_objects/pics/people/hot_springs_old_woman/5.4bpp"
-
-	.align 2
-gFieldObjectPic_HotSpringsOldWoman_6:: @ 84D9C38
-	.incbin "graphics/map_objects/pics/people/hot_springs_old_woman/6.4bpp"
-
-	.align 2
-gFieldObjectPic_HotSpringsOldWoman_7:: @ 84D9D38
-	.incbin "graphics/map_objects/pics/people/hot_springs_old_woman/7.4bpp"
-
-	.align 2
-gFieldObjectPic_HotSpringsOldWoman_8:: @ 84D9E38
-	.incbin "graphics/map_objects/pics/people/hot_springs_old_woman/8.4bpp"
-
-	.align 2
-gFieldObjectPic_LatiasLatios_0:: @ 84D9F38
-	.incbin "graphics/map_objects/pics/pokemon/latias_latios/0.4bpp"
-
-	.align 2
-gFieldObjectPic_LatiasLatios_1:: @ 84DA138
-	.incbin "graphics/map_objects/pics/pokemon/latias_latios/1.4bpp"
-
-	.align 2
-gFieldObjectPic_LatiasLatios_2:: @ 84DA338
-	.incbin "graphics/map_objects/pics/pokemon/latias_latios/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy5_0:: @ 84DA538
-	.incbin "graphics/map_objects/pics/people/boy_5/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy5_1:: @ 84DA638
-	.incbin "graphics/map_objects/pics/people/boy_5/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy5_2:: @ 84DA738
-	.incbin "graphics/map_objects/pics/people/boy_5/2.4bpp"
-
-	.align 2
-gFieldObjectPic_ContestOldMan_0:: @ 84DA838
-	.incbin "graphics/map_objects/pics/people/contest_old_man/0.4bpp"
-
-	.align 2
-gFieldObjectPic_ContestOldMan_1:: @ 84DA938
-	.incbin "graphics/map_objects/pics/people/contest_old_man/1.4bpp"
-
-	.align 2
-gFieldObjectPic_ContestOldMan_2:: @ 84DAA38
-	.incbin "graphics/map_objects/pics/people/contest_old_man/2.4bpp"
-
-	.align 2
-gFieldObjectPic_ContestOldMan_3:: @ 84DAB38
-	.incbin "graphics/map_objects/pics/people/contest_old_man/3.4bpp"
-
-	.align 2
-gFieldObjectPic_ContestOldMan_4:: @ 84DAC38
-	.incbin "graphics/map_objects/pics/people/contest_old_man/4.4bpp"
-
-	.align 2
-gFieldObjectPic_ContestOldMan_5:: @ 84DAD38
-	.incbin "graphics/map_objects/pics/people/contest_old_man/5.4bpp"
-
-	.align 2
-gFieldObjectPic_ContestOldMan_6:: @ 84DAE38
-	.incbin "graphics/map_objects/pics/people/contest_old_man/6.4bpp"
-
-	.align 2
-gFieldObjectPic_ContestOldMan_7:: @ 84DAF38
-	.incbin "graphics/map_objects/pics/people/contest_old_man/7.4bpp"
-
-	.align 2
-gFieldObjectPic_ContestOldMan_8:: @ 84DB038
-	.incbin "graphics/map_objects/pics/people/contest_old_man/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Archie_0:: @ 84DB138
-	.incbin "graphics/map_objects/pics/people/archie/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Archie_1:: @ 84DB238
-	.incbin "graphics/map_objects/pics/people/archie/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Archie_2:: @ 84DB338
-	.incbin "graphics/map_objects/pics/people/archie/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Archie_3:: @ 84DB438
-	.incbin "graphics/map_objects/pics/people/archie/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Archie_4:: @ 84DB538
-	.incbin "graphics/map_objects/pics/people/archie/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Archie_5:: @ 84DB638
-	.incbin "graphics/map_objects/pics/people/archie/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Archie_6:: @ 84DB738
-	.incbin "graphics/map_objects/pics/people/archie/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Archie_7:: @ 84DB838
-	.incbin "graphics/map_objects/pics/people/archie/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Archie_8:: @ 84DB938
-	.incbin "graphics/map_objects/pics/people/archie/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Maxie_0:: @ 84DBA38
-	.incbin "graphics/map_objects/pics/people/maxie/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Maxie_1:: @ 84DBB38
-	.incbin "graphics/map_objects/pics/people/maxie/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Maxie_2:: @ 84DBC38
-	.incbin "graphics/map_objects/pics/people/maxie/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Maxie_3:: @ 84DBD38
-	.incbin "graphics/map_objects/pics/people/maxie/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Maxie_4:: @ 84DBE38
-	.incbin "graphics/map_objects/pics/people/maxie/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Maxie_5:: @ 84DBF38
-	.incbin "graphics/map_objects/pics/people/maxie/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Maxie_6:: @ 84DC038
-	.incbin "graphics/map_objects/pics/people/maxie/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Maxie_7:: @ 84DC138
-	.incbin "graphics/map_objects/pics/people/maxie/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Maxie_8:: @ 84DC238
-	.incbin "graphics/map_objects/pics/people/maxie/8.4bpp"
-
-	.align 2
-gFieldObjectPic_KyogreFront_0:: @ 84DC338
-	.incbin "graphics/map_objects/pics/pokemon/kyogre_front/0.4bpp"
-
-	.align 2
-gFieldObjectPic_KyogreFront_1:: @ 84DC538
-	.incbin "graphics/map_objects/pics/pokemon/kyogre_front/1.4bpp"
-
-	.align 2
-gFieldObjectPic_KyogreSide_0:: @ 84DC738
-	.incbin "graphics/map_objects/pics/pokemon/kyogre_side/0.4bpp"
-
-	.align 2
-gFieldObjectPic_KyogreSide_1:: @ 84DC938
-	.incbin "graphics/map_objects/pics/pokemon/kyogre_side/1.4bpp"
-
-	.align 2
-gFieldObjectPic_GroudonFront_0:: @ 84DCB38
-	.incbin "graphics/map_objects/pics/pokemon/groudon_front/0.4bpp"
-
-	.align 2
-gFieldObjectPic_GroudonFront_1:: @ 84DCD38
-	.incbin "graphics/map_objects/pics/pokemon/groudon_front/1.4bpp"
-
-	.align 2
-gFieldObjectPic_GroudonSide_0:: @ 84DCF38
-	.incbin "graphics/map_objects/pics/pokemon/groudon_side/0.4bpp"
-
-	.align 2
-gFieldObjectPic_GroudonSide_1:: @ 84DD138
-	.incbin "graphics/map_objects/pics/pokemon/groudon_side/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Regi:: @ 84DD338
-	.incbin "graphics/map_objects/pics/pokemon/regi.4bpp"
-
-	.align 2
-gFieldObjectPic_Skitty_0:: @ 84DD538
-	.incbin "graphics/map_objects/pics/pokemon/skitty/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Skitty_1:: @ 84DD5B8
-	.incbin "graphics/map_objects/pics/pokemon/skitty/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Skitty_2:: @ 84DD638
-	.incbin "graphics/map_objects/pics/pokemon/skitty/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Kecleon_0:: @ 84DD6B8
-	.incbin "graphics/map_objects/pics/pokemon/kecleon/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Kecleon_1:: @ 84DD738
-	.incbin "graphics/map_objects/pics/pokemon/kecleon/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Kecleon_2:: @ 84DD7B8
-	.incbin "graphics/map_objects/pics/pokemon/kecleon/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Rayquaza_0:: @ 84DD838
-	.incbin "graphics/map_objects/pics/pokemon/rayquaza/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Rayquaza_1:: @ 84DE038
-	.incbin "graphics/map_objects/pics/pokemon/rayquaza/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Rayquaza_2:: @ 84DE838
-	.incbin "graphics/map_objects/pics/pokemon/rayquaza/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Rayquaza_3:: @ 84DF038
-	.incbin "graphics/map_objects/pics/pokemon/rayquaza/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Rayquaza_4:: @ 84DF838
-	.incbin "graphics/map_objects/pics/pokemon/rayquaza/4.4bpp"
-
-	.align 2
-gFieldObjectPic_RayquazaStill:: @ 84E0038
-	.incbin "graphics/map_objects/pics/pokemon/rayquaza_still.4bpp"
-
-	.align 2
-gFieldObjectPic_Zigzagoon_0:: @ 84E0838
-	.incbin "graphics/map_objects/pics/pokemon/zigzagoon/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Zigzagoon_1:: @ 84E08B8
-	.incbin "graphics/map_objects/pics/pokemon/zigzagoon/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Zigzagoon_2:: @ 84E0938
-	.incbin "graphics/map_objects/pics/pokemon/zigzagoon/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Pikachu_0:: @ 84E09B8
-	.incbin "graphics/map_objects/pics/pokemon/pikachu/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Pikachu_1:: @ 84E0A38
-	.incbin "graphics/map_objects/pics/pokemon/pikachu/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Pikachu_2:: @ 84E0AB8
-	.incbin "graphics/map_objects/pics/pokemon/pikachu/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Azumarill_0:: @ 84E0B38
-	.incbin "graphics/map_objects/pics/pokemon/azumarill/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Azumarill_1:: @ 84E0BB8
-	.incbin "graphics/map_objects/pics/pokemon/azumarill/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Azumarill_2:: @ 84E0C38
-	.incbin "graphics/map_objects/pics/pokemon/azumarill/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Wingull_0:: @ 84E0CB8
-	.incbin "graphics/map_objects/pics/pokemon/wingull/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Wingull_3:: @ 84E0D38
-	.incbin "graphics/map_objects/pics/pokemon/wingull/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Wingull_1:: @ 84E0DB8
-	.incbin "graphics/map_objects/pics/pokemon/wingull/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Wingull_4:: @ 84E0E38
-	.incbin "graphics/map_objects/pics/pokemon/wingull/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Wingull_2:: @ 84E0EB8
-	.incbin "graphics/map_objects/pics/pokemon/wingull/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Wingull_5:: @ 84E0F38
-	.incbin "graphics/map_objects/pics/pokemon/wingull/5.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberMSwimming_0:: @ 84E0FB8
-	.incbin "graphics/map_objects/pics/people/tuber_m_swimming/0.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberMSwimming_1:: @ 84E1038
-	.incbin "graphics/map_objects/pics/people/tuber_m_swimming/1.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberMSwimming_2:: @ 84E10B8
-	.incbin "graphics/map_objects/pics/people/tuber_m_swimming/2.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberMSwimming_3:: @ 84E1138
-	.incbin "graphics/map_objects/pics/people/tuber_m_swimming/3.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberMSwimming_4:: @ 84E11B8
-	.incbin "graphics/map_objects/pics/people/tuber_m_swimming/4.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberMSwimming_5:: @ 84E1238
-	.incbin "graphics/map_objects/pics/people/tuber_m_swimming/5.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberMSwimming_6:: @ 84E12B8
-	.incbin "graphics/map_objects/pics/people/tuber_m_swimming/6.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberMSwimming_7:: @ 84E1338
-	.incbin "graphics/map_objects/pics/people/tuber_m_swimming/7.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberMSwimming_8:: @ 84E13B8
-	.incbin "graphics/map_objects/pics/people/tuber_m_swimming/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Azurill_0:: @ 84E1438
-	.incbin "graphics/map_objects/pics/pokemon/azurill/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Azurill_1:: @ 84E14B8
-	.incbin "graphics/map_objects/pics/pokemon/azurill/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Azurill_2:: @ 84E1538
-	.incbin "graphics/map_objects/pics/pokemon/azurill/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Mom_0:: @ 84E15B8
-	.incbin "graphics/map_objects/pics/people/mom/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Mom_1:: @ 84E16B8
-	.incbin "graphics/map_objects/pics/people/mom/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Mom_2:: @ 84E17B8
-	.incbin "graphics/map_objects/pics/people/mom/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Mom_3:: @ 84E18B8
-	.incbin "graphics/map_objects/pics/people/mom/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Mom_4:: @ 84E19B8
-	.incbin "graphics/map_objects/pics/people/mom/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Mom_5:: @ 84E1AB8
-	.incbin "graphics/map_objects/pics/people/mom/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Mom_6:: @ 84E1BB8
-	.incbin "graphics/map_objects/pics/people/mom/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Mom_7:: @ 84E1CB8
-	.incbin "graphics/map_objects/pics/people/mom/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Mom_8:: @ 84E1DB8
-	.incbin "graphics/map_objects/pics/people/mom/8.4bpp"
-
-	.align 2
-gFieldObjectPalette22:: @ 84E1EB8
-	.incbin "graphics/map_objects/palettes/field_object_palette_22.gbapal"
-
-	.align 2
-gFieldObjectPalette23:: @ 84E1ED8
-	.incbin "graphics/map_objects/palettes/field_object_palette_23.gbapal"
-
-	.align 2
-gFieldObjectPalette24:: @ 84E1EF8
-	.incbin "graphics/map_objects/palettes/field_object_palette_24.gbapal"
-
-	.align 2
-gFieldObjectPalette25:: @ 84E1F18
-	.incbin "graphics/map_objects/palettes/field_object_palette_25.gbapal"
-
-	.align 2
-gFieldObjectPic_UnusedNatuDoll:: @ 84E1F38
-	.incbin "graphics/map_objects/pics/dolls/unused_natu_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_UnusedMagnemiteDoll:: @ 84E1FB8
-	.incbin "graphics/map_objects/pics/dolls/unused_magnemite_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_UnusedSquirtleDoll:: @ 84E2038
-	.incbin "graphics/map_objects/pics/dolls/unused_squirtle_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_UnusedWooperDoll:: @ 84E20B8
-	.incbin "graphics/map_objects/pics/dolls/unused_wooper_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_UnusedPikachuDoll:: @ 84E2138
-	.incbin "graphics/map_objects/pics/dolls/unused_pikachu_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_UnusedPorygon2Doll:: @ 84E21B8
-	.incbin "graphics/map_objects/pics/dolls/unused_porygon2_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_PichuDoll:: @ 84E2238
-	.incbin "graphics/map_objects/pics/dolls/pichu_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_PikachuDoll:: @ 84E22B8
-	.incbin "graphics/map_objects/pics/dolls/pikachu_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_MarillDoll:: @ 84E2338
-	.incbin "graphics/map_objects/pics/dolls/marill_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_TogepiDoll:: @ 84E23B8
-	.incbin "graphics/map_objects/pics/dolls/togepi_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_CyndaquilDoll:: @ 84E2438
-	.incbin "graphics/map_objects/pics/dolls/cyndaquil_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_ChikoritaDoll:: @ 84E24B8
-	.incbin "graphics/map_objects/pics/dolls/chikorita_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_TotodileDoll:: @ 84E2538
-	.incbin "graphics/map_objects/pics/dolls/totodile_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_JigglypuffDoll:: @ 84E25B8
-	.incbin "graphics/map_objects/pics/dolls/jigglypuff_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_MeowthDoll:: @ 84E2638
-	.incbin "graphics/map_objects/pics/dolls/meowth_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_ClefairyDoll:: @ 84E26B8
-	.incbin "graphics/map_objects/pics/dolls/clefairy_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_DittoDoll:: @ 84E2738
-	.incbin "graphics/map_objects/pics/dolls/ditto_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_SmoochumDoll:: @ 84E27B8
-	.incbin "graphics/map_objects/pics/dolls/smoochum_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_TreeckoDoll:: @ 84E2838
-	.incbin "graphics/map_objects/pics/dolls/treecko_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_TorchicDoll:: @ 84E28B8
-	.incbin "graphics/map_objects/pics/dolls/torchic_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_MudkipDoll:: @ 84E2938
-	.incbin "graphics/map_objects/pics/dolls/mudkip_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_DuskullDoll:: @ 84E29B8
-	.incbin "graphics/map_objects/pics/dolls/duskull_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_WynautDoll:: @ 84E2A38
-	.incbin "graphics/map_objects/pics/dolls/wynaut_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_BaltoyDoll:: @ 84E2AB8
-	.incbin "graphics/map_objects/pics/dolls/baltoy_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_KecleonDoll:: @ 84E2B38
-	.incbin "graphics/map_objects/pics/dolls/kecleon_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_AzurillDoll:: @ 84E2BB8
-	.incbin "graphics/map_objects/pics/dolls/azurill_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_SkittyDoll:: @ 84E2C38
-	.incbin "graphics/map_objects/pics/dolls/skitty_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_SwabluDoll:: @ 84E2CB8
-	.incbin "graphics/map_objects/pics/dolls/swablu_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_GulpinDoll:: @ 84E2D38
-	.incbin "graphics/map_objects/pics/dolls/gulpin_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_LotadDoll:: @ 84E2DB8
-	.incbin "graphics/map_objects/pics/dolls/lotad_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_SeedotDoll:: @ 84E2E38
-	.incbin "graphics/map_objects/pics/dolls/seedot_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_PikaCushion:: @ 84E2EB8
-	.incbin "graphics/map_objects/pics/cushions/pika_cushion.4bpp"
-
-	.align 2
-gFieldObjectPic_RoundCushion:: @ 84E2F38
-	.incbin "graphics/map_objects/pics/cushions/round_cushion.4bpp"
-
-	.align 2
-gFieldObjectPic_KissCushion:: @ 84E2FB8
-	.incbin "graphics/map_objects/pics/cushions/kiss_cushion.4bpp"
-
-	.align 2
-gFieldObjectPic_ZigzagCushion:: @ 84E3038
-	.incbin "graphics/map_objects/pics/cushions/zigzag_cushion.4bpp"
-
-	.align 2
-gFieldObjectPic_SpinCushion:: @ 84E30B8
-	.incbin "graphics/map_objects/pics/cushions/spin_cushion.4bpp"
-
-	.align 2
-gFieldObjectPic_DiamondCushion:: @ 84E3138
-	.incbin "graphics/map_objects/pics/cushions/diamond_cushion.4bpp"
-
-	.align 2
-gFieldObjectPic_BallCushion:: @ 84E31B8
-	.incbin "graphics/map_objects/pics/cushions/ball_cushion.4bpp"
-
-	.align 2
-gFieldObjectPic_GrassCushion:: @ 84E3238
-	.incbin "graphics/map_objects/pics/cushions/grass_cushion.4bpp"
-
-	.align 2
-gFieldObjectPic_FireCushion:: @ 84E32B8
-	.incbin "graphics/map_objects/pics/cushions/fire_cushion.4bpp"
-
-	.align 2
-gFieldObjectPic_WaterCushion:: @ 84E3338
-	.incbin "graphics/map_objects/pics/cushions/water_cushion.4bpp"
-
-	.align 2
-gFieldObjectPic_BigSnorlaxDoll:: @ 84E33B8
-	.incbin "graphics/map_objects/pics/dolls/big_snorlax_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_BigRhydonDoll:: @ 84E35B8
-	.incbin "graphics/map_objects/pics/dolls/big_rhydon_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_BigLaprasDoll:: @ 84E37B8
-	.incbin "graphics/map_objects/pics/dolls/big_lapras_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_BigVenusaurDoll:: @ 84E39B8
-	.incbin "graphics/map_objects/pics/dolls/big_venusaur_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_BigCharizardDoll:: @ 84E3BB8
-	.incbin "graphics/map_objects/pics/dolls/big_charizard_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_BigBlastoiseDoll:: @ 84E3DB8
-	.incbin "graphics/map_objects/pics/dolls/big_blastoise_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_BigWailmerDoll:: @ 84E3FB8
-	.incbin "graphics/map_objects/pics/dolls/big_wailmer_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_BigRegirockDoll:: @ 84E41B8
-	.incbin "graphics/map_objects/pics/dolls/big_regirock_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_BigRegiceDoll:: @ 84E43B8
-	.incbin "graphics/map_objects/pics/dolls/big_regice_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_BigRegisteelDoll:: @ 84E45B8
-	.incbin "graphics/map_objects/pics/dolls/big_registeel_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_CuttableTree_0:: @ 84E47B8
-	.incbin "graphics/map_objects/pics/misc/cuttable_tree/0.4bpp"
-
-	.align 2
-gFieldObjectPic_CuttableTree_1:: @ 84E4838
-	.incbin "graphics/map_objects/pics/misc/cuttable_tree/1.4bpp"
-
-	.align 2
-gFieldObjectPic_CuttableTree_2:: @ 84E48B8
-	.incbin "graphics/map_objects/pics/misc/cuttable_tree/2.4bpp"
-
-	.align 2
-gFieldObjectPic_CuttableTree_3:: @ 84E4938
-	.incbin "graphics/map_objects/pics/misc/cuttable_tree/3.4bpp"
-
-	.align 2
-gFieldObjectPic_BreakableRock_0:: @ 84E49B8
-	.incbin "graphics/map_objects/pics/misc/breakable_rock/0.4bpp"
-
-	.align 2
-gFieldObjectPic_BreakableRock_1:: @ 84E4A38
-	.incbin "graphics/map_objects/pics/misc/breakable_rock/1.4bpp"
-
-	.align 2
-gFieldObjectPic_BreakableRock_2:: @ 84E4AB8
-	.incbin "graphics/map_objects/pics/misc/breakable_rock/2.4bpp"
-
-	.align 2
-gFieldObjectPic_BreakableRock_3:: @ 84E4B38
-	.incbin "graphics/map_objects/pics/misc/breakable_rock/3.4bpp"
-
-	.align 2
-gFieldObjectPic_PushableBoulder:: @ 84E4BB8
-	.incbin "graphics/map_objects/pics/misc/pushable_boulder.4bpp"
-
-	.align 2
-gFieldObjectPic_MrBrineysBoat_0:: @ 84E4C38
-	.incbin "graphics/map_objects/pics/misc/mr_brineys_boat/0.4bpp"
-
-	.align 2
-gFieldObjectPic_MrBrineysBoat_1:: @ 84E4E38
-	.incbin "graphics/map_objects/pics/misc/mr_brineys_boat/1.4bpp"
-
-	.align 2
-gFieldObjectPic_MrBrineysBoat_2:: @ 84E5038
-	.incbin "graphics/map_objects/pics/misc/mr_brineys_boat/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Fossil:: @ 84E5238
-	.incbin "graphics/map_objects/pics/misc/fossil.4bpp"
-
-	.align 2
-gFieldObjectPic_SubmarineShadow:: @ 84E52B8
-	.incbin "graphics/map_objects/pics/misc/submarine_shadow.4bpp"
-
-	.align 2
-gFieldObjectPalette26:: @ 84E5838
-	.incbin "graphics/map_objects/palettes/field_object_palette_26.gbapal"
-
-	.align 2
-gFieldObjectPic_Truck:: @ 84E5858
-	.incbin "graphics/map_objects/pics/misc/truck.4bpp"
-
-	.align 2
-gFieldObjectPalette14:: @ 84E5CD8
-	.incbin "graphics/map_objects/palettes/field_object_palette_14.gbapal"
-
-	.align 2
-gFieldObjectPic_VigorothCarryingBox_0:: @ 84E5CF8
-	.incbin "graphics/map_objects/pics/pokemon/vigoroth_carrying_box/0.4bpp"
-
-	.align 2
-gFieldObjectPic_VigorothCarryingBox_1:: @ 84E5EF8
-	.incbin "graphics/map_objects/pics/pokemon/vigoroth_carrying_box/1.4bpp"
-
-	.align 2
-gFieldObjectPic_VigorothCarryingBox_2:: @ 84E60F8
-	.incbin "graphics/map_objects/pics/pokemon/vigoroth_carrying_box/2.4bpp"
-
-	.align 2
-gFieldObjectPic_VigorothFacingAway_0:: @ 84E62F8
-	.incbin "graphics/map_objects/pics/pokemon/vigoroth_facing_away/0.4bpp"
-
-	.align 2
-gFieldObjectPic_VigorothFacingAway_1:: @ 84E64F8
-	.incbin "graphics/map_objects/pics/pokemon/vigoroth_facing_away/1.4bpp"
-
-	.align 2
-gFieldObjectPalette15:: @ 84E66F8
-	.incbin "graphics/map_objects/palettes/field_object_palette_15.gbapal"
-
-	.align 2
-gFieldObjectPic_BirchsBag:: @ 84E6718
-	.incbin "graphics/map_objects/pics/misc/birchs_bag.4bpp"
-
-	.align 2
-gFieldObjectPic_EnemyZigzagoon_0:: @ 84E6798
-	.incbin "graphics/map_objects/pics/pokemon/enemy_zigzagoon/0.4bpp"
-
-	.align 2
-gFieldObjectPic_EnemyZigzagoon_1:: @ 84E6998
-	.incbin "graphics/map_objects/pics/pokemon/enemy_zigzagoon/1.4bpp"
-
-	.align 2
-gFieldObjectPic_EnemyZigzagoon_2:: @ 84E6B98
-	.incbin "graphics/map_objects/pics/pokemon/enemy_zigzagoon/2.4bpp"
-
-	.align 2
-gFieldObjectPic_EnemyZigzagoon_3:: @ 84E6D98
-	.incbin "graphics/map_objects/pics/pokemon/enemy_zigzagoon/3.4bpp"
-
-	.align 2
-gFieldObjectPic_EnemyZigzagoon_4:: @ 84E6F98
-	.incbin "graphics/map_objects/pics/pokemon/enemy_zigzagoon/4.4bpp"
-
-	.align 2
-gFieldObjectPic_EnemyZigzagoon_5:: @ 84E7198
-	.incbin "graphics/map_objects/pics/pokemon/enemy_zigzagoon/5.4bpp"
-
-	.align 2
-gFieldObjectPic_EnemyZigzagoon_6:: @ 84E7398
-	.incbin "graphics/map_objects/pics/pokemon/enemy_zigzagoon/6.4bpp"
-
-	.align 2
-gFieldObjectPic_EnemyZigzagoon_7:: @ 84E7598
-	.incbin "graphics/map_objects/pics/pokemon/enemy_zigzagoon/7.4bpp"
-
-	.align 2
-gFieldObjectPic_EnemyZigzagoon_8:: @ 84E7798
-	.incbin "graphics/map_objects/pics/pokemon/enemy_zigzagoon/8.4bpp"
-
-	.align 2
-gFieldObjectPalette16:: @ 84E7998
-	.incbin "graphics/map_objects/palettes/field_object_palette_16.gbapal"
-
-	.align 2
-gFieldObjectPic_Poochyena_0:: @ 84E79B8
-	.incbin "graphics/map_objects/pics/pokemon/poochyena/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Poochyena_1:: @ 84E7BB8
-	.incbin "graphics/map_objects/pics/pokemon/poochyena/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Poochyena_2:: @ 84E7DB8
-	.incbin "graphics/map_objects/pics/pokemon/poochyena/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Poochyena_3:: @ 84E7FB8
-	.incbin "graphics/map_objects/pics/pokemon/poochyena/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Poochyena_4:: @ 84E81B8
-	.incbin "graphics/map_objects/pics/pokemon/poochyena/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Poochyena_5:: @ 84E83B8
-	.incbin "graphics/map_objects/pics/pokemon/poochyena/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Poochyena_6:: @ 84E85B8
-	.incbin "graphics/map_objects/pics/pokemon/poochyena/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Poochyena_7:: @ 84E87B8
-	.incbin "graphics/map_objects/pics/pokemon/poochyena/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Poochyena_8:: @ 84E89B8
-	.incbin "graphics/map_objects/pics/pokemon/poochyena/8.4bpp"
-
-	.align 2
-gFieldObjectPalette27:: @ 84E8BB8
-	.incbin "graphics/map_objects/palettes/field_object_palette_27.gbapal"
-
-	.align 2
-gFieldObjectPic_CableCar:: @ 84E8BD8
-	.incbin "graphics/map_objects/pics/misc/cable_car.4bpp"
-
-	.align 2
-gFieldObjectPalette20:: @ 84E93D8
-	.incbin "graphics/map_objects/palettes/field_object_palette_20.gbapal"
-
-	.align 2
-gFieldObjectPic_SSTidal:: @ 84E93F8
-	.incbin "graphics/map_objects/pics/misc/ss_tidal.4bpp"
-
-	.align 2
-gFieldObjectPalette21:: @ 84E9B78
-	.incbin "graphics/map_objects/palettes/field_object_palette_21.gbapal"
-
-	.align 2
-gFieldEffectObjectPic_BerryTreeGrowthSparkle_0:: @ 84E9B98
-	.incbin "graphics/map_objects/pics/effects/berry_tree_growth_sparkle/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_BerryTreeGrowthSparkle_1:: @ 84E9C18
-	.incbin "graphics/map_objects/pics/effects/berry_tree_growth_sparkle/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_BerryTreeGrowthSparkle_2:: @ 84E9C98
-	.incbin "graphics/map_objects/pics/effects/berry_tree_growth_sparkle/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_BerryTreeGrowthSparkle_3:: @ 84E9D18
-	.incbin "graphics/map_objects/pics/effects/berry_tree_growth_sparkle/3.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_BerryTreeGrowthSparkle_4:: @ 84E9D98
-	.incbin "graphics/map_objects/pics/effects/berry_tree_growth_sparkle/4.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_BerryTreeGrowthSparkle_5:: @ 84E9E18
-	.incbin "graphics/map_objects/pics/effects/berry_tree_growth_sparkle/5.4bpp"
-
-	.align 2
-gFieldObjectPic_BerryTreeDirtPile:: @ 84E9E98
-	.incbin "graphics/map_objects/pics/berry_trees/dirt_pile.4bpp"
-
-	.align 2
-gFieldObjectPic_BerryTreeSprout_0:: @ 84E9F18
-	.incbin "graphics/map_objects/pics/berry_trees/sprout/0.4bpp"
-
-	.align 2
-gFieldObjectPic_BerryTreeSprout_1:: @ 84E9F98
-	.incbin "graphics/map_objects/pics/berry_trees/sprout/1.4bpp"
-
-	.align 2
-gFieldObjectPic_PechaBerryTree_0:: @ 84EA018
-	.incbin "graphics/map_objects/pics/berry_trees/pecha/0.4bpp"
-
-	.align 2
-gFieldObjectPic_PechaBerryTree_1:: @ 84EA118
-	.incbin "graphics/map_objects/pics/berry_trees/pecha/1.4bpp"
-
-	.align 2
-gFieldObjectPic_PechaBerryTree_2:: @ 84EA218
-	.incbin "graphics/map_objects/pics/berry_trees/pecha/2.4bpp"
-
-	.align 2
-gFieldObjectPic_PechaBerryTree_3:: @ 84EA318
-	.incbin "graphics/map_objects/pics/berry_trees/pecha/3.4bpp"
-
-	.align 2
-gFieldObjectPic_PechaBerryTree_4:: @ 84EA418
-	.incbin "graphics/map_objects/pics/berry_trees/pecha/4.4bpp"
-
-	.align 2
-gFieldObjectPic_PechaBerryTree_5:: @ 84EA518
-	.incbin "graphics/map_objects/pics/berry_trees/pecha/5.4bpp"
-
-	.align 2
-gFieldObjectPic_KelpsyBerryTree_0:: @ 84EA618
-	.incbin "graphics/map_objects/pics/berry_trees/kelpsy/0.4bpp"
-
-	.align 2
-gFieldObjectPic_KelpsyBerryTree_1:: @ 84EA718
-	.incbin "graphics/map_objects/pics/berry_trees/kelpsy/1.4bpp"
-
-	.align 2
-gFieldObjectPic_KelpsyBerryTree_2:: @ 84EA818
-	.incbin "graphics/map_objects/pics/berry_trees/kelpsy/2.4bpp"
-
-	.align 2
-gFieldObjectPic_KelpsyBerryTree_3:: @ 84EA918
-	.incbin "graphics/map_objects/pics/berry_trees/kelpsy/3.4bpp"
-
-	.align 2
-gFieldObjectPic_KelpsyBerryTree_4:: @ 84EAA18
-	.incbin "graphics/map_objects/pics/berry_trees/kelpsy/4.4bpp"
-
-	.align 2
-gFieldObjectPic_KelpsyBerryTree_5:: @ 84EAB18
-	.incbin "graphics/map_objects/pics/berry_trees/kelpsy/5.4bpp"
-
-	.align 2
-gFieldObjectPic_WepearBerryTree_0:: @ 84EAC18
-	.incbin "graphics/map_objects/pics/berry_trees/wepear/0.4bpp"
-
-	.align 2
-gFieldObjectPic_WepearBerryTree_1:: @ 84EAD18
-	.incbin "graphics/map_objects/pics/berry_trees/wepear/1.4bpp"
-
-	.align 2
-gFieldObjectPic_WepearBerryTree_2:: @ 84EAE18
-	.incbin "graphics/map_objects/pics/berry_trees/wepear/2.4bpp"
-
-	.align 2
-gFieldObjectPic_WepearBerryTree_3:: @ 84EAF18
-	.incbin "graphics/map_objects/pics/berry_trees/wepear/3.4bpp"
-
-	.align 2
-gFieldObjectPic_WepearBerryTree_4:: @ 84EB018
-	.incbin "graphics/map_objects/pics/berry_trees/wepear/4.4bpp"
-
-	.align 2
-gFieldObjectPic_WepearBerryTree_5:: @ 84EB118
-	.incbin "graphics/map_objects/pics/berry_trees/wepear/5.4bpp"
-
-	.align 2
-gFieldObjectPic_IapapaBerryTree_0:: @ 84EB218
-	.incbin "graphics/map_objects/pics/berry_trees/iapapa/0.4bpp"
-
-	.align 2
-gFieldObjectPic_IapapaBerryTree_1:: @ 84EB318
-	.incbin "graphics/map_objects/pics/berry_trees/iapapa/1.4bpp"
-
-	.align 2
-gFieldObjectPic_IapapaBerryTree_2:: @ 84EB418
-	.incbin "graphics/map_objects/pics/berry_trees/iapapa/2.4bpp"
-
-	.align 2
-gFieldObjectPic_IapapaBerryTree_3:: @ 84EB518
-	.incbin "graphics/map_objects/pics/berry_trees/iapapa/3.4bpp"
-
-	.align 2
-gFieldObjectPic_IapapaBerryTree_4:: @ 84EB618
-	.incbin "graphics/map_objects/pics/berry_trees/iapapa/4.4bpp"
-
-	.align 2
-gFieldObjectPic_IapapaBerryTree_5:: @ 84EB718
-	.incbin "graphics/map_objects/pics/berry_trees/iapapa/5.4bpp"
-
-	.align 2
-gFieldObjectPic_CheriBerryTree_0:: @ 84EB818
-	.incbin "graphics/map_objects/pics/berry_trees/cheri/0.4bpp"
-
-	.align 2
-gFieldObjectPic_CheriBerryTree_1:: @ 84EB918
-	.incbin "graphics/map_objects/pics/berry_trees/cheri/1.4bpp"
-
-	.align 2
-gFieldObjectPic_CheriBerryTree_2:: @ 84EBA18
-	.incbin "graphics/map_objects/pics/berry_trees/cheri/2.4bpp"
-
-	.align 2
-gFieldObjectPic_CheriBerryTree_3:: @ 84EBB18
-	.incbin "graphics/map_objects/pics/berry_trees/cheri/3.4bpp"
-
-	.align 2
-gFieldObjectPic_CheriBerryTree_4:: @ 84EBC18
-	.incbin "graphics/map_objects/pics/berry_trees/cheri/4.4bpp"
-
-	.align 2
-gFieldObjectPic_CheriBerryTree_5:: @ 84EBD18
-	.incbin "graphics/map_objects/pics/berry_trees/cheri/5.4bpp"
-
-	.align 2
-gFieldObjectPic_FigyBerryTree_0:: @ 84EBE18
-	.incbin "graphics/map_objects/pics/berry_trees/figy/0.4bpp"
-
-	.align 2
-gFieldObjectPic_FigyBerryTree_1:: @ 84EBF18
-	.incbin "graphics/map_objects/pics/berry_trees/figy/1.4bpp"
-
-	.align 2
-gFieldObjectPic_FigyBerryTree_2:: @ 84EC018
-	.incbin "graphics/map_objects/pics/berry_trees/figy/2.4bpp"
-
-	.align 2
-gFieldObjectPic_FigyBerryTree_3:: @ 84EC118
-	.incbin "graphics/map_objects/pics/berry_trees/figy/3.4bpp"
-
-	.align 2
-gFieldObjectPic_FigyBerryTree_4:: @ 84EC218
-	.incbin "graphics/map_objects/pics/berry_trees/figy/4.4bpp"
-
-	.align 2
-gFieldObjectPic_FigyBerryTree_5:: @ 84EC318
-	.incbin "graphics/map_objects/pics/berry_trees/figy/5.4bpp"
-
-	.align 2
-gFieldObjectPic_MagoBerryTree_0:: @ 84EC418
-	.incbin "graphics/map_objects/pics/berry_trees/mago/0.4bpp"
-
-	.align 2
-gFieldObjectPic_MagoBerryTree_1:: @ 84EC518
-	.incbin "graphics/map_objects/pics/berry_trees/mago/1.4bpp"
-
-	.align 2
-gFieldObjectPic_MagoBerryTree_2:: @ 84EC618
-	.incbin "graphics/map_objects/pics/berry_trees/mago/2.4bpp"
-
-	.align 2
-gFieldObjectPic_MagoBerryTree_3:: @ 84EC718
-	.incbin "graphics/map_objects/pics/berry_trees/mago/3.4bpp"
-
-	.align 2
-gFieldObjectPic_MagoBerryTree_4:: @ 84EC818
-	.incbin "graphics/map_objects/pics/berry_trees/mago/4.4bpp"
-
-	.align 2
-gFieldObjectPic_MagoBerryTree_5:: @ 84EC918
-	.incbin "graphics/map_objects/pics/berry_trees/mago/5.4bpp"
-
-	.align 2
-gFieldObjectPic_LumBerryTree_0:: @ 84ECA18
-	.incbin "graphics/map_objects/pics/berry_trees/lum/0.4bpp"
-
-	.align 2
-gFieldObjectPic_LumBerryTree_1:: @ 84ECB18
-	.incbin "graphics/map_objects/pics/berry_trees/lum/1.4bpp"
-
-	.align 2
-gFieldObjectPic_LumBerryTree_2:: @ 84ECC18
-	.incbin "graphics/map_objects/pics/berry_trees/lum/2.4bpp"
-
-	.align 2
-gFieldObjectPic_LumBerryTree_3:: @ 84ECD18
-	.incbin "graphics/map_objects/pics/berry_trees/lum/3.4bpp"
-
-	.align 2
-gFieldObjectPic_LumBerryTree_4:: @ 84ECE18
-	.incbin "graphics/map_objects/pics/berry_trees/lum/4.4bpp"
-
-	.align 2
-gFieldObjectPic_LumBerryTree_5:: @ 84ECF18
-	.incbin "graphics/map_objects/pics/berry_trees/lum/5.4bpp"
-
-	.align 2
-gFieldObjectPic_RazzBerryTree_0:: @ 84ED018
-	.incbin "graphics/map_objects/pics/berry_trees/razz/0.4bpp"
-
-	.align 2
-gFieldObjectPic_RazzBerryTree_1:: @ 84ED118
-	.incbin "graphics/map_objects/pics/berry_trees/razz/1.4bpp"
-
-	.align 2
-gFieldObjectPic_RazzBerryTree_2:: @ 84ED218
-	.incbin "graphics/map_objects/pics/berry_trees/razz/2.4bpp"
-
-	.align 2
-gFieldObjectPic_RazzBerryTree_3:: @ 84ED318
-	.incbin "graphics/map_objects/pics/berry_trees/razz/3.4bpp"
-
-	.align 2
-gFieldObjectPic_RazzBerryTree_4:: @ 84ED418
-	.incbin "graphics/map_objects/pics/berry_trees/razz/4.4bpp"
-
-	.align 2
-gFieldObjectPic_RazzBerryTree_5:: @ 84ED518
-	.incbin "graphics/map_objects/pics/berry_trees/razz/5.4bpp"
-
-	.align 2
-gFieldObjectPic_GrepaBerryTree_0:: @ 84ED618
-	.incbin "graphics/map_objects/pics/berry_trees/grepa/0.4bpp"
-
-	.align 2
-gFieldObjectPic_GrepaBerryTree_1:: @ 84ED718
-	.incbin "graphics/map_objects/pics/berry_trees/grepa/1.4bpp"
-
-	.align 2
-gFieldObjectPic_GrepaBerryTree_2:: @ 84ED818
-	.incbin "graphics/map_objects/pics/berry_trees/grepa/2.4bpp"
-
-	.align 2
-gFieldObjectPic_GrepaBerryTree_3:: @ 84ED918
-	.incbin "graphics/map_objects/pics/berry_trees/grepa/3.4bpp"
-
-	.align 2
-gFieldObjectPic_GrepaBerryTree_4:: @ 84EDA18
-	.incbin "graphics/map_objects/pics/berry_trees/grepa/4.4bpp"
-
-	.align 2
-gFieldObjectPic_GrepaBerryTree_5:: @ 84EDB18
-	.incbin "graphics/map_objects/pics/berry_trees/grepa/5.4bpp"
-
-	.align 2
-gFieldObjectPic_RabutaBerryTree_0:: @ 84EDC18
-	.incbin "graphics/map_objects/pics/berry_trees/rabuta/0.4bpp"
-
-	.align 2
-gFieldObjectPic_RabutaBerryTree_1:: @ 84EDD18
-	.incbin "graphics/map_objects/pics/berry_trees/rabuta/1.4bpp"
-
-	.align 2
-gFieldObjectPic_RabutaBerryTree_2:: @ 84EDE18
-	.incbin "graphics/map_objects/pics/berry_trees/rabuta/2.4bpp"
-
-	.align 2
-gFieldObjectPic_RabutaBerryTree_3:: @ 84EDF18
-	.incbin "graphics/map_objects/pics/berry_trees/rabuta/3.4bpp"
-
-	.align 2
-gFieldObjectPic_RabutaBerryTree_4:: @ 84EE018
-	.incbin "graphics/map_objects/pics/berry_trees/rabuta/4.4bpp"
-
-	.align 2
-gFieldObjectPic_RabutaBerryTree_5:: @ 84EE118
-	.incbin "graphics/map_objects/pics/berry_trees/rabuta/5.4bpp"
-
-	.align 2
-gFieldObjectPic_NomelBerryTree_0:: @ 84EE218
-	.incbin "graphics/map_objects/pics/berry_trees/nomel/0.4bpp"
-
-	.align 2
-gFieldObjectPic_NomelBerryTree_1:: @ 84EE318
-	.incbin "graphics/map_objects/pics/berry_trees/nomel/1.4bpp"
-
-	.align 2
-gFieldObjectPic_NomelBerryTree_2:: @ 84EE418
-	.incbin "graphics/map_objects/pics/berry_trees/nomel/2.4bpp"
-
-	.align 2
-gFieldObjectPic_NomelBerryTree_3:: @ 84EE518
-	.incbin "graphics/map_objects/pics/berry_trees/nomel/3.4bpp"
-
-	.align 2
-gFieldObjectPic_NomelBerryTree_4:: @ 84EE618
-	.incbin "graphics/map_objects/pics/berry_trees/nomel/4.4bpp"
-
-	.align 2
-gFieldObjectPic_NomelBerryTree_5:: @ 84EE718
-	.incbin "graphics/map_objects/pics/berry_trees/nomel/5.4bpp"
-
-	.align 2
-gFieldObjectPic_LeppaBerryTree_0:: @ 84EE818
-	.incbin "graphics/map_objects/pics/berry_trees/leppa/0.4bpp"
-
-	.align 2
-gFieldObjectPic_LeppaBerryTree_1:: @ 84EE918
-	.incbin "graphics/map_objects/pics/berry_trees/leppa/1.4bpp"
-
-	.align 2
-gFieldObjectPic_LeppaBerryTree_2:: @ 84EEA18
-	.incbin "graphics/map_objects/pics/berry_trees/leppa/2.4bpp"
-
-	.align 2
-gFieldObjectPic_LeppaBerryTree_3:: @ 84EEB18
-	.incbin "graphics/map_objects/pics/berry_trees/leppa/3.4bpp"
-
-	.align 2
-gFieldObjectPic_LeppaBerryTree_4:: @ 84EEC18
-	.incbin "graphics/map_objects/pics/berry_trees/leppa/4.4bpp"
-
-	.align 2
-gFieldObjectPic_LeppaBerryTree_5:: @ 84EED18
-	.incbin "graphics/map_objects/pics/berry_trees/leppa/5.4bpp"
-
-	.align 2
-gFieldObjectPic_LiechiBerryTree_0:: @ 84EEE18
-	.incbin "graphics/map_objects/pics/berry_trees/liechi/0.4bpp"
-
-	.align 2
-gFieldObjectPic_LiechiBerryTree_1:: @ 84EEF18
-	.incbin "graphics/map_objects/pics/berry_trees/liechi/1.4bpp"
-
-	.align 2
-gFieldObjectPic_LiechiBerryTree_2:: @ 84EF018
-	.incbin "graphics/map_objects/pics/berry_trees/liechi/2.4bpp"
-
-	.align 2
-gFieldObjectPic_LiechiBerryTree_3:: @ 84EF118
-	.incbin "graphics/map_objects/pics/berry_trees/liechi/3.4bpp"
-
-	.align 2
-gFieldObjectPic_LiechiBerryTree_4:: @ 84EF218
-	.incbin "graphics/map_objects/pics/berry_trees/liechi/4.4bpp"
-
-	.align 2
-gFieldObjectPic_LiechiBerryTree_5:: @ 84EF318
-	.incbin "graphics/map_objects/pics/berry_trees/liechi/5.4bpp"
-
-	.align 2
-gFieldObjectPic_HondewBerryTree_0:: @ 84EF418
-	.incbin "graphics/map_objects/pics/berry_trees/hondew/0.4bpp"
-
-	.align 2
-gFieldObjectPic_HondewBerryTree_1:: @ 84EF518
-	.incbin "graphics/map_objects/pics/berry_trees/hondew/1.4bpp"
-
-	.align 2
-gFieldObjectPic_HondewBerryTree_2:: @ 84EF618
-	.incbin "graphics/map_objects/pics/berry_trees/hondew/2.4bpp"
-
-	.align 2
-gFieldObjectPic_HondewBerryTree_3:: @ 84EF718
-	.incbin "graphics/map_objects/pics/berry_trees/hondew/3.4bpp"
-
-	.align 2
-gFieldObjectPic_HondewBerryTree_4:: @ 84EF818
-	.incbin "graphics/map_objects/pics/berry_trees/hondew/4.4bpp"
-
-	.align 2
-gFieldObjectPic_HondewBerryTree_5:: @ 84EF918
-	.incbin "graphics/map_objects/pics/berry_trees/hondew/5.4bpp"
-
-	.align 2
-gFieldObjectPic_AguavBerryTree_0:: @ 84EFA18
-	.incbin "graphics/map_objects/pics/berry_trees/aguav/0.4bpp"
-
-	.align 2
-gFieldObjectPic_AguavBerryTree_1:: @ 84EFB18
-	.incbin "graphics/map_objects/pics/berry_trees/aguav/1.4bpp"
-
-	.align 2
-gFieldObjectPic_AguavBerryTree_2:: @ 84EFC18
-	.incbin "graphics/map_objects/pics/berry_trees/aguav/2.4bpp"
-
-	.align 2
-gFieldObjectPic_AguavBerryTree_3:: @ 84EFD18
-	.incbin "graphics/map_objects/pics/berry_trees/aguav/3.4bpp"
-
-	.align 2
-gFieldObjectPic_AguavBerryTree_4:: @ 84EFE18
-	.incbin "graphics/map_objects/pics/berry_trees/aguav/4.4bpp"
-
-	.align 2
-gFieldObjectPic_AguavBerryTree_5:: @ 84EFF18
-	.incbin "graphics/map_objects/pics/berry_trees/aguav/5.4bpp"
-
-	.align 2
-gFieldObjectPic_WikiBerryTree_0:: @ 84F0018
-	.incbin "graphics/map_objects/pics/berry_trees/wiki/0.4bpp"
-
-	.align 2
-gFieldObjectPic_WikiBerryTree_1:: @ 84F0118
-	.incbin "graphics/map_objects/pics/berry_trees/wiki/1.4bpp"
-
-	.align 2
-gFieldObjectPic_WikiBerryTree_2:: @ 84F0218
-	.incbin "graphics/map_objects/pics/berry_trees/wiki/2.4bpp"
-
-	.align 2
-gFieldObjectPic_WikiBerryTree_3:: @ 84F0318
-	.incbin "graphics/map_objects/pics/berry_trees/wiki/3.4bpp"
-
-	.align 2
-gFieldObjectPic_WikiBerryTree_4:: @ 84F0418
-	.incbin "graphics/map_objects/pics/berry_trees/wiki/4.4bpp"
-
-	.align 2
-gFieldObjectPic_WikiBerryTree_5:: @ 84F0518
-	.incbin "graphics/map_objects/pics/berry_trees/wiki/5.4bpp"
-
-	.align 2
-gFieldObjectPic_PomegBerryTree_0:: @ 84F0618
-	.incbin "graphics/map_objects/pics/berry_trees/pomeg/0.4bpp"
-
-	.align 2
-gFieldObjectPic_PomegBerryTree_1:: @ 84F0718
-	.incbin "graphics/map_objects/pics/berry_trees/pomeg/1.4bpp"
-
-	.align 2
-gFieldObjectPic_PomegBerryTree_2:: @ 84F0818
-	.incbin "graphics/map_objects/pics/berry_trees/pomeg/2.4bpp"
-
-	.align 2
-gFieldObjectPic_PomegBerryTree_3:: @ 84F0918
-	.incbin "graphics/map_objects/pics/berry_trees/pomeg/3.4bpp"
-
-	.align 2
-gFieldObjectPic_PomegBerryTree_4:: @ 84F0A18
-	.incbin "graphics/map_objects/pics/berry_trees/pomeg/4.4bpp"
-
-	.align 2
-gFieldObjectPic_PomegBerryTree_5:: @ 84F0B18
-	.incbin "graphics/map_objects/pics/berry_trees/pomeg/5.4bpp"
-
-	.align 2
-gFieldObjectPic_RawstBerryTree_0:: @ 84F0C18
-	.incbin "graphics/map_objects/pics/berry_trees/rawst/0.4bpp"
-
-	.align 2
-gFieldObjectPic_RawstBerryTree_1:: @ 84F0D18
-	.incbin "graphics/map_objects/pics/berry_trees/rawst/1.4bpp"
-
-	.align 2
-gFieldObjectPic_RawstBerryTree_2:: @ 84F0E18
-	.incbin "graphics/map_objects/pics/berry_trees/rawst/2.4bpp"
-
-	.align 2
-gFieldObjectPic_RawstBerryTree_3:: @ 84F0F18
-	.incbin "graphics/map_objects/pics/berry_trees/rawst/3.4bpp"
-
-	.align 2
-gFieldObjectPic_RawstBerryTree_4:: @ 84F1018
-	.incbin "graphics/map_objects/pics/berry_trees/rawst/4.4bpp"
-
-	.align 2
-gFieldObjectPic_RawstBerryTree_5:: @ 84F1118
-	.incbin "graphics/map_objects/pics/berry_trees/rawst/5.4bpp"
-
-	.align 2
-gFieldObjectPic_SpelonBerryTree_0:: @ 84F1218
-	.incbin "graphics/map_objects/pics/berry_trees/spelon/0.4bpp"
-
-	.align 2
-gFieldObjectPic_SpelonBerryTree_1:: @ 84F1318
-	.incbin "graphics/map_objects/pics/berry_trees/spelon/1.4bpp"
-
-	.align 2
-gFieldObjectPic_SpelonBerryTree_2:: @ 84F1418
-	.incbin "graphics/map_objects/pics/berry_trees/spelon/2.4bpp"
-
-	.align 2
-gFieldObjectPic_SpelonBerryTree_3:: @ 84F1518
-	.incbin "graphics/map_objects/pics/berry_trees/spelon/3.4bpp"
-
-	.align 2
-gFieldObjectPic_SpelonBerryTree_4:: @ 84F1618
-	.incbin "graphics/map_objects/pics/berry_trees/spelon/4.4bpp"
-
-	.align 2
-gFieldObjectPic_SpelonBerryTree_5:: @ 84F1718
-	.incbin "graphics/map_objects/pics/berry_trees/spelon/5.4bpp"
-
-	.align 2
-gFieldObjectPic_ChestoBerryTree_0:: @ 84F1818
-	.incbin "graphics/map_objects/pics/berry_trees/chesto/0.4bpp"
-
-	.align 2
-gFieldObjectPic_ChestoBerryTree_1:: @ 84F1918
-	.incbin "graphics/map_objects/pics/berry_trees/chesto/1.4bpp"
-
-	.align 2
-gFieldObjectPic_ChestoBerryTree_2:: @ 84F1A18
-	.incbin "graphics/map_objects/pics/berry_trees/chesto/2.4bpp"
-
-	.align 2
-gFieldObjectPic_ChestoBerryTree_3:: @ 84F1B18
-	.incbin "graphics/map_objects/pics/berry_trees/chesto/3.4bpp"
-
-	.align 2
-gFieldObjectPic_ChestoBerryTree_4:: @ 84F1C18
-	.incbin "graphics/map_objects/pics/berry_trees/chesto/4.4bpp"
-
-	.align 2
-gFieldObjectPic_ChestoBerryTree_5:: @ 84F1D18
-	.incbin "graphics/map_objects/pics/berry_trees/chesto/5.4bpp"
-
-	.align 2
-gFieldObjectPic_OranBerryTree_0:: @ 84F1E18
-	.incbin "graphics/map_objects/pics/berry_trees/oran/0.4bpp"
-
-	.align 2
-gFieldObjectPic_OranBerryTree_1:: @ 84F1F18
-	.incbin "graphics/map_objects/pics/berry_trees/oran/1.4bpp"
-
-	.align 2
-gFieldObjectPic_OranBerryTree_2:: @ 84F2018
-	.incbin "graphics/map_objects/pics/berry_trees/oran/2.4bpp"
-
-	.align 2
-gFieldObjectPic_OranBerryTree_3:: @ 84F2118
-	.incbin "graphics/map_objects/pics/berry_trees/oran/3.4bpp"
-
-	.align 2
-gFieldObjectPic_OranBerryTree_4:: @ 84F2218
-	.incbin "graphics/map_objects/pics/berry_trees/oran/4.4bpp"
-
-	.align 2
-gFieldObjectPic_OranBerryTree_5:: @ 84F2318
-	.incbin "graphics/map_objects/pics/berry_trees/oran/5.4bpp"
-
-	.align 2
-gFieldObjectPic_PersimBerryTree_0:: @ 84F2418
-	.incbin "graphics/map_objects/pics/berry_trees/persim/0.4bpp"
-
-	.align 2
-gFieldObjectPic_PersimBerryTree_1:: @ 84F2518
-	.incbin "graphics/map_objects/pics/berry_trees/persim/1.4bpp"
-
-	.align 2
-gFieldObjectPic_PersimBerryTree_2:: @ 84F2618
-	.incbin "graphics/map_objects/pics/berry_trees/persim/2.4bpp"
-
-	.align 2
-gFieldObjectPic_PersimBerryTree_3:: @ 84F2718
-	.incbin "graphics/map_objects/pics/berry_trees/persim/3.4bpp"
-
-	.align 2
-gFieldObjectPic_PersimBerryTree_4:: @ 84F2818
-	.incbin "graphics/map_objects/pics/berry_trees/persim/4.4bpp"
-
-	.align 2
-gFieldObjectPic_PersimBerryTree_5:: @ 84F2918
-	.incbin "graphics/map_objects/pics/berry_trees/persim/5.4bpp"
-
-	.align 2
-gFieldObjectPic_SitrusBerryTree_0:: @ 84F2A18
-	.incbin "graphics/map_objects/pics/berry_trees/sitrus/0.4bpp"
-
-	.align 2
-gFieldObjectPic_SitrusBerryTree_1:: @ 84F2B18
-	.incbin "graphics/map_objects/pics/berry_trees/sitrus/1.4bpp"
-
-	.align 2
-gFieldObjectPic_SitrusBerryTree_2:: @ 84F2C18
-	.incbin "graphics/map_objects/pics/berry_trees/sitrus/2.4bpp"
-
-	.align 2
-gFieldObjectPic_SitrusBerryTree_3:: @ 84F2D18
-	.incbin "graphics/map_objects/pics/berry_trees/sitrus/3.4bpp"
-
-	.align 2
-gFieldObjectPic_SitrusBerryTree_4:: @ 84F2E18
-	.incbin "graphics/map_objects/pics/berry_trees/sitrus/4.4bpp"
-
-	.align 2
-gFieldObjectPic_SitrusBerryTree_5:: @ 84F2F18
-	.incbin "graphics/map_objects/pics/berry_trees/sitrus/5.4bpp"
-
-	.align 2
-gFieldObjectPic_AspearBerryTree_0:: @ 84F3018
-	.incbin "graphics/map_objects/pics/berry_trees/aspear/0.4bpp"
-
-	.align 2
-gFieldObjectPic_AspearBerryTree_1:: @ 84F3118
-	.incbin "graphics/map_objects/pics/berry_trees/aspear/1.4bpp"
-
-	.align 2
-gFieldObjectPic_AspearBerryTree_2:: @ 84F3218
-	.incbin "graphics/map_objects/pics/berry_trees/aspear/2.4bpp"
-
-	.align 2
-gFieldObjectPic_AspearBerryTree_3:: @ 84F3318
-	.incbin "graphics/map_objects/pics/berry_trees/aspear/3.4bpp"
-
-	.align 2
-gFieldObjectPic_AspearBerryTree_4:: @ 84F3418
-	.incbin "graphics/map_objects/pics/berry_trees/aspear/4.4bpp"
-
-	.align 2
-gFieldObjectPic_AspearBerryTree_5:: @ 84F3518
-	.incbin "graphics/map_objects/pics/berry_trees/aspear/5.4bpp"
-
-	.align 2
-gFieldObjectPic_PamtreBerryTree_0:: @ 84F3618
-	.incbin "graphics/map_objects/pics/berry_trees/pamtre/0.4bpp"
-
-	.align 2
-gFieldObjectPic_PamtreBerryTree_1:: @ 84F3718
-	.incbin "graphics/map_objects/pics/berry_trees/pamtre/1.4bpp"
-
-	.align 2
-gFieldObjectPic_PamtreBerryTree_2:: @ 84F3818
-	.incbin "graphics/map_objects/pics/berry_trees/pamtre/2.4bpp"
-
-	.align 2
-gFieldObjectPic_PamtreBerryTree_3:: @ 84F3918
-	.incbin "graphics/map_objects/pics/berry_trees/pamtre/3.4bpp"
-
-	.align 2
-gFieldObjectPic_PamtreBerryTree_4:: @ 84F3A18
-	.incbin "graphics/map_objects/pics/berry_trees/pamtre/4.4bpp"
-
-	.align 2
-gFieldObjectPic_PamtreBerryTree_5:: @ 84F3B18
-	.incbin "graphics/map_objects/pics/berry_trees/pamtre/5.4bpp"
-
-	.align 2
-gFieldObjectPic_CornnBerryTree_0:: @ 84F3C18
-	.incbin "graphics/map_objects/pics/berry_trees/cornn/0.4bpp"
-
-	.align 2
-gFieldObjectPic_CornnBerryTree_1:: @ 84F3D18
-	.incbin "graphics/map_objects/pics/berry_trees/cornn/1.4bpp"
-
-	.align 2
-gFieldObjectPic_CornnBerryTree_2:: @ 84F3E18
-	.incbin "graphics/map_objects/pics/berry_trees/cornn/2.4bpp"
-
-	.align 2
-gFieldObjectPic_CornnBerryTree_3:: @ 84F3F18
-	.incbin "graphics/map_objects/pics/berry_trees/cornn/3.4bpp"
-
-	.align 2
-gFieldObjectPic_CornnBerryTree_4:: @ 84F4018
-	.incbin "graphics/map_objects/pics/berry_trees/cornn/4.4bpp"
-
-	.align 2
-gFieldObjectPic_CornnBerryTree_5:: @ 84F4118
-	.incbin "graphics/map_objects/pics/berry_trees/cornn/5.4bpp"
-
-	.align 2
-gFieldObjectPic_LansatBerryTree_0:: @ 84F4218
-	.incbin "graphics/map_objects/pics/berry_trees/lansat/0.4bpp"
-
-	.align 2
-gFieldObjectPic_LansatBerryTree_1:: @ 84F4318
-	.incbin "graphics/map_objects/pics/berry_trees/lansat/1.4bpp"
-
-	.align 2
-gFieldObjectPic_LansatBerryTree_2:: @ 84F4418
-	.incbin "graphics/map_objects/pics/berry_trees/lansat/2.4bpp"
-
-	.align 2
-gFieldObjectPic_LansatBerryTree_3:: @ 84F4518
-	.incbin "graphics/map_objects/pics/berry_trees/lansat/3.4bpp"
-
-	.align 2
-gFieldObjectPic_LansatBerryTree_4:: @ 84F4618
-	.incbin "graphics/map_objects/pics/berry_trees/lansat/4.4bpp"
-
-	.align 2
-gFieldObjectPic_LansatBerryTree_5:: @ 84F4718
-	.incbin "graphics/map_objects/pics/berry_trees/lansat/5.4bpp"
-
-	.align 2
-gFieldObjectPic_DurinBerryTree_0:: @ 84F4818
-	.incbin "graphics/map_objects/pics/berry_trees/durin/0.4bpp"
-
-	.align 2
-gFieldObjectPic_DurinBerryTree_1:: @ 84F4918
-	.incbin "graphics/map_objects/pics/berry_trees/durin/1.4bpp"
-
-	.align 2
-gFieldObjectPic_DurinBerryTree_2:: @ 84F4A18
-	.incbin "graphics/map_objects/pics/berry_trees/durin/2.4bpp"
-
-	.align 2
-gFieldObjectPic_DurinBerryTree_3:: @ 84F4B18
-	.incbin "graphics/map_objects/pics/berry_trees/durin/3.4bpp"
-
-	.align 2
-gFieldObjectPic_DurinBerryTree_4:: @ 84F4C18
-	.incbin "graphics/map_objects/pics/berry_trees/durin/4.4bpp"
-
-	.align 2
-gFieldObjectPic_DurinBerryTree_5:: @ 84F4D18
-	.incbin "graphics/map_objects/pics/berry_trees/durin/5.4bpp"
-
-	.align 2
-gFieldObjectPic_TamatoBerryTree_0:: @ 84F4E18
-	.incbin "graphics/map_objects/pics/berry_trees/tamato/0.4bpp"
-
-	.align 2
-gFieldObjectPic_TamatoBerryTree_1:: @ 84F4F18
-	.incbin "graphics/map_objects/pics/berry_trees/tamato/1.4bpp"
-
-	.align 2
-gFieldObjectPic_TamatoBerryTree_2:: @ 84F5018
-	.incbin "graphics/map_objects/pics/berry_trees/tamato/2.4bpp"
-
-	.align 2
-gFieldObjectPic_TamatoBerryTree_3:: @ 84F5118
-	.incbin "graphics/map_objects/pics/berry_trees/tamato/3.4bpp"
-
-	.align 2
-gFieldObjectPic_TamatoBerryTree_4:: @ 84F5218
-	.incbin "graphics/map_objects/pics/berry_trees/tamato/4.4bpp"
-
-	.align 2
-gFieldObjectPic_TamatoBerryTree_5:: @ 84F5318
-	.incbin "graphics/map_objects/pics/berry_trees/tamato/5.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_SurfBlob_0:: @ 84F5418
-	.incbin "graphics/map_objects/pics/effects/surf_blob/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_SurfBlob_1:: @ 84F5618
-	.incbin "graphics/map_objects/pics/effects/surf_blob/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_SurfBlob_2:: @ 84F5818
-	.incbin "graphics/map_objects/pics/effects/surf_blob/2.4bpp"
-
-	.align 2
-gFieldObjectPic_QuintyPlump_0:: @ 84F5A18
-	.incbin "graphics/map_objects/pics/people/quinty_plump/0.4bpp"
-
-	.align 2
-gFieldObjectPic_QuintyPlump_1:: @ 84F5C18
-	.incbin "graphics/map_objects/pics/people/quinty_plump/1.4bpp"
-
-	.align 2
-gFieldObjectPic_QuintyPlump_2:: @ 84F5E18
-	.incbin "graphics/map_objects/pics/people/quinty_plump/2.4bpp"
-
-	.align 2
-gFieldObjectPic_QuintyPlump_3:: @ 84F6018
-	.incbin "graphics/map_objects/pics/people/quinty_plump/3.4bpp"
-
-	.align 2
-gFieldObjectPic_QuintyPlump_4:: @ 84F6218
-	.incbin "graphics/map_objects/pics/people/quinty_plump/4.4bpp"
-
-	.align 2
-gFieldObjectPic_QuintyPlump_5:: @ 84F6418
-	.incbin "graphics/map_objects/pics/people/quinty_plump/5.4bpp"
-
-	.align 2
-gFieldObjectPic_QuintyPlump_6:: @ 84F6618
-	.incbin "graphics/map_objects/pics/people/quinty_plump/6.4bpp"
-
-	.align 2
-gFieldObjectPalette12:: @ 84F6818
-	.incbin "graphics/map_objects/palettes/field_object_palette_12.gbapal"
-
-	.align 2
-gFieldObjectPalette13:: @ 84F6838
-	.incbin "graphics/map_objects/palettes/field_object_palette_13.gbapal"
-
-	.align 2
-gFieldEffectObjectPic_ShadowSmall:: @ 84F6858
-	.incbin "graphics/map_objects/pics/effects/shadow_small.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_ShadowMedium:: @ 84F6878
-	.incbin "graphics/map_objects/pics/effects/shadow_medium.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_ShadowLarge:: @ 84F68B8
-	.incbin "graphics/map_objects/pics/effects/shadow_large.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_ShadowExtraLarge:: @ 84F6938
-	.incbin "graphics/map_objects/pics/effects/shadow_extra_large.4bpp"
-
-gUnknown_084F6D38:: @ 84F6D38
-	.incbin "graphics/map_objects/pics/effects/unknown_4F6D38/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPalette6:: @ 84F6E98
-	.incbin "graphics/map_objects/palettes/field_effect_object_palette_06.gbapal"
-
-	.align 2
-gFieldEffectObjectPic_Ripple_0:: @ 84F6EB8
-	.incbin "graphics/map_objects/pics/effects/ripple/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Ripple_1:: @ 84F6F38
-	.incbin "graphics/map_objects/pics/effects/ripple/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Ripple_2:: @ 84F6FB8
-	.incbin "graphics/map_objects/pics/effects/ripple/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Ripple_3:: @ 84F7038
-	.incbin "graphics/map_objects/pics/effects/ripple/3.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Ripple_4:: @ 84F70B8
-	.incbin "graphics/map_objects/pics/effects/ripple/4.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Ash_0:: @ 84F7138
-	.incbin "graphics/map_objects/pics/effects/ash/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Ash_1:: @ 84F71B8
-	.incbin "graphics/map_objects/pics/effects/ash/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Ash_2:: @ 84F7238
-	.incbin "graphics/map_objects/pics/effects/ash/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Ash_3:: @ 84F72B8
-	.incbin "graphics/map_objects/pics/effects/ash/3.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Ash_4:: @ 84F7338
-	.incbin "graphics/map_objects/pics/effects/ash/4.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Arrow_0:: @ 84F73B8
-	.incbin "graphics/map_objects/pics/effects/arrow/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Arrow_1:: @ 84F7438
-	.incbin "graphics/map_objects/pics/effects/arrow/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Arrow_2:: @ 84F74B8
-	.incbin "graphics/map_objects/pics/effects/arrow/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Arrow_3:: @ 84F7538
-	.incbin "graphics/map_objects/pics/effects/arrow/3.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Arrow_4:: @ 84F75B8
-	.incbin "graphics/map_objects/pics/effects/arrow/4.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Arrow_5:: @ 84F7638
-	.incbin "graphics/map_objects/pics/effects/arrow/5.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Arrow_6:: @ 84F76B8
-	.incbin "graphics/map_objects/pics/effects/arrow/6.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Arrow_7:: @ 84F7738
-	.incbin "graphics/map_objects/pics/effects/arrow/7.4bpp"
-
-	.align 2
-gFieldEffectObjectPalette0:: @ 84F77B8
-	.incbin "graphics/map_objects/palettes/field_effect_object_palette_00.gbapal"
-
-	.align 2
-gFieldEffectObjectPalette1:: @ 84F77D8
-	.incbin "graphics/map_objects/palettes/field_effect_object_palette_01.gbapal"
-
-	.align 2
-gFieldEffectObjectPic_GroundImpactDust_0:: @ 84F77F8
-	.incbin "graphics/map_objects/pics/effects/ground_impact_dust/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_GroundImpactDust_1:: @ 84F7838
-	.incbin "graphics/map_objects/pics/effects/ground_impact_dust/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_GroundImpactDust_2:: @ 84F7878
-	.incbin "graphics/map_objects/pics/effects/ground_impact_dust/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_BikeHopTallGrass_0:: @ 84F78B8
-	.incbin "graphics/map_objects/pics/effects/bike_hop_tall_grass/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_BikeHopTallGrass_1:: @ 84F78F8
-	.incbin "graphics/map_objects/pics/effects/bike_hop_tall_grass/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_BikeHopTallGrass_2:: @ 84F7938
-	.incbin "graphics/map_objects/pics/effects/bike_hop_tall_grass/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_BikeHopTallGrass_3:: @ 84F7978
-	.incbin "graphics/map_objects/pics/effects/bike_hop_tall_grass/3.4bpp"
-
-gUnusedGrass_0:: @4F79B8
-	.incbin "graphics/map_objects/pics/effects/unused_grass/0.4bpp"
-	
-gUnusedGrass_1:: @4F7A38
-	.incbin "graphics/map_objects/pics/effects/unused_grass/1.4bpp"
-	
-gUnusedGrass_2:: @4F7AB8
-	.incbin "graphics/map_objects/pics/effects/unused_grass/2.4bpp"
-	
-gUnusedGrass_3:: @4F7B38
-	.incbin "graphics/map_objects/pics/effects/unused_grass/3.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown16_0:: @ 84F7BB8
-	.incbin "graphics/map_objects/pics/effects/unknown_16/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown16_1:: @ 84F7C38
-	.incbin "graphics/map_objects/pics/effects/unknown_16/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown16_2:: @ 84F7CB8
-	.incbin "graphics/map_objects/pics/effects/unknown_16/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown16_3:: @ 84F7D38
-	.incbin "graphics/map_objects/pics/effects/unknown_16/3.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown16_4:: @ 84F7DB8
-	.incbin "graphics/map_objects/pics/effects/unknown_16/4.4bpp"
-
-gUnknown_084F7E38:: @ 84F7E38
-	.incbin "graphics/map_objects/pics/effects/unknown_4F7E38/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown16_5:: @ 84F7EB8
-	.incbin "graphics/map_objects/pics/effects/unknown_16/5.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown17_0:: @ 84F7F38
-	.incbin "graphics/map_objects/pics/effects/unknown_17/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown17_1:: @ 84F7FB8
-	.incbin "graphics/map_objects/pics/effects/unknown_17/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown17_2:: @ 84F8038
-	.incbin "graphics/map_objects/pics/effects/unknown_17/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown17_3:: @ 84F80B8
-	.incbin "graphics/map_objects/pics/effects/unknown_17/3.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown17_4:: @ 84F8138
-	.incbin "graphics/map_objects/pics/effects/unknown_17/4.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown17_5:: @ 84F81B8
-	.incbin "graphics/map_objects/pics/effects/unknown_17/5.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown17_6:: @ 84F8238
-	.incbin "graphics/map_objects/pics/effects/unknown_17/6.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown17_7:: @ 84F82B8
-	.incbin "graphics/map_objects/pics/effects/unknown_17/7.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown18_0:: @ 84F8338
-	.incbin "graphics/map_objects/pics/effects/unknown_18/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown18_1:: @ 84F83B8
-	.incbin "graphics/map_objects/pics/effects/unknown_18/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown18_2:: @ 84F8438
-	.incbin "graphics/map_objects/pics/effects/unknown_18/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown18_3:: @ 84F84B8
-	.incbin "graphics/map_objects/pics/effects/unknown_18/3.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_LongGrass_0:: @ 84F8538
-	.incbin "graphics/map_objects/pics/effects/long_grass/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_LongGrass_1:: @ 84F85B8
-	.incbin "graphics/map_objects/pics/effects/long_grass/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_LongGrass_2:: @ 84F8638
-	.incbin "graphics/map_objects/pics/effects/long_grass/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_LongGrass_3:: @ 84F86B8
-	.incbin "graphics/map_objects/pics/effects/long_grass/3.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_TallGrass_0:: @ 84F8738
-	.incbin "graphics/map_objects/pics/effects/tall_grass/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_TallGrass_1:: @ 84F87B8
-	.incbin "graphics/map_objects/pics/effects/tall_grass/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_TallGrass_2:: @ 84F8838
-	.incbin "graphics/map_objects/pics/effects/tall_grass/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_TallGrass_3:: @ 84F88B8
-	.incbin "graphics/map_objects/pics/effects/tall_grass/3.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_TallGrass_4:: @ 84F8938
-	.incbin "graphics/map_objects/pics/effects/tall_grass/4.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_ShortGrass_0:: @ 84F89B8
-	.incbin "graphics/map_objects/pics/effects/short_grass/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_ShortGrass_1:: @ 84F8A38
-	.incbin "graphics/map_objects/pics/effects/short_grass/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_SandFootprints_0:: @ 84F8AB8
-	.incbin "graphics/map_objects/pics/effects/sand_footprints/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_SandFootprints_1:: @ 84F8B38
-	.incbin "graphics/map_objects/pics/effects/sand_footprints/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_DeepSandFootprints_0:: @ 84F8BB8
-	.incbin "graphics/map_objects/pics/effects/deep_sand_footprints/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_DeepSandFootprints_1:: @ 84F8C38
-	.incbin "graphics/map_objects/pics/effects/deep_sand_footprints/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_BikeTireTracks_0:: @ 84F8CB8
-	.incbin "graphics/map_objects/pics/effects/bike_tire_tracks/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_BikeTireTracks_1:: @ 84F8D38
-	.incbin "graphics/map_objects/pics/effects/bike_tire_tracks/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_BikeTireTracks_2:: @ 84F8DB8
-	.incbin "graphics/map_objects/pics/effects/bike_tire_tracks/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_BikeTireTracks_3:: @ 84F8E38
-	.incbin "graphics/map_objects/pics/effects/bike_tire_tracks/3.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown19_0:: @ 84F8EB8
-	.incbin "graphics/map_objects/pics/effects/unknown_19/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown19_1:: @ 84F8F38
-	.incbin "graphics/map_objects/pics/effects/unknown_19/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown19_2:: @ 84F8FB8
-	.incbin "graphics/map_objects/pics/effects/unknown_19/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown19_3:: @ 84F9038
-	.incbin "graphics/map_objects/pics/effects/unknown_19/3.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown29_0:: @ 84F90B8
-	.incbin "graphics/map_objects/pics/effects/unknown_29/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown29_1:: @ 84F90F8
-	.incbin "graphics/map_objects/pics/effects/unknown_29/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown29_2:: @ 84F9138
-	.incbin "graphics/map_objects/pics/effects/unknown_29/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_BikeHopBigSplash_0:: @ 84F9178
-	.incbin "graphics/map_objects/pics/effects/bike_hop_big_splash/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_BikeHopBigSplash_1:: @ 84F91F8
-	.incbin "graphics/map_objects/pics/effects/bike_hop_big_splash/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_BikeHopBigSplash_2:: @ 84F9278
-	.incbin "graphics/map_objects/pics/effects/bike_hop_big_splash/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_BikeHopBigSplash_3:: @ 84F92F8
-	.incbin "graphics/map_objects/pics/effects/bike_hop_big_splash/3.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Splash_0:: @ 84F9378
-	.incbin "graphics/map_objects/pics/effects/splash/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Splash_1:: @ 84F93B8
-	.incbin "graphics/map_objects/pics/effects/splash/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_BikeHopSmallSplash_0:: @ 84F93F8
-	.incbin "graphics/map_objects/pics/effects/bike_hop_small_splash/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_BikeHopSmallSplash_1:: @ 84F9438
-	.incbin "graphics/map_objects/pics/effects/bike_hop_small_splash/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_BikeHopSmallSplash_2:: @ 84F9478
-	.incbin "graphics/map_objects/pics/effects/bike_hop_small_splash/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown20_0:: @ 84F94B8
-	.incbin "graphics/map_objects/pics/effects/unknown_20/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown20_1:: @ 84F9538
-	.incbin "graphics/map_objects/pics/effects/unknown_20/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown20_2:: @ 84F95B8
-	.incbin "graphics/map_objects/pics/effects/unknown_20/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown20_3:: @ 84F9638
-	.incbin "graphics/map_objects/pics/effects/unknown_20/3.4bpp"
-
-	.align 2
-@ unreferenced
-gFieldEffectObjectPic_Unknown20_4:: @ 84F96B8
-	.incbin "graphics/map_objects/pics/effects/unknown_20/4.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_TreeDisguise_0:: @ 84F9738
-	.incbin "graphics/map_objects/pics/effects/tree_disguise/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_TreeDisguise_1:: @ 84F9838
-	.incbin "graphics/map_objects/pics/effects/tree_disguise/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_TreeDisguise_2:: @ 84F9938
-	.incbin "graphics/map_objects/pics/effects/tree_disguise/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_TreeDisguise_3:: @ 84F9A38
-	.incbin "graphics/map_objects/pics/effects/tree_disguise/3.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_TreeDisguise_4:: @ 84F9B38
-	.incbin "graphics/map_objects/pics/effects/tree_disguise/4.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_TreeDisguise_5:: @ 84F9C38
-	.incbin "graphics/map_objects/pics/effects/tree_disguise/5.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_TreeDisguise_6:: @ 84F9D38
-	.incbin "graphics/map_objects/pics/effects/tree_disguise/6.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_MountainDisguise_0:: @ 84F9E38
-	.incbin "graphics/map_objects/pics/effects/mountain_disguise/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_MountainDisguise_1:: @ 84F9F38
-	.incbin "graphics/map_objects/pics/effects/mountain_disguise/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_MountainDisguise_2:: @ 84FA038
-	.incbin "graphics/map_objects/pics/effects/mountain_disguise/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_MountainDisguise_3:: @ 84FA138
-	.incbin "graphics/map_objects/pics/effects/mountain_disguise/3.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_MountainDisguise_4:: @ 84FA238
-	.incbin "graphics/map_objects/pics/effects/mountain_disguise/4.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_MountainDisguise_5:: @ 84FA338
-	.incbin "graphics/map_objects/pics/effects/mountain_disguise/5.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_MountainDisguise_6:: @ 84FA438
-	.incbin "graphics/map_objects/pics/effects/mountain_disguise/6.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_SandDisguisePlaceholder_0:: @ 84FA538
-	.incbin "graphics/map_objects/pics/effects/sand_disguise_placeholder/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_SandDisguisePlaceholder_1:: @ 84FA638
-	.incbin "graphics/map_objects/pics/effects/sand_disguise_placeholder/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_SandDisguisePlaceholder_2:: @ 84FA738
-	.incbin "graphics/map_objects/pics/effects/sand_disguise_placeholder/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_SandDisguisePlaceholder_3:: @ 84FA838
-	.incbin "graphics/map_objects/pics/effects/sand_disguise_placeholder/3.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_SandDisguisePlaceholder_4:: @ 84FA938
-	.incbin "graphics/map_objects/pics/effects/sand_disguise_placeholder/4.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_SandDisguisePlaceholder_5:: @ 84FAA38
-	.incbin "graphics/map_objects/pics/effects/sand_disguise_placeholder/5.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_SandDisguisePlaceholder_6:: @ 84FAB38
-	.incbin "graphics/map_objects/pics/effects/sand_disguise_placeholder/6.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_HotSpringsWater:: @ 84FAC38
-	.incbin "graphics/map_objects/pics/effects/hot_springs_water.4bpp"
-
-	.align 2
-gFieldEffectObjectPalette2:: @ 84FACB8
-	.incbin "graphics/map_objects/palettes/field_effect_object_palette_02.gbapal"
-
-	.align 2
-gFieldEffectObjectPic_JumpOutOfAsh_0:: @ 84FACD8
-	.incbin "graphics/map_objects/pics/effects/jump_out_of_ash/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_JumpOutOfAsh_1:: @ 84FAD58
-	.incbin "graphics/map_objects/pics/effects/jump_out_of_ash/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_JumpOutOfAsh_2:: @ 84FADD8
-	.incbin "graphics/map_objects/pics/effects/jump_out_of_ash/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_JumpOutOfAsh_3:: @ 84FAE58
-	.incbin "graphics/map_objects/pics/effects/jump_out_of_ash/3.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_JumpOutOfAsh_4:: @ 84FAED8
-	.incbin "graphics/map_objects/pics/effects/jump_out_of_ash/4.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown33_0:: @ 84FAF58
-	.incbin "graphics/map_objects/pics/effects/unknown_33/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown33_1:: @ 84FAFD8
-	.incbin "graphics/map_objects/pics/effects/unknown_33/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown33_2:: @ 84FB058
-	.incbin "graphics/map_objects/pics/effects/unknown_33/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown33_3:: @ 84FB0D8
-	.incbin "graphics/map_objects/pics/effects/unknown_33/3.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown33_4:: @ 84FB158
-	.incbin "graphics/map_objects/pics/effects/unknown_33/4.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Bubbles_0:: @ 84FB1D8
-	.incbin "graphics/map_objects/pics/effects/bubbles/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Bubbles_1:: @ 84FB2D8
-	.incbin "graphics/map_objects/pics/effects/bubbles/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Bubbles_2:: @ 84FB3D8
-	.incbin "graphics/map_objects/pics/effects/bubbles/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Bubbles_3:: @ 84FB4D8
-	.incbin "graphics/map_objects/pics/effects/bubbles/3.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Bubbles_4:: @ 84FB5D8
-	.incbin "graphics/map_objects/pics/effects/bubbles/4.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Bubbles_5:: @ 84FB6D8
-	.incbin "graphics/map_objects/pics/effects/bubbles/5.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Bubbles_6:: @ 84FB7D8
-	.incbin "graphics/map_objects/pics/effects/bubbles/6.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Bubbles_7:: @ 84FB8D8
-	.incbin "graphics/map_objects/pics/effects/bubbles/7.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown35_0:: @ 84FB9D8
-	.incbin "graphics/map_objects/pics/effects/unknown_35/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown35_1:: @ 84FBA58
-	.incbin "graphics/map_objects/pics/effects/unknown_35/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPalette3:: @ 84FBAD8
-	.incbin "graphics/map_objects/palettes/field_effect_object_palette_03.gbapal"
-
-	.align 2
-gFieldEffectObjectPic_Bird:: @ 84FBAF8
-	.incbin "graphics/map_objects/pics/effects/bird.4bpp"
-
-	.align 2
-gFieldObjectPic_Juan_0:: @ 84FBCF8
-	.incbin "graphics/map_objects/pics/people/juan/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Juan_1:: @ 84FBDF8
-	.incbin "graphics/map_objects/pics/people/juan/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Juan_2:: @ 84FBEF8
-	.incbin "graphics/map_objects/pics/people/juan/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Juan_3:: @ 84FBFF8
-	.incbin "graphics/map_objects/pics/people/juan/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Juan_4:: @ 84FC0F8
-	.incbin "graphics/map_objects/pics/people/juan/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Juan_5:: @ 84FC1F8
-	.incbin "graphics/map_objects/pics/people/juan/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Juan_6:: @ 84FC2F8
-	.incbin "graphics/map_objects/pics/people/juan/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Juan_7:: @ 84FC3F8
-	.incbin "graphics/map_objects/pics/people/juan/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Juan_8:: @ 84FC4F8
-	.incbin "graphics/map_objects/pics/people/juan/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Scott_0:: @ 84FC5F8
-	.incbin "graphics/map_objects/pics/people/scott/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Scott_1:: @ 84FC6F8
-	.incbin "graphics/map_objects/pics/people/scott/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Scott_2:: @ 84FC7F8
-	.incbin "graphics/map_objects/pics/people/scott/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Scott_3:: @ 84FC8F8
-	.incbin "graphics/map_objects/pics/people/scott/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Scott_4:: @ 84FC9F8
-	.incbin "graphics/map_objects/pics/people/scott/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Scott_5:: @ 84FCAF8
-	.incbin "graphics/map_objects/pics/people/scott/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Scott_6:: @ 84FCBF8
-	.incbin "graphics/map_objects/pics/people/scott/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Scott_7:: @ 84FCCF8
-	.incbin "graphics/map_objects/pics/people/scott/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Scott_8:: @ 84FCDF8
-	.incbin "graphics/map_objects/pics/people/scott/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Statue:: @ 84FCEF8
-	.incbin "graphics/map_objects/pics/misc/statue.4bpp"
-
-	.align 2
-gFieldObjectPic_Kirlia_0:: @ 84FCFF8
-	.incbin "graphics/map_objects/pics/pokemon/kirlia/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Kirlia_1:: @ 84FD0F8
-	.incbin "graphics/map_objects/pics/pokemon/kirlia/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Kirlia_2:: @ 84FD1F8
-	.incbin "graphics/map_objects/pics/pokemon/kirlia/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Kirlia_3:: @ 84FD2F8
-	.incbin "graphics/map_objects/pics/pokemon/kirlia/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Kirlia_4:: @ 84FD3F8
-	.incbin "graphics/map_objects/pics/pokemon/kirlia/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Kirlia_5:: @ 84FD4F8
-	.incbin "graphics/map_objects/pics/pokemon/kirlia/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Kirlia_6:: @ 84FD5F8
-	.incbin "graphics/map_objects/pics/pokemon/kirlia/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Kirlia_7:: @ 84FD6F8
-	.incbin "graphics/map_objects/pics/pokemon/kirlia/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Kirlia_8:: @ 84FD7F8
-	.incbin "graphics/map_objects/pics/pokemon/kirlia/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Dusclops_0:: @ 84FD8F8
-	.incbin "graphics/map_objects/pics/pokemon/dusclops/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Dusclops_1:: @ 84FD9F8
-	.incbin "graphics/map_objects/pics/pokemon/dusclops/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Dusclops_2:: @ 84FDAF8
-	.incbin "graphics/map_objects/pics/pokemon/dusclops/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Dusclops_3:: @ 84FDBF8
-	.incbin "graphics/map_objects/pics/pokemon/dusclops/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Dusclops_4:: @ 84FDCF8
-	.incbin "graphics/map_objects/pics/pokemon/dusclops/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Dusclops_5:: @ 84FDDF8
-	.incbin "graphics/map_objects/pics/pokemon/dusclops/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Dusclops_6:: @ 84FDEF8
-	.incbin "graphics/map_objects/pics/pokemon/dusclops/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Dusclops_7:: @ 84FDFF8
-	.incbin "graphics/map_objects/pics/pokemon/dusclops/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Dusclops_8:: @ 84FE0F8
-	.incbin "graphics/map_objects/pics/pokemon/dusclops/8.4bpp"
-
-	.align 2
-gFieldObjectPic_MysteryEventDeliveryman_0:: @ 84FE1F8
-	.incbin "graphics/map_objects/pics/people/mystery_event_deliveryman/0.4bpp"
-
-	.align 2
-gFieldObjectPic_MysteryEventDeliveryman_1:: @ 84FE2F8
-	.incbin "graphics/map_objects/pics/people/mystery_event_deliveryman/1.4bpp"
-
-	.align 2
-gFieldObjectPic_MysteryEventDeliveryman_2:: @ 84FE3F8
-	.incbin "graphics/map_objects/pics/people/mystery_event_deliveryman/2.4bpp"
-
-	.align 2
-gFieldObjectPic_UnionRoomAttendant_0:: @ 84FE4F8
-	.incbin "graphics/map_objects/pics/people/union_room_attendant/0.4bpp"
-
-	.align 2
-gFieldObjectPic_UnionRoomAttendant_1:: @ 84FE5F8
-	.incbin "graphics/map_objects/pics/people/union_room_attendant/1.4bpp"
-
-	.align 2
-gFieldObjectPic_UnionRoomAttendant_2:: @ 84FE6F8
-	.incbin "graphics/map_objects/pics/people/union_room_attendant/2.4bpp"
-
-	.align 2
-gFieldObjectPic_MovingBox:: @ 84FE7F8
-	.incbin "graphics/map_objects/pics/misc/moving_box.4bpp"
-
-	.align 2
-gFieldObjectPalette19:: @ 84FE878
-	.incbin "graphics/map_objects/palettes/field_object_palette_19.gbapal"
-
-	.align 2
-gFieldObjectPic_Sudowoodo_0:: @ 84FE898
-	.incbin "graphics/map_objects/pics/pokemon/sudowoodo/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Sudowoodo_1:: @ 84FE998
-	.incbin "graphics/map_objects/pics/pokemon/sudowoodo/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Sudowoodo_2:: @ 84FEA98
-	.incbin "graphics/map_objects/pics/pokemon/sudowoodo/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Mew_0:: @ 84FEB98
-	.incbin "graphics/map_objects/pics/pokemon/mew/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Mew_1:: @ 84FEC98
-	.incbin "graphics/map_objects/pics/pokemon/mew/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Mew_2:: @ 84FED98
-	.incbin "graphics/map_objects/pics/pokemon/mew/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Mew_3:: @ 84FEE98
-	.incbin "graphics/map_objects/pics/pokemon/mew/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Mew_4:: @ 84FEF98
-	.incbin "graphics/map_objects/pics/pokemon/mew/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Mew_5:: @ 84FF098
-	.incbin "graphics/map_objects/pics/pokemon/mew/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Mew_6:: @ 84FF198
-	.incbin "graphics/map_objects/pics/pokemon/mew/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Mew_7:: @ 84FF298
-	.incbin "graphics/map_objects/pics/pokemon/mew/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Mew_8:: @ 84FF398
-	.incbin "graphics/map_objects/pics/pokemon/mew/8.4bpp"
-
-	.align 2
-gFieldObjectPalette28:: @ 84FF498
-	.incbin "graphics/map_objects/palettes/field_object_palette_28.gbapal"
-
-	.align 2
-gFieldObjectPic_Red_0:: @ 84FF4B8
-	.incbin "graphics/map_objects/pics/people/red/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Red_1:: @ 84FF5B8
-	.incbin "graphics/map_objects/pics/people/red/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Red_2:: @ 84FF6B8
-	.incbin "graphics/map_objects/pics/people/red/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Red_3:: @ 84FF7B8
-	.incbin "graphics/map_objects/pics/people/red/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Red_4:: @ 84FF8B8
-	.incbin "graphics/map_objects/pics/people/red/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Red_5:: @ 84FF9B8
-	.incbin "graphics/map_objects/pics/people/red/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Red_6:: @ 84FFAB8
-	.incbin "graphics/map_objects/pics/people/red/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Red_7:: @ 84FFBB8
-	.incbin "graphics/map_objects/pics/people/red/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Red_8:: @ 84FFCB8
-	.incbin "graphics/map_objects/pics/people/red/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Leaf_0:: @ 84FFDB8
-	.incbin "graphics/map_objects/pics/people/leaf/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Leaf_1:: @ 84FFEB8
-	.incbin "graphics/map_objects/pics/people/leaf/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Leaf_2:: @ 84FFFB8
-	.incbin "graphics/map_objects/pics/people/leaf/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Leaf_3:: @ 85000B8
-	.incbin "graphics/map_objects/pics/people/leaf/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Leaf_4:: @ 85001B8
-	.incbin "graphics/map_objects/pics/people/leaf/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Leaf_5:: @ 85002B8
-	.incbin "graphics/map_objects/pics/people/leaf/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Leaf_6:: @ 85003B8
-	.incbin "graphics/map_objects/pics/people/leaf/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Leaf_7:: @ 85004B8
-	.incbin "graphics/map_objects/pics/people/leaf/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Leaf_8:: @ 85005B8
-	.incbin "graphics/map_objects/pics/people/leaf/8.4bpp"
-
-	.align 2
-gFieldObjectPalette30:: @ 85006B8
-	.incbin "graphics/map_objects/palettes/field_object_palette_30.gbapal"
-
-	.align 2
-gFieldObjectPic_BirthIslandStone:: @ 85006D8
-	.incbin "graphics/map_objects/pics/misc/birth_island_stone.4bpp"
-
-	.align 2
-gFieldObjectPalette29:: @ 85008D8
-	.incbin "graphics/map_objects/palettes/field_object_palette_29.gbapal"
-
-	.align 2
-gFieldObjectPic_Deoxys_0:: @ 85008F8
-	.incbin "graphics/map_objects/pics/pokemon/deoxys/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Deoxys_1:: @ 8500AF8
-	.incbin "graphics/map_objects/pics/pokemon/deoxys/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Anabel_0:: @ 8500CF8
-	.incbin "graphics/map_objects/pics/people/anabel/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Anabel_1:: @ 8500DF8
-	.incbin "graphics/map_objects/pics/people/anabel/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Anabel_2:: @ 8500EF8
-	.incbin "graphics/map_objects/pics/people/anabel/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Anabel_3:: @ 8500FF8
-	.incbin "graphics/map_objects/pics/people/anabel/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Anabel_4:: @ 85010F8
-	.incbin "graphics/map_objects/pics/people/anabel/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Anabel_5:: @ 85011F8
-	.incbin "graphics/map_objects/pics/people/anabel/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Anabel_6:: @ 85012F8
-	.incbin "graphics/map_objects/pics/people/anabel/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Anabel_7:: @ 85013F8
-	.incbin "graphics/map_objects/pics/people/anabel/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Anabel_8:: @ 85014F8
-	.incbin "graphics/map_objects/pics/people/anabel/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Tucker_0:: @ 85015F8
-	.incbin "graphics/map_objects/pics/people/tucker/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Tucker_1:: @ 85016F8
-	.incbin "graphics/map_objects/pics/people/tucker/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Tucker_2:: @ 85017F8
-	.incbin "graphics/map_objects/pics/people/tucker/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Tucker_3:: @ 85018F8
-	.incbin "graphics/map_objects/pics/people/tucker/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Tucker_4:: @ 85019F8
-	.incbin "graphics/map_objects/pics/people/tucker/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Tucker_5:: @ 8501AF8
-	.incbin "graphics/map_objects/pics/people/tucker/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Tucker_6:: @ 8501BF8
-	.incbin "graphics/map_objects/pics/people/tucker/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Tucker_7:: @ 8501CF8
-	.incbin "graphics/map_objects/pics/people/tucker/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Tucker_8:: @ 8501DF8
-	.incbin "graphics/map_objects/pics/people/tucker/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Spenser_0:: @ 8501EF8
-	.incbin "graphics/map_objects/pics/people/spenser/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Spenser_1:: @ 8501FF8
-	.incbin "graphics/map_objects/pics/people/spenser/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Spenser_2:: @ 85020F8
-	.incbin "graphics/map_objects/pics/people/spenser/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Spenser_3:: @ 85021F8
-	.incbin "graphics/map_objects/pics/people/spenser/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Spenser_4:: @ 85022F8
-	.incbin "graphics/map_objects/pics/people/spenser/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Spenser_5:: @ 85023F8
-	.incbin "graphics/map_objects/pics/people/spenser/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Spenser_6:: @ 85024F8
-	.incbin "graphics/map_objects/pics/people/spenser/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Spenser_7:: @ 85025F8
-	.incbin "graphics/map_objects/pics/people/spenser/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Spenser_8:: @ 85026F8
-	.incbin "graphics/map_objects/pics/people/spenser/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Greta_0:: @ 85027F8
-	.incbin "graphics/map_objects/pics/people/greta/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Greta_1:: @ 85028F8
-	.incbin "graphics/map_objects/pics/people/greta/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Greta_2:: @ 85029F8
-	.incbin "graphics/map_objects/pics/people/greta/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Greta_3:: @ 8502AF8
-	.incbin "graphics/map_objects/pics/people/greta/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Greta_4:: @ 8502BF8
-	.incbin "graphics/map_objects/pics/people/greta/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Greta_5:: @ 8502CF8
-	.incbin "graphics/map_objects/pics/people/greta/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Greta_6:: @ 8502DF8
-	.incbin "graphics/map_objects/pics/people/greta/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Greta_7:: @ 8502EF8
-	.incbin "graphics/map_objects/pics/people/greta/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Greta_8:: @ 8502FF8
-	.incbin "graphics/map_objects/pics/people/greta/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Noland_0:: @ 85030F8
-	.incbin "graphics/map_objects/pics/people/noland/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Noland_1:: @ 85031F8
-	.incbin "graphics/map_objects/pics/people/noland/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Noland_2:: @ 85032F8
-	.incbin "graphics/map_objects/pics/people/noland/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Noland_3:: @ 85033F8
-	.incbin "graphics/map_objects/pics/people/noland/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Noland_4:: @ 85034F8
-	.incbin "graphics/map_objects/pics/people/noland/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Noland_5:: @ 85035F8
-	.incbin "graphics/map_objects/pics/people/noland/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Noland_6:: @ 85036F8
-	.incbin "graphics/map_objects/pics/people/noland/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Noland_7:: @ 85037F8
-	.incbin "graphics/map_objects/pics/people/noland/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Noland_8:: @ 85038F8
-	.incbin "graphics/map_objects/pics/people/noland/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Lucy_0:: @ 85039F8
-	.incbin "graphics/map_objects/pics/people/lucy/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Lucy_1:: @ 8503AF8
-	.incbin "graphics/map_objects/pics/people/lucy/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Lucy_2:: @ 8503BF8
-	.incbin "graphics/map_objects/pics/people/lucy/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Lucy_3:: @ 8503CF8
-	.incbin "graphics/map_objects/pics/people/lucy/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Lucy_4:: @ 8503DF8
-	.incbin "graphics/map_objects/pics/people/lucy/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Lucy_5:: @ 8503EF8
-	.incbin "graphics/map_objects/pics/people/lucy/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Lucy_6:: @ 8503FF8
-	.incbin "graphics/map_objects/pics/people/lucy/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Lucy_7:: @ 85040F8
-	.incbin "graphics/map_objects/pics/people/lucy/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Lucy_8:: @ 85041F8
-	.incbin "graphics/map_objects/pics/people/lucy/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Brandon_0:: @ 85042F8
-	.incbin "graphics/map_objects/pics/people/brandon/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Brandon_1:: @ 85043F8
-	.incbin "graphics/map_objects/pics/people/brandon/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Brandon_2:: @ 85044F8
-	.incbin "graphics/map_objects/pics/people/brandon/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Brandon_3:: @ 85045F8
-	.incbin "graphics/map_objects/pics/people/brandon/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Brandon_4:: @ 85046F8
-	.incbin "graphics/map_objects/pics/people/brandon/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Brandon_5:: @ 85047F8
-	.incbin "graphics/map_objects/pics/people/brandon/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Brandon_6:: @ 85048F8
-	.incbin "graphics/map_objects/pics/people/brandon/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Brandon_7:: @ 85049F8
-	.incbin "graphics/map_objects/pics/people/brandon/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Brandon_8:: @ 8504AF8
-	.incbin "graphics/map_objects/pics/people/brandon/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Lugia_0:: @ 8504BF8
-	.incbin "graphics/map_objects/pics/pokemon/lugia/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Lugia_1:: @ 8504DF8
-	.incbin "graphics/map_objects/pics/pokemon/lugia/1.4bpp"
-
-	.align 2
-gFieldObjectPalette32:: @ 8504FF8
-	.incbin "graphics/map_objects/palettes/field_object_palette_32.gbapal"
-
-	.align 2
-gFieldObjectPic_HoOh_0:: @ 8505018
-	.incbin "graphics/map_objects/pics/pokemon/ho_oh/0.4bpp"
-
-	.align 2
-gFieldObjectPic_HoOh_1:: @ 8505218
-	.incbin "graphics/map_objects/pics/pokemon/ho_oh/1.4bpp"
-
-	.align 2
-gFieldObjectPalette31:: @ 8505418
-	.incbin "graphics/map_objects/palettes/field_object_palette_31.gbapal"
diff --git a/data/graphics/field_objects/field_object_graphics_info.inc b/data/graphics/field_objects/field_object_graphics_info.inc
deleted file mode 100644
index 6a0778adf..000000000
--- a/data/graphics/field_objects/field_object_graphics_info.inc
+++ /dev/null
@@ -1,4164 +0,0 @@
-	.align 2
-gFieldObjectGraphicsInfo_BrendanNormal:: @ 8509954
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1100 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_BrendanMayNormal
-	.4byte gFieldObjectPicTable_BrendanNormal
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BrendanMachBike:: @ 8509978
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1100 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
-	.byte TRACKS_BIKE_TIRE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_BrendanMachBike
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BrendanAcroBike:: @ 850999C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1100 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
-	.byte TRACKS_BIKE_TIRE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_AcroBike
-	.4byte gFieldObjectPicTable_BrendanAcroBike
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BrendanSurfing:: @ 85099C0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1100 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Surfing
-	.4byte gFieldObjectPicTable_BrendanSurfing
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BrendanFieldMove:: @ 85099E4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1100 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_FieldMove
-	.4byte gFieldObjectPicTable_BrendanFieldMove
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_QuintyPlump:: @ 8509A08
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x110B @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_L << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_QuintyPlump
-	.4byte gFieldObjectPicTable_QuintyPlump
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_LittleBoy1:: @ 8509A2C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_LittleBoy1
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_LittleGirl1:: @ 8509A50
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_LittleGirl1
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Boy1:: @ 8509A74
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Boy1
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Girl1:: @ 8509A98
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Girl1
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Boy2:: @ 8509ABC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Boy2
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Girl2:: @ 8509AE0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Girl2
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_LittleBoy2:: @ 8509B04
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_LittleBoy2
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_LittleGirl2:: @ 8509B28
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_LittleGirl2
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Boy3:: @ 8509B4C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Boy3
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Girl3:: @ 8509B70
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Girl3
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Boy4:: @ 8509B94
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Boy4
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Woman1:: @ 8509BB8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Woman1
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_FatMan:: @ 8509BDC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_FatMan
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Woman2:: @ 8509C00
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Woman2
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Man1:: @ 8509C24
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Man1
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Woman3:: @ 8509C48
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Woman3
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_OldMan1:: @ 8509C6C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_OldMan1
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_OldWoman1:: @ 8509C90
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_OldWoman1
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Man2:: @ 8509CB4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Man2
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Woman4:: @ 8509CD8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Woman4
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Man3:: @ 8509CFC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Man3
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Woman5:: @ 8509D20
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Woman5
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Cook:: @ 8509D44
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Cook
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Woman6:: @ 8509D68
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Woman6
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_OldMan2:: @ 8509D8C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_OldMan2
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_OldWoman2:: @ 8509DB0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_OldWoman2
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Camper:: @ 8509DD4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Camper
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Picnicker:: @ 8509DF8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Picnicker
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Man4:: @ 8509E1C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Man4
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Woman7:: @ 8509E40
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Woman7
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Youngster:: @ 8509E64
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Youngster
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BugCatcher:: @ 8509E88
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_BugCatcher
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_PsychicM:: @ 8509EAC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_PsychicM
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_SchoolKidM:: @ 8509ED0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_SchoolKidM
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Maniac:: @ 8509EF4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Maniac
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_HexManiac:: @ 8509F18
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_HexManiac
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Rayquaza1:: @ 8509F3C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 2048 @ image size
-	.2byte 64 @ width
-	.2byte 64 @ height
-	.byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_64x64
-	.4byte gFieldObjectSpriteOamTables_64x64
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_RayquazaStill
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_SwimmerM:: @ 8509F60
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_SwimmerM
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_SwimmerF:: @ 8509F84
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_SwimmerF
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BlackBelt:: @ 8509FA8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_BlackBelt
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Beauty:: @ 8509FCC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Beauty
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Scientist1:: @ 8509FF0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Scientist1
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Lass:: @ 850A014
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Lass
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Gentleman:: @ 850A038
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Gentleman
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Sailor:: @ 850A05C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Sailor
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Fisherman:: @ 850A080
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Fisherman
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_RunningTriathleteM:: @ 850A0A4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_RunningTriathleteM
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_RunningTriathleteF:: @ 850A0C8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_RunningTriathleteF
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_TuberF:: @ 850A0EC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_TuberF
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_TuberM:: @ 850A110
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_TuberM
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Hiker:: @ 850A134
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Hiker
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_CyclingTriathleteM:: @ 850A158
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_BIKE_TIRE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_AcroBike
-	.4byte gFieldObjectPicTable_CyclingTriathleteM
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_CyclingTriathleteF:: @ 850A17C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_BIKE_TIRE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_AcroBike
-	.4byte gFieldObjectPicTable_CyclingTriathleteF
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Nurse:: @ 850A1A0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Nurse
-	.4byte gFieldObjectPicTable_Nurse
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_ItemBall:: @ 850A1C4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_ItemBall
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BerryTree:: @ 850A1E8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte NULL @ sprite OAM tables
-	.4byte gFieldObjectImageAnimTable_BerryTree
-	.4byte gFieldObjectPicTable_PechaBerryTree
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BerryTreeEarlyStages:: @ 850A20C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_BerryTree
-	.4byte gFieldObjectPicTable_PechaBerryTree
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BerryTreeLateStages:: @ 850A230
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_BerryTree
-	.4byte gFieldObjectPicTable_PechaBerryTree
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_ProfBirch:: @ 850A254
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_ProfBirch
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Man5:: @ 850A278
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Man5
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Man6:: @ 850A29C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Man6
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_ReporterM:: @ 850A2C0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_ReporterM
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_ReporterF:: @ 850A2E4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_ReporterF
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Bard:: @ 850A308
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_MauvilleOldMan1
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Hipster:: @ 850A32C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_MauvilleOldMan1
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Trader:: @ 850A350
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_MauvilleOldMan1
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Storyteller:: @ 850A374
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_MauvilleOldMan2
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Giddy:: @ 850A398
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_MauvilleOldMan2
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_UnusedMauvilleOldMan1:: @ 850A3BC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_MauvilleOldMan2
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_UnusedMauvilleOldMan2:: @ 850A3E0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_MauvilleOldMan2
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_UnusedNatuDoll:: @ 850A404
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_UnusedNatuDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_UnusedMagnemiteDoll:: @ 850A428
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_UnusedMagnemiteDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_UnusedSquirtleDoll:: @ 850A44C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_UnusedSquirtleDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_UnusedWooperDoll:: @ 850A470
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_UnusedWooperDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_UnusedPikachuDoll:: @ 850A494
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_UnusedPikachuDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_UnusedPorygon2Doll:: @ 850A4B8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_UnusedPorygon2Doll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_CuttableTree:: @ 850A4DC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_CuttableTree
-	.4byte gFieldObjectPicTable_CuttableTree
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_MartEmployee:: @ 850A500
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_MartEmployee
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_RooftopSaleWoman:: @ 850A524
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_RooftopSaleWoman
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Teala:: @ 850A548
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Teala
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BreakableRock:: @ 850A56C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_BreakableRock
-	.4byte gFieldObjectPicTable_BreakableRock
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_PushableBoulder:: @ 850A590
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_PushableBoulder
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_MrBrineysBoat:: @ 850A5B4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_MrBrineysBoat
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_MayNormal:: @ 850A5D8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1110 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_BrendanMayNormal
-	.4byte gFieldObjectPicTable_MayNormal
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_MayMachBike:: @ 850A5FC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1110 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
-	.byte TRACKS_BIKE_TIRE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_MayMachBike
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_MayAcroBike:: @ 850A620
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1110 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
-	.byte TRACKS_BIKE_TIRE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_AcroBike
-	.4byte gFieldObjectPicTable_MayAcroBike
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_MaySurfing:: @ 850A644
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1110 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Surfing
-	.4byte gFieldObjectPicTable_MaySurfing
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_MayFieldMove:: @ 850A668
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1110 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_FieldMove
-	.4byte gFieldObjectPicTable_MayFieldMove
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Truck:: @ 850A68C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x110D @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 1152 @ image size
-	.2byte 48 @ width
-	.2byte 48 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_Truck
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_Truck
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_VigorothCarryingBox:: @ 850A6B0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x110E @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_VigorothCarryingBox
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_VigorothFacingAway:: @ 850A6D4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x110E @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_VigorothFacingAway
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BirchsBag:: @ 850A6F8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_BirchsBag
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_EnemyZigzagoon:: @ 850A71C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x110F @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_EnemyZigzagoon
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Poochyena:: @ 850A740
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x111C @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Poochyena
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Artist:: @ 850A764
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Artist
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_RivalBrendanNormal:: @ 850A788
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1100 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_BrendanMayNormal
-	.4byte gFieldObjectPicTable_BrendanNormal
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_RivalBrendanMachBike:: @ 850A7AC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1100 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_BIKE_TIRE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_BrendanMachBike
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_RivalBrendanAcroBike:: @ 850A7D0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1100 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_BIKE_TIRE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_AcroBike
-	.4byte gFieldObjectPicTable_BrendanAcroBike
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_RivalBrendanSurfing:: @ 850A7F4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1100 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Surfing
-	.4byte gFieldObjectPicTable_BrendanSurfing
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_RivalBrendanFieldMove:: @ 850A818
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1100 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_FieldMove
-	.4byte gFieldObjectPicTable_BrendanFieldMove
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_RivalMayNormal:: @ 850A83C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1110 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_BrendanMayNormal
-	.4byte gFieldObjectPicTable_MayNormal
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_RivalMayMachBike:: @ 850A860
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1110 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_BIKE_TIRE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_MayMachBike
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_RivalMayAcroBike:: @ 850A884
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1110 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_BIKE_TIRE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_AcroBike
-	.4byte gFieldObjectPicTable_MayAcroBike
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_RivalMaySurfing:: @ 850A8A8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1110 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Surfing
-	.4byte gFieldObjectPicTable_MaySurfing
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_RivalMayFieldMove:: @ 850A8CC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1110 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_FieldMove
-	.4byte gFieldObjectPicTable_MayFieldMove
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Cameraman:: @ 850A8F0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Cameraman
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BrendanUnderwater:: @ 850A914
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1115 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_BrendanUnderwater
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_MayUnderwater:: @ 850A938
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1115 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_MayUnderwater
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_MovingBox:: @ 850A95C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1112 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_MovingBox
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_CableCar:: @ 850A980
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1113 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 2048 @ image size
-	.2byte 64 @ width
-	.2byte 64 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_64x64
-	.4byte gFieldObjectSpriteOamTables_64x64
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_CableCar
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Scientist2:: @ 850A9A4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Scientist2
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Man7:: @ 850A9C8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Man7
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_AquaMemberM:: @ 850A9EC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_AquaMemberM
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_AquaMemberF:: @ 850AA10
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_AquaMemberF
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_MagmaMemberM:: @ 850AA34
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_MagmaMemberM
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_MagmaMemberF:: @ 850AA58
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_MagmaMemberF
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Sidney:: @ 850AA7C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Sidney
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Phoebe:: @ 850AAA0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Phoebe
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Glacia:: @ 850AAC4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Glacia
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Drake:: @ 850AAE8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Drake
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Roxanne:: @ 850AB0C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Roxanne
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Brawly:: @ 850AB30
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Brawly
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Wattson:: @ 850AB54
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Wattson
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Flannery:: @ 850AB78
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Flannery
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Norman:: @ 850AB9C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Norman
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Winona:: @ 850ABC0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Winona
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Liza:: @ 850ABE4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Liza
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Tate:: @ 850AC08
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Tate
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Wallace:: @ 850AC2C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Wallace
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Steven:: @ 850AC50
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Steven
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Wally:: @ 850AC74
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Wally
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_RubySapphireLittleBoy:: @ 850AC98
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_RubySapphireLittleBoy
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BrendanFishing:: @ 850ACBC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1100 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Fishing
-	.4byte gFieldObjectPicTable_BrendanFishing
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_MayFishing:: @ 850ACE0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1110 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Fishing
-	.4byte gFieldObjectPicTable_MayFishing
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_HotSpringsOldWoman:: @ 850AD04
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_HotSpringsOldWoman
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_SSTidal:: @ 850AD28
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1114 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 1920 @ image size
-	.2byte 96 @ width
-	.2byte 40 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_8x8
-	.4byte gFieldObjectSpriteOamTables_SSTidal
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_SSTidal
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_SubmarineShadow:: @ 850AD4C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x111B @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 1408 @ image size
-	.2byte 88 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_8x8
-	.4byte gFieldObjectSpriteOamTables_SubmarineShadow
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_SubmarineShadow
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_PichuDoll:: @ 850AD70
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_PichuDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_PikachuDoll:: @ 850AD94
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_PikachuDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_MarillDoll:: @ 850ADB8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_MarillDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_TogepiDoll:: @ 850ADDC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_TogepiDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_CyndaquilDoll:: @ 850AE00
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_CyndaquilDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_ChikoritaDoll:: @ 850AE24
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_ChikoritaDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_TotodileDoll:: @ 850AE48
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_TotodileDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_JigglypuffDoll:: @ 850AE6C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_JigglypuffDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_MeowthDoll:: @ 850AE90
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_MeowthDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_ClefairyDoll:: @ 850AEB4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_ClefairyDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_DittoDoll:: @ 850AED8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_DittoDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_SmoochumDoll:: @ 850AEFC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_SmoochumDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_TreeckoDoll:: @ 850AF20
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_TreeckoDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_TorchicDoll:: @ 850AF44
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_TorchicDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_MudkipDoll:: @ 850AF68
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_MudkipDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_DuskullDoll:: @ 850AF8C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_DuskullDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_WynautDoll:: @ 850AFB0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_WynautDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BaltoyDoll:: @ 850AFD4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_BaltoyDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_KecleonDoll:: @ 850AFF8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_KecleonDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_AzurillDoll:: @ 850B01C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_AzurillDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_SkittyDoll:: @ 850B040
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_SkittyDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_SwabluDoll:: @ 850B064
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_SwabluDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_GulpinDoll:: @ 850B088
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_GulpinDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_LotadDoll:: @ 850B0AC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_LotadDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_SeedotDoll:: @ 850B0D0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_SeedotDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_PikaCushion:: @ 850B0F4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_PikaCushion
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_RoundCushion:: @ 850B118
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_RoundCushion
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_KissCushion:: @ 850B13C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_KissCushion
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_ZigzagCushion:: @ 850B160
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_ZigzagCushion
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_SpinCushion:: @ 850B184
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_SpinCushion
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_DiamondCushion:: @ 850B1A8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_DiamondCushion
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BallCushion:: @ 850B1CC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_BallCushion
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_GrassCushion:: @ 850B1F0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_GrassCushion
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_FireCushion:: @ 850B214
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_FireCushion
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_WaterCushion:: @ 850B238
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_WaterCushion
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BigSnorlaxDoll:: @ 850B25C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_BigSnorlaxDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BigRhydonDoll:: @ 850B280
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_BigRhydonDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BigLaprasDoll:: @ 850B2A4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_BigLaprasDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BigVenusaurDoll:: @ 850B2C8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_BigVenusaurDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BigCharizardDoll:: @ 850B2EC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_BigCharizardDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BigBlastoiseDoll:: @ 850B310
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_BigBlastoiseDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BigWailmerDoll:: @ 850B334
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_BigWailmerDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BigRegirockDoll:: @ 850B358
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_BigRegirockDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BigRegiceDoll:: @ 850B37C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_BigRegiceDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BigRegisteelDoll:: @ 850B3A0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_BigRegisteelDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Latias:: @ 850B3C4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_LatiasLatios
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Latios:: @ 850B3E8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_LatiasLatios
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Boy5:: @ 850B40C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Boy5
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_ContestOldMan:: @ 850B430
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_ContestOldMan
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BrendanWatering:: @ 850B454
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1100 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_BrendanWatering
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_MayWatering:: @ 850B478
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1110 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_MayWatering
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BrendanDecorating:: @ 850B49C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1100 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_BrendanDecorating
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_MayDecorating:: @ 850B4C0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1110 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_MayDecorating
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Archie:: @ 850B4E4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Archie
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Maxie:: @ 850B508
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Maxie
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Kyogre1:: @ 850B52C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_KyogreFront
-	.4byte gFieldObjectRotScalAnimTable_KyogreGroudon
-
-	.align 2
-gFieldObjectGraphicsInfo_Groudon1:: @ 850B550
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_GroudonFront
-	.4byte gFieldObjectRotScalAnimTable_KyogreGroudon
-
-	.align 2
-gFieldObjectGraphicsInfo_Kyogre3:: @ 850B574
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_KyogreSide
-	.4byte gFieldObjectRotScalAnimTable_KyogreGroudon
-
-	.align 2
-gFieldObjectGraphicsInfo_Groudon3:: @ 850B598
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Groudon3
-	.4byte gFieldObjectPicTable_GroudonSide
-	.4byte gFieldObjectRotScalAnimTable_KyogreGroudon
-
-	.align 2
-gFieldObjectGraphicsInfo_Fossil:: @ 850B5BC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_Fossil
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Regirock:: @ 850B5E0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Regi
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Regice:: @ 850B604
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Regi
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Registeel:: @ 850B628
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Regi
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Skitty:: @ 850B64C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Skitty
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Kecleon1:: @ 850B670
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Kecleon
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Kyogre2:: @ 850B694
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1116 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_KyogreFront
-	.4byte gFieldObjectRotScalAnimTable_KyogreGroudon
-
-	.align 2
-gFieldObjectGraphicsInfo_Groudon2:: @ 850B6B8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1118 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_GroudonFront
-	.4byte gFieldObjectRotScalAnimTable_KyogreGroudon
-
-	.align 2
-gFieldObjectGraphicsInfo_Rayquaza2:: @ 850B6DC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 2048 @ image size
-	.2byte 64 @ width
-	.2byte 64 @ height
-	.byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_64x64
-	.4byte gFieldObjectSpriteOamTables_64x64
-	.4byte gFieldObjectImageAnimTable_Rayquaza2
-	.4byte gFieldObjectPicTable_Rayquaza
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Zigzagoon:: @ 850B700
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Zigzagoon
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Pikachu:: @ 850B724
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Pikachu
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Azumarill:: @ 850B748
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Azumarill
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Wingull:: @ 850B76C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Wingull
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Kecleon2:: @ 850B790
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Kecleon
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_TuberMSwimming:: @ 850B7B4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_TuberMSwimming
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Azurill:: @ 850B7D8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Azurill
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Mom:: @ 850B7FC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Mom
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_LinkBrendan:: @ 850B820
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1110 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_BrendanMayNormal
-	.4byte gFieldObjectPicTable_BrendanNormal
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_LinkMay:: @ 850B844
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1110 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_BrendanMayNormal
-	.4byte gFieldObjectPicTable_MayNormal
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Juan:: @ 850B868
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Juan
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Scott:: @ 850B88C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Scott
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_MysteryEventDeliveryman:: @ 850B8B0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_MysteryEventDeliveryman
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Statue:: @ 850B8D4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_Statue
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Kirlia:: @ 850B8F8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Kirlia
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Dusclops:: @ 850B91C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Dusclops
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_UnionRoomAttendant:: @ 850B940
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_UnionRoomAttendant
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Red:: @ 850B964
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x111D @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Red
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Leaf:: @ 850B988
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x111D @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Leaf
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Sudowoodo:: @ 850B9AC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Sudowoodo
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Mew:: @ 850B9D0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Mew
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Deoxys:: @ 850B9F4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x111E @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Deoxys
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BirthIslandStone:: @ 850BA18
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x111F @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_BirthIslandStone
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Anabel:: @ 850BA3C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Anabel
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Tucker:: @ 850BA60
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Tucker
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Greta:: @ 850BA84
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Greta
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Spenser:: @ 850BAA8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Spenser
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Noland:: @ 850BACC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Noland
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Lucy:: @ 850BAF0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Lucy
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Brandon:: @ 850BB14
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Brandon
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_RubySapphireBrendan:: @ 850BB38
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1122 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_RubySapphireBrendan
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_RubySapphireMay:: @ 850BB5C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1123 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_RubySapphireMay
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Lugia:: @ 850BB80
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1121 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Lugia
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_HoOh:: @ 850BBA4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1120 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_HoOh
-	.4byte gFieldObjectPicTable_HoOh
-	.4byte gDummySpriteAffineAnimTable
diff --git a/data/graphics/field_objects/field_object_graphics_info_pointers.inc b/data/graphics/field_objects/field_object_graphics_info_pointers.inc
deleted file mode 100644
index 1faea449c..000000000
--- a/data/graphics/field_objects/field_object_graphics_info_pointers.inc
+++ /dev/null
@@ -1,251 +0,0 @@
-	.align 2
-gFieldObjectGraphicsInfoPointers:: @ 8505620
-	.4byte gFieldObjectGraphicsInfo_BrendanNormal
-	.4byte gFieldObjectGraphicsInfo_BrendanMachBike
-	.4byte gFieldObjectGraphicsInfo_BrendanSurfing
-	.4byte gFieldObjectGraphicsInfo_BrendanFieldMove
-	.4byte gFieldObjectGraphicsInfo_QuintyPlump
-	.4byte gFieldObjectGraphicsInfo_LittleBoy1
-	.4byte gFieldObjectGraphicsInfo_LittleGirl1
-	.4byte gFieldObjectGraphicsInfo_Boy1
-	.4byte gFieldObjectGraphicsInfo_Girl1
-	.4byte gFieldObjectGraphicsInfo_Boy2
-	.4byte gFieldObjectGraphicsInfo_Girl2
-	.4byte gFieldObjectGraphicsInfo_LittleBoy2
-	.4byte gFieldObjectGraphicsInfo_LittleGirl2
-	.4byte gFieldObjectGraphicsInfo_Boy3
-	.4byte gFieldObjectGraphicsInfo_Girl3
-	.4byte gFieldObjectGraphicsInfo_Boy4
-	.4byte gFieldObjectGraphicsInfo_Woman1
-	.4byte gFieldObjectGraphicsInfo_FatMan
-	.4byte gFieldObjectGraphicsInfo_Woman2
-	.4byte gFieldObjectGraphicsInfo_Man1
-	.4byte gFieldObjectGraphicsInfo_Woman3
-	.4byte gFieldObjectGraphicsInfo_OldMan1
-	.4byte gFieldObjectGraphicsInfo_OldWoman1
-	.4byte gFieldObjectGraphicsInfo_Man2
-	.4byte gFieldObjectGraphicsInfo_Woman4
-	.4byte gFieldObjectGraphicsInfo_Man3
-	.4byte gFieldObjectGraphicsInfo_Woman5
-	.4byte gFieldObjectGraphicsInfo_Cook
-	.4byte gFieldObjectGraphicsInfo_Woman6
-	.4byte gFieldObjectGraphicsInfo_OldMan2
-	.4byte gFieldObjectGraphicsInfo_OldWoman2
-	.4byte gFieldObjectGraphicsInfo_Camper
-	.4byte gFieldObjectGraphicsInfo_Picnicker
-	.4byte gFieldObjectGraphicsInfo_Man4
-	.4byte gFieldObjectGraphicsInfo_Woman7
-	.4byte gFieldObjectGraphicsInfo_Youngster
-	.4byte gFieldObjectGraphicsInfo_BugCatcher
-	.4byte gFieldObjectGraphicsInfo_PsychicM
-	.4byte gFieldObjectGraphicsInfo_SchoolKidM
-	.4byte gFieldObjectGraphicsInfo_Maniac
-	.4byte gFieldObjectGraphicsInfo_HexManiac
-	.4byte gFieldObjectGraphicsInfo_Rayquaza1
-	.4byte gFieldObjectGraphicsInfo_SwimmerM
-	.4byte gFieldObjectGraphicsInfo_SwimmerF
-	.4byte gFieldObjectGraphicsInfo_BlackBelt
-	.4byte gFieldObjectGraphicsInfo_Beauty
-	.4byte gFieldObjectGraphicsInfo_Scientist1
-	.4byte gFieldObjectGraphicsInfo_Lass
-	.4byte gFieldObjectGraphicsInfo_Gentleman
-	.4byte gFieldObjectGraphicsInfo_Sailor
-	.4byte gFieldObjectGraphicsInfo_Fisherman
-	.4byte gFieldObjectGraphicsInfo_RunningTriathleteM
-	.4byte gFieldObjectGraphicsInfo_RunningTriathleteF
-	.4byte gFieldObjectGraphicsInfo_TuberF
-	.4byte gFieldObjectGraphicsInfo_TuberM
-	.4byte gFieldObjectGraphicsInfo_Hiker
-	.4byte gFieldObjectGraphicsInfo_CyclingTriathleteM
-	.4byte gFieldObjectGraphicsInfo_CyclingTriathleteF
-	.4byte gFieldObjectGraphicsInfo_Nurse
-	.4byte gFieldObjectGraphicsInfo_ItemBall
-	.4byte gFieldObjectGraphicsInfo_BerryTree
-	.4byte gFieldObjectGraphicsInfo_BerryTreeEarlyStages
-	.4byte gFieldObjectGraphicsInfo_BerryTreeLateStages
-	.4byte gFieldObjectGraphicsInfo_BrendanAcroBike
-	.4byte gFieldObjectGraphicsInfo_ProfBirch
-	.4byte gFieldObjectGraphicsInfo_Man5
-	.4byte gFieldObjectGraphicsInfo_Man6
-	.4byte gFieldObjectGraphicsInfo_ReporterM
-	.4byte gFieldObjectGraphicsInfo_ReporterF
-	.4byte gFieldObjectGraphicsInfo_Bard
-	.4byte gFieldObjectGraphicsInfo_Anabel
-	.4byte gFieldObjectGraphicsInfo_Tucker
-	.4byte gFieldObjectGraphicsInfo_Greta
-	.4byte gFieldObjectGraphicsInfo_Spenser
-	.4byte gFieldObjectGraphicsInfo_Noland
-	.4byte gFieldObjectGraphicsInfo_Lucy
-	.4byte gFieldObjectGraphicsInfo_UnusedNatuDoll
-	.4byte gFieldObjectGraphicsInfo_UnusedMagnemiteDoll
-	.4byte gFieldObjectGraphicsInfo_UnusedSquirtleDoll
-	.4byte gFieldObjectGraphicsInfo_UnusedWooperDoll
-	.4byte gFieldObjectGraphicsInfo_UnusedPikachuDoll
-	.4byte gFieldObjectGraphicsInfo_UnusedPorygon2Doll
-	.4byte gFieldObjectGraphicsInfo_CuttableTree
-	.4byte gFieldObjectGraphicsInfo_MartEmployee
-	.4byte gFieldObjectGraphicsInfo_RooftopSaleWoman
-	.4byte gFieldObjectGraphicsInfo_Teala
-	.4byte gFieldObjectGraphicsInfo_BreakableRock
-	.4byte gFieldObjectGraphicsInfo_PushableBoulder
-	.4byte gFieldObjectGraphicsInfo_MrBrineysBoat
-	.4byte gFieldObjectGraphicsInfo_MayNormal
-	.4byte gFieldObjectGraphicsInfo_MayMachBike
-	.4byte gFieldObjectGraphicsInfo_MayAcroBike
-	.4byte gFieldObjectGraphicsInfo_MaySurfing
-	.4byte gFieldObjectGraphicsInfo_MayFieldMove
-	.4byte gFieldObjectGraphicsInfo_Truck
-	.4byte gFieldObjectGraphicsInfo_VigorothCarryingBox
-	.4byte gFieldObjectGraphicsInfo_VigorothFacingAway
-	.4byte gFieldObjectGraphicsInfo_BirchsBag
-	.4byte gFieldObjectGraphicsInfo_EnemyZigzagoon
-	.4byte gFieldObjectGraphicsInfo_Artist
-	.4byte gFieldObjectGraphicsInfo_RivalBrendanNormal
-	.4byte gFieldObjectGraphicsInfo_RivalBrendanMachBike
-	.4byte gFieldObjectGraphicsInfo_RivalBrendanAcroBike
-	.4byte gFieldObjectGraphicsInfo_RivalBrendanSurfing
-	.4byte gFieldObjectGraphicsInfo_RivalBrendanFieldMove
-	.4byte gFieldObjectGraphicsInfo_RivalMayNormal
-	.4byte gFieldObjectGraphicsInfo_RivalMayMachBike
-	.4byte gFieldObjectGraphicsInfo_RivalMayAcroBike
-	.4byte gFieldObjectGraphicsInfo_RivalMaySurfing
-	.4byte gFieldObjectGraphicsInfo_RivalMayFieldMove
-	.4byte gFieldObjectGraphicsInfo_Cameraman
-	.4byte gFieldObjectGraphicsInfo_BrendanUnderwater
-	.4byte gFieldObjectGraphicsInfo_MayUnderwater
-	.4byte gFieldObjectGraphicsInfo_MovingBox
-	.4byte gFieldObjectGraphicsInfo_CableCar
-	.4byte gFieldObjectGraphicsInfo_Scientist2
-	.4byte gFieldObjectGraphicsInfo_Man7
-	.4byte gFieldObjectGraphicsInfo_AquaMemberM
-	.4byte gFieldObjectGraphicsInfo_AquaMemberF
-	.4byte gFieldObjectGraphicsInfo_MagmaMemberM
-	.4byte gFieldObjectGraphicsInfo_MagmaMemberF
-	.4byte gFieldObjectGraphicsInfo_Sidney
-	.4byte gFieldObjectGraphicsInfo_Phoebe
-	.4byte gFieldObjectGraphicsInfo_Glacia
-	.4byte gFieldObjectGraphicsInfo_Drake
-	.4byte gFieldObjectGraphicsInfo_Roxanne
-	.4byte gFieldObjectGraphicsInfo_Brawly
-	.4byte gFieldObjectGraphicsInfo_Wattson
-	.4byte gFieldObjectGraphicsInfo_Flannery
-	.4byte gFieldObjectGraphicsInfo_Norman
-	.4byte gFieldObjectGraphicsInfo_Winona
-	.4byte gFieldObjectGraphicsInfo_Liza
-	.4byte gFieldObjectGraphicsInfo_Tate
-	.4byte gFieldObjectGraphicsInfo_Wallace
-	.4byte gFieldObjectGraphicsInfo_Steven
-	.4byte gFieldObjectGraphicsInfo_Wally
-	.4byte gFieldObjectGraphicsInfo_RubySapphireLittleBoy
-	.4byte gFieldObjectGraphicsInfo_BrendanFishing
-	.4byte gFieldObjectGraphicsInfo_MayFishing
-	.4byte gFieldObjectGraphicsInfo_HotSpringsOldWoman
-	.4byte gFieldObjectGraphicsInfo_SSTidal
-	.4byte gFieldObjectGraphicsInfo_SubmarineShadow
-	.4byte gFieldObjectGraphicsInfo_PichuDoll
-	.4byte gFieldObjectGraphicsInfo_PikachuDoll
-	.4byte gFieldObjectGraphicsInfo_MarillDoll
-	.4byte gFieldObjectGraphicsInfo_TogepiDoll
-	.4byte gFieldObjectGraphicsInfo_CyndaquilDoll
-	.4byte gFieldObjectGraphicsInfo_ChikoritaDoll
-	.4byte gFieldObjectGraphicsInfo_TotodileDoll
-	.4byte gFieldObjectGraphicsInfo_JigglypuffDoll
-	.4byte gFieldObjectGraphicsInfo_MeowthDoll
-	.4byte gFieldObjectGraphicsInfo_ClefairyDoll
-	.4byte gFieldObjectGraphicsInfo_DittoDoll
-	.4byte gFieldObjectGraphicsInfo_SmoochumDoll
-	.4byte gFieldObjectGraphicsInfo_TreeckoDoll
-	.4byte gFieldObjectGraphicsInfo_TorchicDoll
-	.4byte gFieldObjectGraphicsInfo_MudkipDoll
-	.4byte gFieldObjectGraphicsInfo_DuskullDoll
-	.4byte gFieldObjectGraphicsInfo_WynautDoll
-	.4byte gFieldObjectGraphicsInfo_BaltoyDoll
-	.4byte gFieldObjectGraphicsInfo_KecleonDoll
-	.4byte gFieldObjectGraphicsInfo_AzurillDoll
-	.4byte gFieldObjectGraphicsInfo_SkittyDoll
-	.4byte gFieldObjectGraphicsInfo_SwabluDoll
-	.4byte gFieldObjectGraphicsInfo_GulpinDoll
-	.4byte gFieldObjectGraphicsInfo_LotadDoll
-	.4byte gFieldObjectGraphicsInfo_SeedotDoll
-	.4byte gFieldObjectGraphicsInfo_PikaCushion
-	.4byte gFieldObjectGraphicsInfo_RoundCushion
-	.4byte gFieldObjectGraphicsInfo_KissCushion
-	.4byte gFieldObjectGraphicsInfo_ZigzagCushion
-	.4byte gFieldObjectGraphicsInfo_SpinCushion
-	.4byte gFieldObjectGraphicsInfo_DiamondCushion
-	.4byte gFieldObjectGraphicsInfo_BallCushion
-	.4byte gFieldObjectGraphicsInfo_GrassCushion
-	.4byte gFieldObjectGraphicsInfo_FireCushion
-	.4byte gFieldObjectGraphicsInfo_WaterCushion
-	.4byte gFieldObjectGraphicsInfo_BigSnorlaxDoll
-	.4byte gFieldObjectGraphicsInfo_BigRhydonDoll
-	.4byte gFieldObjectGraphicsInfo_BigLaprasDoll
-	.4byte gFieldObjectGraphicsInfo_BigVenusaurDoll
-	.4byte gFieldObjectGraphicsInfo_BigCharizardDoll
-	.4byte gFieldObjectGraphicsInfo_BigBlastoiseDoll
-	.4byte gFieldObjectGraphicsInfo_BigWailmerDoll
-	.4byte gFieldObjectGraphicsInfo_BigRegirockDoll
-	.4byte gFieldObjectGraphicsInfo_BigRegiceDoll
-	.4byte gFieldObjectGraphicsInfo_BigRegisteelDoll
-	.4byte gFieldObjectGraphicsInfo_Latias
-	.4byte gFieldObjectGraphicsInfo_Latios
-	.4byte gFieldObjectGraphicsInfo_Boy5
-	.4byte gFieldObjectGraphicsInfo_ContestOldMan
-	.4byte gFieldObjectGraphicsInfo_BrendanWatering
-	.4byte gFieldObjectGraphicsInfo_MayWatering
-	.4byte gFieldObjectGraphicsInfo_BrendanDecorating
-	.4byte gFieldObjectGraphicsInfo_MayDecorating
-	.4byte gFieldObjectGraphicsInfo_Archie
-	.4byte gFieldObjectGraphicsInfo_Maxie
-	.4byte gFieldObjectGraphicsInfo_Kyogre1
-	.4byte gFieldObjectGraphicsInfo_Groudon1
-	.4byte gFieldObjectGraphicsInfo_Fossil
-	.4byte gFieldObjectGraphicsInfo_Regirock
-	.4byte gFieldObjectGraphicsInfo_Regice
-	.4byte gFieldObjectGraphicsInfo_Registeel
-	.4byte gFieldObjectGraphicsInfo_Skitty
-	.4byte gFieldObjectGraphicsInfo_Kecleon1
-	.4byte gFieldObjectGraphicsInfo_Kyogre2
-	.4byte gFieldObjectGraphicsInfo_Groudon2
-	.4byte gFieldObjectGraphicsInfo_Rayquaza2
-	.4byte gFieldObjectGraphicsInfo_Zigzagoon
-	.4byte gFieldObjectGraphicsInfo_Pikachu
-	.4byte gFieldObjectGraphicsInfo_Azumarill
-	.4byte gFieldObjectGraphicsInfo_Wingull
-	.4byte gFieldObjectGraphicsInfo_Kecleon2
-	.4byte gFieldObjectGraphicsInfo_TuberMSwimming
-	.4byte gFieldObjectGraphicsInfo_Azurill
-	.4byte gFieldObjectGraphicsInfo_Mom
-	.4byte gFieldObjectGraphicsInfo_LinkBrendan
-	.4byte gFieldObjectGraphicsInfo_LinkMay
-	.4byte gFieldObjectGraphicsInfo_Juan
-	.4byte gFieldObjectGraphicsInfo_Scott
-	.4byte gFieldObjectGraphicsInfo_Poochyena
-	.4byte gFieldObjectGraphicsInfo_Kyogre3
-	.4byte gFieldObjectGraphicsInfo_Groudon3
-	.4byte gFieldObjectGraphicsInfo_MysteryEventDeliveryman
-	.4byte gFieldObjectGraphicsInfo_Statue
-	.4byte gFieldObjectGraphicsInfo_Kirlia
-	.4byte gFieldObjectGraphicsInfo_Dusclops
-	.4byte gFieldObjectGraphicsInfo_UnionRoomAttendant
-	.4byte gFieldObjectGraphicsInfo_Sudowoodo
-	.4byte gFieldObjectGraphicsInfo_Mew
-	.4byte gFieldObjectGraphicsInfo_Red
-	.4byte gFieldObjectGraphicsInfo_Leaf
-	.4byte gFieldObjectGraphicsInfo_Deoxys
-	.4byte gFieldObjectGraphicsInfo_BirthIslandStone
-	.4byte gFieldObjectGraphicsInfo_Brandon
-	.4byte gFieldObjectGraphicsInfo_RubySapphireBrendan
-	.4byte gFieldObjectGraphicsInfo_RubySapphireMay
-	.4byte gFieldObjectGraphicsInfo_Lugia
-	.4byte gFieldObjectGraphicsInfo_HoOh
-
-	.align 2
-gMauvilleOldManGraphicsInfoPointers:: @ 85059DC
-	.4byte gFieldObjectGraphicsInfo_Bard
-	.4byte gFieldObjectGraphicsInfo_Hipster
-	.4byte gFieldObjectGraphicsInfo_Trader
-	.4byte gFieldObjectGraphicsInfo_Storyteller
-	.4byte gFieldObjectGraphicsInfo_Giddy
-	.4byte gFieldObjectGraphicsInfo_UnusedMauvilleOldMan1
-	.4byte gFieldObjectGraphicsInfo_UnusedMauvilleOldMan2
diff --git a/data/graphics/field_objects/field_object_oam.inc b/data/graphics/field_objects/field_object_oam.inc
deleted file mode 100644
index ea4da1c02..000000000
--- a/data/graphics/field_objects/field_object_oam.inc
+++ /dev/null
@@ -1,465 +0,0 @@
-	.align 2
-gFieldObjectBaseOam_8x8:: @ 85094EC
-	.4byte OAM_SIZE_8x8
-	.2byte 2 << 10 @ priority
-
-	.align 2
-gFieldObjectBaseOam_16x8:: @ 85094F4
-	.4byte OAM_SIZE_16x8
-	.2byte 2 << 10 @ priority
-
-	.align 2
-gFieldObjectBaseOam_16x16:: @ 85094FC
-	.4byte OAM_SIZE_16x16
-	.2byte 2 << 10 @ priority
-
-	.align 2
-gFieldObjectBaseOam_32x8:: @ 8509504
-	.4byte OAM_SIZE_32x8
-	.2byte 2 << 10 @ priority
-
-	.align 2
-gFieldObjectBaseOam_64x32:: @ 850950C
-	.4byte OAM_SIZE_64x32
-	.2byte 2 << 10 @ priority
-
-	.align 2
-gFieldObjectBaseOam_16x32:: @ 8509514
-	.4byte OAM_SIZE_16x32
-	.2byte 2 << 10 @ priority
-
-	.align 2
-gFieldObjectBaseOam_32x32:: @ 850951C
-	.4byte OAM_SIZE_32x32
-	.2byte 2 << 10 @ priority
-
-	.align 2
-gFieldObjectBaseOam_64x64:: @ 8509524
-	.4byte OAM_SIZE_64x64
-	.2byte 2 << 10 @ priority
-
-	.align 2
-gFieldObjectSpriteOamTable_16x16_0:: @ 850952C
-	subsprite  -8,  -8, 2,  0, 16x16
-
-	.align 2
-gFieldObjectSpriteOamTable_16x16_1:: @ 8509530
-	subsprite  -8,  -8, 1,  0, 16x16
-
-	.align 2
-gFieldObjectSpriteOamTable_16x16_2:: @ 8509534
-	subsprite  -8,  -8, 2,  0, 16x8
-	subsprite  -8,   0, 3,  2, 16x8
-
-	.align 2
-gFieldObjectSpriteOamTable_16x16_3:: @ 850953C
-	subsprite  -8,  -8, 2,  0, 16x16
-	subsprite  -8,  -8, 3,  0, 16x16
-
-	.align 2
-gFieldObjectSpriteOamTable_16x16_4:: @ 8509544
-	subsprite  -8,  -8, 1,  0, 16x16
-	subsprite  -8,  -8, 3,  0, 16x16
-
-	.align 2
-gFieldObjectSpriteOamTables_16x16:: @ 850954C
-	.4byte 0 @ number of sprites
-	.4byte NULL @ unknown
-
-	.4byte 1 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_16x16_0 @ below high bridge
-
-	.4byte 1 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_16x16_1 @ above high bridge
-
-	.4byte 2 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_16x16_2 @ unknown
-
-	.4byte 2 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_16x16_3 @ long grass below high bridge
-
-	.4byte 2 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_16x16_4 @ long grass above high bridge
-
-	.align 2
-gFieldObjectSpriteOamTable_16x32_0:: @ 850957C
-	subsprite  -8, -16, 2,  0, 16x32
-
-	.align 2
-gFieldObjectSpriteOamTable_16x32_1:: @ 8509580
-	subsprite  -8, -16, 1,  0, 16x32
-
-	.align 2
-gFieldObjectSpriteOamTable_16x32_2:: @ 8509584
-	subsprite  -8, -16, 2,  0, 16x16
-	subsprite  -8,   0, 2,  4, 16x8
-	subsprite  -8,   8, 3,  6, 16x8
-
-	.align 2
-gFieldObjectSpriteOamTable_16x32_3:: @ 8509590
-	subsprite  -8, -16, 2,  0, 16x16
-	subsprite  -8,   0, 3,  4, 16x16
-
-	.align 2
-gFieldObjectSpriteOamTable_16x32_4:: @ 8509598
-	subsprite  -8, -16, 1,  0, 16x16
-	subsprite  -8,   0, 3,  4, 16x16
-
-	.align 2
-gFieldObjectSpriteOamTables_16x32:: @ 85095A0
-	.4byte 0 @ number of sprites
-	.4byte NULL @ unknown
-
-	.4byte 1 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_16x32_0 @ below high bridge
-
-	.4byte 1 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_16x32_1 @ above high bridge
-
-	.4byte 3 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_16x32_2 @ unknown
-
-	.4byte 2 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_16x32_3 @ long grass below high bridge
-
-	.4byte 2 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_16x32_4 @ long grass above high bridge
-
-	.align 2
-gFieldObjectSpriteOamTable_32x32_0:: @ 85095D0
-	subsprite -16, -16, 2,  0, 32x32
-
-	.align 2
-gFieldObjectSpriteOamTable_32x32_1:: @ 85095D4
-	subsprite -16, -16, 1,  0, 32x32
-
-	.align 2
-gFieldObjectSpriteOamTable_32x32_2:: @ 85095D8
-	subsprite -16, -16, 2,  0, 32x16
-	subsprite -16,   0, 2,  8, 32x8
-	subsprite -16,   8, 3, 12, 32x8
-
-	.align 2
-gFieldObjectSpriteOamTable_32x32_3:: @ 85095E4
-	subsprite -16, -16, 2,  0, 32x16
-	subsprite -16,   0, 3,  8, 32x16
-
-	.align 2
-gFieldObjectSpriteOamTable_32x32_4:: @ 85095EC
-	subsprite -16, -16, 1,  0, 32x16
-	subsprite -16,   0, 3,  8, 32x16
-
-	.align 2
-gFieldObjectSpriteOamTables_32x32:: @ 85095F4
-	.4byte 0 @ number of sprites
-	.4byte NULL @ unknown
-
-	.4byte 1 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_32x32_0 @ below high bridge
-
-	.4byte 1 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_32x32_1 @ above high bridge
-
-	.4byte 3 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_32x32_2 @ unknown
-
-	.4byte 2 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_32x32_3 @ long grass below high bridge
-
-	.4byte 2 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_32x32_4 @ long grass above high bridge
-
-	.align 2
-gFieldObjectSpriteOamTable_Truck_0:: @ 8509624
-	subsprite -24, -24, 2,  0, 32x8
-	subsprite   8, -24, 2,  4, 16x8
-	subsprite -24, -16, 2,  6, 32x8
-	subsprite   8, -16, 2, 10, 16x8
-	subsprite -24,  -8, 2, 12, 32x8
-	subsprite   8,  -8, 2, 16, 16x8
-	subsprite -24,   0, 2, 18, 32x8
-	subsprite   8,   0, 2, 22, 16x8
-	subsprite -24,   8, 2, 24, 32x8
-	subsprite   8,   8, 2, 28, 16x8
-	subsprite -24,  16, 2, 30, 32x8
-	subsprite   8,  16, 2, 34, 16x8
-
-	.align 2
-gFieldObjectSpriteOamTables_Truck:: @ 8509654
-	.4byte 12 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_Truck_0 @ unknown
-
-	.4byte 12 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_Truck_0 @ below high bridge
-
-	.4byte 12 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_Truck_0 @ above high bridge
-
-	.4byte 12 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_Truck_0 @ unknown
-
-	.4byte 12 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_Truck_0 @ long grass below high bridge
-
-	.4byte 12 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_Truck_0 @ long grass above high bridge
-
-	.align 2
-gFieldObjectSpriteOamTable_Unused_0:: @ 8509684
-	subsprite -32, -16, 2,  0, 64x32
-
-	.align 2
-gFieldObjectSpriteOamTable_Unused_1:: @ 8509688
-	subsprite -32, -16, 1,  0, 64x32
-
-	.align 2
-gFieldObjectSpriteOamTable_Unused_2:: @ 850968C
-	subsprite -32, -16, 2,  0, 64x32
-
-	.align 2
-gFieldObjectSpriteOamTable_Unused_3:: @ 8509690
-	subsprite -32, -16, 2,  0, 64x32
-
-	.align 2
-gFieldObjectSpriteOamTables_Unused:: @ 8509694
-	.4byte 0 @ number of sprites
-	.4byte NULL @ unknown
-
-	.4byte 1 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_Unused_0 @ below high bridge
-
-	.4byte 1 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_Unused_1 @ above high bridge
-
-	.4byte 1 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_Unused_2 @ unknown
-
-	.4byte 1 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_Unused_3 @ long grass below high bridge
-
-	.4byte 1 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_Unused_3 @ long grass above high bridge
-
-	.align 2
-gFieldObjectSpriteOamTable_64x64_0:: @ 85096C4
-	subsprite -32, -32, 2,  0, 64x64
-
-	.align 2
-gFieldObjectSpriteOamTable_64x64_1:: @ 85096C8
-	subsprite -32, -32, 1,  0, 64x64
-
-	.align 2
-gFieldObjectSpriteOamTable_64x64_2:: @ 85096CC
-	subsprite -32, -32, 2,  0, 64x64
-
-	.align 2
-gFieldObjectSpriteOamTable_64x64_3:: @ 85096D0
-	subsprite -32, -32, 2,  0, 64x64
-
-	.align 2
-gFieldObjectSpriteOamTables_64x64:: @ 85096D4
-	.4byte 0 @ number of sprites
-	.4byte NULL @ unknown
-
-	.4byte 1 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_64x64_0 @ below high bridge
-
-	.4byte 1 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_64x64_1 @ above high bridge
-
-	.4byte 1 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_64x64_2 @ unknown
-
-	.4byte 1 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_64x64_3 @ long grass below high bridge
-
-	.4byte 1 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_64x64_3 @ long grass above high bridge
-
-	.align 2
-gFieldObjectSpriteOamTable_SSTidal_0:: @ 8509704
-	subsprite -48, -20, 2,  0, 32x8
-	subsprite -16, -20, 2,  4, 32x8
-	subsprite  16, -20, 2,  8, 32x8
-	subsprite -48, -12, 2, 12, 32x8
-	subsprite -16, -12, 2, 16, 32x8
-	subsprite  16, -12, 2, 20, 32x8
-	subsprite -48,  -4, 2, 24, 32x8
-	subsprite -16,  -4, 2, 28, 32x8
-	subsprite  16,  -4, 2, 32, 32x8
-	subsprite -48,   4, 2, 36, 32x8
-	subsprite -16,   4, 2, 40, 32x8
-	subsprite  16,   4, 2, 44, 32x8
-	subsprite -48,  12, 2, 48, 32x8
-	subsprite -16,  12, 2, 52, 32x8
-	subsprite  16,  12, 2, 56, 32x8
-
-	.align 2
-gFieldObjectSpriteOamTable_SSTidal_1:: @ 8509740
-	subsprite -48, -20, 1,  0, 32x8
-	subsprite -16, -20, 1,  4, 32x8
-	subsprite  16, -20, 1,  8, 32x8
-	subsprite -48, -12, 1, 12, 32x8
-	subsprite -16, -12, 1, 16, 32x8
-	subsprite  16, -12, 1, 20, 32x8
-	subsprite -48,  -4, 1, 24, 32x8
-	subsprite -16,  -4, 1, 28, 32x8
-	subsprite  16,  -4, 1, 32, 32x8
-	subsprite -48,   4, 1, 36, 32x8
-	subsprite -16,   4, 1, 40, 32x8
-	subsprite  16,   4, 1, 44, 32x8
-	subsprite -48,  12, 1, 48, 32x8
-	subsprite -16,  12, 1, 52, 32x8
-	subsprite  16,  12, 1, 56, 32x8
-
-	.align 2
-gFieldObjectSpriteOamTable_SSTidal_2:: @ 850977C
-	subsprite -48, -20, 2,  0, 32x8
-	subsprite -16, -20, 2,  4, 32x8
-	subsprite  16, -20, 2,  8, 32x8
-	subsprite -48, -12, 2, 12, 32x8
-	subsprite -16, -12, 2, 16, 32x8
-	subsprite  16, -12, 2, 20, 32x8
-	subsprite -48,  -4, 2, 24, 32x8
-	subsprite -16,  -4, 2, 28, 32x8
-	subsprite  16,  -4, 2, 32, 32x8
-	subsprite -48,   4, 2, 36, 32x8
-	subsprite -16,   4, 2, 40, 32x8
-	subsprite  16,   4, 2, 44, 32x8
-	subsprite -48,  12, 2, 48, 32x8
-	subsprite -16,  12, 2, 52, 32x8
-	subsprite  16,  12, 2, 56, 32x8
-
-	.align 2
-gFieldObjectSpriteOamTable_SSTidal_3:: @ 85097B8
-	subsprite -48, -20, 1,  0, 32x8
-	subsprite -16, -20, 1,  4, 32x8
-	subsprite  16, -20, 1,  8, 32x8
-	subsprite -48, -12, 1, 12, 32x8
-	subsprite -16, -12, 1, 16, 32x8
-	subsprite  16, -12, 1, 20, 32x8
-	subsprite -48,  -4, 2, 24, 32x8
-	subsprite -16,  -4, 2, 28, 32x8
-	subsprite  16,  -4, 2, 32, 32x8
-	subsprite -48,   4, 2, 36, 32x8
-	subsprite -16,   4, 2, 40, 32x8
-	subsprite  16,   4, 2, 44, 32x8
-	subsprite -48,  12, 2, 48, 32x8
-	subsprite -16,  12, 2, 52, 32x8
-	subsprite  16,  12, 2, 56, 32x8
-
-	.align 2
-gFieldObjectSpriteOamTables_SSTidal:: @ 85097F4
-	.4byte 15 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_SSTidal_0 @ unknown
-
-	.4byte 15 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_SSTidal_0 @ below high bridge
-
-	.4byte 15 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_SSTidal_1 @ above high bridge
-
-	.4byte 15 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_SSTidal_2 @ unknown
-
-	.4byte 15 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_SSTidal_3 @ long grass below high bridge
-
-	.4byte 15 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_SSTidal_3 @ long grass above high bridge
-
-	.align 2
-gFieldObjectSpriteOamTable_SubmarineShadow_0:: @ 8509824
-	subsprite -48, -20, 2,  0, 32x8
-	subsprite -16, -20, 2,  4, 32x8
-	subsprite  16, -20, 2,  8, 16x8
-	subsprite  32, -20, 2, 10,  8x8
-	subsprite -48, -12, 2, 11, 32x8
-	subsprite -16, -12, 2, 15, 32x8
-	subsprite  16, -12, 2, 19, 16x8
-	subsprite  32, -12, 2, 21,  8x8
-	subsprite -48,  -4, 2, 22, 32x8
-	subsprite -16,  -4, 2, 26, 32x8
-	subsprite  16,  -4, 2, 30, 16x8
-	subsprite  32,  -4, 2, 32,  8x8
-	subsprite -48,   4, 2, 33, 32x8
-	subsprite -16,   4, 2, 37, 32x8
-	subsprite  16,   4, 2, 41, 16x8
-	subsprite  32,   4, 2, 43,  8x8
-
-	.align 2
-gFieldObjectSpriteOamTable_SubmarineShadow_1:: @ 8509864
-	subsprite -48, -20, 1,  0, 32x8
-	subsprite -16, -20, 1,  4, 32x8
-	subsprite  16, -20, 1,  8, 16x8
-	subsprite  32, -20, 1, 10,  8x8
-	subsprite -48, -12, 1, 11, 32x8
-	subsprite -16, -12, 1, 15, 32x8
-	subsprite  16, -12, 1, 19, 16x8
-	subsprite  32, -12, 1, 21,  8x8
-	subsprite -48,  -4, 1, 22, 32x8
-	subsprite -16,  -4, 1, 26, 32x8
-	subsprite  16,  -4, 1, 30, 16x8
-	subsprite  32,  -4, 1, 32,  8x8
-	subsprite -48,   4, 1, 33, 32x8
-	subsprite -16,   4, 1, 37, 32x8
-	subsprite  16,   4, 1, 41, 16x8
-	subsprite  32,   4, 1, 43,  8x8
-
-	.align 2
-gFieldObjectSpriteOamTable_SubmarineShadow_2:: @ 85098A4
-	subsprite -48, -20, 2,  0, 32x8
-	subsprite -16, -20, 2,  4, 32x8
-	subsprite  16, -20, 2,  8, 16x8
-	subsprite  32, -20, 2, 10,  8x8
-	subsprite -48, -12, 2, 11, 32x8
-	subsprite -16, -12, 2, 15, 32x8
-	subsprite  16, -12, 2, 19, 16x8
-	subsprite  32, -12, 2, 21,  8x8
-	subsprite -48,  -4, 2, 22, 32x8
-	subsprite -16,  -4, 2, 26, 32x8
-	subsprite  16,  -4, 2, 30, 16x8
-	subsprite  32,  -4, 2, 32,  8x8
-	subsprite -48,   4, 2, 33, 32x8
-	subsprite -16,   4, 2, 37, 32x8
-	subsprite  16,   4, 2, 41, 16x8
-	subsprite  32,   4, 2, 43,  8x8
-
-	.align 2
-gFieldObjectSpriteOamTable_SubmarineShadow_3:: @ 85098E4
-	subsprite -48, -20, 1,  0, 32x8
-	subsprite -16, -20, 1,  4, 32x8
-	subsprite  16, -20, 1,  8, 16x8
-	subsprite  32, -20, 1, 10,  8x8
-	subsprite -48, -12, 1, 11, 32x8
-	subsprite -16, -12, 1, 15, 32x8
-	subsprite  16, -12, 1, 19, 16x8
-	subsprite  32, -12, 1, 21,  8x8
-	subsprite -48,  -4, 2, 22, 32x8
-	subsprite -16,  -4, 2, 26, 32x8
-	subsprite  16,  -4, 2, 30, 16x8
-	subsprite  32,  -4, 2, 32,  8x8
-	subsprite -48,   4, 2, 33, 32x8
-	subsprite -16,   4, 2, 37, 32x8
-	subsprite  16,   4, 2, 41, 16x8
-	subsprite  32,   4, 2, 43,  8x8
-
-	.align 2
-gFieldObjectSpriteOamTables_SubmarineShadow:: @ 8509924
-	.4byte 16 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_SubmarineShadow_0 @ unknown
-
-	.4byte 16 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_SubmarineShadow_0 @ below high bridge
-
-	.4byte 16 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_SubmarineShadow_1 @ above high bridge
-
-	.4byte 16 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_SubmarineShadow_2 @ unknown
-
-	.4byte 16 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_SubmarineShadow_3 @ long grass below high bridge
-
-	.4byte 16 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_SubmarineShadow_3 @ long grass above high bridge
diff --git a/data/graphics/field_objects/field_object_pic_tables.inc b/data/graphics/field_objects/field_object_pic_tables.inc
deleted file mode 100644
index abd09d7c4..000000000
--- a/data/graphics/field_objects/field_object_pic_tables.inc
+++ /dev/null
@@ -1,2174 +0,0 @@
-	.align 2
-gFieldObjectPicTable_BrendanNormal:: @ 8505A8C
-	obj_tiles gFieldObjectPic_BrendanNormal_0, 0x100
-	obj_tiles gFieldObjectPic_BrendanNormal_1, 0x100
-	obj_tiles gFieldObjectPic_BrendanNormal_2, 0x100
-	obj_tiles gFieldObjectPic_BrendanNormal_3, 0x100
-	obj_tiles gFieldObjectPic_BrendanNormal_4, 0x100
-	obj_tiles gFieldObjectPic_BrendanNormal_5, 0x100
-	obj_tiles gFieldObjectPic_BrendanNormal_6, 0x100
-	obj_tiles gFieldObjectPic_BrendanNormal_7, 0x100
-	obj_tiles gFieldObjectPic_BrendanNormal_8, 0x100
-	obj_tiles gFieldObjectPic_BrendanNormal_9, 0x100
-	obj_tiles gFieldObjectPic_BrendanNormal_10, 0x100
-	obj_tiles gFieldObjectPic_BrendanNormal_11, 0x100
-	obj_tiles gFieldObjectPic_BrendanNormal_12, 0x100
-	obj_tiles gFieldObjectPic_BrendanNormal_13, 0x100
-	obj_tiles gFieldObjectPic_BrendanNormal_14, 0x100
-	obj_tiles gFieldObjectPic_BrendanNormal_15, 0x100
-	obj_tiles gFieldObjectPic_BrendanNormal_16, 0x100
-	obj_tiles gFieldObjectPic_BrendanNormal_17, 0x100
-
-	.align 2
-gFieldObjectPicTable_BrendanMachBike:: @ 8505B1C
-	obj_tiles gFieldObjectPic_BrendanMachBike_0, 0x200
-	obj_tiles gFieldObjectPic_BrendanMachBike_1, 0x200
-	obj_tiles gFieldObjectPic_BrendanMachBike_2, 0x200
-	obj_tiles gFieldObjectPic_BrendanMachBike_3, 0x200
-	obj_tiles gFieldObjectPic_BrendanMachBike_4, 0x200
-	obj_tiles gFieldObjectPic_BrendanMachBike_5, 0x200
-	obj_tiles gFieldObjectPic_BrendanMachBike_6, 0x200
-	obj_tiles gFieldObjectPic_BrendanMachBike_7, 0x200
-	obj_tiles gFieldObjectPic_BrendanMachBike_8, 0x200
-
-	.align 2
-gFieldObjectPicTable_BrendanAcroBike:: @ 8505B64
-	obj_tiles gFieldObjectPic_BrendanAcroBike_0, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_1, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_2, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_3, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_4, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_5, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_6, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_7, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_8, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_9, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_10, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_11, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_12, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_13, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_14, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_15, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_16, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_17, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_18, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_19, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_20, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_21, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_22, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_23, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_24, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_25, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_26, 0x200
-
-	.align 2
-gFieldObjectPicTable_BrendanSurfing:: @ 8505C3C
-	obj_tiles gFieldObjectPic_BrendanSurfing_0, 0x200
-	obj_tiles gFieldObjectPic_BrendanSurfing_1, 0x200
-	obj_tiles gFieldObjectPic_BrendanSurfing_2, 0x200
-	obj_tiles gFieldObjectPic_BrendanSurfing_0, 0x200
-	obj_tiles gFieldObjectPic_BrendanSurfing_0, 0x200
-	obj_tiles gFieldObjectPic_BrendanSurfing_1, 0x200
-	obj_tiles gFieldObjectPic_BrendanSurfing_1, 0x200
-	obj_tiles gFieldObjectPic_BrendanSurfing_2, 0x200
-	obj_tiles gFieldObjectPic_BrendanSurfing_2, 0x200
-	obj_tiles gFieldObjectPic_BrendanSurfing_3, 0x200
-	obj_tiles gFieldObjectPic_BrendanSurfing_4, 0x200
-	obj_tiles gFieldObjectPic_BrendanSurfing_5, 0x200
-
-	.align 2
-gFieldObjectPicTable_BrendanUnderwater:: @ 8505C9C
-	obj_tiles gFieldObjectPic_BrendanUnderwater_0, 0x200
-	obj_tiles gFieldObjectPic_BrendanUnderwater_1, 0x200
-	obj_tiles gFieldObjectPic_BrendanUnderwater_2, 0x200
-	obj_tiles gFieldObjectPic_BrendanUnderwater_0, 0x200
-	obj_tiles gFieldObjectPic_BrendanUnderwater_0, 0x200
-	obj_tiles gFieldObjectPic_BrendanUnderwater_1, 0x200
-	obj_tiles gFieldObjectPic_BrendanUnderwater_1, 0x200
-	obj_tiles gFieldObjectPic_BrendanUnderwater_2, 0x200
-	obj_tiles gFieldObjectPic_BrendanUnderwater_2, 0x200
-
-	.align 2
-gFieldObjectPicTable_BrendanFieldMove:: @ 8505CE4
-	obj_tiles gFieldObjectPic_BrendanFieldMove_0, 0x200
-	obj_tiles gFieldObjectPic_BrendanFieldMove_1, 0x200
-	obj_tiles gFieldObjectPic_BrendanFieldMove_2, 0x200
-	obj_tiles gFieldObjectPic_BrendanFieldMove_3, 0x200
-	obj_tiles gFieldObjectPic_BrendanFieldMove_4, 0x200
-
-	.align 2
-gFieldObjectPicTable_QuintyPlump:: @ 8505D0C
-	obj_tiles gFieldObjectPic_QuintyPlump_0, 0x200
-	obj_tiles gFieldObjectPic_QuintyPlump_1, 0x200
-	obj_tiles gFieldObjectPic_QuintyPlump_2, 0x200
-	obj_tiles gFieldObjectPic_QuintyPlump_3, 0x200
-	obj_tiles gFieldObjectPic_QuintyPlump_4, 0x200
-	obj_tiles gFieldObjectPic_QuintyPlump_5, 0x200
-	obj_tiles gFieldObjectPic_QuintyPlump_6, 0x200
-
-	.align 2
-gFieldObjectPicTable_LittleBoy1:: @ 8505D44
-	obj_tiles gFieldObjectPic_LittleBoy1_0, 0x80
-	obj_tiles gFieldObjectPic_LittleBoy1_1, 0x80
-	obj_tiles gFieldObjectPic_LittleBoy1_2, 0x80
-	obj_tiles gFieldObjectPic_LittleBoy1_3, 0x80
-	obj_tiles gFieldObjectPic_LittleBoy1_4, 0x80
-	obj_tiles gFieldObjectPic_LittleBoy1_5, 0x80
-	obj_tiles gFieldObjectPic_LittleBoy1_6, 0x80
-	obj_tiles gFieldObjectPic_LittleBoy1_7, 0x80
-	obj_tiles gFieldObjectPic_LittleBoy1_8, 0x80
-
-	.align 2
-gFieldObjectPicTable_LittleGirl1:: @ 8505D8C
-	obj_tiles gFieldObjectPic_LittleGirl1_0, 0x100
-	obj_tiles gFieldObjectPic_LittleGirl1_1, 0x100
-	obj_tiles gFieldObjectPic_LittleGirl1_2, 0x100
-	obj_tiles gFieldObjectPic_LittleGirl1_3, 0x100
-	obj_tiles gFieldObjectPic_LittleGirl1_4, 0x100
-	obj_tiles gFieldObjectPic_LittleGirl1_5, 0x100
-	obj_tiles gFieldObjectPic_LittleGirl1_6, 0x100
-	obj_tiles gFieldObjectPic_LittleGirl1_7, 0x100
-	obj_tiles gFieldObjectPic_LittleGirl1_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Boy1:: @ 8505DD4
-	obj_tiles gFieldObjectPic_Boy1_0, 0x100
-	obj_tiles gFieldObjectPic_Boy1_1, 0x100
-	obj_tiles gFieldObjectPic_Boy1_2, 0x100
-	obj_tiles gFieldObjectPic_Boy1_3, 0x100
-	obj_tiles gFieldObjectPic_Boy1_4, 0x100
-	obj_tiles gFieldObjectPic_Boy1_5, 0x100
-	obj_tiles gFieldObjectPic_Boy1_6, 0x100
-	obj_tiles gFieldObjectPic_Boy1_7, 0x100
-	obj_tiles gFieldObjectPic_Boy1_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Girl1:: @ 8505E1C
-	obj_tiles gFieldObjectPic_Girl1_0, 0x100
-	obj_tiles gFieldObjectPic_Girl1_1, 0x100
-	obj_tiles gFieldObjectPic_Girl1_2, 0x100
-	obj_tiles gFieldObjectPic_Girl1_3, 0x100
-	obj_tiles gFieldObjectPic_Girl1_4, 0x100
-	obj_tiles gFieldObjectPic_Girl1_5, 0x100
-	obj_tiles gFieldObjectPic_Girl1_6, 0x100
-	obj_tiles gFieldObjectPic_Girl1_7, 0x100
-	obj_tiles gFieldObjectPic_Girl1_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Boy2:: @ 8505E64
-	obj_tiles gFieldObjectPic_Boy2_0, 0x100
-	obj_tiles gFieldObjectPic_Boy2_1, 0x100
-	obj_tiles gFieldObjectPic_Boy2_2, 0x100
-	obj_tiles gFieldObjectPic_Boy2_3, 0x100
-	obj_tiles gFieldObjectPic_Boy2_4, 0x100
-	obj_tiles gFieldObjectPic_Boy2_5, 0x100
-	obj_tiles gFieldObjectPic_Boy2_6, 0x100
-	obj_tiles gFieldObjectPic_Boy2_7, 0x100
-	obj_tiles gFieldObjectPic_Boy2_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Girl2:: @ 8505EAC
-	obj_tiles gFieldObjectPic_Girl2_0, 0x100
-	obj_tiles gFieldObjectPic_Girl2_1, 0x100
-	obj_tiles gFieldObjectPic_Girl2_2, 0x100
-	obj_tiles gFieldObjectPic_Girl2_3, 0x100
-	obj_tiles gFieldObjectPic_Girl2_4, 0x100
-	obj_tiles gFieldObjectPic_Girl2_5, 0x100
-	obj_tiles gFieldObjectPic_Girl2_6, 0x100
-	obj_tiles gFieldObjectPic_Girl2_7, 0x100
-	obj_tiles gFieldObjectPic_Girl2_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_LittleBoy2:: @ 8505EF4
-	obj_tiles gFieldObjectPic_LittleBoy2_0, 0x80
-	obj_tiles gFieldObjectPic_LittleBoy2_1, 0x80
-	obj_tiles gFieldObjectPic_LittleBoy2_2, 0x80
-	obj_tiles gFieldObjectPic_LittleBoy2_3, 0x80
-	obj_tiles gFieldObjectPic_LittleBoy2_4, 0x80
-	obj_tiles gFieldObjectPic_LittleBoy2_5, 0x80
-	obj_tiles gFieldObjectPic_LittleBoy2_6, 0x80
-	obj_tiles gFieldObjectPic_LittleBoy2_7, 0x80
-	obj_tiles gFieldObjectPic_LittleBoy2_8, 0x80
-
-	.align 2
-gFieldObjectPicTable_LittleGirl2:: @ 8505F3C
-	obj_tiles gFieldObjectPic_LittleGirl2_0, 0x80
-	obj_tiles gFieldObjectPic_LittleGirl2_1, 0x80
-	obj_tiles gFieldObjectPic_LittleGirl2_2, 0x80
-	obj_tiles gFieldObjectPic_LittleGirl2_3, 0x80
-	obj_tiles gFieldObjectPic_LittleGirl2_4, 0x80
-	obj_tiles gFieldObjectPic_LittleGirl2_5, 0x80
-	obj_tiles gFieldObjectPic_LittleGirl2_6, 0x80
-	obj_tiles gFieldObjectPic_LittleGirl2_7, 0x80
-	obj_tiles gFieldObjectPic_LittleGirl2_8, 0x80
-
-	.align 2
-gFieldObjectPicTable_Boy3:: @ 8505F84
-	obj_tiles gFieldObjectPic_Boy3_0, 0x100
-	obj_tiles gFieldObjectPic_Boy3_1, 0x100
-	obj_tiles gFieldObjectPic_Boy3_2, 0x100
-	obj_tiles gFieldObjectPic_Boy3_3, 0x100
-	obj_tiles gFieldObjectPic_Boy3_4, 0x100
-	obj_tiles gFieldObjectPic_Boy3_5, 0x100
-	obj_tiles gFieldObjectPic_Boy3_6, 0x100
-	obj_tiles gFieldObjectPic_Boy3_7, 0x100
-	obj_tiles gFieldObjectPic_Boy3_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Girl3:: @ 8505FCC
-	obj_tiles gFieldObjectPic_Girl3_0, 0x100
-	obj_tiles gFieldObjectPic_Girl3_1, 0x100
-	obj_tiles gFieldObjectPic_Girl3_2, 0x100
-	obj_tiles gFieldObjectPic_Girl3_3, 0x100
-	obj_tiles gFieldObjectPic_Girl3_4, 0x100
-	obj_tiles gFieldObjectPic_Girl3_5, 0x100
-	obj_tiles gFieldObjectPic_Girl3_6, 0x100
-	obj_tiles gFieldObjectPic_Girl3_7, 0x100
-	obj_tiles gFieldObjectPic_Girl3_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Boy4:: @ 8506014
-	obj_tiles gFieldObjectPic_Boy4_0, 0x100
-	obj_tiles gFieldObjectPic_Boy4_1, 0x100
-	obj_tiles gFieldObjectPic_Boy4_2, 0x100
-	obj_tiles gFieldObjectPic_Boy4_3, 0x100
-	obj_tiles gFieldObjectPic_Boy4_4, 0x100
-	obj_tiles gFieldObjectPic_Boy4_5, 0x100
-	obj_tiles gFieldObjectPic_Boy4_6, 0x100
-	obj_tiles gFieldObjectPic_Boy4_7, 0x100
-	obj_tiles gFieldObjectPic_Boy4_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Woman1:: @ 850605C
-	obj_tiles gFieldObjectPic_Woman1_0, 0x100
-	obj_tiles gFieldObjectPic_Woman1_1, 0x100
-	obj_tiles gFieldObjectPic_Woman1_2, 0x100
-	obj_tiles gFieldObjectPic_Woman1_3, 0x100
-	obj_tiles gFieldObjectPic_Woman1_4, 0x100
-	obj_tiles gFieldObjectPic_Woman1_5, 0x100
-	obj_tiles gFieldObjectPic_Woman1_6, 0x100
-	obj_tiles gFieldObjectPic_Woman1_7, 0x100
-	obj_tiles gFieldObjectPic_Woman1_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_FatMan:: @ 85060A4
-	obj_tiles gFieldObjectPic_FatMan_0, 0x100
-	obj_tiles gFieldObjectPic_FatMan_1, 0x100
-	obj_tiles gFieldObjectPic_FatMan_2, 0x100
-	obj_tiles gFieldObjectPic_FatMan_3, 0x100
-	obj_tiles gFieldObjectPic_FatMan_4, 0x100
-	obj_tiles gFieldObjectPic_FatMan_5, 0x100
-	obj_tiles gFieldObjectPic_FatMan_6, 0x100
-	obj_tiles gFieldObjectPic_FatMan_7, 0x100
-	obj_tiles gFieldObjectPic_FatMan_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Woman2:: @ 85060EC
-	obj_tiles gFieldObjectPic_Woman2_0, 0x100
-	obj_tiles gFieldObjectPic_Woman2_1, 0x100
-	obj_tiles gFieldObjectPic_Woman2_2, 0x100
-	obj_tiles gFieldObjectPic_Woman2_3, 0x100
-	obj_tiles gFieldObjectPic_Woman2_4, 0x100
-	obj_tiles gFieldObjectPic_Woman2_5, 0x100
-	obj_tiles gFieldObjectPic_Woman2_6, 0x100
-	obj_tiles gFieldObjectPic_Woman2_7, 0x100
-	obj_tiles gFieldObjectPic_Woman2_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Man1:: @ 8506134
-	obj_tiles gFieldObjectPic_Man1_0, 0x100
-	obj_tiles gFieldObjectPic_Man1_1, 0x100
-	obj_tiles gFieldObjectPic_Man1_2, 0x100
-	obj_tiles gFieldObjectPic_Man1_3, 0x100
-	obj_tiles gFieldObjectPic_Man1_4, 0x100
-	obj_tiles gFieldObjectPic_Man1_5, 0x100
-	obj_tiles gFieldObjectPic_Man1_6, 0x100
-	obj_tiles gFieldObjectPic_Man1_7, 0x100
-	obj_tiles gFieldObjectPic_Man1_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Woman3:: @ 850617C
-	obj_tiles gFieldObjectPic_Woman3_0, 0x100
-	obj_tiles gFieldObjectPic_Woman3_1, 0x100
-	obj_tiles gFieldObjectPic_Woman3_2, 0x100
-	obj_tiles gFieldObjectPic_Woman3_3, 0x100
-	obj_tiles gFieldObjectPic_Woman3_4, 0x100
-	obj_tiles gFieldObjectPic_Woman3_5, 0x100
-	obj_tiles gFieldObjectPic_Woman3_6, 0x100
-	obj_tiles gFieldObjectPic_Woman3_7, 0x100
-	obj_tiles gFieldObjectPic_Woman3_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_OldMan1:: @ 85061C4
-	obj_tiles gFieldObjectPic_OldMan1_0, 0x100
-	obj_tiles gFieldObjectPic_OldMan1_1, 0x100
-	obj_tiles gFieldObjectPic_OldMan1_2, 0x100
-	obj_tiles gFieldObjectPic_OldMan1_3, 0x100
-	obj_tiles gFieldObjectPic_OldMan1_4, 0x100
-	obj_tiles gFieldObjectPic_OldMan1_5, 0x100
-	obj_tiles gFieldObjectPic_OldMan1_6, 0x100
-	obj_tiles gFieldObjectPic_OldMan1_7, 0x100
-	obj_tiles gFieldObjectPic_OldMan1_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_OldWoman1:: @ 850620C
-	obj_tiles gFieldObjectPic_OldWoman1_0, 0x100
-	obj_tiles gFieldObjectPic_OldWoman1_1, 0x100
-	obj_tiles gFieldObjectPic_OldWoman1_2, 0x100
-	obj_tiles gFieldObjectPic_OldWoman1_3, 0x100
-	obj_tiles gFieldObjectPic_OldWoman1_4, 0x100
-	obj_tiles gFieldObjectPic_OldWoman1_5, 0x100
-	obj_tiles gFieldObjectPic_OldWoman1_6, 0x100
-	obj_tiles gFieldObjectPic_OldWoman1_7, 0x100
-	obj_tiles gFieldObjectPic_OldWoman1_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Man2:: @ 8506254
-	obj_tiles gFieldObjectPic_Man2_0, 0x100
-	obj_tiles gFieldObjectPic_Man2_1, 0x100
-	obj_tiles gFieldObjectPic_Man2_2, 0x100
-	obj_tiles gFieldObjectPic_Man2_3, 0x100
-	obj_tiles gFieldObjectPic_Man2_4, 0x100
-	obj_tiles gFieldObjectPic_Man2_5, 0x100
-	obj_tiles gFieldObjectPic_Man2_6, 0x100
-	obj_tiles gFieldObjectPic_Man2_7, 0x100
-	obj_tiles gFieldObjectPic_Man2_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Woman4:: @ 850629C
-	obj_tiles gFieldObjectPic_Woman4_0, 0x100
-	obj_tiles gFieldObjectPic_Woman4_1, 0x100
-	obj_tiles gFieldObjectPic_Woman4_2, 0x100
-	obj_tiles gFieldObjectPic_Woman4_3, 0x100
-	obj_tiles gFieldObjectPic_Woman4_4, 0x100
-	obj_tiles gFieldObjectPic_Woman4_5, 0x100
-	obj_tiles gFieldObjectPic_Woman4_6, 0x100
-	obj_tiles gFieldObjectPic_Woman4_7, 0x100
-	obj_tiles gFieldObjectPic_Woman4_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Man3:: @ 85062E4
-	obj_tiles gFieldObjectPic_Man3_0, 0x100
-	obj_tiles gFieldObjectPic_Man3_1, 0x100
-	obj_tiles gFieldObjectPic_Man3_2, 0x100
-	obj_tiles gFieldObjectPic_Man3_3, 0x100
-	obj_tiles gFieldObjectPic_Man3_4, 0x100
-	obj_tiles gFieldObjectPic_Man3_5, 0x100
-	obj_tiles gFieldObjectPic_Man3_6, 0x100
-	obj_tiles gFieldObjectPic_Man3_7, 0x100
-	obj_tiles gFieldObjectPic_Man3_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Woman5:: @ 850632C
-	obj_tiles gFieldObjectPic_Woman5_0, 0x100
-	obj_tiles gFieldObjectPic_Woman5_1, 0x100
-	obj_tiles gFieldObjectPic_Woman5_2, 0x100
-	obj_tiles gFieldObjectPic_Woman5_3, 0x100
-	obj_tiles gFieldObjectPic_Woman5_4, 0x100
-	obj_tiles gFieldObjectPic_Woman5_5, 0x100
-	obj_tiles gFieldObjectPic_Woman5_6, 0x100
-	obj_tiles gFieldObjectPic_Woman5_7, 0x100
-	obj_tiles gFieldObjectPic_Woman5_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Cook:: @ 8506374
-	obj_tiles gFieldObjectPic_Cook_0, 0x100
-	obj_tiles gFieldObjectPic_Cook_1, 0x100
-	obj_tiles gFieldObjectPic_Cook_2, 0x100
-	obj_tiles gFieldObjectPic_Cook_0, 0x100
-	obj_tiles gFieldObjectPic_Cook_0, 0x100
-	obj_tiles gFieldObjectPic_Cook_1, 0x100
-	obj_tiles gFieldObjectPic_Cook_1, 0x100
-	obj_tiles gFieldObjectPic_Cook_2, 0x100
-	obj_tiles gFieldObjectPic_Cook_2, 0x100
-
-	.align 2
-gFieldObjectPicTable_Woman6:: @ 85063BC
-	obj_tiles gFieldObjectPic_Woman6_0, 0x100
-	obj_tiles gFieldObjectPic_Woman6_1, 0x100
-	obj_tiles gFieldObjectPic_Woman6_2, 0x100
-	obj_tiles gFieldObjectPic_Woman6_3, 0x100
-	obj_tiles gFieldObjectPic_Woman6_4, 0x100
-	obj_tiles gFieldObjectPic_Woman6_5, 0x100
-	obj_tiles gFieldObjectPic_Woman6_6, 0x100
-	obj_tiles gFieldObjectPic_Woman6_7, 0x100
-	obj_tiles gFieldObjectPic_Woman6_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_OldMan2:: @ 8506404
-	obj_tiles gFieldObjectPic_OldMan2_0, 0x100
-	obj_tiles gFieldObjectPic_OldMan2_1, 0x100
-	obj_tiles gFieldObjectPic_OldMan2_2, 0x100
-	obj_tiles gFieldObjectPic_OldMan2_0, 0x100
-	obj_tiles gFieldObjectPic_OldMan2_0, 0x100
-	obj_tiles gFieldObjectPic_OldMan2_1, 0x100
-	obj_tiles gFieldObjectPic_OldMan2_1, 0x100
-	obj_tiles gFieldObjectPic_OldMan2_2, 0x100
-	obj_tiles gFieldObjectPic_OldMan2_2, 0x100
-
-	.align 2
-gFieldObjectPicTable_OldWoman2:: @ 850644C
-	obj_tiles gFieldObjectPic_OldWoman2_0, 0x100
-	obj_tiles gFieldObjectPic_OldWoman2_1, 0x100
-	obj_tiles gFieldObjectPic_OldWoman2_2, 0x100
-	obj_tiles gFieldObjectPic_OldWoman2_3, 0x100
-	obj_tiles gFieldObjectPic_OldWoman2_4, 0x100
-	obj_tiles gFieldObjectPic_OldWoman2_5, 0x100
-	obj_tiles gFieldObjectPic_OldWoman2_6, 0x100
-	obj_tiles gFieldObjectPic_OldWoman2_7, 0x100
-	obj_tiles gFieldObjectPic_OldWoman2_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Camper:: @ 8506494
-	obj_tiles gFieldObjectPic_Camper_0, 0x100
-	obj_tiles gFieldObjectPic_Camper_1, 0x100
-	obj_tiles gFieldObjectPic_Camper_2, 0x100
-	obj_tiles gFieldObjectPic_Camper_3, 0x100
-	obj_tiles gFieldObjectPic_Camper_4, 0x100
-	obj_tiles gFieldObjectPic_Camper_5, 0x100
-	obj_tiles gFieldObjectPic_Camper_6, 0x100
-	obj_tiles gFieldObjectPic_Camper_7, 0x100
-	obj_tiles gFieldObjectPic_Camper_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Picnicker:: @ 85064DC
-	obj_tiles gFieldObjectPic_Picnicker_0, 0x100
-	obj_tiles gFieldObjectPic_Picnicker_1, 0x100
-	obj_tiles gFieldObjectPic_Picnicker_2, 0x100
-	obj_tiles gFieldObjectPic_Picnicker_3, 0x100
-	obj_tiles gFieldObjectPic_Picnicker_4, 0x100
-	obj_tiles gFieldObjectPic_Picnicker_5, 0x100
-	obj_tiles gFieldObjectPic_Picnicker_6, 0x100
-	obj_tiles gFieldObjectPic_Picnicker_7, 0x100
-	obj_tiles gFieldObjectPic_Picnicker_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Man4:: @ 8506524
-	obj_tiles gFieldObjectPic_Man4_0, 0x100
-	obj_tiles gFieldObjectPic_Man4_1, 0x100
-	obj_tiles gFieldObjectPic_Man4_2, 0x100
-	obj_tiles gFieldObjectPic_Man4_3, 0x100
-	obj_tiles gFieldObjectPic_Man4_4, 0x100
-	obj_tiles gFieldObjectPic_Man4_5, 0x100
-	obj_tiles gFieldObjectPic_Man4_6, 0x100
-	obj_tiles gFieldObjectPic_Man4_7, 0x100
-	obj_tiles gFieldObjectPic_Man4_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Woman7:: @ 850656C
-	obj_tiles gFieldObjectPic_Woman7_0, 0x100
-	obj_tiles gFieldObjectPic_Woman7_1, 0x100
-	obj_tiles gFieldObjectPic_Woman7_2, 0x100
-	obj_tiles gFieldObjectPic_Woman7_3, 0x100
-	obj_tiles gFieldObjectPic_Woman7_4, 0x100
-	obj_tiles gFieldObjectPic_Woman7_5, 0x100
-	obj_tiles gFieldObjectPic_Woman7_6, 0x100
-	obj_tiles gFieldObjectPic_Woman7_7, 0x100
-	obj_tiles gFieldObjectPic_Woman7_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Youngster:: @ 85065B4
-	obj_tiles gFieldObjectPic_Youngster_0, 0x100
-	obj_tiles gFieldObjectPic_Youngster_1, 0x100
-	obj_tiles gFieldObjectPic_Youngster_2, 0x100
-	obj_tiles gFieldObjectPic_Youngster_3, 0x100
-	obj_tiles gFieldObjectPic_Youngster_4, 0x100
-	obj_tiles gFieldObjectPic_Youngster_5, 0x100
-	obj_tiles gFieldObjectPic_Youngster_6, 0x100
-	obj_tiles gFieldObjectPic_Youngster_7, 0x100
-	obj_tiles gFieldObjectPic_Youngster_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_BugCatcher:: @ 85065FC
-	obj_tiles gFieldObjectPic_BugCatcher_0, 0x100
-	obj_tiles gFieldObjectPic_BugCatcher_1, 0x100
-	obj_tiles gFieldObjectPic_BugCatcher_2, 0x100
-	obj_tiles gFieldObjectPic_BugCatcher_3, 0x100
-	obj_tiles gFieldObjectPic_BugCatcher_4, 0x100
-	obj_tiles gFieldObjectPic_BugCatcher_5, 0x100
-	obj_tiles gFieldObjectPic_BugCatcher_6, 0x100
-	obj_tiles gFieldObjectPic_BugCatcher_7, 0x100
-	obj_tiles gFieldObjectPic_BugCatcher_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_PsychicM:: @ 8506644
-	obj_tiles gFieldObjectPic_PsychicM_0, 0x100
-	obj_tiles gFieldObjectPic_PsychicM_1, 0x100
-	obj_tiles gFieldObjectPic_PsychicM_2, 0x100
-	obj_tiles gFieldObjectPic_PsychicM_3, 0x100
-	obj_tiles gFieldObjectPic_PsychicM_4, 0x100
-	obj_tiles gFieldObjectPic_PsychicM_5, 0x100
-	obj_tiles gFieldObjectPic_PsychicM_6, 0x100
-	obj_tiles gFieldObjectPic_PsychicM_7, 0x100
-	obj_tiles gFieldObjectPic_PsychicM_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_SchoolKidM:: @ 850668C
-	obj_tiles gFieldObjectPic_SchoolKidM_0, 0x100
-	obj_tiles gFieldObjectPic_SchoolKidM_1, 0x100
-	obj_tiles gFieldObjectPic_SchoolKidM_2, 0x100
-	obj_tiles gFieldObjectPic_SchoolKidM_3, 0x100
-	obj_tiles gFieldObjectPic_SchoolKidM_4, 0x100
-	obj_tiles gFieldObjectPic_SchoolKidM_5, 0x100
-	obj_tiles gFieldObjectPic_SchoolKidM_6, 0x100
-	obj_tiles gFieldObjectPic_SchoolKidM_7, 0x100
-	obj_tiles gFieldObjectPic_SchoolKidM_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Maniac:: @ 85066D4
-	obj_tiles gFieldObjectPic_Maniac_0, 0x100
-	obj_tiles gFieldObjectPic_Maniac_1, 0x100
-	obj_tiles gFieldObjectPic_Maniac_2, 0x100
-	obj_tiles gFieldObjectPic_Maniac_3, 0x100
-	obj_tiles gFieldObjectPic_Maniac_4, 0x100
-	obj_tiles gFieldObjectPic_Maniac_5, 0x100
-	obj_tiles gFieldObjectPic_Maniac_6, 0x100
-	obj_tiles gFieldObjectPic_Maniac_7, 0x100
-	obj_tiles gFieldObjectPic_Maniac_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_HexManiac:: @ 850671C
-	obj_tiles gFieldObjectPic_HexManiac_0, 0x100
-	obj_tiles gFieldObjectPic_HexManiac_1, 0x100
-	obj_tiles gFieldObjectPic_HexManiac_2, 0x100
-	obj_tiles gFieldObjectPic_HexManiac_3, 0x100
-	obj_tiles gFieldObjectPic_HexManiac_4, 0x100
-	obj_tiles gFieldObjectPic_HexManiac_5, 0x100
-	obj_tiles gFieldObjectPic_HexManiac_6, 0x100
-	obj_tiles gFieldObjectPic_HexManiac_7, 0x100
-	obj_tiles gFieldObjectPic_HexManiac_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_SwimmerM:: @ 8506764
-	obj_tiles gFieldObjectPic_SwimmerM_0, 0x100
-	obj_tiles gFieldObjectPic_SwimmerM_1, 0x100
-	obj_tiles gFieldObjectPic_SwimmerM_2, 0x100
-	obj_tiles gFieldObjectPic_SwimmerM_3, 0x100
-	obj_tiles gFieldObjectPic_SwimmerM_4, 0x100
-	obj_tiles gFieldObjectPic_SwimmerM_5, 0x100
-	obj_tiles gFieldObjectPic_SwimmerM_6, 0x100
-	obj_tiles gFieldObjectPic_SwimmerM_7, 0x100
-	obj_tiles gFieldObjectPic_SwimmerM_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_SwimmerF:: @ 85067AC
-	obj_tiles gFieldObjectPic_SwimmerF_0, 0x100
-	obj_tiles gFieldObjectPic_SwimmerF_1, 0x100
-	obj_tiles gFieldObjectPic_SwimmerF_2, 0x100
-	obj_tiles gFieldObjectPic_SwimmerF_3, 0x100
-	obj_tiles gFieldObjectPic_SwimmerF_4, 0x100
-	obj_tiles gFieldObjectPic_SwimmerF_5, 0x100
-	obj_tiles gFieldObjectPic_SwimmerF_6, 0x100
-	obj_tiles gFieldObjectPic_SwimmerF_7, 0x100
-	obj_tiles gFieldObjectPic_SwimmerF_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_BlackBelt:: @ 85067F4
-	obj_tiles gFieldObjectPic_BlackBelt_0, 0x100
-	obj_tiles gFieldObjectPic_BlackBelt_1, 0x100
-	obj_tiles gFieldObjectPic_BlackBelt_2, 0x100
-	obj_tiles gFieldObjectPic_BlackBelt_3, 0x100
-	obj_tiles gFieldObjectPic_BlackBelt_4, 0x100
-	obj_tiles gFieldObjectPic_BlackBelt_5, 0x100
-	obj_tiles gFieldObjectPic_BlackBelt_6, 0x100
-	obj_tiles gFieldObjectPic_BlackBelt_7, 0x100
-	obj_tiles gFieldObjectPic_BlackBelt_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Beauty:: @ 850683C
-	obj_tiles gFieldObjectPic_Beauty_0, 0x100
-	obj_tiles gFieldObjectPic_Beauty_1, 0x100
-	obj_tiles gFieldObjectPic_Beauty_2, 0x100
-	obj_tiles gFieldObjectPic_Beauty_3, 0x100
-	obj_tiles gFieldObjectPic_Beauty_4, 0x100
-	obj_tiles gFieldObjectPic_Beauty_5, 0x100
-	obj_tiles gFieldObjectPic_Beauty_6, 0x100
-	obj_tiles gFieldObjectPic_Beauty_7, 0x100
-	obj_tiles gFieldObjectPic_Beauty_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Scientist1:: @ 8506884
-	obj_tiles gFieldObjectPic_Scientist1_0, 0x100
-	obj_tiles gFieldObjectPic_Scientist1_1, 0x100
-	obj_tiles gFieldObjectPic_Scientist1_2, 0x100
-	obj_tiles gFieldObjectPic_Scientist1_3, 0x100
-	obj_tiles gFieldObjectPic_Scientist1_4, 0x100
-	obj_tiles gFieldObjectPic_Scientist1_5, 0x100
-	obj_tiles gFieldObjectPic_Scientist1_6, 0x100
-	obj_tiles gFieldObjectPic_Scientist1_7, 0x100
-	obj_tiles gFieldObjectPic_Scientist1_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Lass:: @ 85068CC
-	obj_tiles gFieldObjectPic_Lass_0, 0x100
-	obj_tiles gFieldObjectPic_Lass_1, 0x100
-	obj_tiles gFieldObjectPic_Lass_2, 0x100
-	obj_tiles gFieldObjectPic_Lass_3, 0x100
-	obj_tiles gFieldObjectPic_Lass_4, 0x100
-	obj_tiles gFieldObjectPic_Lass_5, 0x100
-	obj_tiles gFieldObjectPic_Lass_6, 0x100
-	obj_tiles gFieldObjectPic_Lass_7, 0x100
-	obj_tiles gFieldObjectPic_Lass_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Gentleman:: @ 8506914
-	obj_tiles gFieldObjectPic_Gentleman_0, 0x100
-	obj_tiles gFieldObjectPic_Gentleman_1, 0x100
-	obj_tiles gFieldObjectPic_Gentleman_2, 0x100
-	obj_tiles gFieldObjectPic_Gentleman_3, 0x100
-	obj_tiles gFieldObjectPic_Gentleman_4, 0x100
-	obj_tiles gFieldObjectPic_Gentleman_5, 0x100
-	obj_tiles gFieldObjectPic_Gentleman_6, 0x100
-	obj_tiles gFieldObjectPic_Gentleman_7, 0x100
-	obj_tiles gFieldObjectPic_Gentleman_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Sailor:: @ 850695C
-	obj_tiles gFieldObjectPic_Sailor_0, 0x100
-	obj_tiles gFieldObjectPic_Sailor_1, 0x100
-	obj_tiles gFieldObjectPic_Sailor_2, 0x100
-	obj_tiles gFieldObjectPic_Sailor_3, 0x100
-	obj_tiles gFieldObjectPic_Sailor_4, 0x100
-	obj_tiles gFieldObjectPic_Sailor_5, 0x100
-	obj_tiles gFieldObjectPic_Sailor_6, 0x100
-	obj_tiles gFieldObjectPic_Sailor_7, 0x100
-	obj_tiles gFieldObjectPic_Sailor_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Fisherman:: @ 85069A4
-	obj_tiles gFieldObjectPic_Fisherman_0, 0x100
-	obj_tiles gFieldObjectPic_Fisherman_1, 0x100
-	obj_tiles gFieldObjectPic_Fisherman_2, 0x100
-	obj_tiles gFieldObjectPic_Fisherman_3, 0x100
-	obj_tiles gFieldObjectPic_Fisherman_4, 0x100
-	obj_tiles gFieldObjectPic_Fisherman_5, 0x100
-	obj_tiles gFieldObjectPic_Fisherman_6, 0x100
-	obj_tiles gFieldObjectPic_Fisherman_7, 0x100
-	obj_tiles gFieldObjectPic_Fisherman_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_RunningTriathleteM:: @ 85069EC
-	obj_tiles gFieldObjectPic_RunningTriathleteM_0, 0x100
-	obj_tiles gFieldObjectPic_RunningTriathleteM_1, 0x100
-	obj_tiles gFieldObjectPic_RunningTriathleteM_2, 0x100
-	obj_tiles gFieldObjectPic_RunningTriathleteM_3, 0x100
-	obj_tiles gFieldObjectPic_RunningTriathleteM_4, 0x100
-	obj_tiles gFieldObjectPic_RunningTriathleteM_5, 0x100
-	obj_tiles gFieldObjectPic_RunningTriathleteM_6, 0x100
-	obj_tiles gFieldObjectPic_RunningTriathleteM_7, 0x100
-	obj_tiles gFieldObjectPic_RunningTriathleteM_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_RunningTriathleteF:: @ 8506A34
-	obj_tiles gFieldObjectPic_RunningTriathleteF_0, 0x100
-	obj_tiles gFieldObjectPic_RunningTriathleteF_1, 0x100
-	obj_tiles gFieldObjectPic_RunningTriathleteF_2, 0x100
-	obj_tiles gFieldObjectPic_RunningTriathleteF_3, 0x100
-	obj_tiles gFieldObjectPic_RunningTriathleteF_4, 0x100
-	obj_tiles gFieldObjectPic_RunningTriathleteF_5, 0x100
-	obj_tiles gFieldObjectPic_RunningTriathleteF_6, 0x100
-	obj_tiles gFieldObjectPic_RunningTriathleteF_7, 0x100
-	obj_tiles gFieldObjectPic_RunningTriathleteF_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_TuberF:: @ 8506A7C
-	obj_tiles gFieldObjectPic_TuberF_0, 0x80
-	obj_tiles gFieldObjectPic_TuberF_1, 0x80
-	obj_tiles gFieldObjectPic_TuberF_2, 0x80
-	obj_tiles gFieldObjectPic_TuberF_3, 0x80
-	obj_tiles gFieldObjectPic_TuberF_4, 0x80
-	obj_tiles gFieldObjectPic_TuberF_5, 0x80
-	obj_tiles gFieldObjectPic_TuberF_6, 0x80
-	obj_tiles gFieldObjectPic_TuberF_7, 0x80
-	obj_tiles gFieldObjectPic_TuberF_8, 0x80
-
-	.align 2
-gFieldObjectPicTable_TuberM:: @ 8506AC4
-	obj_tiles gFieldObjectPic_TuberM_0, 0x80
-	obj_tiles gFieldObjectPic_TuberM_1, 0x80
-	obj_tiles gFieldObjectPic_TuberM_2, 0x80
-	obj_tiles gFieldObjectPic_TuberM_3, 0x80
-	obj_tiles gFieldObjectPic_TuberM_4, 0x80
-	obj_tiles gFieldObjectPic_TuberM_5, 0x80
-	obj_tiles gFieldObjectPic_TuberM_6, 0x80
-	obj_tiles gFieldObjectPic_TuberM_7, 0x80
-	obj_tiles gFieldObjectPic_TuberM_8, 0x80
-
-	.align 2
-gFieldObjectPicTable_Hiker:: @ 8506B0C
-	obj_tiles gFieldObjectPic_Hiker_0, 0x100
-	obj_tiles gFieldObjectPic_Hiker_1, 0x100
-	obj_tiles gFieldObjectPic_Hiker_2, 0x100
-	obj_tiles gFieldObjectPic_Hiker_3, 0x100
-	obj_tiles gFieldObjectPic_Hiker_4, 0x100
-	obj_tiles gFieldObjectPic_Hiker_5, 0x100
-	obj_tiles gFieldObjectPic_Hiker_6, 0x100
-	obj_tiles gFieldObjectPic_Hiker_7, 0x100
-	obj_tiles gFieldObjectPic_Hiker_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_CyclingTriathleteM:: @ 8506B54
-	obj_tiles gFieldObjectPic_CyclingTriathleteM_0, 0x200
-	obj_tiles gFieldObjectPic_CyclingTriathleteM_1, 0x200
-	obj_tiles gFieldObjectPic_CyclingTriathleteM_2, 0x200
-	obj_tiles gFieldObjectPic_CyclingTriathleteM_3, 0x200
-	obj_tiles gFieldObjectPic_CyclingTriathleteM_4, 0x200
-	obj_tiles gFieldObjectPic_CyclingTriathleteM_5, 0x200
-	obj_tiles gFieldObjectPic_CyclingTriathleteM_6, 0x200
-	obj_tiles gFieldObjectPic_CyclingTriathleteM_7, 0x200
-	obj_tiles gFieldObjectPic_CyclingTriathleteM_8, 0x200
-
-	.align 2
-gFieldObjectPicTable_CyclingTriathleteF:: @ 8506B9C
-	obj_tiles gFieldObjectPic_CyclingTriathleteF_0, 0x200
-	obj_tiles gFieldObjectPic_CyclingTriathleteF_1, 0x200
-	obj_tiles gFieldObjectPic_CyclingTriathleteF_2, 0x200
-	obj_tiles gFieldObjectPic_CyclingTriathleteF_3, 0x200
-	obj_tiles gFieldObjectPic_CyclingTriathleteF_4, 0x200
-	obj_tiles gFieldObjectPic_CyclingTriathleteF_5, 0x200
-	obj_tiles gFieldObjectPic_CyclingTriathleteF_6, 0x200
-	obj_tiles gFieldObjectPic_CyclingTriathleteF_7, 0x200
-	obj_tiles gFieldObjectPic_CyclingTriathleteF_8, 0x200
-
-	.align 2
-gFieldObjectPicTable_Nurse:: @ 8506BE4
-	obj_tiles gFieldObjectPic_Nurse_0, 0x100
-	obj_tiles gFieldObjectPic_Nurse_1, 0x100
-	obj_tiles gFieldObjectPic_Nurse_2, 0x100
-	obj_tiles gFieldObjectPic_Nurse_0, 0x100
-	obj_tiles gFieldObjectPic_Nurse_0, 0x100
-	obj_tiles gFieldObjectPic_Nurse_1, 0x100
-	obj_tiles gFieldObjectPic_Nurse_1, 0x100
-	obj_tiles gFieldObjectPic_Nurse_2, 0x100
-	obj_tiles gFieldObjectPic_Nurse_2, 0x100
-	obj_tiles gFieldObjectPic_Nurse_3, 0x100
-
-	.align 2
-gFieldObjectPicTable_ItemBall:: @ 8506C34
-	obj_tiles gFieldObjectPic_ItemBall, 0x80
-
-	.align 2
-gFieldObjectPicTable_ProfBirch:: @ 8506C3C
-	obj_tiles gFieldObjectPic_ProfBirch_0, 0x100
-	obj_tiles gFieldObjectPic_ProfBirch_1, 0x100
-	obj_tiles gFieldObjectPic_ProfBirch_2, 0x100
-	obj_tiles gFieldObjectPic_ProfBirch_3, 0x100
-	obj_tiles gFieldObjectPic_ProfBirch_4, 0x100
-	obj_tiles gFieldObjectPic_ProfBirch_5, 0x100
-	obj_tiles gFieldObjectPic_ProfBirch_6, 0x100
-	obj_tiles gFieldObjectPic_ProfBirch_7, 0x100
-	obj_tiles gFieldObjectPic_ProfBirch_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Man5:: @ 8506C84
-	obj_tiles gFieldObjectPic_Man5_0, 0x100
-	obj_tiles gFieldObjectPic_Man5_1, 0x100
-	obj_tiles gFieldObjectPic_Man5_2, 0x100
-	obj_tiles gFieldObjectPic_Man5_3, 0x100
-	obj_tiles gFieldObjectPic_Man5_4, 0x100
-	obj_tiles gFieldObjectPic_Man5_5, 0x100
-	obj_tiles gFieldObjectPic_Man5_6, 0x100
-	obj_tiles gFieldObjectPic_Man5_7, 0x100
-	obj_tiles gFieldObjectPic_Man5_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Man6:: @ 8506CCC
-	obj_tiles gFieldObjectPic_Man6_0, 0x100
-	obj_tiles gFieldObjectPic_Man6_1, 0x100
-	obj_tiles gFieldObjectPic_Man6_2, 0x100
-	obj_tiles gFieldObjectPic_Man6_3, 0x100
-	obj_tiles gFieldObjectPic_Man6_4, 0x100
-	obj_tiles gFieldObjectPic_Man6_5, 0x100
-	obj_tiles gFieldObjectPic_Man6_6, 0x100
-	obj_tiles gFieldObjectPic_Man6_7, 0x100
-	obj_tiles gFieldObjectPic_Man6_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_ReporterM:: @ 8506D14
-	obj_tiles gFieldObjectPic_ReporterM_0, 0x100
-	obj_tiles gFieldObjectPic_ReporterM_1, 0x100
-	obj_tiles gFieldObjectPic_ReporterM_2, 0x100
-	obj_tiles gFieldObjectPic_ReporterM_3, 0x100
-	obj_tiles gFieldObjectPic_ReporterM_4, 0x100
-	obj_tiles gFieldObjectPic_ReporterM_5, 0x100
-	obj_tiles gFieldObjectPic_ReporterM_6, 0x100
-	obj_tiles gFieldObjectPic_ReporterM_7, 0x100
-	obj_tiles gFieldObjectPic_ReporterM_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_ReporterF:: @ 8506D5C
-	obj_tiles gFieldObjectPic_ReporterF_0, 0x100
-	obj_tiles gFieldObjectPic_ReporterF_1, 0x100
-	obj_tiles gFieldObjectPic_ReporterF_2, 0x100
-	obj_tiles gFieldObjectPic_ReporterF_3, 0x100
-	obj_tiles gFieldObjectPic_ReporterF_4, 0x100
-	obj_tiles gFieldObjectPic_ReporterF_5, 0x100
-	obj_tiles gFieldObjectPic_ReporterF_6, 0x100
-	obj_tiles gFieldObjectPic_ReporterF_7, 0x100
-	obj_tiles gFieldObjectPic_ReporterF_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_MauvilleOldMan1:: @ 8506DA4
-	obj_tiles gFieldObjectPic_MauvilleOldMan1_0, 0x100
-	obj_tiles gFieldObjectPic_MauvilleOldMan1_1, 0x100
-	obj_tiles gFieldObjectPic_MauvilleOldMan1_2, 0x100
-	obj_tiles gFieldObjectPic_MauvilleOldMan1_3, 0x100
-	obj_tiles gFieldObjectPic_MauvilleOldMan1_4, 0x100
-	obj_tiles gFieldObjectPic_MauvilleOldMan1_5, 0x100
-	obj_tiles gFieldObjectPic_MauvilleOldMan1_6, 0x100
-	obj_tiles gFieldObjectPic_MauvilleOldMan1_7, 0x100
-	obj_tiles gFieldObjectPic_MauvilleOldMan1_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_MauvilleOldMan2:: @ 8506DEC
-	obj_tiles gFieldObjectPic_MauvilleOldMan2_0, 0x100
-	obj_tiles gFieldObjectPic_MauvilleOldMan2_1, 0x100
-	obj_tiles gFieldObjectPic_MauvilleOldMan2_2, 0x100
-	obj_tiles gFieldObjectPic_MauvilleOldMan2_3, 0x100
-	obj_tiles gFieldObjectPic_MauvilleOldMan2_4, 0x100
-	obj_tiles gFieldObjectPic_MauvilleOldMan2_5, 0x100
-	obj_tiles gFieldObjectPic_MauvilleOldMan2_6, 0x100
-	obj_tiles gFieldObjectPic_MauvilleOldMan2_7, 0x100
-	obj_tiles gFieldObjectPic_MauvilleOldMan2_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_UnusedNatuDoll:: @ 8506E34
-	obj_tiles gFieldObjectPic_UnusedNatuDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_UnusedMagnemiteDoll:: @ 8506E3C
-	obj_tiles gFieldObjectPic_UnusedMagnemiteDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_UnusedSquirtleDoll:: @ 8506E44
-	obj_tiles gFieldObjectPic_UnusedSquirtleDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_UnusedWooperDoll:: @ 8506E4C
-	obj_tiles gFieldObjectPic_UnusedWooperDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_UnusedPikachuDoll:: @ 8506E54
-	obj_tiles gFieldObjectPic_UnusedPikachuDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_UnusedPorygon2Doll:: @ 8506E5C
-	obj_tiles gFieldObjectPic_UnusedPorygon2Doll, 0x80
-
-	.align 2
-gFieldObjectPicTable_CuttableTree:: @ 8506E64
-	obj_tiles gFieldObjectPic_CuttableTree_0, 0x80
-	obj_tiles gFieldObjectPic_CuttableTree_1, 0x80
-	obj_tiles gFieldObjectPic_CuttableTree_2, 0x80
-	obj_tiles gFieldObjectPic_CuttableTree_3, 0x80
-
-	.align 2
-gFieldObjectPicTable_MartEmployee:: @ 8506E84
-	obj_tiles gFieldObjectPic_MartEmployee_0, 0x100
-	obj_tiles gFieldObjectPic_MartEmployee_1, 0x100
-	obj_tiles gFieldObjectPic_MartEmployee_2, 0x100
-	obj_tiles gFieldObjectPic_MartEmployee_3, 0x100
-	obj_tiles gFieldObjectPic_MartEmployee_4, 0x100
-	obj_tiles gFieldObjectPic_MartEmployee_5, 0x100
-	obj_tiles gFieldObjectPic_MartEmployee_6, 0x100
-	obj_tiles gFieldObjectPic_MartEmployee_7, 0x100
-	obj_tiles gFieldObjectPic_MartEmployee_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_RooftopSaleWoman:: @ 8506ECC
-	obj_tiles gFieldObjectPic_RooftopSaleWoman_0, 0x100
-	obj_tiles gFieldObjectPic_RooftopSaleWoman_1, 0x100
-	obj_tiles gFieldObjectPic_RooftopSaleWoman_2, 0x100
-	obj_tiles gFieldObjectPic_RooftopSaleWoman_3, 0x100
-	obj_tiles gFieldObjectPic_RooftopSaleWoman_4, 0x100
-	obj_tiles gFieldObjectPic_RooftopSaleWoman_5, 0x100
-	obj_tiles gFieldObjectPic_RooftopSaleWoman_6, 0x100
-	obj_tiles gFieldObjectPic_RooftopSaleWoman_7, 0x100
-	obj_tiles gFieldObjectPic_RooftopSaleWoman_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Teala:: @ 8506F14
-	obj_tiles gFieldObjectPic_Teala_0, 0x100
-	obj_tiles gFieldObjectPic_Teala_1, 0x100
-	obj_tiles gFieldObjectPic_Teala_2, 0x100
-	obj_tiles gFieldObjectPic_Teala_3, 0x100
-	obj_tiles gFieldObjectPic_Teala_4, 0x100
-	obj_tiles gFieldObjectPic_Teala_5, 0x100
-	obj_tiles gFieldObjectPic_Teala_6, 0x100
-	obj_tiles gFieldObjectPic_Teala_7, 0x100
-	obj_tiles gFieldObjectPic_Teala_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_BreakableRock:: @ 8506F5C
-	obj_tiles gFieldObjectPic_BreakableRock_0, 0x80
-	obj_tiles gFieldObjectPic_BreakableRock_1, 0x80
-	obj_tiles gFieldObjectPic_BreakableRock_2, 0x80
-	obj_tiles gFieldObjectPic_BreakableRock_3, 0x80
-
-	.align 2
-gFieldObjectPicTable_PushableBoulder:: @ 8506F7C
-	obj_tiles gFieldObjectPic_PushableBoulder, 0x80
-
-	.align 2
-gFieldObjectPicTable_MrBrineysBoat:: @ 8506F84
-	obj_tiles gFieldObjectPic_MrBrineysBoat_0, 0x200
-	obj_tiles gFieldObjectPic_MrBrineysBoat_1, 0x200
-	obj_tiles gFieldObjectPic_MrBrineysBoat_2, 0x200
-	obj_tiles gFieldObjectPic_MrBrineysBoat_0, 0x200
-	obj_tiles gFieldObjectPic_MrBrineysBoat_0, 0x200
-	obj_tiles gFieldObjectPic_MrBrineysBoat_1, 0x200
-	obj_tiles gFieldObjectPic_MrBrineysBoat_1, 0x200
-	obj_tiles gFieldObjectPic_MrBrineysBoat_2, 0x200
-	obj_tiles gFieldObjectPic_MrBrineysBoat_2, 0x200
-
-	.align 2
-gFieldObjectPicTable_Truck:: @ 8506FCC
-	obj_tiles gFieldObjectPic_Truck, 0x480
-
-	.align 2
-gFieldObjectPicTable_VigorothCarryingBox:: @ 8506FD4
-	obj_tiles gFieldObjectPic_VigorothCarryingBox_0, 0x200
-	obj_tiles gFieldObjectPic_VigorothCarryingBox_0, 0x200
-	obj_tiles gFieldObjectPic_VigorothCarryingBox_0, 0x200
-	obj_tiles gFieldObjectPic_VigorothCarryingBox_1, 0x200
-	obj_tiles gFieldObjectPic_VigorothCarryingBox_2, 0x200
-	obj_tiles gFieldObjectPic_VigorothCarryingBox_1, 0x200
-	obj_tiles gFieldObjectPic_VigorothCarryingBox_2, 0x200
-	obj_tiles gFieldObjectPic_VigorothCarryingBox_1, 0x200
-	obj_tiles gFieldObjectPic_VigorothCarryingBox_2, 0x200
-
-	.align 2
-gFieldObjectPicTable_VigorothFacingAway:: @ 850701C
-	obj_tiles gFieldObjectPic_VigorothFacingAway_0, 0x200
-	obj_tiles gFieldObjectPic_VigorothFacingAway_0, 0x200
-	obj_tiles gFieldObjectPic_VigorothFacingAway_0, 0x200
-	obj_tiles gFieldObjectPic_VigorothFacingAway_1, 0x200
-	obj_tiles gFieldObjectPic_VigorothFacingAway_1, 0x200
-	obj_tiles gFieldObjectPic_VigorothFacingAway_1, 0x200
-	obj_tiles gFieldObjectPic_VigorothFacingAway_1, 0x200
-	obj_tiles gFieldObjectPic_VigorothFacingAway_1, 0x200
-	obj_tiles gFieldObjectPic_VigorothFacingAway_1, 0x200
-
-	.align 2
-gFieldObjectPicTable_BirchsBag:: @ 8507064
-	obj_tiles gFieldObjectPic_BirchsBag, 0x80
-
-	.align 2
-gFieldObjectPicTable_EnemyZigzagoon:: @ 850706C
-	obj_tiles gFieldObjectPic_EnemyZigzagoon_0, 0x200
-	obj_tiles gFieldObjectPic_EnemyZigzagoon_1, 0x200
-	obj_tiles gFieldObjectPic_EnemyZigzagoon_2, 0x200
-	obj_tiles gFieldObjectPic_EnemyZigzagoon_3, 0x200
-	obj_tiles gFieldObjectPic_EnemyZigzagoon_4, 0x200
-	obj_tiles gFieldObjectPic_EnemyZigzagoon_5, 0x200
-	obj_tiles gFieldObjectPic_EnemyZigzagoon_6, 0x200
-	obj_tiles gFieldObjectPic_EnemyZigzagoon_7, 0x200
-	obj_tiles gFieldObjectPic_EnemyZigzagoon_8, 0x200
-
-	.align 2
-gFieldObjectPicTable_Poochyena:: @ 85070B4
-	obj_tiles gFieldObjectPic_Poochyena_0, 0x200
-	obj_tiles gFieldObjectPic_Poochyena_1, 0x200
-	obj_tiles gFieldObjectPic_Poochyena_2, 0x200
-	obj_tiles gFieldObjectPic_Poochyena_3, 0x200
-	obj_tiles gFieldObjectPic_Poochyena_4, 0x200
-	obj_tiles gFieldObjectPic_Poochyena_5, 0x200
-	obj_tiles gFieldObjectPic_Poochyena_6, 0x200
-	obj_tiles gFieldObjectPic_Poochyena_7, 0x200
-	obj_tiles gFieldObjectPic_Poochyena_8, 0x200
-
-	.align 2
-gFieldObjectPicTable_Artist:: @ 85070FC
-	obj_tiles gFieldObjectPic_Artist_0, 0x100
-	obj_tiles gFieldObjectPic_Artist_1, 0x100
-	obj_tiles gFieldObjectPic_Artist_2, 0x100
-	obj_tiles gFieldObjectPic_Artist_3, 0x100
-	obj_tiles gFieldObjectPic_Artist_4, 0x100
-	obj_tiles gFieldObjectPic_Artist_5, 0x100
-	obj_tiles gFieldObjectPic_Artist_6, 0x100
-	obj_tiles gFieldObjectPic_Artist_7, 0x100
-	obj_tiles gFieldObjectPic_Artist_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_MayNormal:: @ 8507144
-	obj_tiles gFieldObjectPic_MayNormal_0, 0x100
-	obj_tiles gFieldObjectPic_MayNormal_1, 0x100
-	obj_tiles gFieldObjectPic_MayNormal_2, 0x100
-	obj_tiles gFieldObjectPic_MayNormal_3, 0x100
-	obj_tiles gFieldObjectPic_MayNormal_4, 0x100
-	obj_tiles gFieldObjectPic_MayNormal_5, 0x100
-	obj_tiles gFieldObjectPic_MayNormal_6, 0x100
-	obj_tiles gFieldObjectPic_MayNormal_7, 0x100
-	obj_tiles gFieldObjectPic_MayNormal_8, 0x100
-	obj_tiles gFieldObjectPic_MayNormal_9, 0x100
-	obj_tiles gFieldObjectPic_MayNormal_10, 0x100
-	obj_tiles gFieldObjectPic_MayNormal_11, 0x100
-	obj_tiles gFieldObjectPic_MayNormal_12, 0x100
-	obj_tiles gFieldObjectPic_MayNormal_13, 0x100
-	obj_tiles gFieldObjectPic_MayNormal_14, 0x100
-	obj_tiles gFieldObjectPic_MayNormal_15, 0x100
-	obj_tiles gFieldObjectPic_MayNormal_16, 0x100
-	obj_tiles gFieldObjectPic_MayNormal_17, 0x100
-
-	.align 2
-gFieldObjectPicTable_MayMachBike:: @ 85071D4
-	obj_tiles gFieldObjectPic_MayMachBike_0, 0x200
-	obj_tiles gFieldObjectPic_MayMachBike_1, 0x200
-	obj_tiles gFieldObjectPic_MayMachBike_2, 0x200
-	obj_tiles gFieldObjectPic_MayMachBike_3, 0x200
-	obj_tiles gFieldObjectPic_MayMachBike_4, 0x200
-	obj_tiles gFieldObjectPic_MayMachBike_5, 0x200
-	obj_tiles gFieldObjectPic_MayMachBike_6, 0x200
-	obj_tiles gFieldObjectPic_MayMachBike_7, 0x200
-	obj_tiles gFieldObjectPic_MayMachBike_8, 0x200
-
-	.align 2
-gFieldObjectPicTable_MayAcroBike:: @ 850721C
-	obj_tiles gFieldObjectPic_MayAcroBike_0, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_1, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_2, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_3, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_4, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_5, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_6, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_7, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_8, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_9, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_10, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_11, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_12, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_13, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_14, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_15, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_16, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_17, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_18, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_19, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_20, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_21, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_22, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_23, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_24, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_25, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_26, 0x200
-
-	.align 2
-gFieldObjectPicTable_MaySurfing:: @ 85072F4
-	obj_tiles gFieldObjectPic_MaySurfing_0, 0x200
-	obj_tiles gFieldObjectPic_MaySurfing_1, 0x200
-	obj_tiles gFieldObjectPic_MaySurfing_2, 0x200
-	obj_tiles gFieldObjectPic_MaySurfing_0, 0x200
-	obj_tiles gFieldObjectPic_MaySurfing_0, 0x200
-	obj_tiles gFieldObjectPic_MaySurfing_1, 0x200
-	obj_tiles gFieldObjectPic_MaySurfing_1, 0x200
-	obj_tiles gFieldObjectPic_MaySurfing_2, 0x200
-	obj_tiles gFieldObjectPic_MaySurfing_2, 0x200
-	obj_tiles gFieldObjectPic_MaySurfing_3, 0x200
-	obj_tiles gFieldObjectPic_MaySurfing_4, 0x200
-	obj_tiles gFieldObjectPic_MaySurfing_5, 0x200
-
-	.align 2
-gFieldObjectPicTable_MayUnderwater:: @ 8507354
-	obj_tiles gFieldObjectPic_MayUnderwater_0, 0x200
-	obj_tiles gFieldObjectPic_MayUnderwater_1, 0x200
-	obj_tiles gFieldObjectPic_MayUnderwater_2, 0x200
-	obj_tiles gFieldObjectPic_MayUnderwater_0, 0x200
-	obj_tiles gFieldObjectPic_MayUnderwater_0, 0x200
-	obj_tiles gFieldObjectPic_MayUnderwater_1, 0x200
-	obj_tiles gFieldObjectPic_MayUnderwater_1, 0x200
-	obj_tiles gFieldObjectPic_MayUnderwater_2, 0x200
-	obj_tiles gFieldObjectPic_MayUnderwater_2, 0x200
-
-	.align 2
-gFieldObjectPicTable_MayFieldMove:: @ 850739C
-	obj_tiles gFieldObjectPic_MayFieldMove_0, 0x200
-	obj_tiles gFieldObjectPic_MayFieldMove_1, 0x200
-	obj_tiles gFieldObjectPic_MayFieldMove_2, 0x200
-	obj_tiles gFieldObjectPic_MayFieldMove_3, 0x200
-	obj_tiles gFieldObjectPic_MayFieldMove_4, 0x200
-
-	.align 2
-gFieldObjectPicTable_Cameraman:: @ 85073C4
-	obj_tiles gFieldObjectPic_Cameraman_0, 0x100
-	obj_tiles gFieldObjectPic_Cameraman_1, 0x100
-	obj_tiles gFieldObjectPic_Cameraman_2, 0x100
-	obj_tiles gFieldObjectPic_Cameraman_3, 0x100
-	obj_tiles gFieldObjectPic_Cameraman_4, 0x100
-	obj_tiles gFieldObjectPic_Cameraman_5, 0x100
-	obj_tiles gFieldObjectPic_Cameraman_6, 0x100
-	obj_tiles gFieldObjectPic_Cameraman_7, 0x100
-	obj_tiles gFieldObjectPic_Cameraman_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_MovingBox:: @ 850740C
-	obj_tiles gFieldObjectPic_MovingBox, 0x80
-
-	.align 2
-gFieldObjectPicTable_CableCar:: @ 8507414
-	obj_tiles gFieldObjectPic_CableCar, 0x800
-
-	.align 2
-gFieldObjectPicTable_Scientist2:: @ 850741C
-	obj_tiles gFieldObjectPic_Scientist2_0, 0x100
-	obj_tiles gFieldObjectPic_Scientist2_1, 0x100
-	obj_tiles gFieldObjectPic_Scientist2_2, 0x100
-	obj_tiles gFieldObjectPic_Scientist2_3, 0x100
-	obj_tiles gFieldObjectPic_Scientist2_4, 0x100
-	obj_tiles gFieldObjectPic_Scientist2_5, 0x100
-	obj_tiles gFieldObjectPic_Scientist2_6, 0x100
-	obj_tiles gFieldObjectPic_Scientist2_7, 0x100
-	obj_tiles gFieldObjectPic_Scientist2_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Man7:: @ 8507464
-	obj_tiles gFieldObjectPic_Man7_0, 0x100
-	obj_tiles gFieldObjectPic_Man7_1, 0x100
-	obj_tiles gFieldObjectPic_Man7_2, 0x100
-	obj_tiles gFieldObjectPic_Man7_3, 0x100
-	obj_tiles gFieldObjectPic_Man7_4, 0x100
-	obj_tiles gFieldObjectPic_Man7_5, 0x100
-	obj_tiles gFieldObjectPic_Man7_6, 0x100
-	obj_tiles gFieldObjectPic_Man7_7, 0x100
-	obj_tiles gFieldObjectPic_Man7_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_AquaMemberM:: @ 85074AC
-	obj_tiles gFieldObjectPic_AquaMemberM_0, 0x100
-	obj_tiles gFieldObjectPic_AquaMemberM_1, 0x100
-	obj_tiles gFieldObjectPic_AquaMemberM_2, 0x100
-	obj_tiles gFieldObjectPic_AquaMemberM_3, 0x100
-	obj_tiles gFieldObjectPic_AquaMemberM_4, 0x100
-	obj_tiles gFieldObjectPic_AquaMemberM_5, 0x100
-	obj_tiles gFieldObjectPic_AquaMemberM_6, 0x100
-	obj_tiles gFieldObjectPic_AquaMemberM_7, 0x100
-	obj_tiles gFieldObjectPic_AquaMemberM_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_AquaMemberF:: @ 85074F4
-	obj_tiles gFieldObjectPic_AquaMemberF_0, 0x100
-	obj_tiles gFieldObjectPic_AquaMemberF_1, 0x100
-	obj_tiles gFieldObjectPic_AquaMemberF_2, 0x100
-	obj_tiles gFieldObjectPic_AquaMemberF_3, 0x100
-	obj_tiles gFieldObjectPic_AquaMemberF_4, 0x100
-	obj_tiles gFieldObjectPic_AquaMemberF_5, 0x100
-	obj_tiles gFieldObjectPic_AquaMemberF_6, 0x100
-	obj_tiles gFieldObjectPic_AquaMemberF_7, 0x100
-	obj_tiles gFieldObjectPic_AquaMemberF_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_MagmaMemberM:: @ 850753C
-	obj_tiles gFieldObjectPic_MagmaMemberM_0, 0x100
-	obj_tiles gFieldObjectPic_MagmaMemberM_1, 0x100
-	obj_tiles gFieldObjectPic_MagmaMemberM_2, 0x100
-	obj_tiles gFieldObjectPic_MagmaMemberM_3, 0x100
-	obj_tiles gFieldObjectPic_MagmaMemberM_4, 0x100
-	obj_tiles gFieldObjectPic_MagmaMemberM_5, 0x100
-	obj_tiles gFieldObjectPic_MagmaMemberM_6, 0x100
-	obj_tiles gFieldObjectPic_MagmaMemberM_7, 0x100
-	obj_tiles gFieldObjectPic_MagmaMemberM_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_MagmaMemberF:: @ 8507584
-	obj_tiles gFieldObjectPic_MagmaMemberF_0, 0x100
-	obj_tiles gFieldObjectPic_MagmaMemberF_1, 0x100
-	obj_tiles gFieldObjectPic_MagmaMemberF_2, 0x100
-	obj_tiles gFieldObjectPic_MagmaMemberF_3, 0x100
-	obj_tiles gFieldObjectPic_MagmaMemberF_4, 0x100
-	obj_tiles gFieldObjectPic_MagmaMemberF_5, 0x100
-	obj_tiles gFieldObjectPic_MagmaMemberF_6, 0x100
-	obj_tiles gFieldObjectPic_MagmaMemberF_7, 0x100
-	obj_tiles gFieldObjectPic_MagmaMemberF_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Sidney:: @ 85075CC
-	obj_tiles gFieldObjectPic_Sidney_0, 0x100
-	obj_tiles gFieldObjectPic_Sidney_1, 0x100
-	obj_tiles gFieldObjectPic_Sidney_2, 0x100
-	obj_tiles gFieldObjectPic_Sidney_0, 0x100
-	obj_tiles gFieldObjectPic_Sidney_0, 0x100
-	obj_tiles gFieldObjectPic_Sidney_1, 0x100
-	obj_tiles gFieldObjectPic_Sidney_1, 0x100
-	obj_tiles gFieldObjectPic_Sidney_2, 0x100
-	obj_tiles gFieldObjectPic_Sidney_2, 0x100
-
-	.align 2
-gFieldObjectPicTable_Phoebe:: @ 8507614
-	obj_tiles gFieldObjectPic_Phoebe_0, 0x100
-	obj_tiles gFieldObjectPic_Phoebe_1, 0x100
-	obj_tiles gFieldObjectPic_Phoebe_2, 0x100
-	obj_tiles gFieldObjectPic_Phoebe_0, 0x100
-	obj_tiles gFieldObjectPic_Phoebe_0, 0x100
-	obj_tiles gFieldObjectPic_Phoebe_1, 0x100
-	obj_tiles gFieldObjectPic_Phoebe_1, 0x100
-	obj_tiles gFieldObjectPic_Phoebe_2, 0x100
-	obj_tiles gFieldObjectPic_Phoebe_2, 0x100
-
-	.align 2
-gFieldObjectPicTable_Glacia:: @ 850765C
-	obj_tiles gFieldObjectPic_Glacia_0, 0x100
-	obj_tiles gFieldObjectPic_Glacia_1, 0x100
-	obj_tiles gFieldObjectPic_Glacia_2, 0x100
-	obj_tiles gFieldObjectPic_Glacia_0, 0x100
-	obj_tiles gFieldObjectPic_Glacia_0, 0x100
-	obj_tiles gFieldObjectPic_Glacia_1, 0x100
-	obj_tiles gFieldObjectPic_Glacia_1, 0x100
-	obj_tiles gFieldObjectPic_Glacia_2, 0x100
-	obj_tiles gFieldObjectPic_Glacia_2, 0x100
-
-	.align 2
-gFieldObjectPicTable_Drake:: @ 85076A4
-	obj_tiles gFieldObjectPic_Drake_0, 0x100
-	obj_tiles gFieldObjectPic_Drake_1, 0x100
-	obj_tiles gFieldObjectPic_Drake_2, 0x100
-	obj_tiles gFieldObjectPic_Drake_0, 0x100
-	obj_tiles gFieldObjectPic_Drake_0, 0x100
-	obj_tiles gFieldObjectPic_Drake_1, 0x100
-	obj_tiles gFieldObjectPic_Drake_1, 0x100
-	obj_tiles gFieldObjectPic_Drake_2, 0x100
-	obj_tiles gFieldObjectPic_Drake_2, 0x100
-
-	.align 2
-gFieldObjectPicTable_Roxanne:: @ 85076EC
-	obj_tiles gFieldObjectPic_Roxanne_0, 0x100
-	obj_tiles gFieldObjectPic_Roxanne_1, 0x100
-	obj_tiles gFieldObjectPic_Roxanne_2, 0x100
-	obj_tiles gFieldObjectPic_Roxanne_0, 0x100
-	obj_tiles gFieldObjectPic_Roxanne_0, 0x100
-	obj_tiles gFieldObjectPic_Roxanne_1, 0x100
-	obj_tiles gFieldObjectPic_Roxanne_1, 0x100
-	obj_tiles gFieldObjectPic_Roxanne_2, 0x100
-	obj_tiles gFieldObjectPic_Roxanne_2, 0x100
-
-	.align 2
-gFieldObjectPicTable_Brawly:: @ 8507734
-	obj_tiles gFieldObjectPic_Brawly_0, 0x100
-	obj_tiles gFieldObjectPic_Brawly_1, 0x100
-	obj_tiles gFieldObjectPic_Brawly_2, 0x100
-	obj_tiles gFieldObjectPic_Brawly_0, 0x100
-	obj_tiles gFieldObjectPic_Brawly_0, 0x100
-	obj_tiles gFieldObjectPic_Brawly_1, 0x100
-	obj_tiles gFieldObjectPic_Brawly_1, 0x100
-	obj_tiles gFieldObjectPic_Brawly_2, 0x100
-	obj_tiles gFieldObjectPic_Brawly_2, 0x100
-
-	.align 2
-gFieldObjectPicTable_Wattson:: @ 850777C
-	obj_tiles gFieldObjectPic_Wattson_0, 0x100
-	obj_tiles gFieldObjectPic_Wattson_1, 0x100
-	obj_tiles gFieldObjectPic_Wattson_2, 0x100
-	obj_tiles gFieldObjectPic_Wattson_0, 0x100
-	obj_tiles gFieldObjectPic_Wattson_0, 0x100
-	obj_tiles gFieldObjectPic_Wattson_1, 0x100
-	obj_tiles gFieldObjectPic_Wattson_1, 0x100
-	obj_tiles gFieldObjectPic_Wattson_2, 0x100
-	obj_tiles gFieldObjectPic_Wattson_2, 0x100
-
-	.align 2
-gFieldObjectPicTable_Flannery:: @ 85077C4
-	obj_tiles gFieldObjectPic_Flannery_0, 0x100
-	obj_tiles gFieldObjectPic_Flannery_1, 0x100
-	obj_tiles gFieldObjectPic_Flannery_2, 0x100
-	obj_tiles gFieldObjectPic_Flannery_0, 0x100
-	obj_tiles gFieldObjectPic_Flannery_0, 0x100
-	obj_tiles gFieldObjectPic_Flannery_1, 0x100
-	obj_tiles gFieldObjectPic_Flannery_1, 0x100
-	obj_tiles gFieldObjectPic_Flannery_2, 0x100
-	obj_tiles gFieldObjectPic_Flannery_2, 0x100
-
-	.align 2
-gFieldObjectPicTable_Norman:: @ 850780C
-	obj_tiles gFieldObjectPic_Norman_0, 0x100
-	obj_tiles gFieldObjectPic_Norman_1, 0x100
-	obj_tiles gFieldObjectPic_Norman_2, 0x100
-	obj_tiles gFieldObjectPic_Norman_3, 0x100
-	obj_tiles gFieldObjectPic_Norman_4, 0x100
-	obj_tiles gFieldObjectPic_Norman_5, 0x100
-	obj_tiles gFieldObjectPic_Norman_6, 0x100
-	obj_tiles gFieldObjectPic_Norman_7, 0x100
-	obj_tiles gFieldObjectPic_Norman_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Winona:: @ 8507854
-	obj_tiles gFieldObjectPic_Winona_0, 0x100
-	obj_tiles gFieldObjectPic_Winona_1, 0x100
-	obj_tiles gFieldObjectPic_Winona_2, 0x100
-	obj_tiles gFieldObjectPic_Winona_0, 0x100
-	obj_tiles gFieldObjectPic_Winona_0, 0x100
-	obj_tiles gFieldObjectPic_Winona_1, 0x100
-	obj_tiles gFieldObjectPic_Winona_1, 0x100
-	obj_tiles gFieldObjectPic_Winona_2, 0x100
-	obj_tiles gFieldObjectPic_Winona_2, 0x100
-
-	.align 2
-gFieldObjectPicTable_Liza:: @ 850789C
-	obj_tiles gFieldObjectPic_Liza_0, 0x100
-	obj_tiles gFieldObjectPic_Liza_1, 0x100
-	obj_tiles gFieldObjectPic_Liza_2, 0x100
-	obj_tiles gFieldObjectPic_Liza_0, 0x100
-	obj_tiles gFieldObjectPic_Liza_0, 0x100
-	obj_tiles gFieldObjectPic_Liza_1, 0x100
-	obj_tiles gFieldObjectPic_Liza_1, 0x100
-	obj_tiles gFieldObjectPic_Liza_2, 0x100
-	obj_tiles gFieldObjectPic_Liza_2, 0x100
-
-	.align 2
-gFieldObjectPicTable_Tate:: @ 85078E4
-	obj_tiles gFieldObjectPic_Tate_0, 0x100
-	obj_tiles gFieldObjectPic_Tate_1, 0x100
-	obj_tiles gFieldObjectPic_Tate_2, 0x100
-	obj_tiles gFieldObjectPic_Tate_0, 0x100
-	obj_tiles gFieldObjectPic_Tate_0, 0x100
-	obj_tiles gFieldObjectPic_Tate_1, 0x100
-	obj_tiles gFieldObjectPic_Tate_1, 0x100
-	obj_tiles gFieldObjectPic_Tate_2, 0x100
-	obj_tiles gFieldObjectPic_Tate_2, 0x100
-
-	.align 2
-gFieldObjectPicTable_Wallace:: @ 850792C
-	obj_tiles gFieldObjectPic_Wallace_0, 0x100
-	obj_tiles gFieldObjectPic_Wallace_1, 0x100
-	obj_tiles gFieldObjectPic_Wallace_2, 0x100
-	obj_tiles gFieldObjectPic_Wallace_3, 0x100
-	obj_tiles gFieldObjectPic_Wallace_4, 0x100
-	obj_tiles gFieldObjectPic_Wallace_5, 0x100
-	obj_tiles gFieldObjectPic_Wallace_6, 0x100
-	obj_tiles gFieldObjectPic_Wallace_7, 0x100
-	obj_tiles gFieldObjectPic_Wallace_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Steven:: @ 8507974
-	obj_tiles gFieldObjectPic_Steven_0, 0x100
-	obj_tiles gFieldObjectPic_Steven_1, 0x100
-	obj_tiles gFieldObjectPic_Steven_2, 0x100
-	obj_tiles gFieldObjectPic_Steven_3, 0x100
-	obj_tiles gFieldObjectPic_Steven_4, 0x100
-	obj_tiles gFieldObjectPic_Steven_5, 0x100
-	obj_tiles gFieldObjectPic_Steven_6, 0x100
-	obj_tiles gFieldObjectPic_Steven_7, 0x100
-	obj_tiles gFieldObjectPic_Steven_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Wally:: @ 85079BC
-	obj_tiles gFieldObjectPic_Wally_0, 0x100
-	obj_tiles gFieldObjectPic_Wally_1, 0x100
-	obj_tiles gFieldObjectPic_Wally_2, 0x100
-	obj_tiles gFieldObjectPic_Wally_3, 0x100
-	obj_tiles gFieldObjectPic_Wally_4, 0x100
-	obj_tiles gFieldObjectPic_Wally_5, 0x100
-	obj_tiles gFieldObjectPic_Wally_6, 0x100
-	obj_tiles gFieldObjectPic_Wally_7, 0x100
-	obj_tiles gFieldObjectPic_Wally_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_RubySapphireLittleBoy:: @ 8507A04
-	obj_tiles gFieldObjectPic_RubySapphireLittleBoy_0, 0x80
-	obj_tiles gFieldObjectPic_RubySapphireLittleBoy_1, 0x80
-	obj_tiles gFieldObjectPic_RubySapphireLittleBoy_2, 0x80
-	obj_tiles gFieldObjectPic_RubySapphireLittleBoy_3, 0x80
-	obj_tiles gFieldObjectPic_RubySapphireLittleBoy_4, 0x80
-	obj_tiles gFieldObjectPic_RubySapphireLittleBoy_5, 0x80
-	obj_tiles gFieldObjectPic_RubySapphireLittleBoy_6, 0x80
-	obj_tiles gFieldObjectPic_RubySapphireLittleBoy_7, 0x80
-	obj_tiles gFieldObjectPic_RubySapphireLittleBoy_8, 0x80
-
-	.align 2
-gFieldObjectPicTable_BrendanFishing:: @ 8507A4C
-	obj_tiles gFieldObjectPic_BrendanFishing_0, 0x200
-	obj_tiles gFieldObjectPic_BrendanFishing_1, 0x200
-	obj_tiles gFieldObjectPic_BrendanFishing_2, 0x200
-	obj_tiles gFieldObjectPic_BrendanFishing_3, 0x200
-	obj_tiles gFieldObjectPic_BrendanFishing_4, 0x200
-	obj_tiles gFieldObjectPic_BrendanFishing_5, 0x200
-	obj_tiles gFieldObjectPic_BrendanFishing_6, 0x200
-	obj_tiles gFieldObjectPic_BrendanFishing_7, 0x200
-	obj_tiles gFieldObjectPic_BrendanFishing_8, 0x200
-	obj_tiles gFieldObjectPic_BrendanFishing_9, 0x200
-	obj_tiles gFieldObjectPic_BrendanFishing_10, 0x200
-	obj_tiles gFieldObjectPic_BrendanFishing_11, 0x200
-
-	.align 2
-gFieldObjectPicTable_MayFishing:: @ 8507AAC
-	obj_tiles gFieldObjectPic_MayFishing_0, 0x200
-	obj_tiles gFieldObjectPic_MayFishing_1, 0x200
-	obj_tiles gFieldObjectPic_MayFishing_2, 0x200
-	obj_tiles gFieldObjectPic_MayFishing_3, 0x200
-	obj_tiles gFieldObjectPic_MayFishing_4, 0x200
-	obj_tiles gFieldObjectPic_MayFishing_5, 0x200
-	obj_tiles gFieldObjectPic_MayFishing_6, 0x200
-	obj_tiles gFieldObjectPic_MayFishing_7, 0x200
-	obj_tiles gFieldObjectPic_MayFishing_8, 0x200
-	obj_tiles gFieldObjectPic_MayFishing_9, 0x200
-	obj_tiles gFieldObjectPic_MayFishing_10, 0x200
-	obj_tiles gFieldObjectPic_MayFishing_11, 0x200
-
-	.align 2
-gFieldObjectPicTable_HotSpringsOldWoman:: @ 8507B0C
-	obj_tiles gFieldObjectPic_HotSpringsOldWoman_0, 0x100
-	obj_tiles gFieldObjectPic_HotSpringsOldWoman_1, 0x100
-	obj_tiles gFieldObjectPic_HotSpringsOldWoman_2, 0x100
-	obj_tiles gFieldObjectPic_HotSpringsOldWoman_3, 0x100
-	obj_tiles gFieldObjectPic_HotSpringsOldWoman_4, 0x100
-	obj_tiles gFieldObjectPic_HotSpringsOldWoman_5, 0x100
-	obj_tiles gFieldObjectPic_HotSpringsOldWoman_6, 0x100
-	obj_tiles gFieldObjectPic_HotSpringsOldWoman_7, 0x100
-	obj_tiles gFieldObjectPic_HotSpringsOldWoman_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_SSTidal:: @ 8507B54
-	obj_tiles gFieldObjectPic_SSTidal, 0x780
-	obj_tiles gFieldObjectPic_SSTidal, 0x780
-	obj_tiles gFieldObjectPic_SSTidal, 0x780
-	obj_tiles gFieldObjectPic_SSTidal, 0x780
-	obj_tiles gFieldObjectPic_SSTidal, 0x780
-	obj_tiles gFieldObjectPic_SSTidal, 0x780
-	obj_tiles gFieldObjectPic_SSTidal, 0x780
-	obj_tiles gFieldObjectPic_SSTidal, 0x780
-	obj_tiles gFieldObjectPic_SSTidal, 0x780
-
-	.align 2
-gFieldObjectPicTable_SubmarineShadow:: @ 8507B9C
-	obj_tiles gFieldObjectPic_SubmarineShadow, 0x580
-	obj_tiles gFieldObjectPic_SubmarineShadow, 0x580
-	obj_tiles gFieldObjectPic_SubmarineShadow, 0x580
-	obj_tiles gFieldObjectPic_SubmarineShadow, 0x580
-	obj_tiles gFieldObjectPic_SubmarineShadow, 0x580
-	obj_tiles gFieldObjectPic_SubmarineShadow, 0x580
-	obj_tiles gFieldObjectPic_SubmarineShadow, 0x580
-	obj_tiles gFieldObjectPic_SubmarineShadow, 0x580
-	obj_tiles gFieldObjectPic_SubmarineShadow, 0x580
-
-	.align 2
-gFieldObjectPicTable_PichuDoll:: @ 8507BE4
-	obj_tiles gFieldObjectPic_PichuDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_PikachuDoll:: @ 8507BEC
-	obj_tiles gFieldObjectPic_PikachuDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_MarillDoll:: @ 8507BF4
-	obj_tiles gFieldObjectPic_MarillDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_TogepiDoll:: @ 8507BFC
-	obj_tiles gFieldObjectPic_TogepiDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_CyndaquilDoll:: @ 8507C04
-	obj_tiles gFieldObjectPic_CyndaquilDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_ChikoritaDoll:: @ 8507C0C
-	obj_tiles gFieldObjectPic_ChikoritaDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_TotodileDoll:: @ 8507C14
-	obj_tiles gFieldObjectPic_TotodileDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_JigglypuffDoll:: @ 8507C1C
-	obj_tiles gFieldObjectPic_JigglypuffDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_MeowthDoll:: @ 8507C24
-	obj_tiles gFieldObjectPic_MeowthDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_ClefairyDoll:: @ 8507C2C
-	obj_tiles gFieldObjectPic_ClefairyDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_DittoDoll:: @ 8507C34
-	obj_tiles gFieldObjectPic_DittoDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_SmoochumDoll:: @ 8507C3C
-	obj_tiles gFieldObjectPic_SmoochumDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_TreeckoDoll:: @ 8507C44
-	obj_tiles gFieldObjectPic_TreeckoDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_TorchicDoll:: @ 8507C4C
-	obj_tiles gFieldObjectPic_TorchicDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_MudkipDoll:: @ 8507C54
-	obj_tiles gFieldObjectPic_MudkipDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_DuskullDoll:: @ 8507C5C
-	obj_tiles gFieldObjectPic_DuskullDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_WynautDoll:: @ 8507C64
-	obj_tiles gFieldObjectPic_WynautDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_BaltoyDoll:: @ 8507C6C
-	obj_tiles gFieldObjectPic_BaltoyDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_KecleonDoll:: @ 8507C74
-	obj_tiles gFieldObjectPic_KecleonDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_AzurillDoll:: @ 8507C7C
-	obj_tiles gFieldObjectPic_AzurillDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_SkittyDoll:: @ 8507C84
-	obj_tiles gFieldObjectPic_SkittyDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_SwabluDoll:: @ 8507C8C
-	obj_tiles gFieldObjectPic_SwabluDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_GulpinDoll:: @ 8507C94
-	obj_tiles gFieldObjectPic_GulpinDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_LotadDoll:: @ 8507C9C
-	obj_tiles gFieldObjectPic_LotadDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_SeedotDoll:: @ 8507CA4
-	obj_tiles gFieldObjectPic_SeedotDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_PikaCushion:: @ 8507CAC
-	obj_tiles gFieldObjectPic_PikaCushion, 0x80
-
-	.align 2
-gFieldObjectPicTable_RoundCushion:: @ 8507CB4
-	obj_tiles gFieldObjectPic_RoundCushion, 0x80
-
-	.align 2
-gFieldObjectPicTable_KissCushion:: @ 8507CBC
-	obj_tiles gFieldObjectPic_KissCushion, 0x80
-
-	.align 2
-gFieldObjectPicTable_ZigzagCushion:: @ 8507CC4
-	obj_tiles gFieldObjectPic_ZigzagCushion, 0x80
-
-	.align 2
-gFieldObjectPicTable_SpinCushion:: @ 8507CCC
-	obj_tiles gFieldObjectPic_SpinCushion, 0x80
-
-	.align 2
-gFieldObjectPicTable_DiamondCushion:: @ 8507CD4
-	obj_tiles gFieldObjectPic_DiamondCushion, 0x80
-
-	.align 2
-gFieldObjectPicTable_BallCushion:: @ 8507CDC
-	obj_tiles gFieldObjectPic_BallCushion, 0x80
-
-	.align 2
-gFieldObjectPicTable_GrassCushion:: @ 8507CE4
-	obj_tiles gFieldObjectPic_GrassCushion, 0x80
-
-	.align 2
-gFieldObjectPicTable_FireCushion:: @ 8507CEC
-	obj_tiles gFieldObjectPic_FireCushion, 0x80
-
-	.align 2
-gFieldObjectPicTable_WaterCushion:: @ 8507CF4
-	obj_tiles gFieldObjectPic_WaterCushion, 0x80
-
-	.align 2
-gFieldObjectPicTable_BigSnorlaxDoll:: @ 8507CFC
-	obj_tiles gFieldObjectPic_BigSnorlaxDoll, 0x200
-
-	.align 2
-gFieldObjectPicTable_BigRhydonDoll:: @ 8507D04
-	obj_tiles gFieldObjectPic_BigRhydonDoll, 0x200
-
-	.align 2
-gFieldObjectPicTable_BigLaprasDoll:: @ 8507D0C
-	obj_tiles gFieldObjectPic_BigLaprasDoll, 0x200
-
-	.align 2
-gFieldObjectPicTable_BigVenusaurDoll:: @ 8507D14
-	obj_tiles gFieldObjectPic_BigVenusaurDoll, 0x200
-
-	.align 2
-gFieldObjectPicTable_BigCharizardDoll:: @ 8507D1C
-	obj_tiles gFieldObjectPic_BigCharizardDoll, 0x200
-
-	.align 2
-gFieldObjectPicTable_BigBlastoiseDoll:: @ 8507D24
-	obj_tiles gFieldObjectPic_BigBlastoiseDoll, 0x200
-
-	.align 2
-gFieldObjectPicTable_BigWailmerDoll:: @ 8507D2C
-	obj_tiles gFieldObjectPic_BigWailmerDoll, 0x200
-
-	.align 2
-gFieldObjectPicTable_BigRegirockDoll:: @ 8507D34
-	obj_tiles gFieldObjectPic_BigRegirockDoll, 0x200
-
-	.align 2
-gFieldObjectPicTable_BigRegiceDoll:: @ 8507D3C
-	obj_tiles gFieldObjectPic_BigRegiceDoll, 0x200
-
-	.align 2
-gFieldObjectPicTable_BigRegisteelDoll:: @ 8507D44
-	obj_tiles gFieldObjectPic_BigRegisteelDoll, 0x200
-
-	.align 2
-gFieldObjectPicTable_LatiasLatios:: @ 8507D4C
-	obj_tiles gFieldObjectPic_LatiasLatios_0, 0x200
-	obj_tiles gFieldObjectPic_LatiasLatios_0, 0x200
-	obj_tiles gFieldObjectPic_LatiasLatios_0, 0x200
-	obj_tiles gFieldObjectPic_LatiasLatios_1, 0x200
-	obj_tiles gFieldObjectPic_LatiasLatios_2, 0x200
-	obj_tiles gFieldObjectPic_LatiasLatios_1, 0x200
-	obj_tiles gFieldObjectPic_LatiasLatios_2, 0x200
-	obj_tiles gFieldObjectPic_LatiasLatios_1, 0x200
-	obj_tiles gFieldObjectPic_LatiasLatios_2, 0x200
-
-	.align 2
-gFieldObjectPicTable_Boy5:: @ 8507D94
-	obj_tiles gFieldObjectPic_Boy5_0, 0x100
-	obj_tiles gFieldObjectPic_Boy5_1, 0x100
-	obj_tiles gFieldObjectPic_Boy5_2, 0x100
-	obj_tiles gFieldObjectPic_Boy5_0, 0x100
-	obj_tiles gFieldObjectPic_Boy5_0, 0x100
-	obj_tiles gFieldObjectPic_Boy5_1, 0x100
-	obj_tiles gFieldObjectPic_Boy5_1, 0x100
-	obj_tiles gFieldObjectPic_Boy5_2, 0x100
-	obj_tiles gFieldObjectPic_Boy5_2, 0x100
-
-	.align 2
-gFieldObjectPicTable_ContestOldMan:: @ 8507DDC
-	obj_tiles gFieldObjectPic_ContestOldMan_0, 0x100
-	obj_tiles gFieldObjectPic_ContestOldMan_1, 0x100
-	obj_tiles gFieldObjectPic_ContestOldMan_2, 0x100
-	obj_tiles gFieldObjectPic_ContestOldMan_3, 0x100
-	obj_tiles gFieldObjectPic_ContestOldMan_4, 0x100
-	obj_tiles gFieldObjectPic_ContestOldMan_5, 0x100
-	obj_tiles gFieldObjectPic_ContestOldMan_6, 0x100
-	obj_tiles gFieldObjectPic_ContestOldMan_7, 0x100
-	obj_tiles gFieldObjectPic_ContestOldMan_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_BrendanWatering:: @ 8507E24
-	obj_tiles gFieldObjectPic_BrendanWatering_0, 0x200
-	obj_tiles gFieldObjectPic_BrendanWatering_1, 0x200
-	obj_tiles gFieldObjectPic_BrendanWatering_2, 0x200
-	obj_tiles gFieldObjectPic_BrendanWatering_3, 0x200
-	obj_tiles gFieldObjectPic_BrendanWatering_3, 0x200
-	obj_tiles gFieldObjectPic_BrendanWatering_4, 0x200
-	obj_tiles gFieldObjectPic_BrendanWatering_4, 0x200
-	obj_tiles gFieldObjectPic_BrendanWatering_5, 0x200
-	obj_tiles gFieldObjectPic_BrendanWatering_5, 0x200
-
-	.align 2
-gFieldObjectPicTable_MayWatering:: @ 8507E6C
-	obj_tiles gFieldObjectPic_MayWatering_0, 0x200
-	obj_tiles gFieldObjectPic_MayWatering_1, 0x200
-	obj_tiles gFieldObjectPic_MayWatering_2, 0x200
-	obj_tiles gFieldObjectPic_MayWatering_3, 0x200
-	obj_tiles gFieldObjectPic_MayWatering_3, 0x200
-	obj_tiles gFieldObjectPic_MayWatering_4, 0x200
-	obj_tiles gFieldObjectPic_MayWatering_4, 0x200
-	obj_tiles gFieldObjectPic_MayWatering_5, 0x200
-	obj_tiles gFieldObjectPic_MayWatering_5, 0x200
-
-	.align 2
-gFieldObjectPicTable_BrendanDecorating:: @ 8507EB4
-	obj_tiles gFieldObjectPic_BrendanDecorating, 0x100
-
-	.align 2
-gFieldObjectPicTable_MayDecorating:: @ 8507EBC
-	obj_tiles gFieldObjectPic_MayDecorating, 0x100
-
-	.align 2
-gFieldObjectPicTable_Archie:: @ 8507EC4
-	obj_tiles gFieldObjectPic_Archie_0, 0x100
-	obj_tiles gFieldObjectPic_Archie_1, 0x100
-	obj_tiles gFieldObjectPic_Archie_2, 0x100
-	obj_tiles gFieldObjectPic_Archie_3, 0x100
-	obj_tiles gFieldObjectPic_Archie_4, 0x100
-	obj_tiles gFieldObjectPic_Archie_5, 0x100
-	obj_tiles gFieldObjectPic_Archie_6, 0x100
-	obj_tiles gFieldObjectPic_Archie_7, 0x100
-	obj_tiles gFieldObjectPic_Archie_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Maxie:: @ 8507F0C
-	obj_tiles gFieldObjectPic_Maxie_0, 0x100
-	obj_tiles gFieldObjectPic_Maxie_1, 0x100
-	obj_tiles gFieldObjectPic_Maxie_2, 0x100
-	obj_tiles gFieldObjectPic_Maxie_3, 0x100
-	obj_tiles gFieldObjectPic_Maxie_4, 0x100
-	obj_tiles gFieldObjectPic_Maxie_5, 0x100
-	obj_tiles gFieldObjectPic_Maxie_6, 0x100
-	obj_tiles gFieldObjectPic_Maxie_7, 0x100
-	obj_tiles gFieldObjectPic_Maxie_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_KyogreFront:: @ 8507F54
-	obj_tiles gFieldObjectPic_KyogreFront_0, 0x200
-	obj_tiles gFieldObjectPic_KyogreFront_0, 0x200
-	obj_tiles gFieldObjectPic_KyogreFront_0, 0x200
-	obj_tiles gFieldObjectPic_KyogreFront_1, 0x200
-	obj_tiles gFieldObjectPic_KyogreFront_1, 0x200
-	obj_tiles gFieldObjectPic_KyogreFront_1, 0x200
-	obj_tiles gFieldObjectPic_KyogreFront_1, 0x200
-	obj_tiles gFieldObjectPic_KyogreFront_1, 0x200
-	obj_tiles gFieldObjectPic_KyogreFront_1, 0x200
-
-	.align 2
-gFieldObjectPicTable_GroudonFront:: @ 8507F9C
-	obj_tiles gFieldObjectPic_GroudonFront_0, 0x200
-	obj_tiles gFieldObjectPic_GroudonFront_0, 0x200
-	obj_tiles gFieldObjectPic_GroudonFront_0, 0x200
-	obj_tiles gFieldObjectPic_GroudonFront_1, 0x200
-	obj_tiles gFieldObjectPic_GroudonFront_1, 0x200
-	obj_tiles gFieldObjectPic_GroudonFront_1, 0x200
-	obj_tiles gFieldObjectPic_GroudonFront_1, 0x200
-	obj_tiles gFieldObjectPic_GroudonFront_1, 0x200
-	obj_tiles gFieldObjectPic_GroudonFront_1, 0x200
-
-	.align 2
-gFieldObjectPicTable_KyogreSide:: @ 8507FE4
-	obj_tiles gFieldObjectPic_KyogreSide_0, 0x200
-	obj_tiles gFieldObjectPic_KyogreSide_0, 0x200
-	obj_tiles gFieldObjectPic_KyogreSide_0, 0x200
-	obj_tiles gFieldObjectPic_KyogreSide_1, 0x200
-	obj_tiles gFieldObjectPic_KyogreSide_1, 0x200
-	obj_tiles gFieldObjectPic_KyogreSide_1, 0x200
-	obj_tiles gFieldObjectPic_KyogreSide_1, 0x200
-	obj_tiles gFieldObjectPic_KyogreSide_1, 0x200
-	obj_tiles gFieldObjectPic_KyogreSide_1, 0x200
-
-	.align 2
-gFieldObjectPicTable_GroudonSide:: @ 850802C
-	obj_tiles gFieldObjectPic_GroudonSide_0, 0x200
-	obj_tiles gFieldObjectPic_GroudonSide_0, 0x200
-	obj_tiles gFieldObjectPic_GroudonSide_0, 0x200
-	obj_tiles gFieldObjectPic_GroudonSide_1, 0x200
-	obj_tiles gFieldObjectPic_GroudonSide_1, 0x200
-	obj_tiles gFieldObjectPic_GroudonSide_1, 0x200
-	obj_tiles gFieldObjectPic_GroudonSide_1, 0x200
-	obj_tiles gFieldObjectPic_GroudonSide_1, 0x200
-	obj_tiles gFieldObjectPic_GroudonSide_1, 0x200
-
-	.align 2
-gFieldObjectPicTable_Fossil:: @ 8508074
-	obj_tiles gFieldObjectPic_Fossil, 0x80
-
-	.align 2
-gFieldObjectPicTable_Regi:: @ 850807C
-	obj_tiles gFieldObjectPic_Regi, 0x200
-	obj_tiles gFieldObjectPic_Regi, 0x200
-	obj_tiles gFieldObjectPic_Regi, 0x200
-	obj_tiles gFieldObjectPic_Regi, 0x200
-	obj_tiles gFieldObjectPic_Regi, 0x200
-	obj_tiles gFieldObjectPic_Regi, 0x200
-	obj_tiles gFieldObjectPic_Regi, 0x200
-	obj_tiles gFieldObjectPic_Regi, 0x200
-	obj_tiles gFieldObjectPic_Regi, 0x200
-
-	.align 2
-gFieldObjectPicTable_Skitty:: @ 85080C4
-	obj_tiles gFieldObjectPic_Skitty_0, 0x80
-	obj_tiles gFieldObjectPic_Skitty_1, 0x80
-	obj_tiles gFieldObjectPic_Skitty_2, 0x80
-	obj_tiles gFieldObjectPic_Skitty_0, 0x80
-	obj_tiles gFieldObjectPic_Skitty_0, 0x80
-	obj_tiles gFieldObjectPic_Skitty_1, 0x80
-	obj_tiles gFieldObjectPic_Skitty_1, 0x80
-	obj_tiles gFieldObjectPic_Skitty_2, 0x80
-	obj_tiles gFieldObjectPic_Skitty_2, 0x80
-
-	.align 2
-gFieldObjectPicTable_Kecleon:: @ 850810C
-	obj_tiles gFieldObjectPic_Kecleon_0, 0x80
-	obj_tiles gFieldObjectPic_Kecleon_1, 0x80
-	obj_tiles gFieldObjectPic_Kecleon_2, 0x80
-	obj_tiles gFieldObjectPic_Kecleon_0, 0x80
-	obj_tiles gFieldObjectPic_Kecleon_0, 0x80
-	obj_tiles gFieldObjectPic_Kecleon_1, 0x80
-	obj_tiles gFieldObjectPic_Kecleon_1, 0x80
-	obj_tiles gFieldObjectPic_Kecleon_2, 0x80
-	obj_tiles gFieldObjectPic_Kecleon_2, 0x80
-
-	.align 2
-gFieldObjectPicTable_Rayquaza:: @ 8508154
-	obj_tiles gFieldObjectPic_Rayquaza_0, 0x800
-	obj_tiles gFieldObjectPic_Rayquaza_1, 0x800
-	obj_tiles gFieldObjectPic_Rayquaza_2, 0x800
-	obj_tiles gFieldObjectPic_Rayquaza_3, 0x800
-	obj_tiles gFieldObjectPic_Rayquaza_4, 0x800
-
-	.align 2
-gFieldObjectPicTable_RayquazaStill:: @ 850817C
-	obj_tiles gFieldObjectPic_RayquazaStill, 0x800
-	obj_tiles gFieldObjectPic_RayquazaStill, 0x800
-	obj_tiles gFieldObjectPic_RayquazaStill, 0x800
-	obj_tiles gFieldObjectPic_RayquazaStill, 0x800
-	obj_tiles gFieldObjectPic_RayquazaStill, 0x800
-	obj_tiles gFieldObjectPic_RayquazaStill, 0x800
-	obj_tiles gFieldObjectPic_RayquazaStill, 0x800
-	obj_tiles gFieldObjectPic_RayquazaStill, 0x800
-	obj_tiles gFieldObjectPic_RayquazaStill, 0x800
-
-	.align 2
-gFieldObjectPicTable_Zigzagoon:: @ 85081C4
-	obj_tiles gFieldObjectPic_Zigzagoon_0, 0x80
-	obj_tiles gFieldObjectPic_Zigzagoon_1, 0x80
-	obj_tiles gFieldObjectPic_Zigzagoon_2, 0x80
-	obj_tiles gFieldObjectPic_Zigzagoon_0, 0x80
-	obj_tiles gFieldObjectPic_Zigzagoon_0, 0x80
-	obj_tiles gFieldObjectPic_Zigzagoon_1, 0x80
-	obj_tiles gFieldObjectPic_Zigzagoon_1, 0x80
-	obj_tiles gFieldObjectPic_Zigzagoon_2, 0x80
-	obj_tiles gFieldObjectPic_Zigzagoon_2, 0x80
-
-	.align 2
-gFieldObjectPicTable_Pikachu:: @ 850820C
-	obj_tiles gFieldObjectPic_Pikachu_0, 0x80
-	obj_tiles gFieldObjectPic_Pikachu_1, 0x80
-	obj_tiles gFieldObjectPic_Pikachu_2, 0x80
-	obj_tiles gFieldObjectPic_Pikachu_0, 0x80
-	obj_tiles gFieldObjectPic_Pikachu_0, 0x80
-	obj_tiles gFieldObjectPic_Pikachu_1, 0x80
-	obj_tiles gFieldObjectPic_Pikachu_1, 0x80
-	obj_tiles gFieldObjectPic_Pikachu_2, 0x80
-	obj_tiles gFieldObjectPic_Pikachu_2, 0x80
-
-	.align 2
-gFieldObjectPicTable_Azumarill:: @ 8508254
-	obj_tiles gFieldObjectPic_Azumarill_0, 0x80
-	obj_tiles gFieldObjectPic_Azumarill_1, 0x80
-	obj_tiles gFieldObjectPic_Azumarill_2, 0x80
-	obj_tiles gFieldObjectPic_Azumarill_0, 0x80
-	obj_tiles gFieldObjectPic_Azumarill_0, 0x80
-	obj_tiles gFieldObjectPic_Azumarill_1, 0x80
-	obj_tiles gFieldObjectPic_Azumarill_1, 0x80
-	obj_tiles gFieldObjectPic_Azumarill_2, 0x80
-	obj_tiles gFieldObjectPic_Azumarill_2, 0x80
-
-	.align 2
-gFieldObjectPicTable_Wingull:: @ 850829C
-	obj_tiles gFieldObjectPic_Wingull_0, 0x80
-	obj_tiles gFieldObjectPic_Wingull_1, 0x80
-	obj_tiles gFieldObjectPic_Wingull_2, 0x80
-	obj_tiles gFieldObjectPic_Wingull_3, 0x80
-	obj_tiles gFieldObjectPic_Wingull_3, 0x80
-	obj_tiles gFieldObjectPic_Wingull_4, 0x80
-	obj_tiles gFieldObjectPic_Wingull_4, 0x80
-	obj_tiles gFieldObjectPic_Wingull_5, 0x80
-	obj_tiles gFieldObjectPic_Wingull_5, 0x80
-
-	.align 2
-gFieldObjectPicTable_TuberMSwimming:: @ 85082E4
-	obj_tiles gFieldObjectPic_TuberMSwimming_0, 0x80
-	obj_tiles gFieldObjectPic_TuberMSwimming_1, 0x80
-	obj_tiles gFieldObjectPic_TuberMSwimming_2, 0x80
-	obj_tiles gFieldObjectPic_TuberMSwimming_3, 0x80
-	obj_tiles gFieldObjectPic_TuberMSwimming_4, 0x80
-	obj_tiles gFieldObjectPic_TuberMSwimming_5, 0x80
-	obj_tiles gFieldObjectPic_TuberMSwimming_6, 0x80
-	obj_tiles gFieldObjectPic_TuberMSwimming_7, 0x80
-	obj_tiles gFieldObjectPic_TuberMSwimming_8, 0x80
-
-	.align 2
-gFieldObjectPicTable_Azurill:: @ 850832C
-	obj_tiles gFieldObjectPic_Azurill_0, 0x80
-	obj_tiles gFieldObjectPic_Azurill_1, 0x80
-	obj_tiles gFieldObjectPic_Azurill_2, 0x80
-	obj_tiles gFieldObjectPic_Azurill_0, 0x80
-	obj_tiles gFieldObjectPic_Azurill_0, 0x80
-	obj_tiles gFieldObjectPic_Azurill_1, 0x80
-	obj_tiles gFieldObjectPic_Azurill_1, 0x80
-	obj_tiles gFieldObjectPic_Azurill_2, 0x80
-	obj_tiles gFieldObjectPic_Azurill_2, 0x80
-
-	.align 2
-gFieldObjectPicTable_Mom:: @ 8508374
-	obj_tiles gFieldObjectPic_Mom_0, 0x100
-	obj_tiles gFieldObjectPic_Mom_1, 0x100
-	obj_tiles gFieldObjectPic_Mom_2, 0x100
-	obj_tiles gFieldObjectPic_Mom_3, 0x100
-	obj_tiles gFieldObjectPic_Mom_4, 0x100
-	obj_tiles gFieldObjectPic_Mom_5, 0x100
-	obj_tiles gFieldObjectPic_Mom_6, 0x100
-	obj_tiles gFieldObjectPic_Mom_7, 0x100
-	obj_tiles gFieldObjectPic_Mom_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Scott:: @ 85083BC
-	obj_tiles gFieldObjectPic_Scott_0, 0x100
-	obj_tiles gFieldObjectPic_Scott_1, 0x100
-	obj_tiles gFieldObjectPic_Scott_2, 0x100
-	obj_tiles gFieldObjectPic_Scott_3, 0x100
-	obj_tiles gFieldObjectPic_Scott_4, 0x100
-	obj_tiles gFieldObjectPic_Scott_5, 0x100
-	obj_tiles gFieldObjectPic_Scott_6, 0x100
-	obj_tiles gFieldObjectPic_Scott_7, 0x100
-	obj_tiles gFieldObjectPic_Scott_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Juan:: @ 8508404
-	obj_tiles gFieldObjectPic_Juan_0, 0x100
-	obj_tiles gFieldObjectPic_Juan_1, 0x100
-	obj_tiles gFieldObjectPic_Juan_2, 0x100
-	obj_tiles gFieldObjectPic_Juan_3, 0x100
-	obj_tiles gFieldObjectPic_Juan_4, 0x100
-	obj_tiles gFieldObjectPic_Juan_5, 0x100
-	obj_tiles gFieldObjectPic_Juan_6, 0x100
-	obj_tiles gFieldObjectPic_Juan_7, 0x100
-	obj_tiles gFieldObjectPic_Juan_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_MysteryEventDeliveryman:: @ 850844C
-	obj_tiles gFieldObjectPic_MysteryEventDeliveryman_0, 0x100
-	obj_tiles gFieldObjectPic_MysteryEventDeliveryman_1, 0x100
-	obj_tiles gFieldObjectPic_MysteryEventDeliveryman_2, 0x100
-	obj_tiles gFieldObjectPic_MysteryEventDeliveryman_0, 0x100
-	obj_tiles gFieldObjectPic_MysteryEventDeliveryman_0, 0x100
-	obj_tiles gFieldObjectPic_MysteryEventDeliveryman_1, 0x100
-	obj_tiles gFieldObjectPic_MysteryEventDeliveryman_1, 0x100
-	obj_tiles gFieldObjectPic_MysteryEventDeliveryman_2, 0x100
-	obj_tiles gFieldObjectPic_MysteryEventDeliveryman_2, 0x100
-
-	.align 2
-gFieldObjectPicTable_Statue:: @ 8508494
-	obj_tiles gFieldObjectPic_Statue, 0x100
-
-	.align 2
-gFieldObjectPicTable_Dusclops:: @ 850849C
-	obj_tiles gFieldObjectPic_Dusclops_0, 0x100
-	obj_tiles gFieldObjectPic_Dusclops_1, 0x100
-	obj_tiles gFieldObjectPic_Dusclops_2, 0x100
-	obj_tiles gFieldObjectPic_Dusclops_3, 0x100
-	obj_tiles gFieldObjectPic_Dusclops_4, 0x100
-	obj_tiles gFieldObjectPic_Dusclops_5, 0x100
-	obj_tiles gFieldObjectPic_Dusclops_6, 0x100
-	obj_tiles gFieldObjectPic_Dusclops_7, 0x100
-	obj_tiles gFieldObjectPic_Dusclops_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Kirlia:: @ 85084E4
-	obj_tiles gFieldObjectPic_Kirlia_0, 0x100
-	obj_tiles gFieldObjectPic_Kirlia_1, 0x100
-	obj_tiles gFieldObjectPic_Kirlia_2, 0x100
-	obj_tiles gFieldObjectPic_Kirlia_3, 0x100
-	obj_tiles gFieldObjectPic_Kirlia_4, 0x100
-	obj_tiles gFieldObjectPic_Kirlia_5, 0x100
-	obj_tiles gFieldObjectPic_Kirlia_6, 0x100
-	obj_tiles gFieldObjectPic_Kirlia_7, 0x100
-	obj_tiles gFieldObjectPic_Kirlia_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_UnionRoomAttendant:: @ 850852C
-	obj_tiles gFieldObjectPic_UnionRoomAttendant_0, 0x100
-	obj_tiles gFieldObjectPic_UnionRoomAttendant_1, 0x100
-	obj_tiles gFieldObjectPic_UnionRoomAttendant_2, 0x100
-	obj_tiles gFieldObjectPic_UnionRoomAttendant_0, 0x100
-	obj_tiles gFieldObjectPic_UnionRoomAttendant_0, 0x100
-	obj_tiles gFieldObjectPic_UnionRoomAttendant_1, 0x100
-	obj_tiles gFieldObjectPic_UnionRoomAttendant_1, 0x100
-	obj_tiles gFieldObjectPic_UnionRoomAttendant_2, 0x100
-	obj_tiles gFieldObjectPic_UnionRoomAttendant_2, 0x100
-
-	.align 2
-gFieldObjectPicTable_Sudowoodo:: @ 8508574
-	obj_tiles gFieldObjectPic_Sudowoodo_0, 0x100
-	obj_tiles gFieldObjectPic_Sudowoodo_0, 0x100
-	obj_tiles gFieldObjectPic_Sudowoodo_1, 0x100
-	obj_tiles gFieldObjectPic_Sudowoodo_0, 0x100
-	obj_tiles gFieldObjectPic_Sudowoodo_0, 0x100
-	obj_tiles gFieldObjectPic_Sudowoodo_0, 0x100
-	obj_tiles gFieldObjectPic_Sudowoodo_0, 0x100
-	obj_tiles gFieldObjectPic_Sudowoodo_1, 0x100
-	obj_tiles gFieldObjectPic_Sudowoodo_2, 0x100
-
-	.align 2
-gFieldObjectPicTable_Mew:: @ 85085BC
-	obj_tiles gFieldObjectPic_Mew_0, 0x100
-	obj_tiles gFieldObjectPic_Mew_1, 0x100
-	obj_tiles gFieldObjectPic_Mew_2, 0x100
-	obj_tiles gFieldObjectPic_Mew_3, 0x100
-	obj_tiles gFieldObjectPic_Mew_4, 0x100
-	obj_tiles gFieldObjectPic_Mew_5, 0x100
-	obj_tiles gFieldObjectPic_Mew_6, 0x100
-	obj_tiles gFieldObjectPic_Mew_7, 0x100
-	obj_tiles gFieldObjectPic_Mew_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Red:: @ 8508604
-	obj_tiles gFieldObjectPic_Red_0, 0x100
-	obj_tiles gFieldObjectPic_Red_1, 0x100
-	obj_tiles gFieldObjectPic_Red_2, 0x100
-	obj_tiles gFieldObjectPic_Red_3, 0x100
-	obj_tiles gFieldObjectPic_Red_4, 0x100
-	obj_tiles gFieldObjectPic_Red_5, 0x100
-	obj_tiles gFieldObjectPic_Red_6, 0x100
-	obj_tiles gFieldObjectPic_Red_7, 0x100
-	obj_tiles gFieldObjectPic_Red_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Leaf:: @ 850864C
-	obj_tiles gFieldObjectPic_Leaf_0, 0x100
-	obj_tiles gFieldObjectPic_Leaf_1, 0x100
-	obj_tiles gFieldObjectPic_Leaf_2, 0x100
-	obj_tiles gFieldObjectPic_Leaf_3, 0x100
-	obj_tiles gFieldObjectPic_Leaf_4, 0x100
-	obj_tiles gFieldObjectPic_Leaf_5, 0x100
-	obj_tiles gFieldObjectPic_Leaf_6, 0x100
-	obj_tiles gFieldObjectPic_Leaf_7, 0x100
-	obj_tiles gFieldObjectPic_Leaf_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Deoxys:: @ 8508694
-	obj_tiles gFieldObjectPic_Deoxys_0, 0x200
-	obj_tiles gFieldObjectPic_Deoxys_0, 0x200
-	obj_tiles gFieldObjectPic_Deoxys_0, 0x200
-	obj_tiles gFieldObjectPic_Deoxys_0, 0x200
-	obj_tiles gFieldObjectPic_Deoxys_1, 0x200
-	obj_tiles gFieldObjectPic_Deoxys_0, 0x200
-	obj_tiles gFieldObjectPic_Deoxys_1, 0x200
-	obj_tiles gFieldObjectPic_Deoxys_0, 0x200
-	obj_tiles gFieldObjectPic_Deoxys_0, 0x200
-
-	.align 2
-gFieldObjectPicTable_BirthIslandStone:: @ 85086DC
-	obj_tiles gFieldObjectPic_BirthIslandStone, 0x200
-
-	.align 2
-gFieldObjectPicTable_Anabel:: @ 85086E4
-	obj_tiles gFieldObjectPic_Anabel_0, 0x100
-	obj_tiles gFieldObjectPic_Anabel_1, 0x100
-	obj_tiles gFieldObjectPic_Anabel_2, 0x100
-	obj_tiles gFieldObjectPic_Anabel_3, 0x100
-	obj_tiles gFieldObjectPic_Anabel_4, 0x100
-	obj_tiles gFieldObjectPic_Anabel_5, 0x100
-	obj_tiles gFieldObjectPic_Anabel_6, 0x100
-	obj_tiles gFieldObjectPic_Anabel_7, 0x100
-	obj_tiles gFieldObjectPic_Anabel_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Tucker:: @ 850872C
-	obj_tiles gFieldObjectPic_Tucker_0, 0x100
-	obj_tiles gFieldObjectPic_Tucker_1, 0x100
-	obj_tiles gFieldObjectPic_Tucker_2, 0x100
-	obj_tiles gFieldObjectPic_Tucker_3, 0x100
-	obj_tiles gFieldObjectPic_Tucker_4, 0x100
-	obj_tiles gFieldObjectPic_Tucker_5, 0x100
-	obj_tiles gFieldObjectPic_Tucker_6, 0x100
-	obj_tiles gFieldObjectPic_Tucker_7, 0x100
-	obj_tiles gFieldObjectPic_Tucker_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Spenser:: @ 8508774
-	obj_tiles gFieldObjectPic_Spenser_0, 0x100
-	obj_tiles gFieldObjectPic_Spenser_1, 0x100
-	obj_tiles gFieldObjectPic_Spenser_2, 0x100
-	obj_tiles gFieldObjectPic_Spenser_3, 0x100
-	obj_tiles gFieldObjectPic_Spenser_4, 0x100
-	obj_tiles gFieldObjectPic_Spenser_5, 0x100
-	obj_tiles gFieldObjectPic_Spenser_6, 0x100
-	obj_tiles gFieldObjectPic_Spenser_7, 0x100
-	obj_tiles gFieldObjectPic_Spenser_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Greta:: @ 85087BC
-	obj_tiles gFieldObjectPic_Greta_0, 0x100
-	obj_tiles gFieldObjectPic_Greta_1, 0x100
-	obj_tiles gFieldObjectPic_Greta_2, 0x100
-	obj_tiles gFieldObjectPic_Greta_3, 0x100
-	obj_tiles gFieldObjectPic_Greta_4, 0x100
-	obj_tiles gFieldObjectPic_Greta_5, 0x100
-	obj_tiles gFieldObjectPic_Greta_6, 0x100
-	obj_tiles gFieldObjectPic_Greta_7, 0x100
-	obj_tiles gFieldObjectPic_Greta_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Noland:: @ 8508804
-	obj_tiles gFieldObjectPic_Noland_0, 0x100
-	obj_tiles gFieldObjectPic_Noland_1, 0x100
-	obj_tiles gFieldObjectPic_Noland_2, 0x100
-	obj_tiles gFieldObjectPic_Noland_3, 0x100
-	obj_tiles gFieldObjectPic_Noland_4, 0x100
-	obj_tiles gFieldObjectPic_Noland_5, 0x100
-	obj_tiles gFieldObjectPic_Noland_6, 0x100
-	obj_tiles gFieldObjectPic_Noland_7, 0x100
-	obj_tiles gFieldObjectPic_Noland_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Lucy:: @ 850884C
-	obj_tiles gFieldObjectPic_Lucy_0, 0x100
-	obj_tiles gFieldObjectPic_Lucy_1, 0x100
-	obj_tiles gFieldObjectPic_Lucy_2, 0x100
-	obj_tiles gFieldObjectPic_Lucy_3, 0x100
-	obj_tiles gFieldObjectPic_Lucy_4, 0x100
-	obj_tiles gFieldObjectPic_Lucy_5, 0x100
-	obj_tiles gFieldObjectPic_Lucy_6, 0x100
-	obj_tiles gFieldObjectPic_Lucy_7, 0x100
-	obj_tiles gFieldObjectPic_Lucy_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Brandon:: @ 8508894
-	obj_tiles gFieldObjectPic_Brandon_0, 0x100
-	obj_tiles gFieldObjectPic_Brandon_1, 0x100
-	obj_tiles gFieldObjectPic_Brandon_2, 0x100
-	obj_tiles gFieldObjectPic_Brandon_3, 0x100
-	obj_tiles gFieldObjectPic_Brandon_4, 0x100
-	obj_tiles gFieldObjectPic_Brandon_5, 0x100
-	obj_tiles gFieldObjectPic_Brandon_6, 0x100
-	obj_tiles gFieldObjectPic_Brandon_7, 0x100
-	obj_tiles gFieldObjectPic_Brandon_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Lugia:: @ 85088DC
-	obj_tiles gFieldObjectPic_Lugia_0, 0x200
-	obj_tiles gFieldObjectPic_Lugia_0, 0x200
-	obj_tiles gFieldObjectPic_Lugia_0, 0x200
-	obj_tiles gFieldObjectPic_Lugia_0, 0x200
-	obj_tiles gFieldObjectPic_Lugia_1, 0x200
-	obj_tiles gFieldObjectPic_Lugia_0, 0x200
-	obj_tiles gFieldObjectPic_Lugia_1, 0x200
-	obj_tiles gFieldObjectPic_Lugia_0, 0x200
-	obj_tiles gFieldObjectPic_Lugia_1, 0x200
-
-	.align 2
-gFieldObjectPicTable_HoOh:: @ 8508924
-	obj_tiles gFieldObjectPic_HoOh_0, 0x200
-	obj_tiles gFieldObjectPic_HoOh_0, 0x200
-	obj_tiles gFieldObjectPic_HoOh_0, 0x200
-	obj_tiles gFieldObjectPic_HoOh_0, 0x200
-	obj_tiles gFieldObjectPic_HoOh_1, 0x200
-	obj_tiles gFieldObjectPic_HoOh_0, 0x200
-	obj_tiles gFieldObjectPic_HoOh_1, 0x200
-	obj_tiles gFieldObjectPic_HoOh_0, 0x200
-	obj_tiles gFieldObjectPic_HoOh_1, 0x200
-
-	.align 2
-gFieldObjectPicTable_RubySapphireBrendan:: @ 850896C
-	obj_tiles gFieldObjectPic_RubySapphireBrendan_0, 0x100
-	obj_tiles gFieldObjectPic_RubySapphireBrendan_1, 0x100
-	obj_tiles gFieldObjectPic_RubySapphireBrendan_2, 0x100
-	obj_tiles gFieldObjectPic_RubySapphireBrendan_3, 0x100
-	obj_tiles gFieldObjectPic_RubySapphireBrendan_4, 0x100
-	obj_tiles gFieldObjectPic_RubySapphireBrendan_5, 0x100
-	obj_tiles gFieldObjectPic_RubySapphireBrendan_6, 0x100
-	obj_tiles gFieldObjectPic_RubySapphireBrendan_7, 0x100
-	obj_tiles gFieldObjectPic_RubySapphireBrendan_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_RubySapphireMay:: @ 85089B4
-	obj_tiles gFieldObjectPic_RubySapphireMay_0, 0x100
-	obj_tiles gFieldObjectPic_RubySapphireMay_1, 0x100
-	obj_tiles gFieldObjectPic_RubySapphireMay_2, 0x100
-	obj_tiles gFieldObjectPic_RubySapphireMay_3, 0x100
-	obj_tiles gFieldObjectPic_RubySapphireMay_4, 0x100
-	obj_tiles gFieldObjectPic_RubySapphireMay_5, 0x100
-	obj_tiles gFieldObjectPic_RubySapphireMay_6, 0x100
-	obj_tiles gFieldObjectPic_RubySapphireMay_7, 0x100
-	obj_tiles gFieldObjectPic_RubySapphireMay_8, 0x100
diff --git a/data/map_events.s b/data/map_events.s
index 8784ee047..228380e7b 100644
--- a/data/map_events.s
+++ b/data/map_events.s
@@ -1,6 +1,6 @@
 #include "constants/flags.h"
 #include "constants/items.h"
-#include "constants/map_objects.h"
+#include "constants/event_objects.h"
 #include "constants/vars.h"
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"
diff --git a/data/map_obj_8097404.s b/data/map_obj_8097404.s
deleted file mode 100644
index 719a78266..000000000
--- a/data/map_obj_8097404.s
+++ /dev/null
@@ -1,130 +0,0 @@
-    .include "asm/macros.inc"
-    .include "constants/constants.inc"
-
-    .section .rodata
-    .align 2
-gUnknown_0850E6C4:: @ 850E6C4
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-
-    .align 2
-gUnknown_0850E704:: @ 850E704
-	.4byte double_little_steps
-	.4byte double_little_steps
-	.4byte double_little_steps
-	.4byte double_little_steps
-	.4byte double_little_steps
-	.4byte double_little_steps
-	.4byte double_little_steps
-	.4byte double_little_steps
-
-    .align 2
-gUnknown_0850E724:: @ 850E724
-	.4byte double_little_steps
-	.4byte triple_little_steps
-	.4byte triple_little_steps
-	.4byte double_little_steps
-	.4byte triple_little_steps
-	.4byte triple_little_steps
-
-    .align 2
-gUnknown_0850E73C:: @ 850E73C
-	.4byte quad_little_steps
-	.4byte quad_little_steps
-	.4byte quad_little_steps
-	.4byte quad_little_steps
-
-    .align 2
-gUnknown_0850E74C:: @ 850E74C
-	.4byte oct_little_steps
-	.4byte oct_little_steps
-
-    .align 2
-gUnknown_0850E754:: @ 850E754
-	.4byte gUnknown_0850E6C4
-	.4byte gUnknown_0850E704
-	.4byte gUnknown_0850E724
-	.4byte gUnknown_0850E73C
-	.4byte gUnknown_0850E74C
-
-    .align 1
-gUnknown_0850E768:: @ 850E768
-	.2byte 0x0010, 0x0008, 0x0006, 0x0004, 0x0002
-
-gUnknown_0850E772:: @ 850E772
-	.byte 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01
-	.byte 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00
-	.byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
-gUnknown_0850E7BA:: @ 850E7BA
-	.byte 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00
-	.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe
-
-gUnknown_0850E802:: @ 850E802
-	.byte 0xfc, 0xfa, 0xf8, 0xf6, 0xf5, 0xf4, 0xf4, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xfa, 0xfc, 0x00, 0x00
-
-gUnknown_0850E812:: @ 850E812
-	.byte 0x00, 0xfe, 0xfd, 0xfc, 0xfb, 0xfa, 0xfa, 0xfa, 0xfb, 0xfb, 0xfc, 0xfd, 0xfe, 0x00, 0x00, 0x00
-
-gUnknown_0850E822:: @ 850E822
-	.byte 0xfe, 0xfc, 0xfa, 0xf8, 0xf7, 0xf6, 0xf6, 0xf6, 0xf7, 0xf8, 0xfa, 0xfb, 0xfd, 0xfe, 0x00, 0x00
-
-    .align 2
-gUnknown_0850E834:: @ 850E834
-	.4byte gUnknown_0850E802
-	.4byte gUnknown_0850E812
-	.4byte gUnknown_0850E822
-
-    .align 1
-gUnknown_0850E840:: @ 850E840
-	.byte 0x10, 0x00, 0x10, 0x00, 0x20, 0x00
-
-    .align 1
-gUnknown_0850E846:: @ 850E846
-	.byte 0x00, 0x00, 0x01, 0x00
-
-    .align 1
-gUnknown_0850E84A:: @ 850E84A
-	.byte 0x20, 0x00, 0x20, 0x00, 0x40, 0x00
-
-    .align 1
-gUnknown_0850E850:: @ 850E850
-	.byte 0x01, 0x01, 0x02, 0x00
-
-// referenced in data/field_map_obj.s
-    .align 2
-gUnknown_0850E854::
-	.4byte sub_8097E50
-	.4byte sub_80964B8
-
-    .align 2
-gUnknown_0850E85C::
-	.4byte sub_8097EF0
-	.4byte sub_80964B8
-
-    .align 2
-gUnknown_0850E864::
-	.4byte sub_80980C0
-	.4byte sub_80980D0
-	.4byte sub_8098124
-
-    .align 2
-gUnknown_0850E870::
-	.4byte sub_80980F4
-	.4byte sub_8098108
-	.4byte sub_8098124
diff --git a/data/maps/events/AbandonedShip_CaptainsOffice.inc b/data/maps/events/AbandonedShip_CaptainsOffice.inc
index b2bc10ebb..ddfab5eab 100644
--- a/data/maps/events/AbandonedShip_CaptainsOffice.inc
+++ b/data/maps/events/AbandonedShip_CaptainsOffice.inc
@@ -1,11 +1,11 @@
-AbandonedShip_CaptainsOffice_MapObjects: @ 8536A5C
-	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 3, 4, 3, 8, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_2387E2, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 6, 3, 1, 17, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_29126E, 1100, 0, 0
+AbandonedShip_CaptainsOffice_EventObjects: @ 8536A5C
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 3, 4, 3, 8, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_2387E2, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 6, 3, 1, 17, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_29126E, 1100, 0, 0
 
 AbandonedShip_CaptainsOffice_MapWarps: @ 8536A8C
 	warp_def 7, 6, 3, 4, ABANDONED_SHIP_DECK
 	warp_def 8, 6, 3, 4, ABANDONED_SHIP_DECK
 
 AbandonedShip_CaptainsOffice_MapEvents:: @ 8536A9C
-	map_events AbandonedShip_CaptainsOffice_MapObjects, AbandonedShip_CaptainsOffice_MapWarps, 0x0, 0x0
+	map_events AbandonedShip_CaptainsOffice_EventObjects, AbandonedShip_CaptainsOffice_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/AbandonedShip_Corridors_1F.inc b/data/maps/events/AbandonedShip_Corridors_1F.inc
index a2b3b906f..c3cf0f54d 100644
--- a/data/maps/events/AbandonedShip_Corridors_1F.inc
+++ b/data/maps/events/AbandonedShip_Corridors_1F.inc
@@ -1,6 +1,6 @@
-AbandonedShip_Corridors_1F_MapObjects: @ 85366C0
-	object_event 1, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 17, 7, 3, 2, 17, 0, 0, 0, AbandonedShip_Corridors_1F_EventScript_2379A5, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TUBER_M, 0, 0, 5, 10, 3, 45, 116, 0, 1, 3, AbandonedShip_Corridors_1F_EventScript_2379AE, 0, 0, 0
+AbandonedShip_Corridors_1F_EventObjects: @ 85366C0
+	object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 17, 7, 3, 2, 17, 0, 0, 0, AbandonedShip_Corridors_1F_EventScript_2379A5, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_TUBER_M, 0, 0, 5, 10, 3, 45, 116, 0, 1, 3, AbandonedShip_Corridors_1F_EventScript_2379AE, 0, 0, 0
 
 AbandonedShip_Corridors_1F_MapWarps: @ 85366F0
 	warp_def 9, 11, 3, 2, ABANDONED_SHIP_DECK
@@ -17,5 +17,5 @@ AbandonedShip_Corridors_1F_MapWarps: @ 85366F0
 	warp_def 3, 3, 3, 2, ABANDONED_SHIP_ROOMS_2_1F
 
 AbandonedShip_Corridors_1F_MapEvents:: @ 8536750
-	map_events AbandonedShip_Corridors_1F_MapObjects, AbandonedShip_Corridors_1F_MapWarps, 0x0, 0x0
+	map_events AbandonedShip_Corridors_1F_EventObjects, AbandonedShip_Corridors_1F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/AbandonedShip_Corridors_B1F.inc b/data/maps/events/AbandonedShip_Corridors_B1F.inc
index 637e658ce..8903de197 100644
--- a/data/maps/events/AbandonedShip_Corridors_B1F.inc
+++ b/data/maps/events/AbandonedShip_Corridors_B1F.inc
@@ -1,6 +1,6 @@
-AbandonedShip_Corridors_B1F_MapObjects: @ 8536808
-	object_event 1, MAP_OBJ_GFX_TUBER_M, 0, 0, 2, 8, 3, 2, 17, 0, 0, 0, AbandonedShip_Corridors_B1F_EventScript_237DBF, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SAILOR, 0, 0, 9, 6, 3, 14, 0, 0, 1, 4, AbandonedShip_Corridors_B1F_EventScript_237E13, 0, 0, 0
+AbandonedShip_Corridors_B1F_EventObjects: @ 8536808
+	object_event 1, EVENT_OBJ_GFX_TUBER_M, 0, 0, 2, 8, 3, 2, 17, 0, 0, 0, AbandonedShip_Corridors_B1F_EventScript_237DBF, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 0, 9, 6, 3, 14, 0, 0, 1, 4, AbandonedShip_Corridors_B1F_EventScript_237E13, 0, 0, 0
 
 AbandonedShip_Corridors_B1F_MapWarps: @ 8536838
 	warp_def 6, 4, 3, 2, ABANDONED_SHIP_ROOMS_2_B1F
@@ -16,5 +16,5 @@ AbandonedShip_Corridors_B1F_MapBGEvents: @ 8536878
 	bg_event 11, 4, 3, 0, 0, AbandonedShip_Corridors_B1F_EventScript_237DC8
 
 AbandonedShip_Corridors_B1F_MapEvents:: @ 8536884
-	map_events AbandonedShip_Corridors_B1F_MapObjects, AbandonedShip_Corridors_B1F_MapWarps, 0x0, AbandonedShip_Corridors_B1F_MapBGEvents
+	map_events AbandonedShip_Corridors_B1F_EventObjects, AbandonedShip_Corridors_B1F_MapWarps, 0x0, AbandonedShip_Corridors_B1F_MapBGEvents
 
diff --git a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc b/data/maps/events/AbandonedShip_HiddenFloorRooms.inc
index 21a4370ce..27756e5a3 100644
--- a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc
+++ b/data/maps/events/AbandonedShip_HiddenFloorRooms.inc
@@ -1,8 +1,8 @@
-AbandonedShip_HiddenFloorRooms_MapObjects: @ 8536B40
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 41, 4, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_29127B, 1077, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 16, 10, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291288, 1078, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 11, 3, 1, 17, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_2912A2, 1102, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 31, 11, 3, 1, 17, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291295, 1101, 0, 0
+AbandonedShip_HiddenFloorRooms_EventObjects: @ 8536B40
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 41, 4, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_29127B, 1077, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 16, 10, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291288, 1078, 0, 0
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 11, 3, 1, 17, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_2912A2, 1102, 0, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 31, 11, 3, 1, 17, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291295, 1101, 0, 0
 
 AbandonedShip_HiddenFloorRooms_MapWarps: @ 8536BA0
 	warp_def 6, 14, 3, 0, ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
@@ -28,5 +28,5 @@ AbandonedShip_HiddenFloorRooms_MapBGEvents: @ 8536BE8
 	bg_event 24, 6, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
 
 AbandonedShip_HiddenFloorRooms_MapEvents:: @ 8536C60
-	map_events AbandonedShip_HiddenFloorRooms_MapObjects, AbandonedShip_HiddenFloorRooms_MapWarps, 0x0, AbandonedShip_HiddenFloorRooms_MapBGEvents
+	map_events AbandonedShip_HiddenFloorRooms_EventObjects, AbandonedShip_HiddenFloorRooms_MapWarps, 0x0, AbandonedShip_HiddenFloorRooms_MapBGEvents
 
diff --git a/data/maps/events/AbandonedShip_Room_B1F.inc b/data/maps/events/AbandonedShip_Room_B1F.inc
index d22e24bde..67411fcf9 100644
--- a/data/maps/events/AbandonedShip_Room_B1F.inc
+++ b/data/maps/events/AbandonedShip_Room_B1F.inc
@@ -1,10 +1,10 @@
-AbandonedShip_Room_B1F_MapObjects: @ 853697C
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, 3, 1, 17, 0, 0, 0, AbandonedShip_Room_B1F_EventScript_291254, 1098, 0, 0
+AbandonedShip_Room_B1F_EventObjects: @ 853697C
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, 3, 1, 17, 0, 0, 0, AbandonedShip_Room_B1F_EventScript_291254, 1098, 0, 0
 
 AbandonedShip_Room_B1F_MapWarps: @ 8536994
 	warp_def 4, 7, 3, 5, ABANDONED_SHIP_CORRIDORS_B1F
 	warp_def 5, 7, 3, 5, ABANDONED_SHIP_CORRIDORS_B1F
 
 AbandonedShip_Room_B1F_MapEvents:: @ 85369A4
-	map_events AbandonedShip_Room_B1F_MapObjects, AbandonedShip_Room_B1F_MapWarps, 0x0, 0x0
+	map_events AbandonedShip_Room_B1F_EventObjects, AbandonedShip_Room_B1F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/AbandonedShip_Rooms2_1F.inc b/data/maps/events/AbandonedShip_Rooms2_1F.inc
index ac5f57a53..4791919f6 100644
--- a/data/maps/events/AbandonedShip_Rooms2_1F.inc
+++ b/data/maps/events/AbandonedShip_Rooms2_1F.inc
@@ -1,9 +1,9 @@
-AbandonedShip_Rooms2_1F_MapObjects: @ 85369B8
-	object_event 1, MAP_OBJ_GFX_MAN_5, 0, 0, 7, 13, 3, 8, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_2380A7, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 0, 6, 13, 3, 8, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_23810B, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms2_1F_EventScript_291261, 1099, 0, 0
-	object_event 4, MAP_OBJ_GFX_HIKER, 0, 0, 3, 2, 3, 10, 17, 0, 1, 3, AbandonedShip_Rooms2_1F_EventScript_238186, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_TUBER_F, 0, 0, 7, 2, 3, 9, 17, 0, 1, 3, AbandonedShip_Rooms2_1F_EventScript_23816F, 0, 0, 0
+AbandonedShip_Rooms2_1F_EventObjects: @ 85369B8
+	object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 0, 7, 13, 3, 8, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_2380A7, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 6, 13, 3, 8, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_23810B, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms2_1F_EventScript_291261, 1099, 0, 0
+	object_event 4, EVENT_OBJ_GFX_HIKER, 0, 0, 3, 2, 3, 10, 17, 0, 1, 3, AbandonedShip_Rooms2_1F_EventScript_238186, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_TUBER_F, 0, 0, 7, 2, 3, 9, 17, 0, 1, 3, AbandonedShip_Rooms2_1F_EventScript_23816F, 0, 0, 0
 
 AbandonedShip_Rooms2_1F_MapWarps: @ 8536A30
 	warp_def 4, 16, 3, 8, ABANDONED_SHIP_CORRIDORS_1F
@@ -11,5 +11,5 @@ AbandonedShip_Rooms2_1F_MapWarps: @ 8536A30
 	warp_def 4, 1, 3, 11, ABANDONED_SHIP_CORRIDORS_1F
 
 AbandonedShip_Rooms2_1F_MapEvents:: @ 8536A48
-	map_events AbandonedShip_Rooms2_1F_MapObjects, AbandonedShip_Rooms2_1F_MapWarps, 0x0, 0x0
+	map_events AbandonedShip_Rooms2_1F_EventObjects, AbandonedShip_Rooms2_1F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/AbandonedShip_Rooms2_B1F.inc b/data/maps/events/AbandonedShip_Rooms2_B1F.inc
index 08846936a..e28a2ed5b 100644
--- a/data/maps/events/AbandonedShip_Rooms2_B1F.inc
+++ b/data/maps/events/AbandonedShip_Rooms2_B1F.inc
@@ -1,6 +1,6 @@
-AbandonedShip_Rooms2_B1F_MapObjects: @ 85368F4
-	object_event 1, MAP_OBJ_GFX_CAMPER, 0, 0, 3, 4, 3, 2, 17, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_238025, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 13, 3, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_291247, 1097, 0, 0
+AbandonedShip_Rooms2_B1F_EventObjects: @ 85368F4
+	object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 0, 3, 4, 3, 2, 17, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_238025, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 13, 3, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_291247, 1097, 0, 0
 
 AbandonedShip_Rooms2_B1F_MapWarps: @ 8536924
 	warp_def 4, 7, 3, 1, ABANDONED_SHIP_CORRIDORS_B1F
@@ -9,5 +9,5 @@ AbandonedShip_Rooms2_B1F_MapWarps: @ 8536924
 	warp_def 14, 7, 3, 0, ABANDONED_SHIP_CORRIDORS_B1F
 
 AbandonedShip_Rooms2_B1F_MapEvents:: @ 8536944
-	map_events AbandonedShip_Rooms2_B1F_MapObjects, AbandonedShip_Rooms2_B1F_MapWarps, 0x0, 0x0
+	map_events AbandonedShip_Rooms2_B1F_EventObjects, AbandonedShip_Rooms2_B1F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/AbandonedShip_Rooms_1F.inc b/data/maps/events/AbandonedShip_Rooms_1F.inc
index 7e358ef75..fe9b6f7da 100644
--- a/data/maps/events/AbandonedShip_Rooms_1F.inc
+++ b/data/maps/events/AbandonedShip_Rooms_1F.inc
@@ -1,8 +1,8 @@
-AbandonedShip_Rooms_1F_MapObjects: @ 8536764
-	object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 12, 5, 3, 2, 17, 0, 0, 0, AbandonedShip_Rooms_1F_EventScript_237A93, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 5, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms_1F_EventScript_29122D, 1095, 0, 0
-	object_event 3, MAP_OBJ_GFX_BEAUTY, 0, 0, 10, 11, 3, 8, 17, 0, 1, 4, AbandonedShip_Rooms_1F_EventScript_237AB3, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 10, 16, 3, 16, 17, 0, 1, 4, AbandonedShip_Rooms_1F_EventScript_237A9C, 0, 0, 0
+AbandonedShip_Rooms_1F_EventObjects: @ 8536764
+	object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 12, 5, 3, 2, 17, 0, 0, 0, AbandonedShip_Rooms_1F_EventScript_237A93, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 5, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms_1F_EventScript_29122D, 1095, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 0, 10, 11, 3, 8, 17, 0, 1, 4, AbandonedShip_Rooms_1F_EventScript_237AB3, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 10, 16, 3, 16, 17, 0, 1, 4, AbandonedShip_Rooms_1F_EventScript_237A9C, 0, 0, 0
 
 AbandonedShip_Rooms_1F_MapWarps: @ 85367C4
 	warp_def 4, 16, 3, 4, ABANDONED_SHIP_CORRIDORS_1F
@@ -13,5 +13,5 @@ AbandonedShip_Rooms_1F_MapWarps: @ 85367C4
 	warp_def 14, 16, 3, 5, ABANDONED_SHIP_CORRIDORS_1F
 
 AbandonedShip_Rooms_1F_MapEvents:: @ 85367F4
-	map_events AbandonedShip_Rooms_1F_MapObjects, AbandonedShip_Rooms_1F_MapWarps, 0x0, 0x0
+	map_events AbandonedShip_Rooms_1F_EventObjects, AbandonedShip_Rooms_1F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/AbandonedShip_Rooms_B1F.inc b/data/maps/events/AbandonedShip_Rooms_B1F.inc
index 4627c4ab7..631b33746 100644
--- a/data/maps/events/AbandonedShip_Rooms_B1F.inc
+++ b/data/maps/events/AbandonedShip_Rooms_B1F.inc
@@ -1,6 +1,6 @@
-AbandonedShip_Rooms_B1F_MapObjects: @ 8536898
-	object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 0, 25, 6, 3, 9, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_237FC6, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 7, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_29123A, 1096, 0, 0
+AbandonedShip_Rooms_B1F_EventObjects: @ 8536898
+	object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 25, 6, 3, 9, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_237FC6, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 7, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_29123A, 1096, 0, 0
 
 AbandonedShip_Rooms_B1F_MapWarps: @ 85368C8
 	warp_def 4, 1, 3, 2, ABANDONED_SHIP_CORRIDORS_B1F
@@ -8,5 +8,5 @@ AbandonedShip_Rooms_B1F_MapWarps: @ 85368C8
 	warp_def 22, 1, 3, 4, ABANDONED_SHIP_CORRIDORS_B1F
 
 AbandonedShip_Rooms_B1F_MapEvents:: @ 85368E0
-	map_events AbandonedShip_Rooms_B1F_MapObjects, AbandonedShip_Rooms_B1F_MapWarps, 0x0, 0x0
+	map_events AbandonedShip_Rooms_B1F_EventObjects, AbandonedShip_Rooms_B1F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/AncientTomb.inc b/data/maps/events/AncientTomb.inc
index 667ab3876..a0bde74e3 100644
--- a/data/maps/events/AncientTomb.inc
+++ b/data/maps/events/AncientTomb.inc
@@ -1,5 +1,5 @@
-AncientTomb_MapObjects: @ 8536CDC
-	object_event 1, MAP_OBJ_GFX_REGISTEEL, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, AncientTomb_EventScript_23905A, 937, 0, 0
+AncientTomb_EventObjects: @ 8536CDC
+	object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, AncientTomb_EventScript_23905A, 937, 0, 0
 
 AncientTomb_MapWarps: @ 8536CF4
 	warp_def 8, 29, 3, 0, ROUTE_120
@@ -12,5 +12,5 @@ AncientTomb_MapBGEvents: @ 8536D0C
 	bg_event 9, 20, 0, 0, 0, AncientTomb_EventScript_239050
 
 AncientTomb_MapEvents:: @ 8536D30
-	map_events AncientTomb_MapObjects, AncientTomb_MapWarps, 0x0, AncientTomb_MapBGEvents
+	map_events AncientTomb_EventObjects, AncientTomb_MapWarps, 0x0, AncientTomb_MapBGEvents
 
diff --git a/data/maps/events/AquaHideout_1F.inc b/data/maps/events/AquaHideout_1F.inc
index 4c418b286..d5b9f17d6 100644
--- a/data/maps/events/AquaHideout_1F.inc
+++ b/data/maps/events/AquaHideout_1F.inc
@@ -1,7 +1,7 @@
-AquaHideout_1F_MapObjects: @ 8535304
-	object_event 1, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 11, 3, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_233494, 821, 0, 0
-	object_event 2, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 14, 11, 3, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_2334C6, 822, 0, 0
-	object_event 3, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 20, 4, 3, 50, 93, 0, 1, 3, AquaHideout_1F_EventScript_2334F8, 924, 0, 0
+AquaHideout_1F_EventObjects: @ 8535304
+	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 11, 3, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_233494, 821, 0, 0
+	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 14, 11, 3, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_2334C6, 822, 0, 0
+	object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 20, 4, 3, 50, 93, 0, 1, 3, AquaHideout_1F_EventScript_2334F8, 924, 0, 0
 
 AquaHideout_1F_MapWarps: @ 853534C
 	warp_def 13, 27, 1, 6, LILYCOVE_CITY
@@ -9,5 +9,5 @@ AquaHideout_1F_MapWarps: @ 853534C
 	warp_def 22, 1, 3, 0, AQUA_HIDEOUT_B1F
 
 AquaHideout_1F_MapEvents:: @ 8535364
-	map_events AquaHideout_1F_MapObjects, AquaHideout_1F_MapWarps, 0x0, 0x0
+	map_events AquaHideout_1F_EventObjects, AquaHideout_1F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/AquaHideout_B1F.inc b/data/maps/events/AquaHideout_B1F.inc
index b62157d6f..c1b2f36b7 100644
--- a/data/maps/events/AquaHideout_B1F.inc
+++ b/data/maps/events/AquaHideout_B1F.inc
@@ -1,13 +1,13 @@
-AquaHideout_B1F_MapObjects: @ 8535378
-	object_event 1, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 28, 16, 3, 8, 0, 0, 1, 4, AquaHideout_B1F_EventScript_233A85, 924, 0, 0
-	object_event 2, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 6, 3, 9, 0, 0, 1, 5, AquaHideout_B1F_EventScript_233AB0, 924, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 29, 12, 3, 1, 0, 0, 0, 0, AquaHideout_B1F_EventScript_291372, 1071, 0, 0
-	object_event 4, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 20, 18, 3, 23, 4, 0, 1, 4, AquaHideout_B1F_EventScript_233AD5, 924, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 15, 9, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_291358, 1124, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 16, 9, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_2339EB, 977, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 15, 10, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_291365, 1132, 0, 0
-	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 16, 10, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_233A38, 978, 0, 0
-	object_event 9, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 28, 21, 3, 7, 17, 0, 1, 4, AquaHideout_B1F_EventScript_233AEC, 924, 0, 0
+AquaHideout_B1F_EventObjects: @ 8535378
+	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 28, 16, 3, 8, 0, 0, 1, 4, AquaHideout_B1F_EventScript_233A85, 924, 0, 0
+	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 6, 3, 9, 0, 0, 1, 5, AquaHideout_B1F_EventScript_233AB0, 924, 0, 0
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 29, 12, 3, 1, 0, 0, 0, 0, AquaHideout_B1F_EventScript_291372, 1071, 0, 0
+	object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 20, 18, 3, 23, 4, 0, 1, 4, AquaHideout_B1F_EventScript_233AD5, 924, 0, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 15, 9, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_291358, 1124, 0, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 16, 9, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_2339EB, 977, 0, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 15, 10, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_291365, 1132, 0, 0
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 16, 10, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_233A38, 978, 0, 0
+	object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 28, 21, 3, 7, 17, 0, 1, 4, AquaHideout_B1F_EventScript_233AEC, 924, 0, 0
 
 AquaHideout_B1F_MapWarps: @ 8535450
 	warp_def 29, 1, 3, 2, AQUA_HIDEOUT_1F
@@ -37,5 +37,5 @@ AquaHideout_B1F_MapWarps: @ 8535450
 	warp_def 48, 17, 3, 19, AQUA_HIDEOUT_B1F
 
 AquaHideout_B1F_MapEvents:: @ 8535518
-	map_events AquaHideout_B1F_MapObjects, AquaHideout_B1F_MapWarps, 0x0, 0x0
+	map_events AquaHideout_B1F_EventObjects, AquaHideout_B1F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/AquaHideout_B2F.inc b/data/maps/events/AquaHideout_B2F.inc
index 24f97a1ea..54ef390fd 100644
--- a/data/maps/events/AquaHideout_B2F.inc
+++ b/data/maps/events/AquaHideout_B2F.inc
@@ -1,10 +1,10 @@
-AquaHideout_B2F_MapObjects: @ 853552C
-	object_event 1, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 23, 19, 3, 9, 0, 0, 0, 0, AquaHideout_B2F_EventScript_233E09, 924, 0, 0
-	object_event 2, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 23, 10, 3, 45, 52, 0, 1, 3, AquaHideout_B2F_EventScript_233E8A, 924, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 13, 3, 1, 0, 0, 0, 0, AquaHideout_B2F_EventScript_29137F, 1072, 0, 0
-	object_event 4, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 0, 19, 20, 1, 9, 0, 0, 0, 0, 0x0, 943, 0, 0
-	object_event 5, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 7, 5, 3, 10, 17, 0, 1, 5, AquaHideout_B2F_EventScript_233EAF, 924, 0, 0
-	object_event 6, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 5, 3, 9, 17, 0, 1, 5, AquaHideout_B2F_EventScript_233EC6, 924, 0, 0
+AquaHideout_B2F_EventObjects: @ 853552C
+	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 23, 19, 3, 9, 0, 0, 0, 0, AquaHideout_B2F_EventScript_233E09, 924, 0, 0
+	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 23, 10, 3, 45, 52, 0, 1, 3, AquaHideout_B2F_EventScript_233E8A, 924, 0, 0
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 13, 3, 1, 0, 0, 0, 0, AquaHideout_B2F_EventScript_29137F, 1072, 0, 0
+	object_event 4, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 0, 19, 20, 1, 9, 0, 0, 0, 0, 0x0, 943, 0, 0
+	object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 7, 5, 3, 10, 17, 0, 1, 5, AquaHideout_B2F_EventScript_233EAF, 924, 0, 0
+	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 5, 3, 9, 17, 0, 1, 5, AquaHideout_B2F_EventScript_233EC6, 924, 0, 0
 
 AquaHideout_B2F_MapWarps: @ 85355BC
 	warp_def 18, 1, 3, 1, AQUA_HIDEOUT_B1F
@@ -23,5 +23,5 @@ AquaHideout_B2F_MapCoordEvents: @ 853560C
 	coord_event 28, 16, 3, 0, VAR_TEMP_1, 0, 0, AquaHideout_B2F_EventScript_233DE5
 
 AquaHideout_B2F_MapEvents:: @ 853562C
-	map_events AquaHideout_B2F_MapObjects, AquaHideout_B2F_MapWarps, AquaHideout_B2F_MapCoordEvents, 0x0
+	map_events AquaHideout_B2F_EventObjects, AquaHideout_B2F_MapWarps, AquaHideout_B2F_MapCoordEvents, 0x0
 
diff --git a/data/maps/events/ArtisanCave_1F.inc b/data/maps/events/ArtisanCave_1F.inc
index 148408aa9..e5899ef05 100644
--- a/data/maps/events/ArtisanCave_1F.inc
+++ b/data/maps/events/ArtisanCave_1F.inc
@@ -1,10 +1,10 @@
-ArtisanCave_1F_MapObjects: @ 8537774
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 14, 5, 3, 1, 17, 0, 0, 0, ArtisanCave_1F_EventScript_2914D1, 1163, 0, 0
+ArtisanCave_1F_EventObjects: @ 8537774
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 14, 5, 3, 1, 17, 0, 0, 0, ArtisanCave_1F_EventScript_2914D1, 1163, 0, 0
 
 ArtisanCave_1F_MapWarps: @ 853778C
 	warp_def 10, 17, 0, 13, BATTLE_FRONTIER_OUTSIDE_EAST
 	warp_def 6, 5, 0, 1, ARTISAN_CAVE_B1F
 
 ArtisanCave_1F_MapEvents:: @ 853779C
-	map_events ArtisanCave_1F_MapObjects, ArtisanCave_1F_MapWarps, 0x0, 0x0
+	map_events ArtisanCave_1F_EventObjects, ArtisanCave_1F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/ArtisanCave_B1F.inc b/data/maps/events/ArtisanCave_B1F.inc
index 38a978c9b..af24f4b4a 100644
--- a/data/maps/events/ArtisanCave_B1F.inc
+++ b/data/maps/events/ArtisanCave_B1F.inc
@@ -1,5 +1,5 @@
-ArtisanCave_B1F_MapObjects: @ 8537708
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 32, 38, 3, 1, 17, 0, 0, 0, ArtisanCave_B1F_EventScript_2914C4, 1162, 0, 0
+ArtisanCave_B1F_EventObjects: @ 8537708
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 32, 38, 3, 1, 17, 0, 0, 0, ArtisanCave_B1F_EventScript_2914C4, 1162, 0, 0
 
 ArtisanCave_B1F_MapWarps: @ 8537720
 	warp_def 8, 48, 0, 10, BATTLE_FRONTIER_OUTSIDE_WEST
@@ -12,5 +12,5 @@ ArtisanCave_B1F_MapBGEvents: @ 8537730
 	bg_event 19, 43, 0, 7, 0, ITEM_IRON, 104, 0
 
 ArtisanCave_B1F_MapEvents:: @ 8537760
-	map_events ArtisanCave_B1F_MapObjects, ArtisanCave_B1F_MapWarps, 0x0, ArtisanCave_B1F_MapBGEvents
+	map_events ArtisanCave_B1F_EventObjects, ArtisanCave_B1F_MapWarps, 0x0, ArtisanCave_B1F_MapBGEvents
 
diff --git a/data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc b/data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc
index fee53156b..029a59b41 100644
--- a/data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc
+++ b/data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc
@@ -1,14 +1,14 @@
-BattleFrontier_BattleArenaBattleRoom_MapObjects: @ 853C8EC
-	object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 5, 3, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 10, 3, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 5, 9, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 10, 9, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 4, 5, 3, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 11, 5, 3, 9, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_HIPSTER, 0, 0, 15, 6, 3, 9, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_TRADER, 0, 0, 0, 6, 3, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 7, 4, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+BattleFrontier_BattleArenaBattleRoom_EventObjects: @ 853C8EC
+	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 5, 3, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 10, 3, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 5, 9, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 10, 9, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 4, 5, 3, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 11, 5, 3, 9, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_HIPSTER, 0, 0, 15, 6, 3, 9, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 6, 3, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 7, 4, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
 
 BattleFrontier_BattleArenaBattleRoom_MapEvents:: @ 853C9C4
-	map_events BattleFrontier_BattleArenaBattleRoom_MapObjects, 0x0, 0x0, 0x0
+	map_events BattleFrontier_BattleArenaBattleRoom_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/BattleFrontier_BattleArenaCorridor.inc b/data/maps/events/BattleFrontier_BattleArenaCorridor.inc
index d35c35ad0..657f912e3 100644
--- a/data/maps/events/BattleFrontier_BattleArenaCorridor.inc
+++ b/data/maps/events/BattleFrontier_BattleArenaCorridor.inc
@@ -1,6 +1,6 @@
-BattleFrontier_BattleArenaCorridor_MapObjects: @ 853C8C0
-	object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 9, 12, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+BattleFrontier_BattleArenaCorridor_EventObjects: @ 853C8C0
+	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 9, 12, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
 
 BattleFrontier_BattleArenaCorridor_MapEvents:: @ 853C8D8
-	map_events BattleFrontier_BattleArenaCorridor_MapObjects, 0x0, 0x0, 0x0
+	map_events BattleFrontier_BattleArenaCorridor_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/BattleFrontier_BattleArenaLobby.inc b/data/maps/events/BattleFrontier_BattleArenaLobby.inc
index ec84dfb77..3add19881 100644
--- a/data/maps/events/BattleFrontier_BattleArenaLobby.inc
+++ b/data/maps/events/BattleFrontier_BattleArenaLobby.inc
@@ -1,9 +1,9 @@
-BattleFrontier_BattleArenaLobby_MapObjects: @ 853C814
-	object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 7, 7, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_255DF4, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 0, 2, 10, 3, 2, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560C1, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_6, 0, 0, 14, 11, 3, 9, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560AF, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_CAMPER, 0, 0, 14, 12, 3, 9, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560B8, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 14, 10, 3, 9, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560A6, 0, 0, 0
+BattleFrontier_BattleArenaLobby_EventObjects: @ 853C814
+	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 7, 7, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_255DF4, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 2, 10, 3, 2, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560C1, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_6, 0, 0, 14, 11, 3, 9, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560AF, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 0, 14, 12, 3, 9, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560B8, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 14, 10, 3, 9, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560A6, 0, 0, 0
 
 BattleFrontier_BattleArenaLobby_MapWarps: @ 853C88C
 	warp_def 7, 12, 3, 1, BATTLE_FRONTIER_OUTSIDE_EAST
@@ -13,5 +13,5 @@ BattleFrontier_BattleArenaLobby_MapBGEvents: @ 853C894
 	bg_event 1, 7, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560CA
 
 BattleFrontier_BattleArenaLobby_MapEvents:: @ 853C8AC
-	map_events BattleFrontier_BattleArenaLobby_MapObjects, BattleFrontier_BattleArenaLobby_MapWarps, 0x0, BattleFrontier_BattleArenaLobby_MapBGEvents
+	map_events BattleFrontier_BattleArenaLobby_EventObjects, BattleFrontier_BattleArenaLobby_MapWarps, 0x0, BattleFrontier_BattleArenaLobby_MapBGEvents
 
diff --git a/data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc b/data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc
index 3f0429bf2..595d14b60 100644
--- a/data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc
+++ b/data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc
@@ -1,20 +1,20 @@
-BattleFrontier_BattleDomeBattleRoom_MapObjects: @ 853C1C4
-	object_event 1, MAP_OBJ_GFX_REPORTER_M, 0, 0, 5, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 7, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_1, 0, 0, 9, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BOY_2, 0, 0, 11, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 16, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_1, 0, 0, 4, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 16, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_CAMPER, 0, 0, 8, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_MAN_2, 0, 0, 0, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_FAT_MAN, 0, 0, 12, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_GIRL_2, 0, 0, 13, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_GIRL_1, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_TRADER, 0, 0, 4, 9, 4, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_WOMAN_4, 0, 0, 14, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_HIPSTER, 0, 0, 11, 6, 0, 9, 17, 0, 0, 0, 0x0, 0, 0, 0
+BattleFrontier_BattleDomeBattleRoom_EventObjects: @ 853C1C4
+	object_event 1, EVENT_OBJ_GFX_REPORTER_M, 0, 0, 5, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 7, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 9, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 0, 11, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 16, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 0, 4, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 16, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_CAMPER, 0, 0, 8, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 0, 0, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 12, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 11, EVENT_OBJ_GFX_GIRL_2, 0, 0, 13, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 13, EVENT_OBJ_GFX_TRADER, 0, 0, 4, 9, 4, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 14, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 14, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 15, EVENT_OBJ_GFX_HIPSTER, 0, 0, 11, 6, 0, 9, 17, 0, 0, 0, 0x0, 0, 0, 0
 
 BattleFrontier_BattleDomeBattleRoom_MapEvents:: @ 853C32C
-	map_events BattleFrontier_BattleDomeBattleRoom_MapObjects, 0x0, 0x0, 0x0
+	map_events BattleFrontier_BattleDomeBattleRoom_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/BattleFrontier_BattleDomeCorridor.inc b/data/maps/events/BattleFrontier_BattleDomeCorridor.inc
index 61b6e019d..9b3f387b1 100644
--- a/data/maps/events/BattleFrontier_BattleDomeCorridor.inc
+++ b/data/maps/events/BattleFrontier_BattleDomeCorridor.inc
@@ -1,10 +1,10 @@
-BattleFrontier_BattleDomeCorridor_MapObjects: @ 853C14C
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 23, 5, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+BattleFrontier_BattleDomeCorridor_EventObjects: @ 853C14C
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 23, 5, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
 
 BattleFrontier_BattleDomeCorridor_MapWarps: @ 853C164
 	warp_def 6, 8, 3, 1, BATTLE_FRONTIER_OUTSIDE_WEST
 	warp_def 7, 8, 3, 1, BATTLE_FRONTIER_OUTSIDE_WEST
 
 BattleFrontier_BattleDomeCorridor_MapEvents:: @ 853C174
-	map_events BattleFrontier_BattleDomeCorridor_MapObjects, BattleFrontier_BattleDomeCorridor_MapWarps, 0x0, 0x0
+	map_events BattleFrontier_BattleDomeCorridor_EventObjects, BattleFrontier_BattleDomeCorridor_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/BattleFrontier_BattleDomeLobby.inc b/data/maps/events/BattleFrontier_BattleDomeLobby.inc
index 09ebc903c..59605010f 100644
--- a/data/maps/events/BattleFrontier_BattleDomeLobby.inc
+++ b/data/maps/events/BattleFrontier_BattleDomeLobby.inc
@@ -1,10 +1,10 @@
-BattleFrontier_BattleDomeLobby_MapObjects: @ 853C068
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 5, 10, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A35, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_4, 0, 0, 1, 11, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E10, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_LASS, 0, 0, 14, 14, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DFE, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_FAT_MAN, 0, 0, 18, 14, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E07, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_MANIAC, 0, 0, 8, 14, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DED, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_TEALA, 0, 0, 17, 10, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A47, 0, 0, 0
+BattleFrontier_BattleDomeLobby_EventObjects: @ 853C068
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 5, 10, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A35, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 0, 1, 11, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E10, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_LASS, 0, 0, 14, 14, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DFE, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 18, 14, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E07, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 0, 8, 14, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DED, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_TEALA, 0, 0, 17, 10, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A47, 0, 0, 0
 
 BattleFrontier_BattleDomeLobby_MapWarps: @ 853C0F8
 	warp_def 11, 16, 0, 1, BATTLE_FRONTIER_OUTSIDE_WEST
@@ -17,5 +17,5 @@ BattleFrontier_BattleDomeLobby_MapBGEvents: @ 853C108
 	bg_event 15, 10, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E34
 
 BattleFrontier_BattleDomeLobby_MapEvents:: @ 853C138
-	map_events BattleFrontier_BattleDomeLobby_MapObjects, BattleFrontier_BattleDomeLobby_MapWarps, 0x0, BattleFrontier_BattleDomeLobby_MapBGEvents
+	map_events BattleFrontier_BattleDomeLobby_EventObjects, BattleFrontier_BattleDomeLobby_MapWarps, 0x0, BattleFrontier_BattleDomeLobby_MapBGEvents
 
diff --git a/data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc b/data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc
index 6d8a8abe8..82da39a63 100644
--- a/data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc
+++ b/data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc
@@ -1,10 +1,10 @@
-BattleFrontier_BattleDomePreBattleRoom_MapObjects: @ 853C188
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 5, 2, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+BattleFrontier_BattleDomePreBattleRoom_EventObjects: @ 853C188
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 5, 2, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
 
 BattleFrontier_BattleDomePreBattleRoom_MapWarps: @ 853C1A0
 	warp_def 6, 8, 3, 1, BATTLE_FRONTIER_OUTSIDE_WEST
 	warp_def 7, 8, 3, 1, BATTLE_FRONTIER_OUTSIDE_WEST
 
 BattleFrontier_BattleDomePreBattleRoom_MapEvents:: @ 853C1B0
-	map_events BattleFrontier_BattleDomePreBattleRoom_MapObjects, BattleFrontier_BattleDomePreBattleRoom_MapWarps, 0x0, 0x0
+	map_events BattleFrontier_BattleDomePreBattleRoom_EventObjects, BattleFrontier_BattleDomePreBattleRoom_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc b/data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc
index 65ce8b684..48fd10c07 100644
--- a/data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc
+++ b/data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc
@@ -1,13 +1,13 @@
-BattleFrontier_BattleFactoryBattleRoom_MapObjects: @ 853CADC
-	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 6, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 7, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 8, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 12, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 12, 6, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 12, 8, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+BattleFrontier_BattleFactoryBattleRoom_EventObjects: @ 853CADC
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 6, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 7, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 8, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 12, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 12, 6, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 12, 8, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
 	object_event 8, 255, 0, 0, 5, 11, 0, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
 
 BattleFrontier_BattleFactoryBattleRoom_MapEvents:: @ 853CB9C
-	map_events BattleFrontier_BattleFactoryBattleRoom_MapObjects, 0x0, 0x0, 0x0
+	map_events BattleFrontier_BattleFactoryBattleRoom_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/BattleFrontier_BattleFactoryLobby.inc b/data/maps/events/BattleFrontier_BattleFactoryLobby.inc
index e9f54cb50..8d514f8a0 100644
--- a/data/maps/events/BattleFrontier_BattleFactoryLobby.inc
+++ b/data/maps/events/BattleFrontier_BattleFactoryLobby.inc
@@ -1,10 +1,10 @@
-BattleFrontier_BattleFactoryLobby_MapObjects: @ 853C9D8
-	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 7, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585CB, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_1, 0, 0, 3, 11, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258813, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_CAMPER, 0, 0, 14, 11, 0, 8, 0, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_25881C, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 0, 13, 11, 0, 10, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258825, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_FAT_MAN, 0, 0, 6, 10, 0, 1, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258830, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 14, 7, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585DD, 0, 0, 0
+BattleFrontier_BattleFactoryLobby_EventObjects: @ 853C9D8
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 7, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585CB, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 3, 11, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258813, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 0, 14, 11, 0, 8, 0, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_25881C, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 0, 13, 11, 0, 10, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258825, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 6, 10, 0, 1, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258830, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 14, 7, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585DD, 0, 0, 0
 
 BattleFrontier_BattleFactoryLobby_MapWarps: @ 853CA68
 	warp_def 9, 11, 0, 2, BATTLE_FRONTIER_OUTSIDE_WEST
@@ -16,5 +16,5 @@ BattleFrontier_BattleFactoryLobby_MapBGEvents: @ 853CA78
 	bg_event 9, 4, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258839
 
 BattleFrontier_BattleFactoryLobby_MapEvents:: @ 853CA9C
-	map_events BattleFrontier_BattleFactoryLobby_MapObjects, BattleFrontier_BattleFactoryLobby_MapWarps, 0x0, BattleFrontier_BattleFactoryLobby_MapBGEvents
+	map_events BattleFrontier_BattleFactoryLobby_EventObjects, BattleFrontier_BattleFactoryLobby_MapWarps, 0x0, BattleFrontier_BattleFactoryLobby_MapBGEvents
 
diff --git a/data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc b/data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc
index de03d5945..e1a0529fd 100644
--- a/data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc
+++ b/data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc
@@ -1,6 +1,6 @@
-BattleFrontier_BattleFactoryPreBattleRoom_MapObjects: @ 853CAB0
-	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 8, 12, 0, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
+BattleFrontier_BattleFactoryPreBattleRoom_EventObjects: @ 853CAB0
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 8, 12, 0, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
 
 BattleFrontier_BattleFactoryPreBattleRoom_MapEvents:: @ 853CAC8
-	map_events BattleFrontier_BattleFactoryPreBattleRoom_MapObjects, 0x0, 0x0, 0x0
+	map_events BattleFrontier_BattleFactoryPreBattleRoom_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc b/data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc
index 1314bbb40..b5fc13838 100644
--- a/data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc
+++ b/data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc
@@ -1,14 +1,14 @@
-BattleFrontier_BattlePalaceBattleRoom_MapObjects: @ 853C4FC
-	object_event 1, MAP_OBJ_GFX_TRADER, 0, 0, 1, 9, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 13, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 1, 4, 3, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_DUSCLOPS, 0, 0, 13, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_AZURILL, 0, 0, 13, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+BattleFrontier_BattlePalaceBattleRoom_EventObjects: @ 853C4FC
+	object_event 1, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 9, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 13, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 1, 4, 3, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_DUSCLOPS, 0, 0, 13, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_AZURILL, 0, 0, 13, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
 
 BattleFrontier_BattlePalaceBattleRoom_MapWarps: @ 853C574
 	warp_def 0, 9, 3, 2, BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR
 	warp_def 1, 9, 3, 2, BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR
 
 BattleFrontier_BattlePalaceBattleRoom_MapEvents:: @ 853C584
-	map_events BattleFrontier_BattlePalaceBattleRoom_MapObjects, BattleFrontier_BattlePalaceBattleRoom_MapWarps, 0x0, 0x0
+	map_events BattleFrontier_BattlePalaceBattleRoom_EventObjects, BattleFrontier_BattlePalaceBattleRoom_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/BattleFrontier_BattlePalaceCorridor.inc b/data/maps/events/BattleFrontier_BattlePalaceCorridor.inc
index dc86a54b8..2b6f7f251 100644
--- a/data/maps/events/BattleFrontier_BattlePalaceCorridor.inc
+++ b/data/maps/events/BattleFrontier_BattlePalaceCorridor.inc
@@ -1,11 +1,11 @@
-BattleFrontier_BattlePalaceCorridor_MapObjects: @ 853C420
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 8, 12, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_AZURILL, 0, 0, 3, 5, 0, 2, 1, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_KIRLIA, 0, 0, 12, 6, 0, 14, 32, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_PIKACHU, 0, 0, 15, 5, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 4, 9, 0, 14, 32, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_AZUMARILL, 0, 0, 13, 9, 0, 1, 16, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_WINGULL, 0, 0, 3, 10, 0, 2, 33, 0, 0, 0, 0x0, 0, 0, 0
+BattleFrontier_BattlePalaceCorridor_EventObjects: @ 853C420
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 8, 12, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 0, 3, 5, 0, 2, 1, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_KIRLIA, 0, 0, 12, 6, 0, 14, 32, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_PIKACHU, 0, 0, 15, 5, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 4, 9, 0, 14, 32, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 0, 13, 9, 0, 1, 16, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 0, 3, 10, 0, 2, 33, 0, 0, 0, 0x0, 0, 0, 0
 
 BattleFrontier_BattlePalaceCorridor_MapWarps: @ 853C4C8
 	warp_def 8, 13, 3, 2, BATTLE_FRONTIER_BATTLE_PALACE_LOBBY
@@ -14,5 +14,5 @@ BattleFrontier_BattlePalaceCorridor_MapWarps: @ 853C4C8
 	warp_def 10, 3, 3, 0, BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM
 
 BattleFrontier_BattlePalaceCorridor_MapEvents:: @ 853C4E8
-	map_events BattleFrontier_BattlePalaceCorridor_MapObjects, BattleFrontier_BattlePalaceCorridor_MapWarps, 0x0, 0x0
+	map_events BattleFrontier_BattlePalaceCorridor_EventObjects, BattleFrontier_BattlePalaceCorridor_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/BattleFrontier_BattlePalaceLobby.inc b/data/maps/events/BattleFrontier_BattlePalaceLobby.inc
index 890d545ae..318ac3c49 100644
--- a/data/maps/events/BattleFrontier_BattlePalaceLobby.inc
+++ b/data/maps/events/BattleFrontier_BattlePalaceLobby.inc
@@ -1,10 +1,10 @@
-BattleFrontier_BattlePalaceLobby_MapObjects: @ 853C340
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 6, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D944, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 11, 8, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC82, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MANIAC, 0, 0, 24, 5, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC9D, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_4, 0, 0, 18, 10, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC8B, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BEAUTY, 0, 0, 2, 10, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC94, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 19, 6, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D956, 0, 0, 0
+BattleFrontier_BattlePalaceLobby_EventObjects: @ 853C340
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 6, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D944, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 11, 8, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC82, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 0, 24, 5, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC9D, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 0, 18, 10, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC8B, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 0, 2, 10, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC94, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 19, 6, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D956, 0, 0, 0
 
 BattleFrontier_BattlePalaceLobby_MapWarps: @ 853C3D0
 	warp_def 12, 11, 0, 2, BATTLE_FRONTIER_OUTSIDE_EAST
@@ -17,5 +17,5 @@ BattleFrontier_BattlePalaceLobby_MapBGEvents: @ 853C3E8
 	bg_event 10, 4, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DCA6
 
 BattleFrontier_BattlePalaceLobby_MapEvents:: @ 853C40C
-	map_events BattleFrontier_BattlePalaceLobby_MapObjects, BattleFrontier_BattlePalaceLobby_MapWarps, 0x0, BattleFrontier_BattlePalaceLobby_MapBGEvents
+	map_events BattleFrontier_BattlePalaceLobby_EventObjects, BattleFrontier_BattlePalaceLobby_MapWarps, 0x0, BattleFrontier_BattlePalaceLobby_MapBGEvents
 
diff --git a/data/maps/events/BattleFrontier_BattlePikeCorridor.inc b/data/maps/events/BattleFrontier_BattlePikeCorridor.inc
index 2e6b8ecc7..1960c0d63 100644
--- a/data/maps/events/BattleFrontier_BattlePikeCorridor.inc
+++ b/data/maps/events/BattleFrontier_BattlePikeCorridor.inc
@@ -1,6 +1,6 @@
-BattleFrontier_BattlePikeCorridor_MapObjects: @ 853CC54
-	object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 0, 6, 6, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+BattleFrontier_BattlePikeCorridor_EventObjects: @ 853CC54
+	object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 6, 6, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
 
 BattleFrontier_BattlePikeCorridor_MapEvents:: @ 853CC6C
-	map_events BattleFrontier_BattlePikeCorridor_MapObjects, 0x0, 0x0, 0x0
+	map_events BattleFrontier_BattlePikeCorridor_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/BattleFrontier_BattlePikeLobby.inc b/data/maps/events/BattleFrontier_BattlePikeLobby.inc
index 4580d0358..6def28528 100644
--- a/data/maps/events/BattleFrontier_BattlePikeLobby.inc
+++ b/data/maps/events/BattleFrontier_BattlePikeLobby.inc
@@ -1,8 +1,8 @@
-BattleFrontier_BattlePikeLobby_MapObjects: @ 853CBB0
-	object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 0, 5, 5, 3, 8, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25B868, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIKER, 0, 0, 10, 9, 3, 7, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAAB, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 0, 5, 3, 9, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAB4, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BEAUTY, 0, 0, 8, 9, 3, 2, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BABD, 0, 0, 0
+BattleFrontier_BattlePikeLobby_EventObjects: @ 853CBB0
+	object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 5, 5, 3, 8, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25B868, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_HIKER, 0, 0, 10, 9, 3, 7, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAAB, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 0, 5, 3, 9, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAB4, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 0, 8, 9, 3, 2, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BABD, 0, 0, 0
 
 BattleFrontier_BattlePikeLobby_MapWarps: @ 853CC10
 	warp_def 5, 12, 0, 0, BATTLE_FRONTIER_OUTSIDE_WEST
@@ -14,5 +14,5 @@ BattleFrontier_BattlePikeLobby_MapBGEvents: @ 853CC28
 	bg_event 1, 3, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAC6
 
 BattleFrontier_BattlePikeLobby_MapEvents:: @ 853CC40
-	map_events BattleFrontier_BattlePikeLobby_MapObjects, BattleFrontier_BattlePikeLobby_MapWarps, 0x0, BattleFrontier_BattlePikeLobby_MapBGEvents
+	map_events BattleFrontier_BattlePikeLobby_EventObjects, BattleFrontier_BattlePikeLobby_MapWarps, 0x0, BattleFrontier_BattlePikeLobby_MapBGEvents
 
diff --git a/data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc b/data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc
index c7c3a36d0..03e0a15e4 100644
--- a/data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc
+++ b/data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc
@@ -1,6 +1,6 @@
-BattleFrontier_BattlePikeRandomRoom1_MapObjects: @ 853CD54
-	object_event 1, MAP_OBJ_GFX_HIPSTER, 0, 0, 4, 4, 3, 8, 17, 0, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TRADER, 0, 0, 3, 4, 3, 8, 17, 0, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 0, 0, 0
+BattleFrontier_BattlePikeRandomRoom1_EventObjects: @ 853CD54
+	object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 0, 4, 4, 3, 8, 17, 0, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_TRADER, 0, 0, 3, 4, 3, 8, 17, 0, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 0, 0, 0
 
 BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents: @ 853CD84
 	coord_event 4, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2
@@ -12,5 +12,5 @@ BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents: @ 853CD84
 	coord_event 5, 7, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D
 
 BattleFrontier_BattlePikeRandomRoom1_MapEvents:: @ 853CDF4
-	map_events BattleFrontier_BattlePikeRandomRoom1_MapObjects, 0x0, BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents, 0x0
+	map_events BattleFrontier_BattlePikeRandomRoom1_EventObjects, 0x0, BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents, 0x0
 
diff --git a/data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc b/data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc
index 078882617..69c213606 100644
--- a/data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc
+++ b/data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc
@@ -1,6 +1,6 @@
-BattleFrontier_BattlePikeRandomRoom2_MapObjects: @ 853CE08
-	object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 0, 2, 4, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+BattleFrontier_BattlePikeRandomRoom2_EventObjects: @ 853CE08
+	object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 2, 4, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
 
 BattleFrontier_BattlePikeRandomRoom2_MapEvents:: @ 853CE20
-	map_events BattleFrontier_BattlePikeRandomRoom2_MapObjects, 0x0, 0x0, 0x0
+	map_events BattleFrontier_BattlePikeRandomRoom2_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc b/data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc
index 7894ab85a..f2bca38c1 100644
--- a/data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc
+++ b/data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc
@@ -1,6 +1,6 @@
-BattleFrontier_BattlePikeThreePathRoom_MapObjects: @ 853CC80
-	object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 0, 4, 10, 3, 10, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_6, 0, 0, 8, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB, 0, 0, 0
+BattleFrontier_BattlePikeThreePathRoom_EventObjects: @ 853CC80
+	object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 4, 10, 3, 10, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 8, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB, 0, 0, 0
 
 BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents: @ 853CCB0
 	coord_event 2, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E
@@ -14,5 +14,5 @@ BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents: @ 853CCB0
 	coord_event 7, 10, 0, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D
 
 BattleFrontier_BattlePikeThreePathRoom_MapEvents:: @ 853CD40
-	map_events BattleFrontier_BattlePikeThreePathRoom_MapObjects, 0x0, BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents, 0x0
+	map_events BattleFrontier_BattlePikeThreePathRoom_EventObjects, 0x0, BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents, 0x0
 
diff --git a/data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc b/data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc
index 5e5a23fa4..63e7f2acd 100644
--- a/data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc
+++ b/data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc
@@ -1,13 +1,13 @@
-BattleFrontier_BattlePointExchangeServiceCorner_MapObjects: @ 853D018
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 4, 4, 0, 9, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BOY_4, 0, 0, 0, 5, 0, 10, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 0, 4, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SAILOR, 0, 0, 14, 6, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAN_6, 0, 0, 1, 9, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_TEALA, 0, 0, 5, 5, 0, 8, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_TEALA, 0, 0, 9, 5, 0, 8, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_TEALA, 0, 0, 10, 4, 0, 10, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_GIRL_1, 0, 0, 12, 10, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1, 0, 0, 0
+BattleFrontier_BattlePointExchangeServiceCorner_EventObjects: @ 853D018
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 4, 4, 0, 9, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 0, 0, 5, 0, 10, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 0, 4, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 0, 14, 6, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 0, 1, 9, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_TEALA, 0, 0, 5, 5, 0, 8, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_TEALA, 0, 0, 9, 5, 0, 8, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 4, 0, 10, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_GIRL_1, 0, 0, 12, 10, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1, 0, 0, 0
 
 BattleFrontier_BattlePointExchangeServiceCorner_MapWarps: @ 853D0F0
 	warp_def 7, 10, 0, 6, BATTLE_FRONTIER_OUTSIDE_EAST
@@ -15,5 +15,5 @@ BattleFrontier_BattlePointExchangeServiceCorner_MapWarps: @ 853D0F0
 	warp_def 8, 10, 0, 6, BATTLE_FRONTIER_OUTSIDE_EAST
 
 BattleFrontier_BattlePointExchangeServiceCorner_MapEvents:: @ 853D108
-	map_events BattleFrontier_BattlePointExchangeServiceCorner_MapObjects, BattleFrontier_BattlePointExchangeServiceCorner_MapWarps, 0x0, 0x0
+	map_events BattleFrontier_BattlePointExchangeServiceCorner_EventObjects, BattleFrontier_BattlePointExchangeServiceCorner_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc b/data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc
index aba4f907d..7d531b54b 100644
--- a/data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc
+++ b/data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc
@@ -1,21 +1,21 @@
-BattleFrontier_BattlePyramidEmptySquare_MapObjects: @ 853C62C
-	object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 0, 0, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 7, 0, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 0, 1, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 1, 1, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 3, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 4, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 5, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 6, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 7, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 2, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+BattleFrontier_BattlePyramidEmptySquare_EventObjects: @ 853C62C
+	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 0, 0, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 7, 0, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 0, 1, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 1, 1, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 11, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 3, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 12, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 4, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 13, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 5, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 14, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 6, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 15, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 7, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 16, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 2, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
 
 BattleFrontier_BattlePyramidEmptySquare_MapEvents:: @ 853C7AC
-	map_events BattleFrontier_BattlePyramidEmptySquare_MapObjects, 0x0, 0x0, 0x0
+	map_events BattleFrontier_BattlePyramidEmptySquare_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/BattleFrontier_BattlePyramidLobby.inc b/data/maps/events/BattleFrontier_BattlePyramidLobby.inc
index eb56352ed..fccb4abff 100644
--- a/data/maps/events/BattleFrontier_BattlePyramidLobby.inc
+++ b/data/maps/events/BattleFrontier_BattlePyramidLobby.inc
@@ -1,8 +1,8 @@
-BattleFrontier_BattlePyramidLobby_MapObjects: @ 853C598
-	object_event 1, MAP_OBJ_GFX_HIKER, 0, 0, 7, 12, 4, 8, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_2508B1, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 14, 13, 4, 9, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250ACE, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_4, 0, 0, 2, 15, 4, 2, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E83, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_FAT_MAN, 0, 0, 12, 16, 4, 2, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E8C, 0, 0, 0
+BattleFrontier_BattlePyramidLobby_EventObjects: @ 853C598
+	object_event 1, EVENT_OBJ_GFX_HIKER, 0, 0, 7, 12, 4, 8, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_2508B1, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 14, 13, 4, 9, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250ACE, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 2, 15, 4, 2, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E83, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 12, 16, 4, 2, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E8C, 0, 0, 0
 
 BattleFrontier_BattlePyramidLobby_MapWarps: @ 853C5F8
 	warp_def 7, 17, 4, 3, BATTLE_FRONTIER_OUTSIDE_EAST
@@ -12,5 +12,5 @@ BattleFrontier_BattlePyramidLobby_MapBGEvents: @ 853C600
 	bg_event 1, 12, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E95
 
 BattleFrontier_BattlePyramidLobby_MapEvents:: @ 853C618
-	map_events BattleFrontier_BattlePyramidLobby_MapObjects, BattleFrontier_BattlePyramidLobby_MapWarps, 0x0, BattleFrontier_BattlePyramidLobby_MapBGEvents
+	map_events BattleFrontier_BattlePyramidLobby_EventObjects, BattleFrontier_BattlePyramidLobby_MapWarps, 0x0, BattleFrontier_BattlePyramidLobby_MapBGEvents
 
diff --git a/data/maps/events/BattleFrontier_BattlePyramidTop.inc b/data/maps/events/BattleFrontier_BattlePyramidTop.inc
index 79e4770ea..a6ca1adea 100644
--- a/data/maps/events/BattleFrontier_BattlePyramidTop.inc
+++ b/data/maps/events/BattleFrontier_BattlePyramidTop.inc
@@ -1,10 +1,10 @@
-BattleFrontier_BattlePyramidTop_MapObjects: @ 853C7C0
-	object_event 1, MAP_OBJ_GFX_HIKER, 0, 0, 17, 11, 6, 8, 17, 0, 0, 3, BattleFrontier_BattlePyramidTop_EventScript_2551D0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BRANDON, 0, 0, 17, 7, 0, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
+BattleFrontier_BattlePyramidTop_EventObjects: @ 853C7C0
+	object_event 1, EVENT_OBJ_GFX_HIKER, 0, 0, 17, 11, 6, 8, 17, 0, 0, 3, BattleFrontier_BattlePyramidTop_EventScript_2551D0, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BRANDON, 0, 0, 17, 7, 0, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
 
 BattleFrontier_BattlePyramidTop_MapCoordEvents: @ 853C7F0
 	coord_event 17, 9, 4, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePyramidTop_EventScript_255256
 
 BattleFrontier_BattlePyramidTop_MapEvents:: @ 853C800
-	map_events BattleFrontier_BattlePyramidTop_MapObjects, 0x0, BattleFrontier_BattlePyramidTop_MapCoordEvents, 0x0
+	map_events BattleFrontier_BattlePyramidTop_EventObjects, 0x0, BattleFrontier_BattlePyramidTop_MapCoordEvents, 0x0
 
diff --git a/data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc b/data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc
index c9b46f8ca..af9677524 100644
--- a/data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc
+++ b/data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc
@@ -1,12 +1,12 @@
-BattleFrontier_BattleTowerBattleRoom_MapObjects: @ 853B7D0
-	object_event 1, MAP_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, 0x0, 888, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 1, 7, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 4, 8, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
+BattleFrontier_BattleTowerBattleRoom_EventObjects: @ 853B7D0
+	object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, 0x0, 888, 0, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 1, 7, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 4, 8, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
 
 BattleFrontier_BattleTowerBattleRoom_MapWarps: @ 853B818
 	warp_def 5, 8, 0, 2, BATTLE_FRONTIER_BATTLE_TOWER_LOBBY
 	warp_def 6, 8, 0, 2, BATTLE_FRONTIER_BATTLE_TOWER_LOBBY
 
 BattleFrontier_BattleTowerBattleRoom_MapEvents:: @ 853B828
-	map_events BattleFrontier_BattleTowerBattleRoom_MapObjects, BattleFrontier_BattleTowerBattleRoom_MapWarps, 0x0, 0x0
+	map_events BattleFrontier_BattleTowerBattleRoom_EventObjects, BattleFrontier_BattleTowerBattleRoom_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc b/data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc
index afab09840..2d8dcaa07 100644
--- a/data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc
+++ b/data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc
@@ -1,11 +1,11 @@
-BattleFrontier_BattleTowerBattleRoom2_MapObjects: @ 853BFC4
-	object_event 1, MAP_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, 0x0, 888, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 1, 4, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 1, 5, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_TRADER, 0, 0, 4, 1, 3, 8, 0, 0, 0, 0, 0x0, 888, 0, 0
+BattleFrontier_BattleTowerBattleRoom2_EventObjects: @ 853BFC4
+	object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, 0x0, 888, 0, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 1, 4, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 1, 5, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_TRADER, 0, 0, 4, 1, 3, 8, 0, 0, 0, 0, 0x0, 888, 0, 0
 	object_event 5, 255, 0, 0, 4, 8, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
 	object_event 6, 254, 0, 0, 5, 8, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
 
 BattleFrontier_BattleTowerBattleRoom2_MapEvents:: @ 853C054
-	map_events BattleFrontier_BattleTowerBattleRoom2_MapObjects, 0x0, 0x0, 0x0
+	map_events BattleFrontier_BattleTowerBattleRoom2_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/BattleFrontier_BattleTowerCorridor.inc b/data/maps/events/BattleFrontier_BattleTowerCorridor.inc
index 75d51fb28..a363801f0 100644
--- a/data/maps/events/BattleFrontier_BattleTowerCorridor.inc
+++ b/data/maps/events/BattleFrontier_BattleTowerCorridor.inc
@@ -1,6 +1,6 @@
-BattleFrontier_BattleTowerCorridor_MapObjects: @ 853B7A4
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 9, 2, 3, 9, 0, 0, 0, 0, 0x0, 0, 0, 0
+BattleFrontier_BattleTowerCorridor_EventObjects: @ 853B7A4
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 9, 2, 3, 9, 0, 0, 0, 0, 0x0, 0, 0, 0
 
 BattleFrontier_BattleTowerCorridor_MapEvents:: @ 853B7BC
-	map_events BattleFrontier_BattleTowerCorridor_MapObjects, 0x0, 0x0, 0x0
+	map_events BattleFrontier_BattleTowerCorridor_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/BattleFrontier_BattleTowerCorridor2.inc b/data/maps/events/BattleFrontier_BattleTowerCorridor2.inc
index 083b877ab..c2f1e30bf 100644
--- a/data/maps/events/BattleFrontier_BattleTowerCorridor2.inc
+++ b/data/maps/events/BattleFrontier_BattleTowerCorridor2.inc
@@ -1,9 +1,9 @@
-BattleFrontier_BattleTowerCorridor2_MapObjects: @ 853BF50
+BattleFrontier_BattleTowerCorridor2_EventObjects: @ 853BF50
 	object_event 1, 255, 0, 0, 1, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 14, 3, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 1, 3, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 14, 3, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 1, 3, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
 	object_event 4, 254, 0, 0, 14, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
 
 BattleFrontier_BattleTowerCorridor2_MapEvents:: @ 853BFB0
-	map_events BattleFrontier_BattleTowerCorridor2_MapObjects, 0x0, 0x0, 0x0
+	map_events BattleFrontier_BattleTowerCorridor2_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/BattleFrontier_BattleTowerElevator.inc b/data/maps/events/BattleFrontier_BattleTowerElevator.inc
index 4f2a32d89..a4dbc6afa 100644
--- a/data/maps/events/BattleFrontier_BattleTowerElevator.inc
+++ b/data/maps/events/BattleFrontier_BattleTowerElevator.inc
@@ -1,6 +1,6 @@
-BattleFrontier_BattleTowerElevator_MapObjects: @ 853B778
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 1, 5, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
+BattleFrontier_BattleTowerElevator_EventObjects: @ 853B778
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 1, 5, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
 
 BattleFrontier_BattleTowerElevator_MapEvents:: @ 853B790
-	map_events BattleFrontier_BattleTowerElevator_MapObjects, 0x0, 0x0, 0x0
+	map_events BattleFrontier_BattleTowerElevator_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/BattleFrontier_BattleTowerLobby.inc b/data/maps/events/BattleFrontier_BattleTowerLobby.inc
index 35f6e6bca..2faa6a413 100644
--- a/data/maps/events/BattleFrontier_BattleTowerLobby.inc
+++ b/data/maps/events/BattleFrontier_BattleTowerLobby.inc
@@ -1,13 +1,13 @@
-BattleFrontier_BattleTowerLobby_MapObjects: @ 853B638
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23E936, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_5, 0, 0, 23, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EEE7, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 0, 17, 8, 3, 2, 17, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFB5, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BOY_1, 0, 0, 15, 9, 3, 2, 17, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFBE, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_REPORTER_F, 0, 0, 11, 9, 3, 10, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_28CB96, 918, 0, 0
-	object_event 6, MAP_OBJ_GFX_HIPSTER, 0, 0, 1, 5, 3, 8, 17, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_2B688D, 701, 0, 0
-	object_event 7, MAP_OBJ_GFX_TEALA, 0, 0, 10, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EA9F, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_TEALA, 0, 0, 14, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EC08, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_TEALA, 0, 0, 18, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23ED74, 0, 0, 0
+BattleFrontier_BattleTowerLobby_EventObjects: @ 853B638
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23E936, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 0, 23, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EEE7, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 17, 8, 3, 2, 17, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFB5, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 0, 15, 9, 3, 2, 17, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFBE, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 11, 9, 3, 10, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_28CB96, 918, 0, 0
+	object_event 6, EVENT_OBJ_GFX_HIPSTER, 0, 0, 1, 5, 3, 8, 17, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_2B688D, 701, 0, 0
+	object_event 7, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EA9F, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_TEALA, 0, 0, 14, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EC08, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_TEALA, 0, 0, 18, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23ED74, 0, 0, 0
 
 BattleFrontier_BattleTowerLobby_MapWarps: @ 853B710
 	warp_def 12, 9, 3, 0, BATTLE_FRONTIER_OUTSIDE_EAST
@@ -22,5 +22,5 @@ BattleFrontier_BattleTowerLobby_MapBGEvents: @ 853B728
 	bg_event 2, 1, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23F4BE
 
 BattleFrontier_BattleTowerLobby_MapEvents:: @ 853B764
-	map_events BattleFrontier_BattleTowerLobby_MapObjects, BattleFrontier_BattleTowerLobby_MapWarps, 0x0, BattleFrontier_BattleTowerLobby_MapBGEvents
+	map_events BattleFrontier_BattleTowerLobby_EventObjects, BattleFrontier_BattleTowerLobby_MapWarps, 0x0, BattleFrontier_BattleTowerLobby_MapBGEvents
 
diff --git a/data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc b/data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc
index 0292088de..3d2bb6127 100644
--- a/data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc
+++ b/data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc
@@ -1,14 +1,14 @@
-BattleFrontier_BattleTowerMultiBattleRoom_MapObjects: @ 853BE64
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 11, 2, 3, 8, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 2, 10, 3, 1, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29, 711, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 17, 11, 3, 14, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB, 712, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 6, 9, 3, 1, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008, 713, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 8, 13, 3, 1, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015, 714, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 10, 11, 3, 7, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022, 715, 0, 0
-	object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 13, 10, 3, 10, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F, 716, 0, 0
+BattleFrontier_BattleTowerMultiBattleRoom_EventObjects: @ 853BE64
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 11, 2, 3, 8, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 2, 10, 3, 1, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29, 711, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 17, 11, 3, 14, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB, 712, 0, 0
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 6, 9, 3, 1, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008, 713, 0, 0
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 8, 13, 3, 1, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015, 714, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 10, 11, 3, 7, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022, 715, 0, 0
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 13, 10, 3, 10, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F, 716, 0, 0
 	object_event 8, 246, 0, 0, 15, 13, 3, 15, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C, 864, 0, 0
 	object_event 9, 247, 0, 0, 4, 12, 3, 10, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049, 865, 0, 0
 
 BattleFrontier_BattleTowerMultiBattleRoom_MapEvents:: @ 853BF3C
-	map_events BattleFrontier_BattleTowerMultiBattleRoom_MapObjects, 0x0, 0x0, 0x0
+	map_events BattleFrontier_BattleTowerMultiBattleRoom_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/BattleFrontier_Lounge1.inc b/data/maps/events/BattleFrontier_Lounge1.inc
index 748d86b6c..b00838290 100644
--- a/data/maps/events/BattleFrontier_Lounge1.inc
+++ b/data/maps/events/BattleFrontier_Lounge1.inc
@@ -1,11 +1,11 @@
-BattleFrontier_Lounge1_MapObjects: @ 853CFB4
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 0, 6, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge1_EventScript_25E775, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BOY_3, 0, 0, 7, 6, 0, 2, 33, 0, 0, 0, BattleFrontier_Lounge1_EventScript_25E94D, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_2, 0, 0, 5, 4, 0, 2, 18, 0, 0, 0, BattleFrontier_Lounge1_EventScript_25E956, 0, 0, 0
+BattleFrontier_Lounge1_EventObjects: @ 853CFB4
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 0, 6, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge1_EventScript_25E775, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 0, 7, 6, 0, 2, 33, 0, 0, 0, BattleFrontier_Lounge1_EventScript_25E94D, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 0, 5, 4, 0, 2, 18, 0, 0, 0, BattleFrontier_Lounge1_EventScript_25E956, 0, 0, 0
 
 BattleFrontier_Lounge1_MapWarps: @ 853CFFC
 	warp_def 4, 9, 0, 5, BATTLE_FRONTIER_OUTSIDE_EAST
 
 BattleFrontier_Lounge1_MapEvents:: @ 853D004
-	map_events BattleFrontier_Lounge1_MapObjects, BattleFrontier_Lounge1_MapWarps, 0x0, 0x0
+	map_events BattleFrontier_Lounge1_EventObjects, BattleFrontier_Lounge1_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/BattleFrontier_Lounge2.inc b/data/maps/events/BattleFrontier_Lounge2.inc
index c31e86ab6..0370b2a18 100644
--- a/data/maps/events/BattleFrontier_Lounge2.inc
+++ b/data/maps/events/BattleFrontier_Lounge2.inc
@@ -1,14 +1,14 @@
-BattleFrontier_Lounge2_MapObjects: @ 853D11C
-	object_event 1, MAP_OBJ_GFX_MANIAC, 0, 0, 8, 4, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_260643, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MANIAC, 0, 0, 10, 4, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_26073C, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MANIAC, 0, 0, 10, 3, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_260747, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 0, 4, 6, 0, 2, 33, 0, 0, 0, BattleFrontier_Lounge2_EventScript_26075D, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_MANIAC, 0, 0, 10, 5, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_260752, 0, 0, 0
+BattleFrontier_Lounge2_EventObjects: @ 853D11C
+	object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 8, 4, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_260643, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MANIAC, 0, 0, 10, 4, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_26073C, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 0, 10, 3, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_260747, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 0, 4, 6, 0, 2, 33, 0, 0, 0, BattleFrontier_Lounge2_EventScript_26075D, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 0, 10, 5, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_260752, 0, 0, 0
 
 BattleFrontier_Lounge2_MapWarps: @ 853D194
 	warp_def 1, 7, 0, 3, BATTLE_FRONTIER_OUTSIDE_WEST
 	warp_def 2, 7, 0, 3, BATTLE_FRONTIER_OUTSIDE_WEST
 
 BattleFrontier_Lounge2_MapEvents:: @ 853D1A4
-	map_events BattleFrontier_Lounge2_MapObjects, BattleFrontier_Lounge2_MapWarps, 0x0, 0x0
+	map_events BattleFrontier_Lounge2_EventObjects, BattleFrontier_Lounge2_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/BattleFrontier_Lounge3.inc b/data/maps/events/BattleFrontier_Lounge3.inc
index 0655cea90..6349cd381 100644
--- a/data/maps/events/BattleFrontier_Lounge3.inc
+++ b/data/maps/events/BattleFrontier_Lounge3.inc
@@ -1,13 +1,13 @@
-BattleFrontier_Lounge3_MapObjects: @ 853D1B8
-	object_event 1, MAP_OBJ_GFX_HIKER, 0, 0, 4, 6, 0, 7, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261D83, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 0, 4, 4, 0, 8, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FE1, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_3, 0, 0, 3, 5, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FC1, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_2, 0, 0, 5, 5, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FD1, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAN_4, 0, 0, 0, 6, 0, 2, 48, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FB8, 0, 0, 0
+BattleFrontier_Lounge3_EventObjects: @ 853D1B8
+	object_event 1, EVENT_OBJ_GFX_HIKER, 0, 0, 4, 6, 0, 7, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261D83, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 4, 4, 0, 8, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FE1, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 3, 5, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FC1, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 5, 5, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FD1, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 0, 0, 6, 0, 2, 48, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FB8, 0, 0, 0
 
 BattleFrontier_Lounge3_MapWarps: @ 853D230
 	warp_def 4, 9, 0, 9, BATTLE_FRONTIER_OUTSIDE_EAST
 
 BattleFrontier_Lounge3_MapEvents:: @ 853D238
-	map_events BattleFrontier_Lounge3_MapObjects, BattleFrontier_Lounge3_MapWarps, 0x0, 0x0
+	map_events BattleFrontier_Lounge3_EventObjects, BattleFrontier_Lounge3_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/BattleFrontier_Lounge4.inc b/data/maps/events/BattleFrontier_Lounge4.inc
index ae4e7c4b7..2076facee 100644
--- a/data/maps/events/BattleFrontier_Lounge4.inc
+++ b/data/maps/events/BattleFrontier_Lounge4.inc
@@ -1,11 +1,11 @@
-BattleFrontier_Lounge4_MapObjects: @ 853D24C
-	object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 0, 4, 4, 0, 7, 17, 0, 0, 0, BattleFrontier_Lounge4_EventScript_26358D, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_COOK, 0, 0, 6, 6, 0, 2, 17, 0, 0, 0, BattleFrontier_Lounge4_EventScript_263596, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 0, 5, 0, 10, 18, 0, 0, 0, BattleFrontier_Lounge4_EventScript_26359F, 0, 0, 0
+BattleFrontier_Lounge4_EventObjects: @ 853D24C
+	object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 4, 4, 0, 7, 17, 0, 0, 0, BattleFrontier_Lounge4_EventScript_26358D, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_COOK, 0, 0, 6, 6, 0, 2, 17, 0, 0, 0, BattleFrontier_Lounge4_EventScript_263596, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 0, 5, 0, 10, 18, 0, 0, 0, BattleFrontier_Lounge4_EventScript_26359F, 0, 0, 0
 
 BattleFrontier_Lounge4_MapWarps: @ 853D294
 	warp_def 4, 9, 0, 6, BATTLE_FRONTIER_OUTSIDE_WEST
 
 BattleFrontier_Lounge4_MapEvents:: @ 853D29C
-	map_events BattleFrontier_Lounge4_MapObjects, BattleFrontier_Lounge4_MapWarps, 0x0, 0x0
+	map_events BattleFrontier_Lounge4_EventObjects, BattleFrontier_Lounge4_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/BattleFrontier_Lounge5.inc b/data/maps/events/BattleFrontier_Lounge5.inc
index cc8759d1d..a8e5f97f5 100644
--- a/data/maps/events/BattleFrontier_Lounge5.inc
+++ b/data/maps/events/BattleFrontier_Lounge5.inc
@@ -1,13 +1,13 @@
-BattleFrontier_Lounge5_MapObjects: @ 853D2EC
-	object_event 1, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 12, 4, 4, 9, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_2645C6, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 0, 4, 3, 10, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_264617, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 6, 5, 0, 2, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_264620, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 11, 7, 0, 1, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_264629, 0, 0, 0
+BattleFrontier_Lounge5_EventObjects: @ 853D2EC
+	object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 12, 4, 4, 9, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_2645C6, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 0, 4, 3, 10, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_264617, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 6, 5, 0, 2, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_264620, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 11, 7, 0, 1, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_264629, 0, 0, 0
 
 BattleFrontier_Lounge5_MapWarps: @ 853D34C
 	warp_def 1, 7, 0, 7, BATTLE_FRONTIER_OUTSIDE_EAST
 	warp_def 2, 7, 0, 7, BATTLE_FRONTIER_OUTSIDE_EAST
 
 BattleFrontier_Lounge5_MapEvents:: @ 853D35C
-	map_events BattleFrontier_Lounge5_MapObjects, BattleFrontier_Lounge5_MapWarps, 0x0, 0x0
+	map_events BattleFrontier_Lounge5_EventObjects, BattleFrontier_Lounge5_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/BattleFrontier_Lounge6.inc b/data/maps/events/BattleFrontier_Lounge6.inc
index b2aa2b93f..be0db4f08 100644
--- a/data/maps/events/BattleFrontier_Lounge6.inc
+++ b/data/maps/events/BattleFrontier_Lounge6.inc
@@ -1,9 +1,9 @@
-BattleFrontier_Lounge6_MapObjects: @ 853D370
-	object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 0, 2, 4, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge6_EventScript_264FED, 0, 0, 0
+BattleFrontier_Lounge6_EventObjects: @ 853D370
+	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 0, 2, 4, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge6_EventScript_264FED, 0, 0, 0
 
 BattleFrontier_Lounge6_MapWarps: @ 853D388
 	warp_def 4, 9, 0, 8, BATTLE_FRONTIER_OUTSIDE_EAST
 
 BattleFrontier_Lounge6_MapEvents:: @ 853D390
-	map_events BattleFrontier_Lounge6_MapObjects, BattleFrontier_Lounge6_MapWarps, 0x0, 0x0
+	map_events BattleFrontier_Lounge6_EventObjects, BattleFrontier_Lounge6_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/BattleFrontier_Lounge7.inc b/data/maps/events/BattleFrontier_Lounge7.inc
index 43cb50ddf..b4e6cc5eb 100644
--- a/data/maps/events/BattleFrontier_Lounge7.inc
+++ b/data/maps/events/BattleFrontier_Lounge7.inc
@@ -1,12 +1,12 @@
-BattleFrontier_Lounge7_MapObjects: @ 853D3A4
-	object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 0, 7, 0, 2, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_2656DB, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 2, 5, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_265255, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 6, 5, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_265445, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 8, 3, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_2656E4, 0, 0, 0
+BattleFrontier_Lounge7_EventObjects: @ 853D3A4
+	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 0, 7, 0, 2, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_2656DB, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 2, 5, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_265255, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 6, 5, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_265445, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 8, 3, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_2656E4, 0, 0, 0
 
 BattleFrontier_Lounge7_MapWarps: @ 853D404
 	warp_def 4, 9, 0, 7, BATTLE_FRONTIER_OUTSIDE_WEST
 
 BattleFrontier_Lounge7_MapEvents:: @ 853D40C
-	map_events BattleFrontier_Lounge7_MapObjects, BattleFrontier_Lounge7_MapWarps, 0x0, 0x0
+	map_events BattleFrontier_Lounge7_EventObjects, BattleFrontier_Lounge7_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/BattleFrontier_Lounge8.inc b/data/maps/events/BattleFrontier_Lounge8.inc
index 0420a702f..99aa3333c 100644
--- a/data/maps/events/BattleFrontier_Lounge8.inc
+++ b/data/maps/events/BattleFrontier_Lounge8.inc
@@ -1,11 +1,11 @@
-BattleFrontier_Lounge8_MapObjects: @ 853D4BC
-	object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 4, 5, 0, 2, 34, 0, 0, 0, BattleFrontier_Lounge8_EventScript_2676DC, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_4, 0, 0, 8, 7, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge8_EventScript_2676CA, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 0, 8, 4, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge8_EventScript_2676D3, 0, 0, 0
+BattleFrontier_Lounge8_EventObjects: @ 853D4BC
+	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 4, 5, 0, 2, 34, 0, 0, 0, BattleFrontier_Lounge8_EventScript_2676DC, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 0, 8, 7, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge8_EventScript_2676CA, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 8, 4, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge8_EventScript_2676D3, 0, 0, 0
 
 BattleFrontier_Lounge8_MapWarps: @ 853D504
 	warp_def 4, 9, 0, 10, BATTLE_FRONTIER_OUTSIDE_EAST
 
 BattleFrontier_Lounge8_MapEvents:: @ 853D50C
-	map_events BattleFrontier_Lounge8_MapObjects, BattleFrontier_Lounge8_MapWarps, 0x0, 0x0
+	map_events BattleFrontier_Lounge8_EventObjects, BattleFrontier_Lounge8_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/BattleFrontier_Lounge9.inc b/data/maps/events/BattleFrontier_Lounge9.inc
index ff96fc94f..7c478fabe 100644
--- a/data/maps/events/BattleFrontier_Lounge9.inc
+++ b/data/maps/events/BattleFrontier_Lounge9.inc
@@ -1,10 +1,10 @@
-BattleFrontier_Lounge9_MapObjects: @ 853D520
-	object_event 1, MAP_OBJ_GFX_GIRL_2, 0, 0, 6, 3, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+BattleFrontier_Lounge9_EventObjects: @ 853D520
+	object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 0, 6, 3, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
 
 BattleFrontier_Lounge9_MapWarps: @ 853D538
 	warp_def 1, 9, 0, 11, BATTLE_FRONTIER_OUTSIDE_EAST
 	warp_def 2, 9, 0, 11, BATTLE_FRONTIER_OUTSIDE_EAST
 
 BattleFrontier_Lounge9_MapEvents:: @ 853D548
-	map_events BattleFrontier_Lounge9_MapObjects, BattleFrontier_Lounge9_MapWarps, 0x0, 0x0
+	map_events BattleFrontier_Lounge9_EventObjects, BattleFrontier_Lounge9_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/BattleFrontier_Mart.inc b/data/maps/events/BattleFrontier_Mart.inc
index 5ce69f2ee..969b54855 100644
--- a/data/maps/events/BattleFrontier_Mart.inc
+++ b/data/maps/events/BattleFrontier_Mart.inc
@@ -1,13 +1,13 @@
-BattleFrontier_Mart_MapObjects: @ 853D68C
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267ACC, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 0, 5, 4, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B0B, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B02, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BOY_2, 0, 0, 8, 4, 3, 9, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B20, 0, 0, 0
+BattleFrontier_Mart_EventObjects: @ 853D68C
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267ACC, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 5, 4, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B0B, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B02, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 0, 8, 4, 3, 9, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B20, 0, 0, 0
 
 BattleFrontier_Mart_MapWarps: @ 853D6EC
 	warp_def 3, 7, 0, 4, BATTLE_FRONTIER_OUTSIDE_WEST
 	warp_def 4, 7, 0, 4, BATTLE_FRONTIER_OUTSIDE_WEST
 
 BattleFrontier_Mart_MapEvents:: @ 853D6FC
-	map_events BattleFrontier_Mart_MapObjects, BattleFrontier_Mart_MapWarps, 0x0, 0x0
+	map_events BattleFrontier_Mart_EventObjects, BattleFrontier_Mart_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/BattleFrontier_OutsideEast.inc b/data/maps/events/BattleFrontier_OutsideEast.inc
index a99a7fcf0..3d7c53493 100644
--- a/data/maps/events/BattleFrontier_OutsideEast.inc
+++ b/data/maps/events/BattleFrontier_OutsideEast.inc
@@ -1,30 +1,30 @@
-BattleFrontier_OutsideEast_MapObjects: @ 853BB10
-	object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 20, 17, 0, 27, 19, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C67, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_4, 0, 0, 42, 15, 0, 2, 49, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C70, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_HIKER, 0, 0, 53, 6, 0, 8, 2, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C79, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 54, 16, 0, 2, 18, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C82, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 37, 32, 0, 7, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C8B, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_COOK, 0, 0, 41, 56, 3, 9, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C94, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 8, 46, 0, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CBB, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 34, 41, 0, 28, 19, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CE1, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_BOY_4, 0, 0, 45, 47, 3, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CB2, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 59, 35, 0, 26, 97, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CC4, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 18, 40, 0, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CCD, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_MAN_1, 0, 0, 17, 40, 0, 10, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CD6, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 40, 56, 3, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C9F, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_SUDOWOODO, 0, 0, 54, 62, 3, 8, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CEA, 842, 0, 0
-	object_event 15, MAP_OBJ_GFX_MANIAC, 0, 0, 42, 34, 3, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D79, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_GIRL_3, 0, 0, 51, 53, 3, 2, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D82, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 62, 18, 0, 46, 98, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D8B, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_MAN_4, 0, 0, 11, 21, 0, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D94, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_WOMAN_7, 0, 0, 10, 21, 0, 10, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D9D, 0, 0, 0
-	object_event 20, MAP_OBJ_GFX_WOMAN_7, 0, 0, 16, 30, 0, 2, 35, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DA6, 0, 0, 0
-	object_event 21, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 33, 14, 0, 7, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DAF, 0, 0, 0
-	object_event 22, MAP_OBJ_GFX_MANIAC, 0, 0, 54, 31, 0, 9, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DB8, 0, 0, 0
-	object_event 23, MAP_OBJ_GFX_WOMAN_5, 0, 0, 54, 32, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DC3, 0, 0, 0
-	object_event 24, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 0, 58, 55, 3, 17, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE9, 0, 0, 0
-	object_event 25, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 48, 41, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE0, 0, 0, 0
-	object_event 26, MAP_OBJ_GFX_CAMPER, 0, 0, 29, 14, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242E08, 0, 0, 0
+BattleFrontier_OutsideEast_EventObjects: @ 853BB10
+	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 20, 17, 0, 27, 19, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C67, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 0, 42, 15, 0, 2, 49, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C70, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_HIKER, 0, 0, 53, 6, 0, 8, 2, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C79, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 54, 16, 0, 2, 18, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C82, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 37, 32, 0, 7, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C8B, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_COOK, 0, 0, 41, 56, 3, 9, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C94, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 8, 46, 0, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CBB, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 34, 41, 0, 28, 19, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CE1, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_BOY_4, 0, 0, 45, 47, 3, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CB2, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 59, 35, 0, 26, 97, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CC4, 0, 0, 0
+	object_event 11, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 18, 40, 0, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CCD, 0, 0, 0
+	object_event 12, EVENT_OBJ_GFX_MAN_1, 0, 0, 17, 40, 0, 10, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CD6, 0, 0, 0
+	object_event 13, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 40, 56, 3, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C9F, 0, 0, 0
+	object_event 14, EVENT_OBJ_GFX_SUDOWOODO, 0, 0, 54, 62, 3, 8, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CEA, 842, 0, 0
+	object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 0, 42, 34, 3, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D79, 0, 0, 0
+	object_event 16, EVENT_OBJ_GFX_GIRL_3, 0, 0, 51, 53, 3, 2, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D82, 0, 0, 0
+	object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 62, 18, 0, 46, 98, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D8B, 0, 0, 0
+	object_event 18, EVENT_OBJ_GFX_MAN_4, 0, 0, 11, 21, 0, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D94, 0, 0, 0
+	object_event 19, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 10, 21, 0, 10, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D9D, 0, 0, 0
+	object_event 20, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 16, 30, 0, 2, 35, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DA6, 0, 0, 0
+	object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 33, 14, 0, 7, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DAF, 0, 0, 0
+	object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 0, 54, 31, 0, 9, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DB8, 0, 0, 0
+	object_event 23, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 54, 32, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DC3, 0, 0, 0
+	object_event 24, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 58, 55, 3, 17, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE9, 0, 0, 0
+	object_event 25, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 48, 41, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE0, 0, 0, 0
+	object_event 26, EVENT_OBJ_GFX_CAMPER, 0, 0, 29, 14, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242E08, 0, 0, 0
 
 BattleFrontier_OutsideEast_MapWarps: @ 853BD80
 	warp_def 16, 14, 0, 0, BATTLE_FRONTIER_BATTLE_TOWER_LOBBY
@@ -53,5 +53,5 @@ BattleFrontier_OutsideEast_MapBGEvents: @ 853BDF0
 	bg_event 5, 51, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_271E73
 
 BattleFrontier_OutsideEast_MapEvents:: @ 853BE50
-	map_events BattleFrontier_OutsideEast_MapObjects, BattleFrontier_OutsideEast_MapWarps, 0x0, BattleFrontier_OutsideEast_MapBGEvents
+	map_events BattleFrontier_OutsideEast_EventObjects, BattleFrontier_OutsideEast_MapWarps, 0x0, BattleFrontier_OutsideEast_MapBGEvents
 
diff --git a/data/maps/events/BattleFrontier_OutsideWest.inc b/data/maps/events/BattleFrontier_OutsideWest.inc
index e6f2eef7d..7923af813 100644
--- a/data/maps/events/BattleFrontier_OutsideWest.inc
+++ b/data/maps/events/BattleFrontier_OutsideWest.inc
@@ -1,28 +1,28 @@
-BattleFrontier_OutsideWest_MapObjects: @ 853B350
-	object_event 1, MAP_OBJ_GFX_BOY_2, 0, 0, 26, 38, 0, 2, 34, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D50F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 0, 20, 70, 0, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BEAUTY, 0, 0, 19, 68, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D3F0, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 26, 20, 0, 5, 8, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D68B, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAN_4, 0, 0, 27, 30, 0, 2, 49, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D52D, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_WOMAN_7, 0, 0, 33, 41, 0, 2, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D69D, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_FAT_MAN, 0, 0, 28, 43, 0, 3, 48, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6A6, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 17, 20, 0, 2, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D679, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_MANIAC, 0, 0, 13, 44, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D536, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_MANIAC, 0, 0, 14, 44, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D53D, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_MAN_6, 0, 0, 23, 47, 0, 15, 34, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D694, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_GIRL_1, 0, 0, 38, 27, 0, 2, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D5C6, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_WOMAN_4, 0, 0, 45, 18, 0, 3, 49, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D635, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_CAMPER, 0, 0, 9, 47, 0, 15, 33, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D57F, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_LASS, 0, 0, 35, 5, 0, 2, 18, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D682, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_MAN_2, 0, 0, 11, 66, 0, 9, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_249E19, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_FISHERMAN, 0, 0, 31, 31, 0, 8, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D667, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_FISHERMAN, 0, 0, 42, 48, 0, 18, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D518, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_FAT_MAN, 0, 0, 38, 22, 0, 3, 48, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6AF, 0, 0, 0
-	object_event 20, MAP_OBJ_GFX_WOMAN_3, 0, 0, 12, 9, 0, 8, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6B8, 0, 0, 0
-	object_event 21, MAP_OBJ_GFX_BOY_1, 0, 0, 12, 10, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6C3, 0, 0, 0
-	object_event 22, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 11, 10, 0, 23, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6CE, 0, 0, 0
-	object_event 23, MAP_OBJ_GFX_MAN_5, 0, 0, 8, 5, 0, 8, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6D7, 0, 0, 0
-	object_event 24, MAP_OBJ_GFX_WOMAN_2, 0, 0, 4, 26, 0, 24, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6EE, 0, 0, 0
+BattleFrontier_OutsideWest_EventObjects: @ 853B350
+	object_event 1, EVENT_OBJ_GFX_BOY_2, 0, 0, 26, 38, 0, 2, 34, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D50F, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 0, 20, 70, 0, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 0, 19, 68, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D3F0, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 26, 20, 0, 5, 8, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D68B, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 0, 27, 30, 0, 2, 49, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D52D, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 33, 41, 0, 2, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D69D, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 28, 43, 0, 3, 48, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6A6, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 17, 20, 0, 2, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D679, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 0, 13, 44, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D536, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 0, 14, 44, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D53D, 0, 0, 0
+	object_event 11, EVENT_OBJ_GFX_MAN_6, 0, 0, 23, 47, 0, 15, 34, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D694, 0, 0, 0
+	object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 0, 38, 27, 0, 2, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D5C6, 0, 0, 0
+	object_event 13, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 45, 18, 0, 3, 49, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D635, 0, 0, 0
+	object_event 14, EVENT_OBJ_GFX_CAMPER, 0, 0, 9, 47, 0, 15, 33, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D57F, 0, 0, 0
+	object_event 15, EVENT_OBJ_GFX_LASS, 0, 0, 35, 5, 0, 2, 18, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D682, 0, 0, 0
+	object_event 16, EVENT_OBJ_GFX_MAN_2, 0, 0, 11, 66, 0, 9, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_249E19, 0, 0, 0
+	object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 31, 31, 0, 8, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D667, 0, 0, 0
+	object_event 18, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 42, 48, 0, 18, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D518, 0, 0, 0
+	object_event 19, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 38, 22, 0, 3, 48, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6AF, 0, 0, 0
+	object_event 20, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 12, 9, 0, 8, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6B8, 0, 0, 0
+	object_event 21, EVENT_OBJ_GFX_BOY_1, 0, 0, 12, 10, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6C3, 0, 0, 0
+	object_event 22, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 11, 10, 0, 23, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6CE, 0, 0, 0
+	object_event 23, EVENT_OBJ_GFX_MAN_5, 0, 0, 8, 5, 0, 8, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6D7, 0, 0, 0
+	object_event 24, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 4, 26, 0, 24, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6EE, 0, 0, 0
 
 BattleFrontier_OutsideWest_MapWarps: @ 853B590
 	warp_def 42, 27, 0, 0, BATTLE_FRONTIER_BATTLE_PIKE_LOBBY
@@ -45,5 +45,5 @@ BattleFrontier_OutsideWest_MapBGEvents: @ 853B5E8
 	bg_event 53, 51, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_271E6A
 
 BattleFrontier_OutsideWest_MapEvents:: @ 853B624
-	map_events BattleFrontier_OutsideWest_MapObjects, BattleFrontier_OutsideWest_MapWarps, 0x0, BattleFrontier_OutsideWest_MapBGEvents
+	map_events BattleFrontier_OutsideWest_EventObjects, BattleFrontier_OutsideWest_MapWarps, 0x0, BattleFrontier_OutsideWest_MapBGEvents
 
diff --git a/data/maps/events/BattleFrontier_PokemonCenter_1F.inc b/data/maps/events/BattleFrontier_PokemonCenter_1F.inc
index 0a8974135..262744ce1 100644
--- a/data/maps/events/BattleFrontier_PokemonCenter_1F.inc
+++ b/data/maps/events/BattleFrontier_PokemonCenter_1F.inc
@@ -1,9 +1,9 @@
-BattleFrontier_PokemonCenter_1F_MapObjects: @ 853D55C
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267908, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 4, 5, 3, 14, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267916, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 11, 4, 3, 8, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_26791F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 0, 2, 3, 3, 9, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267928, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_SKITTY, 0, 0, 1, 3, 3, 10, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267931, 0, 0, 0
+BattleFrontier_PokemonCenter_1F_EventObjects: @ 853D55C
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267908, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 4, 5, 3, 14, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267916, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 11, 4, 3, 8, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_26791F, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 0, 2, 3, 3, 9, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267928, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_SKITTY, 0, 0, 1, 3, 3, 10, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267931, 0, 0, 0
 
 BattleFrontier_PokemonCenter_1F_MapWarps: @ 853D5D4
 	warp_def 7, 8, 3, 12, BATTLE_FRONTIER_OUTSIDE_EAST
@@ -11,5 +11,5 @@ BattleFrontier_PokemonCenter_1F_MapWarps: @ 853D5D4
 	warp_def 1, 6, 4, 0, BATTLE_FRONTIER_POKEMON_CENTER_2F
 
 BattleFrontier_PokemonCenter_1F_MapEvents:: @ 853D5EC
-	map_events BattleFrontier_PokemonCenter_1F_MapObjects, BattleFrontier_PokemonCenter_1F_MapWarps, 0x0, 0x0
+	map_events BattleFrontier_PokemonCenter_1F_EventObjects, BattleFrontier_PokemonCenter_1F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/BattleFrontier_PokemonCenter_2F.inc b/data/maps/events/BattleFrontier_PokemonCenter_2F.inc
index 44d40453f..f9d9d408a 100644
--- a/data/maps/events/BattleFrontier_PokemonCenter_2F.inc
+++ b/data/maps/events/BattleFrontier_PokemonCenter_2F.inc
@@ -1,8 +1,8 @@
-BattleFrontier_PokemonCenter_2F_MapObjects: @ 853D600
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
+BattleFrontier_PokemonCenter_2F_EventObjects: @ 853D600
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273761, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273767, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
 
 BattleFrontier_PokemonCenter_2F_MapWarps: @ 853D660
 	warp_def 1, 6, 4, 2, BATTLE_FRONTIER_POKEMON_CENTER_1F
@@ -10,5 +10,5 @@ BattleFrontier_PokemonCenter_2F_MapWarps: @ 853D660
 	warp_def 9, 1, 3, 0, TRADE_CENTER
 
 BattleFrontier_PokemonCenter_2F_MapEvents:: @ 853D678
-	map_events BattleFrontier_PokemonCenter_2F_MapObjects, BattleFrontier_PokemonCenter_2F_MapWarps, 0x0, 0x0
+	map_events BattleFrontier_PokemonCenter_2F_EventObjects, BattleFrontier_PokemonCenter_2F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/BattleFrontier_RankingHall.inc b/data/maps/events/BattleFrontier_RankingHall.inc
index 853f83ab7..81058b042 100644
--- a/data/maps/events/BattleFrontier_RankingHall.inc
+++ b/data/maps/events/BattleFrontier_RankingHall.inc
@@ -1,7 +1,7 @@
-BattleFrontier_RankingHall_MapObjects: @ 853CEB8
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 24, 13, 3, 8, 17, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E52F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 4, 10, 3, 2, 17, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E54A, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_3, 0, 0, 44, 11, 3, 2, 17, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E573, 0, 0, 0
+BattleFrontier_RankingHall_EventObjects: @ 853CEB8
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 24, 13, 3, 8, 17, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E52F, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 4, 10, 3, 2, 17, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E54A, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 0, 44, 11, 3, 2, 17, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E573, 0, 0, 0
 
 BattleFrontier_RankingHall_MapWarps: @ 853CF00
 	warp_def 26, 14, 3, 4, BATTLE_FRONTIER_OUTSIDE_EAST
@@ -22,5 +22,5 @@ BattleFrontier_RankingHall_MapBGEvents: @ 853CF10
 	bg_event 36, 8, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E541
 
 BattleFrontier_RankingHall_MapEvents:: @ 853CFA0
-	map_events BattleFrontier_RankingHall_MapObjects, BattleFrontier_RankingHall_MapWarps, 0x0, BattleFrontier_RankingHall_MapBGEvents
+	map_events BattleFrontier_RankingHall_EventObjects, BattleFrontier_RankingHall_MapWarps, 0x0, BattleFrontier_RankingHall_MapBGEvents
 
diff --git a/data/maps/events/BattleFrontier_ReceptionGate.inc b/data/maps/events/BattleFrontier_ReceptionGate.inc
index 641723257..8984c44a0 100644
--- a/data/maps/events/BattleFrontier_ReceptionGate.inc
+++ b/data/maps/events/BattleFrontier_ReceptionGate.inc
@@ -1,14 +1,14 @@
-BattleFrontier_ReceptionGate_MapObjects: @ 853D420
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 0, 11, 0, 10, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_2662FC, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 8, 11, 0, 9, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_266310, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_2, 0, 0, 8, 4, 0, 9, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_266436, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SCOTT, 0, 0, 4, 5, 3, 8, 17, 0, 0, 0, 0x0, 836, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAN_2, 0, 0, 0, 4, 0, 10, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_2664F4, 0, 0, 0
+BattleFrontier_ReceptionGate_EventObjects: @ 853D420
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 0, 11, 0, 10, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_2662FC, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 8, 11, 0, 9, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_266310, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_2, 0, 0, 8, 4, 0, 9, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_266436, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 0, 4, 5, 3, 8, 17, 0, 0, 0, 0x0, 836, 0, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 0, 0, 4, 0, 10, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_2664F4, 0, 0, 0
 
 BattleFrontier_ReceptionGate_MapWarps: @ 853D498
 	warp_def 4, 13, 0, 8, BATTLE_FRONTIER_OUTSIDE_WEST
 	warp_def 4, 1, 0, 9, BATTLE_FRONTIER_OUTSIDE_WEST
 
 BattleFrontier_ReceptionGate_MapEvents:: @ 853D4A8
-	map_events BattleFrontier_ReceptionGate_MapObjects, BattleFrontier_ReceptionGate_MapWarps, 0x0, 0x0
+	map_events BattleFrontier_ReceptionGate_EventObjects, BattleFrontier_ReceptionGate_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/BattleFrontier_ScottsHouse.inc b/data/maps/events/BattleFrontier_ScottsHouse.inc
index fd9f2f522..4ea329ab9 100644
--- a/data/maps/events/BattleFrontier_ScottsHouse.inc
+++ b/data/maps/events/BattleFrontier_ScottsHouse.inc
@@ -1,10 +1,10 @@
-BattleFrontier_ScottsHouse_MapObjects: @ 853D2B0
-	object_event 1, MAP_OBJ_GFX_SCOTT, 0, 0, 2, 3, 3, 1, 17, 0, 0, 0, BattleFrontier_ScottsHouse_EventScript_2636A8, 0, 0, 0
+BattleFrontier_ScottsHouse_EventObjects: @ 853D2B0
+	object_event 1, EVENT_OBJ_GFX_SCOTT, 0, 0, 2, 3, 3, 1, 17, 0, 0, 0, BattleFrontier_ScottsHouse_EventScript_2636A8, 0, 0, 0
 
 BattleFrontier_ScottsHouse_MapWarps: @ 853D2C8
 	warp_def 2, 7, 3, 5, BATTLE_FRONTIER_OUTSIDE_WEST
 	warp_def 3, 7, 3, 5, BATTLE_FRONTIER_OUTSIDE_WEST
 
 BattleFrontier_ScottsHouse_MapEvents:: @ 853D2D8
-	map_events BattleFrontier_ScottsHouse_MapObjects, BattleFrontier_ScottsHouse_MapWarps, 0x0, 0x0
+	map_events BattleFrontier_ScottsHouse_EventObjects, BattleFrontier_ScottsHouse_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/BattlePyramidSquare01.inc b/data/maps/events/BattlePyramidSquare01.inc
index f3c260243..0226b4fdb 100644
--- a/data/maps/events/BattlePyramidSquare01.inc
+++ b/data/maps/events/BattlePyramidSquare01.inc
@@ -1,12 +1,12 @@
-BattlePyramidSquare01_MapObjects: @ 853A460
-	object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 2, 3, 4, 18, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 5, 3, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_4, 0, 0, 2, 6, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BOY_2, 0, 0, 6, 6, 4, 9, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 4, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+BattlePyramidSquare01_EventObjects: @ 853A460
+	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 2, 3, 4, 18, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 5, 3, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 0, 2, 6, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 0, 6, 6, 4, 9, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 4, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
 
 BattlePyramidSquare01_MapEvents:: @ 853A508
-	map_events BattlePyramidSquare01_MapObjects, 0x0, 0x0, 0x0
+	map_events BattlePyramidSquare01_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/BattlePyramidSquare02.inc b/data/maps/events/BattlePyramidSquare02.inc
index 790fb67a0..8b14a4a47 100644
--- a/data/maps/events/BattlePyramidSquare02.inc
+++ b/data/maps/events/BattlePyramidSquare02.inc
@@ -1,12 +1,12 @@
-BattlePyramidSquare02_MapObjects: @ 853A51C
-	object_event 1, MAP_OBJ_GFX_BOY_3, 0, 0, 2, 1, 4, 18, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 5, 6, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 0, 2, 6, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 5, 1, 4, 17, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+BattlePyramidSquare02_EventObjects: @ 853A51C
+	object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 0, 2, 1, 4, 18, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 5, 6, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 2, 6, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 5, 1, 4, 17, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
 
 BattlePyramidSquare02_MapEvents:: @ 853A5C4
-	map_events BattlePyramidSquare02_MapObjects, 0x0, 0x0, 0x0
+	map_events BattlePyramidSquare02_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/BattlePyramidSquare03.inc b/data/maps/events/BattlePyramidSquare03.inc
index a8c8c59a7..4b7713426 100644
--- a/data/maps/events/BattlePyramidSquare03.inc
+++ b/data/maps/events/BattlePyramidSquare03.inc
@@ -1,12 +1,12 @@
-BattlePyramidSquare03_MapObjects: @ 853A5D8
-	object_event 1, MAP_OBJ_GFX_BOY_1, 0, 0, 2, 1, 4, 18, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 6, 1, 4, 17, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_FISHERMAN, 0, 0, 6, 4, 4, 15, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_4, 0, 0, 3, 4, 4, 18, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 2, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+BattlePyramidSquare03_EventObjects: @ 853A5D8
+	object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 0, 2, 1, 4, 18, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 6, 1, 4, 17, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 6, 4, 4, 15, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 0, 3, 4, 4, 18, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
 
 BattlePyramidSquare03_MapEvents:: @ 853A680
-	map_events BattlePyramidSquare03_MapObjects, 0x0, 0x0, 0x0
+	map_events BattlePyramidSquare03_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/BattlePyramidSquare04.inc b/data/maps/events/BattlePyramidSquare04.inc
index ca836e2b5..dd35fcc43 100644
--- a/data/maps/events/BattlePyramidSquare04.inc
+++ b/data/maps/events/BattlePyramidSquare04.inc
@@ -1,12 +1,12 @@
-BattlePyramidSquare04_MapObjects: @ 853A694
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 7, 2, 4, 17, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_1, 0, 0, 7, 7, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_4, 0, 0, 1, 4, 4, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 0, 6, 4, 4, 15, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 2, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+BattlePyramidSquare04_EventObjects: @ 853A694
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 7, 2, 4, 17, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 0, 7, 7, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 0, 1, 4, 4, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 6, 4, 4, 15, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
 
 BattlePyramidSquare04_MapEvents:: @ 853A73C
-	map_events BattlePyramidSquare04_MapObjects, 0x0, 0x0, 0x0
+	map_events BattlePyramidSquare04_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/BattlePyramidSquare05.inc b/data/maps/events/BattlePyramidSquare05.inc
index 0486f6283..766ee7626 100644
--- a/data/maps/events/BattlePyramidSquare05.inc
+++ b/data/maps/events/BattlePyramidSquare05.inc
@@ -1,12 +1,12 @@
-BattlePyramidSquare05_MapObjects: @ 853A750
-	object_event 1, MAP_OBJ_GFX_BOY_2, 0, 0, 6, 4, 4, 7, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BOY_2, 0, 0, 3, 7, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_2, 0, 0, 3, 1, 4, 8, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BOY_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+BattlePyramidSquare05_EventObjects: @ 853A750
+	object_event 1, EVENT_OBJ_GFX_BOY_2, 0, 0, 6, 4, 4, 7, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 0, 3, 7, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 0, 3, 1, 4, 8, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
 
 BattlePyramidSquare05_MapEvents:: @ 853A7F8
-	map_events BattlePyramidSquare05_MapObjects, 0x0, 0x0, 0x0
+	map_events BattlePyramidSquare05_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/BattlePyramidSquare06.inc b/data/maps/events/BattlePyramidSquare06.inc
index 65d2f2576..64ab2e226 100644
--- a/data/maps/events/BattlePyramidSquare06.inc
+++ b/data/maps/events/BattlePyramidSquare06.inc
@@ -1,12 +1,12 @@
-BattlePyramidSquare06_MapObjects: @ 853A80C
-	object_event 1, MAP_OBJ_GFX_GIRL_2, 0, 0, 5, 2, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_2, 0, 0, 2, 5, 4, 16, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GIRL_2, 0, 0, 5, 5, 4, 15, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_GIRL_2, 0, 0, 2, 2, 4, 18, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+BattlePyramidSquare06_EventObjects: @ 853A80C
+	object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 0, 5, 2, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 0, 2, 5, 4, 16, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 0, 5, 5, 4, 15, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_GIRL_2, 0, 0, 2, 2, 4, 18, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
 
 BattlePyramidSquare06_MapEvents:: @ 853A8B4
-	map_events BattlePyramidSquare06_MapObjects, 0x0, 0x0, 0x0
+	map_events BattlePyramidSquare06_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/BattlePyramidSquare07.inc b/data/maps/events/BattlePyramidSquare07.inc
index 9a71e2a0b..a3a0734f1 100644
--- a/data/maps/events/BattlePyramidSquare07.inc
+++ b/data/maps/events/BattlePyramidSquare07.inc
@@ -1,12 +1,12 @@
-BattlePyramidSquare07_MapObjects: @ 853A8C8
-	object_event 1, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 0, 6, 4, 10, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 4, 0, 4, 17, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 6, 0, 4, 8, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 4, 4, 4, 15, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+BattlePyramidSquare07_EventObjects: @ 853A8C8
+	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 0, 6, 4, 10, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 4, 0, 4, 17, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 6, 0, 4, 8, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 4, 4, 4, 15, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
 
 BattlePyramidSquare07_MapEvents:: @ 853A970
-	map_events BattlePyramidSquare07_MapObjects, 0x0, 0x0, 0x0
+	map_events BattlePyramidSquare07_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/BattlePyramidSquare08.inc b/data/maps/events/BattlePyramidSquare08.inc
index 52a8d4911..dfcfdb451 100644
--- a/data/maps/events/BattlePyramidSquare08.inc
+++ b/data/maps/events/BattlePyramidSquare08.inc
@@ -1,12 +1,12 @@
-BattlePyramidSquare08_MapObjects: @ 853A984
-	object_event 1, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 1, 2, 4, 18, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 6, 5, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 1, 5, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 6, 2, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+BattlePyramidSquare08_EventObjects: @ 853A984
+	object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 1, 2, 4, 18, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 6, 5, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 1, 5, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 6, 2, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
 
 BattlePyramidSquare08_MapEvents:: @ 853AA2C
-	map_events BattlePyramidSquare08_MapObjects, 0x0, 0x0, 0x0
+	map_events BattlePyramidSquare08_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/BattlePyramidSquare09.inc b/data/maps/events/BattlePyramidSquare09.inc
index bc90aa649..dc4ab38ee 100644
--- a/data/maps/events/BattlePyramidSquare09.inc
+++ b/data/maps/events/BattlePyramidSquare09.inc
@@ -1,12 +1,12 @@
-BattlePyramidSquare09_MapObjects: @ 853AA40
-	object_event 1, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 3, 0, 4, 8, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 6, 4, 4, 15, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 3, 5, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+BattlePyramidSquare09_EventObjects: @ 853AA40
+	object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 3, 0, 4, 8, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 6, 4, 4, 15, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 3, 5, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
 
 BattlePyramidSquare09_MapEvents:: @ 853AAE8
-	map_events BattlePyramidSquare09_MapObjects, 0x0, 0x0, 0x0
+	map_events BattlePyramidSquare09_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/BattlePyramidSquare10.inc b/data/maps/events/BattlePyramidSquare10.inc
index 013cd7be6..9e87c6b06 100644
--- a/data/maps/events/BattlePyramidSquare10.inc
+++ b/data/maps/events/BattlePyramidSquare10.inc
@@ -1,12 +1,12 @@
-BattlePyramidSquare10_MapObjects: @ 853AAFC
-	object_event 1, MAP_OBJ_GFX_GIRL_3, 0, 0, 3, 0, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 0, 3, 4, 10, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 0, 6, 5, 4, 9, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 0, 0, 5, 4, 10, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+BattlePyramidSquare10_EventObjects: @ 853AAFC
+	object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 0, 3, 0, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 0, 3, 4, 10, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 0, 6, 5, 4, 9, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 0, 5, 4, 10, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
 
 BattlePyramidSquare10_MapEvents:: @ 853ABA4
-	map_events BattlePyramidSquare10_MapObjects, 0x0, 0x0, 0x0
+	map_events BattlePyramidSquare10_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/BattlePyramidSquare11.inc b/data/maps/events/BattlePyramidSquare11.inc
index 96dc118e5..b0ce15fb5 100644
--- a/data/maps/events/BattlePyramidSquare11.inc
+++ b/data/maps/events/BattlePyramidSquare11.inc
@@ -1,12 +1,12 @@
-BattlePyramidSquare11_MapObjects: @ 853ABB8
-	object_event 1, MAP_OBJ_GFX_BOY_4, 0, 0, 3, 2, 4, 8, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BOY_4, 0, 0, 3, 6, 4, 14, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_4, 0, 0, 6, 4, 4, 8, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BOY_4, 0, 0, 6, 7, 4, 7, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+BattlePyramidSquare11_EventObjects: @ 853ABB8
+	object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 0, 3, 2, 4, 8, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 0, 3, 6, 4, 14, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 0, 6, 4, 4, 8, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 0, 6, 7, 4, 7, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
 
 BattlePyramidSquare11_MapEvents:: @ 853AC60
-	map_events BattlePyramidSquare11_MapObjects, 0x0, 0x0, 0x0
+	map_events BattlePyramidSquare11_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/BattlePyramidSquare12.inc b/data/maps/events/BattlePyramidSquare12.inc
index 10b301d6c..08783200f 100644
--- a/data/maps/events/BattlePyramidSquare12.inc
+++ b/data/maps/events/BattlePyramidSquare12.inc
@@ -1,12 +1,12 @@
-BattlePyramidSquare12_MapObjects: @ 853AC74
-	object_event 1, MAP_OBJ_GFX_WOMAN_1, 0, 0, 7, 5, 4, 9, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_1, 0, 0, 0, 5, 4, 10, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_1, 0, 0, 3, 0, 4, 8, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_1, 0, 0, 3, 3, 4, 7, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+BattlePyramidSquare12_EventObjects: @ 853AC74
+	object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 7, 5, 4, 9, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 0, 5, 4, 10, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 3, 0, 4, 8, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 3, 3, 4, 7, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
 
 BattlePyramidSquare12_MapEvents:: @ 853AD1C
-	map_events BattlePyramidSquare12_MapObjects, 0x0, 0x0, 0x0
+	map_events BattlePyramidSquare12_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/BattlePyramidSquare13.inc b/data/maps/events/BattlePyramidSquare13.inc
index 0a83a5441..a930160cb 100644
--- a/data/maps/events/BattlePyramidSquare13.inc
+++ b/data/maps/events/BattlePyramidSquare13.inc
@@ -1,12 +1,12 @@
-BattlePyramidSquare13_MapObjects: @ 853AD30
-	object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 0, 5, 1, 4, 8, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 0, 5, 6, 4, 7, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 0, 1, 1, 4, 8, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_FAT_MAN, 0, 0, 1, 6, 4, 7, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+BattlePyramidSquare13_EventObjects: @ 853AD30
+	object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 5, 1, 4, 8, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 5, 6, 4, 7, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 1, 1, 4, 8, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 1, 6, 4, 7, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
 
 BattlePyramidSquare13_MapEvents:: @ 853ADD8
-	map_events BattlePyramidSquare13_MapObjects, 0x0, 0x0, 0x0
+	map_events BattlePyramidSquare13_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/BattlePyramidSquare14.inc b/data/maps/events/BattlePyramidSquare14.inc
index 599219cf1..a81c9b5e0 100644
--- a/data/maps/events/BattlePyramidSquare14.inc
+++ b/data/maps/events/BattlePyramidSquare14.inc
@@ -1,12 +1,12 @@
-BattlePyramidSquare14_MapObjects: @ 853ADEC
-	object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 7, 1, 4, 17, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 1, 1, 4, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 5, 4, 15, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_2, 0, 0, 0, 5, 4, 16, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+BattlePyramidSquare14_EventObjects: @ 853ADEC
+	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 7, 1, 4, 17, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 1, 1, 4, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 6, 5, 4, 15, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 0, 5, 4, 16, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
 
 BattlePyramidSquare14_MapEvents:: @ 853AE94
-	map_events BattlePyramidSquare14_MapObjects, 0x0, 0x0, 0x0
+	map_events BattlePyramidSquare14_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/BattlePyramidSquare15.inc b/data/maps/events/BattlePyramidSquare15.inc
index ef92bec9a..fe0d085bd 100644
--- a/data/maps/events/BattlePyramidSquare15.inc
+++ b/data/maps/events/BattlePyramidSquare15.inc
@@ -1,12 +1,12 @@
-BattlePyramidSquare15_MapObjects: @ 853AEA8
-	object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 2, 5, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 2, 1, 4, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 4, 4, 15, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+BattlePyramidSquare15_EventObjects: @ 853AEA8
+	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 2, 5, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 2, 1, 4, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 6, 4, 4, 15, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
 
 BattlePyramidSquare15_MapEvents:: @ 853AF50
-	map_events BattlePyramidSquare15_MapObjects, 0x0, 0x0, 0x0
+	map_events BattlePyramidSquare15_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/BattlePyramidSquare16.inc b/data/maps/events/BattlePyramidSquare16.inc
index 1d7e44f70..11abe791d 100644
--- a/data/maps/events/BattlePyramidSquare16.inc
+++ b/data/maps/events/BattlePyramidSquare16.inc
@@ -1,12 +1,12 @@
-BattlePyramidSquare16_MapObjects: @ 853AF64
-	object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 0, 6, 4, 16, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 1, 0, 0, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 7, 4, 15, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+BattlePyramidSquare16_EventObjects: @ 853AF64
+	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 0, 6, 4, 16, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 1, 0, 0, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 6, 7, 4, 15, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
 
 BattlePyramidSquare16_MapEvents:: @ 853B00C
-	map_events BattlePyramidSquare16_MapObjects, 0x0, 0x0, 0x0
+	map_events BattlePyramidSquare16_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/BirthIsland_Exterior.inc b/data/maps/events/BirthIsland_Exterior.inc
index 457d86314..1d6238e8f 100644
--- a/data/maps/events/BirthIsland_Exterior.inc
+++ b/data/maps/events/BirthIsland_Exterior.inc
@@ -1,10 +1,10 @@
-BirthIsland_Exterior_MapObjects: @ 853D7DC
-	object_event 1, MAP_OBJ_GFX_DEOXYS_TRIANGLE, 0, 0, 15, 12, 3, 8, 17, 0, 0, 0, BirthIsland_Exterior_EventScript_267F83, 764, 0, 0
-	object_event 2, MAP_OBJ_GFX_DEOXYS, 0, 0, 15, 3, 0, 8, 17, 0, 0, 0, 0x0, 763, 0, 0
+BirthIsland_Exterior_EventObjects: @ 853D7DC
+	object_event 1, EVENT_OBJ_GFX_DEOXYS_TRIANGLE, 0, 0, 15, 12, 3, 8, 17, 0, 0, 0, BirthIsland_Exterior_EventScript_267F83, 764, 0, 0
+	object_event 2, EVENT_OBJ_GFX_DEOXYS, 0, 0, 15, 3, 0, 8, 17, 0, 0, 0, 0x0, 763, 0, 0
 
 BirthIsland_Exterior_MapWarps: @ 853D80C
 	warp_def 15, 24, 0, 0, BIRTH_ISLAND_HARBOR
 
 BirthIsland_Exterior_MapEvents:: @ 853D814
-	map_events BirthIsland_Exterior_MapObjects, BirthIsland_Exterior_MapWarps, 0x0, 0x0
+	map_events BirthIsland_Exterior_EventObjects, BirthIsland_Exterior_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/BirthIsland_Harbor.inc b/data/maps/events/BirthIsland_Harbor.inc
index e035d2f44..bb2d6036d 100644
--- a/data/maps/events/BirthIsland_Harbor.inc
+++ b/data/maps/events/BirthIsland_Harbor.inc
@@ -1,10 +1,10 @@
-BirthIsland_Harbor_MapObjects: @ 853D828
-	object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 8, 5, 0, 7, 17, 0, 0, 0, BirthIsland_Harbor_EventScript_26805D, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 0, 8, 7, 1, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
+BirthIsland_Harbor_EventObjects: @ 853D828
+	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 8, 5, 0, 7, 17, 0, 0, 0, BirthIsland_Harbor_EventScript_26805D, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 0, 8, 7, 1, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
 
 BirthIsland_Harbor_MapWarps: @ 853D858
 	warp_def 8, 2, 0, 0, BIRTH_ISLAND_EXTERIOR
 
 BirthIsland_Harbor_MapEvents:: @ 853D860
-	map_events BirthIsland_Harbor_MapObjects, BirthIsland_Harbor_MapWarps, 0x0, 0x0
+	map_events BirthIsland_Harbor_EventObjects, BirthIsland_Harbor_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/CaveOfOrigin_B1F.inc b/data/maps/events/CaveOfOrigin_B1F.inc
index 9c6cc18c6..148bb22a6 100644
--- a/data/maps/events/CaveOfOrigin_B1F.inc
+++ b/data/maps/events/CaveOfOrigin_B1F.inc
@@ -1,9 +1,9 @@
-CaveOfOrigin_B1F_MapObjects: @ 8535DD0
-	object_event 1, MAP_OBJ_GFX_WALLACE, 0, 0, 9, 13, 3, 7, 17, 0, 0, 0, CaveOfOrigin_B1F_EventScript_2357A9, 820, 0, 0
+CaveOfOrigin_B1F_EventObjects: @ 8535DD0
+	object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 0, 9, 13, 3, 7, 17, 0, 0, 0, CaveOfOrigin_B1F_EventScript_2357A9, 820, 0, 0
 
 CaveOfOrigin_B1F_MapWarps: @ 8535DE8
 	warp_def 9, 3, 3, 1, CAVE_OF_ORIGIN_1F
 
 CaveOfOrigin_B1F_MapEvents:: @ 8535DF0
-	map_events CaveOfOrigin_B1F_MapObjects, CaveOfOrigin_B1F_MapWarps, 0x0, 0x0
+	map_events CaveOfOrigin_B1F_EventObjects, CaveOfOrigin_B1F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/DesertRuins.inc b/data/maps/events/DesertRuins.inc
index 4a78cae40..2253dec67 100644
--- a/data/maps/events/DesertRuins.inc
+++ b/data/maps/events/DesertRuins.inc
@@ -1,5 +1,5 @@
-DesertRuins_MapObjects: @ 8534354
-	object_event 1, MAP_OBJ_GFX_REGIROCK, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, DesertRuins_EventScript_22DA02, 935, 0, 0
+DesertRuins_EventObjects: @ 8534354
+	object_event 1, EVENT_OBJ_GFX_REGIROCK, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, DesertRuins_EventScript_22DA02, 935, 0, 0
 
 DesertRuins_MapWarps: @ 853436C
 	warp_def 8, 29, 3, 1, ROUTE_111
@@ -12,5 +12,5 @@ DesertRuins_MapBGEvents: @ 8534384
 	bg_event 9, 20, 0, 0, 0, DesertRuins_EventScript_22D9F8
 
 DesertRuins_MapEvents:: @ 85343A8
-	map_events DesertRuins_MapObjects, DesertRuins_MapWarps, 0x0, DesertRuins_MapBGEvents
+	map_events DesertRuins_EventObjects, DesertRuins_MapWarps, 0x0, DesertRuins_MapBGEvents
 
diff --git a/data/maps/events/DesertUnderpass.inc b/data/maps/events/DesertUnderpass.inc
index cb5c06874..deb440ff9 100644
--- a/data/maps/events/DesertUnderpass.inc
+++ b/data/maps/events/DesertUnderpass.inc
@@ -1,9 +1,9 @@
-DesertUnderpass_MapObjects: @ 85376D4
-	object_event 1, MAP_OBJ_GFX_FOSSIL, 0, 0, 132, 10, 0, 8, 17, 0, 0, 0, DesertUnderpass_EventScript_23AF41, 874, 0, 0
+DesertUnderpass_EventObjects: @ 85376D4
+	object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 0, 132, 10, 0, 8, 17, 0, 0, 0, DesertUnderpass_EventScript_23AF41, 874, 0, 0
 
 DesertUnderpass_MapWarps: @ 85376EC
 	warp_def 10, 12, 0, 2, ROUTE_114_FOSSIL_MANIACS_TUNNEL
 
 DesertUnderpass_MapEvents:: @ 85376F4
-	map_events DesertUnderpass_MapObjects, DesertUnderpass_MapWarps, 0x0, 0x0
+	map_events DesertUnderpass_EventObjects, DesertUnderpass_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/DewfordTown.inc b/data/maps/events/DewfordTown.inc
index 3a4e95de9..8bb897125 100644
--- a/data/maps/events/DewfordTown.inc
+++ b/data/maps/events/DewfordTown.inc
@@ -1,9 +1,9 @@
-DewfordTown_MapObjects: @ 8527964
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 7, 12, 3, 5, 1, 0, 0, 0, DewfordTown_EventScript_1E95B1, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 9, 3, 9, 16, 0, 0, 3, DewfordTown_EventScript_1E9511, 740, 0, 0
-	object_event 3, MAP_OBJ_GFX_FISHERMAN, 0, 0, 12, 14, 3, 5, 1, 0, 0, 0, DewfordTown_EventScript_1E95D5, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 0, 12, 8, 1, 8, 0, 0, 0, 0, 0x0, 743, 0, 0
-	object_event 5, MAP_OBJ_GFX_BOY_1, 0, 0, 1, 6, 3, 1, 0, 0, 0, 0, DewfordTown_EventScript_1E9922, 0, 0, 0
+DewfordTown_EventObjects: @ 8527964
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 7, 12, 3, 5, 1, 0, 0, 0, DewfordTown_EventScript_1E95B1, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 9, 3, 9, 16, 0, 0, 3, DewfordTown_EventScript_1E9511, 740, 0, 0
+	object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 12, 14, 3, 5, 1, 0, 0, 0, DewfordTown_EventScript_1E95D5, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 0, 12, 8, 1, 8, 0, 0, 0, 0, 0x0, 743, 0, 0
+	object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 0, 1, 6, 3, 1, 0, 0, 0, 0, DewfordTown_EventScript_1E9922, 0, 0, 0
 
 DewfordTown_MapWarps: @ 85279DC
 	warp_def 3, 3, 0, 0, DEWFORD_TOWN_HALL
@@ -20,5 +20,5 @@ DewfordTown_MapBGEvents: @ 8527A04
 	bg_event 2, 4, 0, 0, 0, DewfordTown_EventScript_1E95CC
 
 DewfordTown_MapEvents:: @ 8527A40
-	map_events DewfordTown_MapObjects, DewfordTown_MapWarps, 0x0, DewfordTown_MapBGEvents
+	map_events DewfordTown_EventObjects, DewfordTown_MapWarps, 0x0, DewfordTown_MapBGEvents
 
diff --git a/data/maps/events/DewfordTown_Gym.inc b/data/maps/events/DewfordTown_Gym.inc
index e9a6b6477..8d7a8e460 100644
--- a/data/maps/events/DewfordTown_Gym.inc
+++ b/data/maps/events/DewfordTown_Gym.inc
@@ -1,12 +1,12 @@
-DewfordTown_Gym_MapObjects: @ 852DB34
-	object_event 1, MAP_OBJ_GFX_BRAWLY, 0, 0, 4, 3, 0, 8, 0, 0, 0, 0, DewfordTown_Gym_EventScript_1FC7C2, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 2, 18, 0, 7, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8B7, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 0, 15, 3, 3, 8, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8D9, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 0, 12, 25, 3, 7, 0, 0, 1, 2, DewfordTown_Gym_EventScript_1FC8FB, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAN_2, 0, 0, 5, 24, 3, 8, 0, 0, 0, 0, DewfordTown_Gym_EventScript_1FC983, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 7, 8, 1, 10, 17, 0, 1, 3, DewfordTown_Gym_EventScript_1FC93F, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_GIRL_3, 0, 0, 16, 9, 3, 8, 17, 0, 1, 3, DewfordTown_Gym_EventScript_1FC961, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_SAILOR, 0, 0, 14, 12, 1, 10, 17, 0, 1, 2, DewfordTown_Gym_EventScript_1FC91D, 0, 0, 0
+DewfordTown_Gym_EventObjects: @ 852DB34
+	object_event 1, EVENT_OBJ_GFX_BRAWLY, 0, 0, 4, 3, 0, 8, 0, 0, 0, 0, DewfordTown_Gym_EventScript_1FC7C2, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 2, 18, 0, 7, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8B7, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 0, 15, 3, 3, 8, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8D9, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 12, 25, 3, 7, 0, 0, 1, 2, DewfordTown_Gym_EventScript_1FC8FB, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 0, 5, 24, 3, 8, 0, 0, 0, 0, DewfordTown_Gym_EventScript_1FC983, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 7, 8, 1, 10, 17, 0, 1, 3, DewfordTown_Gym_EventScript_1FC93F, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 0, 16, 9, 3, 8, 17, 0, 1, 3, DewfordTown_Gym_EventScript_1FC961, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_SAILOR, 0, 0, 14, 12, 1, 10, 17, 0, 1, 2, DewfordTown_Gym_EventScript_1FC91D, 0, 0, 0
 
 DewfordTown_Gym_MapWarps: @ 852DBF4
 	warp_def 5, 27, 0, 2, DEWFORD_TOWN
@@ -19,5 +19,5 @@ DewfordTown_Gym_MapBGEvents: @ 852DC04
 	bg_event 7, 24, 0, 1, 0, DewfordTown_Gym_EventScript_1FC9B2
 
 DewfordTown_Gym_MapEvents:: @ 852DC34
-	map_events DewfordTown_Gym_MapObjects, DewfordTown_Gym_MapWarps, 0x0, DewfordTown_Gym_MapBGEvents
+	map_events DewfordTown_Gym_EventObjects, DewfordTown_Gym_MapWarps, 0x0, DewfordTown_Gym_MapBGEvents
 
diff --git a/data/maps/events/DewfordTown_Hall.inc b/data/maps/events/DewfordTown_Hall.inc
index f5af1fc3c..c4b6600ec 100644
--- a/data/maps/events/DewfordTown_Hall.inc
+++ b/data/maps/events/DewfordTown_Hall.inc
@@ -1,13 +1,13 @@
-DewfordTown_Hall_MapObjects: @ 852DC48
-	object_event 1, MAP_OBJ_GFX_GIRL_2, 0, 0, 4, 6, 0, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4D0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 0, 1, 5, 0, 10, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4F9, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_1, 0, 0, 5, 4, 0, 9, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD50A, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 9, 3, 0, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD547, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 5, 2, 3, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD563, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 14, 7, 0, 5, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD57F, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 12, 3, 3, 10, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD62F, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 15, 3, 3, 9, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD63B, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_MANIAC, 0, 0, 8, 6, 3, 5, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD7DA, 940, 0, 0
+DewfordTown_Hall_EventObjects: @ 852DC48
+	object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 0, 4, 6, 0, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4D0, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 1, 5, 0, 10, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4F9, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 0, 5, 4, 0, 9, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD50A, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 9, 3, 0, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD547, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 5, 2, 3, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD563, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 14, 7, 0, 5, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD57F, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 12, 3, 3, 10, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD62F, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 15, 3, 3, 9, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD63B, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 0, 8, 6, 3, 5, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD7DA, 940, 0, 0
 
 DewfordTown_Hall_MapWarps: @ 852DD20
 	warp_def 5, 8, 0, 0, DEWFORD_TOWN
@@ -18,5 +18,5 @@ DewfordTown_Hall_MapBGEvents: @ 852DD30
 	bg_event 7, 1, 3, 0, 0, DewfordTown_Hall_EventScript_1FD5A0
 
 DewfordTown_Hall_MapEvents:: @ 852DD48
-	map_events DewfordTown_Hall_MapObjects, DewfordTown_Hall_MapWarps, 0x0, DewfordTown_Hall_MapBGEvents
+	map_events DewfordTown_Hall_EventObjects, DewfordTown_Hall_MapWarps, 0x0, DewfordTown_Hall_MapBGEvents
 
diff --git a/data/maps/events/DewfordTown_House1.inc b/data/maps/events/DewfordTown_House1.inc
index 1990975c5..72b63dff3 100644
--- a/data/maps/events/DewfordTown_House1.inc
+++ b/data/maps/events/DewfordTown_House1.inc
@@ -1,12 +1,12 @@
-DewfordTown_House1_MapObjects: @ 852D9C8
-	object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 0, 6, 3, 3, 9, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3D7, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_1, 0, 0, 3, 3, 3, 10, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3CE, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 4, 2, 3, 8, 19, 0, 0, 0, DewfordTown_House1_EventScript_1FC3E0, 0, 0, 0
+DewfordTown_House1_EventObjects: @ 852D9C8
+	object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 6, 3, 3, 9, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3D7, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 3, 3, 3, 10, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3CE, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 4, 2, 3, 8, 19, 0, 0, 0, DewfordTown_House1_EventScript_1FC3E0, 0, 0, 0
 
 DewfordTown_House1_MapWarps: @ 852DA10
 	warp_def 3, 7, 0, 3, DEWFORD_TOWN
 	warp_def 4, 7, 0, 3, DEWFORD_TOWN
 
 DewfordTown_House1_MapEvents:: @ 852DA20
-	map_events DewfordTown_House1_MapObjects, DewfordTown_House1_MapWarps, 0x0, 0x0
+	map_events DewfordTown_House1_EventObjects, DewfordTown_House1_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/DewfordTown_House2.inc b/data/maps/events/DewfordTown_House2.inc
index b487372f6..901046cbc 100644
--- a/data/maps/events/DewfordTown_House2.inc
+++ b/data/maps/events/DewfordTown_House2.inc
@@ -1,11 +1,11 @@
-DewfordTown_House2_MapObjects: @ 852DD5C
-	object_event 1, MAP_OBJ_GFX_MAN_4, 0, 0, 6, 5, 3, 10, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE22E, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BOY_2, 0, 0, 2, 3, 3, 1, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE271, 0, 0, 0
+DewfordTown_House2_EventObjects: @ 852DD5C
+	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 0, 6, 5, 3, 10, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE22E, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 0, 2, 3, 3, 1, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE271, 0, 0, 0
 
 DewfordTown_House2_MapWarps: @ 852DD8C
 	warp_def 3, 8, 0, 4, DEWFORD_TOWN
 	warp_def 4, 8, 0, 4, DEWFORD_TOWN
 
 DewfordTown_House2_MapEvents:: @ 852DD9C
-	map_events DewfordTown_House2_MapObjects, DewfordTown_House2_MapWarps, 0x0, 0x0
+	map_events DewfordTown_House2_EventObjects, DewfordTown_House2_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/DewfordTown_PokemonCenter_1F.inc b/data/maps/events/DewfordTown_PokemonCenter_1F.inc
index c393ed795..f61966b88 100644
--- a/data/maps/events/DewfordTown_PokemonCenter_1F.inc
+++ b/data/maps/events/DewfordTown_PokemonCenter_1F.inc
@@ -1,7 +1,7 @@
-DewfordTown_PokemonCenter_1F_MapObjects: @ 852DA34
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC537, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 10, 6, 3, 10, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC545, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 5, 5, 0, 5, 18, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC54E, 0, 0, 0
+DewfordTown_PokemonCenter_1F_EventObjects: @ 852DA34
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC537, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 10, 6, 3, 10, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC545, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 5, 5, 0, 5, 18, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC54E, 0, 0, 0
 
 DewfordTown_PokemonCenter_1F_MapWarps: @ 852DA7C
 	warp_def 7, 8, 3, 1, DEWFORD_TOWN
@@ -9,5 +9,5 @@ DewfordTown_PokemonCenter_1F_MapWarps: @ 852DA7C
 	warp_def 1, 6, 4, 0, DEWFORD_TOWN_POKEMON_CENTER_2F
 
 DewfordTown_PokemonCenter_1F_MapEvents:: @ 852DA94
-	map_events DewfordTown_PokemonCenter_1F_MapObjects, DewfordTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
+	map_events DewfordTown_PokemonCenter_1F_EventObjects, DewfordTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/DewfordTown_PokemonCenter_2F.inc b/data/maps/events/DewfordTown_PokemonCenter_2F.inc
index 437441e08..7098e6ed8 100644
--- a/data/maps/events/DewfordTown_PokemonCenter_2F.inc
+++ b/data/maps/events/DewfordTown_PokemonCenter_2F.inc
@@ -1,8 +1,8 @@
-DewfordTown_PokemonCenter_2F_MapObjects: @ 852DAA8
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
+DewfordTown_PokemonCenter_2F_EventObjects: @ 852DAA8
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
 
 DewfordTown_PokemonCenter_2F_MapWarps: @ 852DB08
 	warp_def 1, 6, 4, 2, DEWFORD_TOWN_POKEMON_CENTER_1F
@@ -10,5 +10,5 @@ DewfordTown_PokemonCenter_2F_MapWarps: @ 852DB08
 	warp_def 9, 1, 3, 0, TRADE_CENTER
 
 DewfordTown_PokemonCenter_2F_MapEvents:: @ 852DB20
-	map_events DewfordTown_PokemonCenter_2F_MapObjects, DewfordTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
+	map_events DewfordTown_PokemonCenter_2F_EventObjects, DewfordTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/EverGrandeCity_ChampionsRoom.inc b/data/maps/events/EverGrandeCity_ChampionsRoom.inc
index e5fbb81c1..269645dc6 100644
--- a/data/maps/events/EverGrandeCity_ChampionsRoom.inc
+++ b/data/maps/events/EverGrandeCity_ChampionsRoom.inc
@@ -1,12 +1,12 @@
-EverGrandeCity_ChampionsRoom_MapObjects: @ 8533700
-	object_event 1, MAP_OBJ_GFX_WALLACE, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 6, 12, 3, 7, 0, 0, 0, 0, 0x0, 920, 0, 0
-	object_event 3, MAP_OBJ_GFX_PROF_BIRCH, 0, 0, 6, 12, 3, 7, 0, 0, 0, 0, 0x0, 921, 0, 0
+EverGrandeCity_ChampionsRoom_EventObjects: @ 8533700
+	object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 6, 12, 3, 7, 0, 0, 0, 0, 0x0, 920, 0, 0
+	object_event 3, EVENT_OBJ_GFX_PROF_BIRCH, 0, 0, 6, 12, 3, 7, 0, 0, 0, 0, 0x0, 921, 0, 0
 
 EverGrandeCity_ChampionsRoom_MapWarps: @ 8533748
 	warp_def 6, 12, 3, 1, EVER_GRANDE_CITY_HALL_4
 	warp_def 6, 2, 0, 0, EVER_GRANDE_CITY_HALL_OF_FAME
 
 EverGrandeCity_ChampionsRoom_MapEvents:: @ 8533758
-	map_events EverGrandeCity_ChampionsRoom_MapObjects, EverGrandeCity_ChampionsRoom_MapWarps, 0x0, 0x0
+	map_events EverGrandeCity_ChampionsRoom_EventObjects, EverGrandeCity_ChampionsRoom_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/EverGrandeCity_DrakesRoom.inc b/data/maps/events/EverGrandeCity_DrakesRoom.inc
index 2db37957d..761e321d6 100644
--- a/data/maps/events/EverGrandeCity_DrakesRoom.inc
+++ b/data/maps/events/EverGrandeCity_DrakesRoom.inc
@@ -1,10 +1,10 @@
-EverGrandeCity_DrakesRoom_MapObjects: @ 85336C4
-	object_event 1, MAP_OBJ_GFX_DRAKE, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_DrakesRoom_EventScript_2286F3, 0, 0, 0
+EverGrandeCity_DrakesRoom_EventObjects: @ 85336C4
+	object_event 1, EVENT_OBJ_GFX_DRAKE, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_DrakesRoom_EventScript_2286F3, 0, 0, 0
 
 EverGrandeCity_DrakesRoom_MapWarps: @ 85336DC
 	warp_def 6, 13, 3, 1, EVER_GRANDE_CITY_HALL_3
 	warp_def 6, 2, 0, 0, EVER_GRANDE_CITY_HALL_4
 
 EverGrandeCity_DrakesRoom_MapEvents:: @ 85336EC
-	map_events EverGrandeCity_DrakesRoom_MapObjects, EverGrandeCity_DrakesRoom_MapWarps, 0x0, 0x0
+	map_events EverGrandeCity_DrakesRoom_EventObjects, EverGrandeCity_DrakesRoom_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/EverGrandeCity_GlaciasRoom.inc b/data/maps/events/EverGrandeCity_GlaciasRoom.inc
index 7d97a2bc6..a8632b8c1 100644
--- a/data/maps/events/EverGrandeCity_GlaciasRoom.inc
+++ b/data/maps/events/EverGrandeCity_GlaciasRoom.inc
@@ -1,10 +1,10 @@
-EverGrandeCity_GlaciasRoom_MapObjects: @ 8533688
-	object_event 1, MAP_OBJ_GFX_GLACIA, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_GlaciasRoom_EventScript_228469, 0, 0, 0
+EverGrandeCity_GlaciasRoom_EventObjects: @ 8533688
+	object_event 1, EVENT_OBJ_GFX_GLACIA, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_GlaciasRoom_EventScript_228469, 0, 0, 0
 
 EverGrandeCity_GlaciasRoom_MapWarps: @ 85336A0
 	warp_def 6, 13, 3, 1, EVER_GRANDE_CITY_HALL_2
 	warp_def 6, 2, 0, 0, EVER_GRANDE_CITY_HALL_3
 
 EverGrandeCity_GlaciasRoom_MapEvents:: @ 85336B0
-	map_events EverGrandeCity_GlaciasRoom_MapObjects, EverGrandeCity_GlaciasRoom_MapWarps, 0x0, 0x0
+	map_events EverGrandeCity_GlaciasRoom_EventObjects, EverGrandeCity_GlaciasRoom_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/EverGrandeCity_HallOfFame.inc b/data/maps/events/EverGrandeCity_HallOfFame.inc
index 18ed3ebdb..0d75ef553 100644
--- a/data/maps/events/EverGrandeCity_HallOfFame.inc
+++ b/data/maps/events/EverGrandeCity_HallOfFame.inc
@@ -1,9 +1,9 @@
-EverGrandeCity_HallOfFame_MapObjects: @ 85338FC
-	object_event 1, MAP_OBJ_GFX_WALLACE, 0, 0, 6, 16, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
+EverGrandeCity_HallOfFame_EventObjects: @ 85338FC
+	object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 0, 6, 16, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
 
 EverGrandeCity_HallOfFame_MapWarps: @ 8533914
 	warp_def 7, 11, 3, 1, EVER_GRANDE_CITY_CHAMPIONS_ROOM
 
 EverGrandeCity_HallOfFame_MapEvents:: @ 853391C
-	map_events EverGrandeCity_HallOfFame_MapObjects, EverGrandeCity_HallOfFame_MapWarps, 0x0, 0x0
+	map_events EverGrandeCity_HallOfFame_EventObjects, EverGrandeCity_HallOfFame_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/EverGrandeCity_PhoebesRoom.inc b/data/maps/events/EverGrandeCity_PhoebesRoom.inc
index 471bae1fc..dd09ad4a1 100644
--- a/data/maps/events/EverGrandeCity_PhoebesRoom.inc
+++ b/data/maps/events/EverGrandeCity_PhoebesRoom.inc
@@ -1,10 +1,10 @@
-EverGrandeCity_PhoebesRoom_MapObjects: @ 853364C
-	object_event 1, MAP_OBJ_GFX_PHOEBE, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_PhoebesRoom_EventScript_2281CB, 0, 0, 0
+EverGrandeCity_PhoebesRoom_EventObjects: @ 853364C
+	object_event 1, EVENT_OBJ_GFX_PHOEBE, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_PhoebesRoom_EventScript_2281CB, 0, 0, 0
 
 EverGrandeCity_PhoebesRoom_MapWarps: @ 8533664
 	warp_def 6, 13, 3, 1, EVER_GRANDE_CITY_HALL_1
 	warp_def 6, 2, 0, 0, EVER_GRANDE_CITY_HALL_2
 
 EverGrandeCity_PhoebesRoom_MapEvents:: @ 8533674
-	map_events EverGrandeCity_PhoebesRoom_MapObjects, EverGrandeCity_PhoebesRoom_MapWarps, 0x0, 0x0
+	map_events EverGrandeCity_PhoebesRoom_EventObjects, EverGrandeCity_PhoebesRoom_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc b/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc
index 28491f59b..a758c4d73 100644
--- a/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc
+++ b/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc
@@ -1,8 +1,8 @@
-EverGrandeCity_PokemonCenter_1F_MapObjects: @ 8533930
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A59, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 0, 5, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A67, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 10, 7, 3, 10, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A70, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SCOTT, 0, 0, 9, 4, 3, 7, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A79, 793, 0, 0
+EverGrandeCity_PokemonCenter_1F_EventObjects: @ 8533930
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A59, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 5, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A67, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 10, 7, 3, 10, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A70, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 0, 9, 4, 3, 7, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A79, 793, 0, 0
 
 EverGrandeCity_PokemonCenter_1F_MapWarps: @ 8533990
 	warp_def 7, 8, 3, 1, EVER_GRANDE_CITY
@@ -10,5 +10,5 @@ EverGrandeCity_PokemonCenter_1F_MapWarps: @ 8533990
 	warp_def 1, 6, 4, 0, EVER_GRANDE_CITY_POKEMON_CENTER_2F
 
 EverGrandeCity_PokemonCenter_1F_MapEvents:: @ 85339A8
-	map_events EverGrandeCity_PokemonCenter_1F_MapObjects, EverGrandeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
+	map_events EverGrandeCity_PokemonCenter_1F_EventObjects, EverGrandeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc b/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc
index d34c8082f..bbedf59d2 100644
--- a/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc
+++ b/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc
@@ -1,8 +1,8 @@
-EverGrandeCity_PokemonCenter_2F_MapObjects: @ 85339BC
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
+EverGrandeCity_PokemonCenter_2F_EventObjects: @ 85339BC
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
 
 EverGrandeCity_PokemonCenter_2F_MapWarps: @ 8533A1C
 	warp_def 1, 6, 4, 2, EVER_GRANDE_CITY_POKEMON_CENTER_1F
@@ -10,5 +10,5 @@ EverGrandeCity_PokemonCenter_2F_MapWarps: @ 8533A1C
 	warp_def 9, 1, 3, 0, TRADE_CENTER
 
 EverGrandeCity_PokemonCenter_2F_MapEvents:: @ 8533A34
-	map_events EverGrandeCity_PokemonCenter_2F_MapObjects, EverGrandeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
+	map_events EverGrandeCity_PokemonCenter_2F_EventObjects, EverGrandeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/EverGrandeCity_PokemonLeague_1F.inc b/data/maps/events/EverGrandeCity_PokemonLeague_1F.inc
index ee368c6e1..a19984ea2 100644
--- a/data/maps/events/EverGrandeCity_PokemonLeague_1F.inc
+++ b/data/maps/events/EverGrandeCity_PokemonLeague_1F.inc
@@ -1,8 +1,8 @@
-EverGrandeCity_PokemonLeague_1F_MapObjects: @ 8533860
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 3, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_2295FC, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 16, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_22960A, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 8, 2, 3, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_4, 0, 0, 11, 2, 3, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0, 0, 0
+EverGrandeCity_PokemonLeague_1F_EventObjects: @ 8533860
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 3, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_2295FC, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 16, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_22960A, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 8, 2, 3, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 0, 11, 2, 3, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0, 0, 0
 
 EverGrandeCity_PokemonLeague_1F_MapWarps: @ 85338C0
 	warp_def 9, 11, 3, 0, EVER_GRANDE_CITY
@@ -12,5 +12,5 @@ EverGrandeCity_PokemonLeague_1F_MapWarps: @ 85338C0
 	warp_def 1, 7, 4, 0, EVER_GRANDE_CITY_POKEMON_LEAGUE_2F
 
 EverGrandeCity_PokemonLeague_1F_MapEvents:: @ 85338E8
-	map_events EverGrandeCity_PokemonLeague_1F_MapObjects, EverGrandeCity_PokemonLeague_1F_MapWarps, 0x0, 0x0
+	map_events EverGrandeCity_PokemonLeague_1F_EventObjects, EverGrandeCity_PokemonLeague_1F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/EverGrandeCity_PokemonLeague_2F.inc b/data/maps/events/EverGrandeCity_PokemonLeague_2F.inc
index 499aad196..6b85a2fb0 100644
--- a/data/maps/events/EverGrandeCity_PokemonLeague_2F.inc
+++ b/data/maps/events/EverGrandeCity_PokemonLeague_2F.inc
@@ -1,8 +1,8 @@
-EverGrandeCity_PokemonLeague_2F_MapObjects: @ 8533A48
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273761, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273767, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_276B03, 702, 0, 0
+EverGrandeCity_PokemonLeague_2F_EventObjects: @ 8533A48
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_27375B, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273761, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273767, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_276B03, 702, 0, 0
 
 EverGrandeCity_PokemonLeague_2F_MapWarps: @ 8533AA8
 	warp_def 1, 6, 4, 4, EVER_GRANDE_CITY_POKEMON_LEAGUE_1F
@@ -10,5 +10,5 @@ EverGrandeCity_PokemonLeague_2F_MapWarps: @ 8533AA8
 	warp_def 9, 1, 3, 0, TRADE_CENTER
 
 EverGrandeCity_PokemonLeague_2F_MapEvents:: @ 8533AC0
-	map_events EverGrandeCity_PokemonLeague_2F_MapObjects, EverGrandeCity_PokemonLeague_2F_MapWarps, 0x0, 0x0
+	map_events EverGrandeCity_PokemonLeague_2F_EventObjects, EverGrandeCity_PokemonLeague_2F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/EverGrandeCity_SidneysRoom.inc b/data/maps/events/EverGrandeCity_SidneysRoom.inc
index 9ff3d40cb..93d9a879e 100644
--- a/data/maps/events/EverGrandeCity_SidneysRoom.inc
+++ b/data/maps/events/EverGrandeCity_SidneysRoom.inc
@@ -1,10 +1,10 @@
-EverGrandeCity_SidneysRoom_MapObjects: @ 8533610
-	object_event 1, MAP_OBJ_GFX_SIDNEY, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_SidneysRoom_EventScript_227F64, 0, 0, 0
+EverGrandeCity_SidneysRoom_EventObjects: @ 8533610
+	object_event 1, EVENT_OBJ_GFX_SIDNEY, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_SidneysRoom_EventScript_227F64, 0, 0, 0
 
 EverGrandeCity_SidneysRoom_MapWarps: @ 8533628
 	warp_def 6, 13, 3, 1, EVER_GRANDE_CITY_HALL_5
 	warp_def 6, 2, 0, 0, EVER_GRANDE_CITY_HALL_1
 
 EverGrandeCity_SidneysRoom_MapEvents:: @ 8533638
-	map_events EverGrandeCity_SidneysRoom_MapObjects, EverGrandeCity_SidneysRoom_MapWarps, 0x0, 0x0
+	map_events EverGrandeCity_SidneysRoom_EventObjects, EverGrandeCity_SidneysRoom_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/FallarborTown.inc b/data/maps/events/FallarborTown.inc
index 28dab394b..e9fb7579c 100644
--- a/data/maps/events/FallarborTown.inc
+++ b/data/maps/events/FallarborTown.inc
@@ -1,8 +1,8 @@
-FallarborTown_MapObjects: @ 8527BE0
-	object_event 1, MAP_OBJ_GFX_GIRL_1, 0, 0, 8, 11, 3, 8, 16, 0, 0, 0, FallarborTown_EventScript_1EB22B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 11, 9, 3, 5, 1, 0, 0, 0, FallarborTown_EventScript_1EB20C, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 11, 15, 3, 3, 17, 0, 0, 0, FallarborTown_EventScript_1EB234, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_AZURILL, 0, 0, 8, 12, 3, 1, 1, 0, 0, 0, FallarborTown_EventScript_1EB23D, 907, 0, 0
+FallarborTown_EventObjects: @ 8527BE0
+	object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 0, 8, 11, 3, 8, 16, 0, 0, 0, FallarborTown_EventScript_1EB22B, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 11, 9, 3, 5, 1, 0, 0, 0, FallarborTown_EventScript_1EB20C, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 11, 15, 3, 3, 17, 0, 0, 0, FallarborTown_EventScript_1EB234, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_AZURILL, 0, 0, 8, 12, 3, 1, 1, 0, 0, 0, FallarborTown_EventScript_1EB23D, 907, 0, 0
 
 FallarborTown_MapWarps: @ 8527C40
 	warp_def 15, 15, 0, 0, FALLARBOR_TOWN_MART
@@ -22,5 +22,5 @@ FallarborTown_MapBGEvents: @ 8527C68
 	bg_event 2, 15, 3, 7, 0, ITEM_NUGGET, 28, 0
 
 FallarborTown_MapEvents:: @ 8527CC8
-	map_events FallarborTown_MapObjects, FallarborTown_MapWarps, 0x0, FallarborTown_MapBGEvents
+	map_events FallarborTown_EventObjects, FallarborTown_MapWarps, 0x0, FallarborTown_MapBGEvents
 
diff --git a/data/maps/events/FallarborTown_BattleTentBattleRoom.inc b/data/maps/events/FallarborTown_BattleTentBattleRoom.inc
index bed082ccb..7c5842ab8 100644
--- a/data/maps/events/FallarborTown_BattleTentBattleRoom.inc
+++ b/data/maps/events/FallarborTown_BattleTentBattleRoom.inc
@@ -1,8 +1,8 @@
-FallarborTown_BattleTentBattleRoom_MapObjects: @ 852E444
-	object_event 1, MAP_OBJ_GFX_TRADER, 0, 0, 4, 8, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 3, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+FallarborTown_BattleTentBattleRoom_EventObjects: @ 852E444
+	object_event 1, EVENT_OBJ_GFX_TRADER, 0, 0, 4, 8, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 3, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
 
 FallarborTown_BattleTentBattleRoom_MapEvents:: @ 852E48C
-	map_events FallarborTown_BattleTentBattleRoom_MapObjects, 0x0, 0x0, 0x0
+	map_events FallarborTown_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/FallarborTown_BattleTentCorridor.inc b/data/maps/events/FallarborTown_BattleTentCorridor.inc
index 023ef7f0b..35bca7b85 100644
--- a/data/maps/events/FallarborTown_BattleTentCorridor.inc
+++ b/data/maps/events/FallarborTown_BattleTentCorridor.inc
@@ -1,6 +1,6 @@
-FallarborTown_BattleTentCorridor_MapObjects: @ 852E418
-	object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 2, 6, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
+FallarborTown_BattleTentCorridor_EventObjects: @ 852E418
+	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 2, 6, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
 
 FallarborTown_BattleTentCorridor_MapEvents:: @ 852E430
-	map_events FallarborTown_BattleTentCorridor_MapObjects, 0x0, 0x0, 0x0
+	map_events FallarborTown_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/FallarborTown_BattleTentLobby.inc b/data/maps/events/FallarborTown_BattleTentLobby.inc
index 6c0d25020..e261f185f 100644
--- a/data/maps/events/FallarborTown_BattleTentLobby.inc
+++ b/data/maps/events/FallarborTown_BattleTentLobby.inc
@@ -1,9 +1,9 @@
-FallarborTown_BattleTentLobby_MapObjects: @ 852E370
-	object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 6, 5, 3, 8, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_200001, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIKER, 0, 0, 1, 5, 3, 5, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_20020D, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 12, 6, 3, 3, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_200216, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LASS, 0, 0, 10, 9, 3, 8, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_20021F, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_SCOTT, 0, 0, 0, 7, 3, 10, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_200228, 767, 0, 0
+FallarborTown_BattleTentLobby_EventObjects: @ 852E370
+	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 6, 5, 3, 8, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_200001, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_HIKER, 0, 0, 1, 5, 3, 5, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_20020D, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 12, 6, 3, 3, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_200216, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_LASS, 0, 0, 10, 9, 3, 8, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_20021F, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 0, 0, 7, 3, 10, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_200228, 767, 0, 0
 
 FallarborTown_BattleTentLobby_MapWarps: @ 852E3E8
 	warp_def 6, 9, 0, 1, FALLARBOR_TOWN
@@ -13,5 +13,5 @@ FallarborTown_BattleTentLobby_MapBGEvents: @ 852E3F8
 	bg_event 4, 5, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_20024F
 
 FallarborTown_BattleTentLobby_MapEvents:: @ 852E404
-	map_events FallarborTown_BattleTentLobby_MapObjects, FallarborTown_BattleTentLobby_MapWarps, 0x0, FallarborTown_BattleTentLobby_MapBGEvents
+	map_events FallarborTown_BattleTentLobby_EventObjects, FallarborTown_BattleTentLobby_MapWarps, 0x0, FallarborTown_BattleTentLobby_MapBGEvents
 
diff --git a/data/maps/events/FallarborTown_House1.inc b/data/maps/events/FallarborTown_House1.inc
index 971236802..b3975685c 100644
--- a/data/maps/events/FallarborTown_House1.inc
+++ b/data/maps/events/FallarborTown_House1.inc
@@ -1,11 +1,11 @@
-FallarborTown_House1_MapObjects: @ 852E5B8
-	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 4, 3, 2, 17, 0, 0, 0, FallarborTown_House1_EventScript_200F13, 928, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 0, 5, 6, 3, 5, 1, 0, 0, 0, FallarborTown_House1_EventScript_200FBC, 0, 0, 0
+FallarborTown_House1_EventObjects: @ 852E5B8
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 4, 3, 2, 17, 0, 0, 0, FallarborTown_House1_EventScript_200F13, 928, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 5, 6, 3, 5, 1, 0, 0, 0, FallarborTown_House1_EventScript_200FBC, 0, 0, 0
 
 FallarborTown_House1_MapWarps: @ 852E5E8
 	warp_def 3, 8, 0, 3, FALLARBOR_TOWN
 	warp_def 4, 8, 0, 3, FALLARBOR_TOWN
 
 FallarborTown_House1_MapEvents:: @ 852E5F8
-	map_events FallarborTown_House1_MapObjects, FallarborTown_House1_MapWarps, 0x0, 0x0
+	map_events FallarborTown_House1_EventObjects, FallarborTown_House1_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/FallarborTown_House2.inc b/data/maps/events/FallarborTown_House2.inc
index 058c4c5af..d809bf493 100644
--- a/data/maps/events/FallarborTown_House2.inc
+++ b/data/maps/events/FallarborTown_House2.inc
@@ -1,10 +1,10 @@
-FallarborTown_House2_MapObjects: @ 852E60C
-	object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, FallarborTown_House2_EventScript_201383, 0, 0, 0
+FallarborTown_House2_EventObjects: @ 852E60C
+	object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, FallarborTown_House2_EventScript_201383, 0, 0, 0
 
 FallarborTown_House2_MapWarps: @ 852E624
 	warp_def 3, 7, 0, 4, FALLARBOR_TOWN
 	warp_def 4, 7, 0, 4, FALLARBOR_TOWN
 
 FallarborTown_House2_MapEvents:: @ 852E634
-	map_events FallarborTown_House2_MapObjects, FallarborTown_House2_MapWarps, 0x0, 0x0
+	map_events FallarborTown_House2_EventObjects, FallarborTown_House2_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/FallarborTown_Mart.inc b/data/maps/events/FallarborTown_Mart.inc
index a59da4c66..762db16f9 100644
--- a/data/maps/events/FallarborTown_Mart.inc
+++ b/data/maps/events/FallarborTown_Mart.inc
@@ -1,14 +1,14 @@
-FallarborTown_Mart_MapObjects: @ 852E2D4
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCBF, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 0, 5, 3, 3, 2, 17, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCF4, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_3, 0, 0, 9, 6, 3, 8, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCFD, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SKITTY, 0, 0, 2, 5, 3, 1, 17, 0, 0, 0, FallarborTown_Mart_EventScript_1FFD06, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIRL_2, 0, 0, 7, 2, 3, 7, 0, 0, 0, 0, FallarborTown_Mart_EventScript_2C80B6, 0, 0, 0
+FallarborTown_Mart_EventObjects: @ 852E2D4
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCBF, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 5, 3, 3, 2, 17, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCF4, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 0, 9, 6, 3, 8, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCFD, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_SKITTY, 0, 0, 2, 5, 3, 1, 17, 0, 0, 0, FallarborTown_Mart_EventScript_1FFD06, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 0, 7, 2, 3, 7, 0, 0, 0, 0, FallarborTown_Mart_EventScript_2C80B6, 0, 0, 0
 
 FallarborTown_Mart_MapWarps: @ 852E34C
 	warp_def 3, 7, 0, 0, FALLARBOR_TOWN
 	warp_def 4, 7, 0, 0, FALLARBOR_TOWN
 
 FallarborTown_Mart_MapEvents:: @ 852E35C
-	map_events FallarborTown_Mart_MapObjects, FallarborTown_Mart_MapWarps, 0x0, 0x0
+	map_events FallarborTown_Mart_EventObjects, FallarborTown_Mart_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/FallarborTown_PokemonCenter_1F.inc b/data/maps/events/FallarborTown_PokemonCenter_1F.inc
index 19421411e..e6c91a736 100644
--- a/data/maps/events/FallarborTown_PokemonCenter_1F.inc
+++ b/data/maps/events/FallarborTown_PokemonCenter_1F.inc
@@ -1,8 +1,8 @@
-FallarborTown_PokemonCenter_1F_MapObjects: @ 852E4A0
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BE1, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 10, 6, 3, 10, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BEF, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BF8, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_3, 0, 0, 10, 2, 3, 7, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200C01, 871, 0, 0
+FallarborTown_PokemonCenter_1F_EventObjects: @ 852E4A0
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BE1, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 10, 6, 3, 10, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BEF, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BF8, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 10, 2, 3, 7, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200C01, 871, 0, 0
 
 FallarborTown_PokemonCenter_1F_MapWarps: @ 852E500
 	warp_def 7, 8, 3, 2, FALLARBOR_TOWN
@@ -10,5 +10,5 @@ FallarborTown_PokemonCenter_1F_MapWarps: @ 852E500
 	warp_def 1, 6, 4, 0, FALLARBOR_TOWN_POKEMON_CENTER_2F
 
 FallarborTown_PokemonCenter_1F_MapEvents:: @ 852E518
-	map_events FallarborTown_PokemonCenter_1F_MapObjects, FallarborTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
+	map_events FallarborTown_PokemonCenter_1F_EventObjects, FallarborTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/FallarborTown_PokemonCenter_2F.inc b/data/maps/events/FallarborTown_PokemonCenter_2F.inc
index 408ecf9db..6ddb7e9c9 100644
--- a/data/maps/events/FallarborTown_PokemonCenter_2F.inc
+++ b/data/maps/events/FallarborTown_PokemonCenter_2F.inc
@@ -1,8 +1,8 @@
-FallarborTown_PokemonCenter_2F_MapObjects: @ 852E52C
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
+FallarborTown_PokemonCenter_2F_EventObjects: @ 852E52C
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
 
 FallarborTown_PokemonCenter_2F_MapWarps: @ 852E58C
 	warp_def 1, 6, 4, 2, FALLARBOR_TOWN_POKEMON_CENTER_1F
@@ -10,5 +10,5 @@ FallarborTown_PokemonCenter_2F_MapWarps: @ 852E58C
 	warp_def 9, 1, 3, 0, TRADE_CENTER
 
 FallarborTown_PokemonCenter_2F_MapEvents:: @ 852E5A4
-	map_events FallarborTown_PokemonCenter_2F_MapObjects, FallarborTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
+	map_events FallarborTown_PokemonCenter_2F_EventObjects, FallarborTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/FarawayIsland_Entrance.inc b/data/maps/events/FarawayIsland_Entrance.inc
index cd321124f..27d98189e 100644
--- a/data/maps/events/FarawayIsland_Entrance.inc
+++ b/data/maps/events/FarawayIsland_Entrance.inc
@@ -1,6 +1,6 @@
-FarawayIsland_Entrance_MapObjects: @ 853D710
-	object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 13, 39, 3, 7, 0, 0, 0, 0, FarawayIsland_Entrance_EventScript_267CA2, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 0, 13, 41, 1, 10, 0, 0, 0, 0, 0x0, 0, 0, 0
+FarawayIsland_Entrance_EventObjects: @ 853D710
+	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 13, 39, 3, 7, 0, 0, 0, 0, FarawayIsland_Entrance_EventScript_267CA2, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 0, 13, 41, 1, 10, 0, 0, 0, 0, 0x0, 0, 0, 0
 
 FarawayIsland_Entrance_MapWarps: @ 853D740
 	warp_def 22, 7, 3, 0, FARAWAY_ISLAND_INTERIOR
@@ -15,5 +15,5 @@ FarawayIsland_Entrance_MapBGEvents: @ 853D780
 	bg_event 3, 32, 0, 1, 0, FarawayIsland_Entrance_EventScript_267CF1
 
 FarawayIsland_Entrance_MapEvents:: @ 853D78C
-	map_events FarawayIsland_Entrance_MapObjects, FarawayIsland_Entrance_MapWarps, FarawayIsland_Entrance_MapCoordEvents, FarawayIsland_Entrance_MapBGEvents
+	map_events FarawayIsland_Entrance_EventObjects, FarawayIsland_Entrance_MapWarps, FarawayIsland_Entrance_MapCoordEvents, FarawayIsland_Entrance_MapBGEvents
 
diff --git a/data/maps/events/FarawayIsland_Interior.inc b/data/maps/events/FarawayIsland_Interior.inc
index 6f13ca36e..d74eb9d8f 100644
--- a/data/maps/events/FarawayIsland_Interior.inc
+++ b/data/maps/events/FarawayIsland_Interior.inc
@@ -1,10 +1,10 @@
-FarawayIsland_Interior_MapObjects: @ 853D7A0
-	object_event 1, MAP_OBJ_GFX_MEW, 0, 0, 13, 17, 3, 60, 255, 0, 0, 1, FarawayIsland_Interior_EventScript_267DF2, 718, 0, 0
+FarawayIsland_Interior_EventObjects: @ 853D7A0
+	object_event 1, EVENT_OBJ_GFX_MEW, 0, 0, 13, 17, 3, 60, 255, 0, 0, 1, FarawayIsland_Interior_EventScript_267DF2, 718, 0, 0
 
 FarawayIsland_Interior_MapWarps: @ 853D7B8
 	warp_def 12, 19, 0, 0, FARAWAY_ISLAND_ENTRANCE
 	warp_def 13, 19, 0, 1, FARAWAY_ISLAND_ENTRANCE
 
 FarawayIsland_Interior_MapEvents:: @ 853D7C8
-	map_events FarawayIsland_Interior_MapObjects, FarawayIsland_Interior_MapWarps, 0x0, 0x0
+	map_events FarawayIsland_Interior_EventObjects, FarawayIsland_Interior_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/FieryPath.inc b/data/maps/events/FieryPath.inc
index cd360a75f..3b68b1292 100644
--- a/data/maps/events/FieryPath.inc
+++ b/data/maps/events/FieryPath.inc
@@ -1,17 +1,17 @@
-FieryPath_MapObjects: @ 8534C80
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 8, 3, 3, 1, 17, 0, 0, 0, FieryPath_EventScript_29119E, 1091, 0, 0
-	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 10, 15, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 17, 0, 0
-	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 17, 15, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 18, 0, 0
-	object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 8, 11, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 19, 0, 0
-	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 3, 12, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 20, 0, 0
-	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 23, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 21, 0, 0
-	object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 24, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 22, 0, 0
-	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 32, 3, 1, 17, 0, 0, 0, FieryPath_EventScript_291191, 1111, 0, 0
+FieryPath_EventObjects: @ 8534C80
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 8, 3, 3, 1, 17, 0, 0, 0, FieryPath_EventScript_29119E, 1091, 0, 0
+	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 10, 15, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 17, 0, 0
+	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 17, 15, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 18, 0, 0
+	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 8, 11, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 19, 0, 0
+	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 3, 12, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 20, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 23, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 21, 0, 0
+	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 24, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 22, 0, 0
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 32, 3, 1, 17, 0, 0, 0, FieryPath_EventScript_291191, 1111, 0, 0
 
 FieryPath_MapWarps: @ 8534D40
 	warp_def 26, 36, 3, 4, ROUTE_112
 	warp_def 26, 4, 3, 5, ROUTE_112
 
 FieryPath_MapEvents:: @ 8534D50
-	map_events FieryPath_MapObjects, FieryPath_MapWarps, 0x0, 0x0
+	map_events FieryPath_EventObjects, FieryPath_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/FortreeCity.inc b/data/maps/events/FortreeCity.inc
index 03ff20df1..517d32d53 100644
--- a/data/maps/events/FortreeCity.inc
+++ b/data/maps/events/FortreeCity.inc
@@ -1,11 +1,11 @@
-FortreeCity_MapObjects: @ 8526B9C
-	object_event 1, MAP_OBJ_GFX_MAN_2, 0, 0, 31, 3, 4, 1, 0, 0, 0, 0, FortreeCity_EventScript_1E25B6, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_1, 0, 0, 32, 16, 3, 2, 17, 0, 0, 0, FortreeCity_EventScript_1E25DE, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 0, 32, 10, 3, 3, 16, 0, 0, 0, FortreeCity_EventScript_1E25BF, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BOY_1, 0, 0, 11, 14, 4, 1, 0, 0, 0, 0, FortreeCity_EventScript_1E25F0, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 8, 10, 3, 1, 0, 0, 0, 0, FortreeCity_EventScript_1E25E7, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_BOY_5, 0, 0, 9, 16, 3, 8, 0, 0, 0, 0, FortreeCity_EventScript_1E25F9, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_KECLEON_1, 0, 0, 25, 8, 3, 76, 17, 0, 0, 0, FortreeCity_EventScript_1E2614, 969, 0, 0
+FortreeCity_EventObjects: @ 8526B9C
+	object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 0, 31, 3, 4, 1, 0, 0, 0, 0, FortreeCity_EventScript_1E25B6, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 0, 32, 16, 3, 2, 17, 0, 0, 0, FortreeCity_EventScript_1E25DE, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 32, 10, 3, 3, 16, 0, 0, 0, FortreeCity_EventScript_1E25BF, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 0, 11, 14, 4, 1, 0, 0, 0, 0, FortreeCity_EventScript_1E25F0, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 8, 10, 3, 1, 0, 0, 0, 0, FortreeCity_EventScript_1E25E7, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_BOY_5, 0, 0, 9, 16, 3, 8, 0, 0, 0, 0, FortreeCity_EventScript_1E25F9, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 25, 8, 3, 76, 17, 0, 0, 0, FortreeCity_EventScript_1E2614, 969, 0, 0
 
 FortreeCity_MapWarps: @ 8526C44
 	warp_def 5, 6, 0, 0, FORTREE_CITY_POKEMON_CENTER_1F
@@ -27,5 +27,5 @@ FortreeCity_MapBGEvents: @ 8526C8C
 	bg_event 6, 14, 0, 1, 0, FortreeCity_EventScript_271E6A
 
 FortreeCity_MapEvents:: @ 8526CD4
-	map_events FortreeCity_MapObjects, FortreeCity_MapWarps, 0x0, FortreeCity_MapBGEvents
+	map_events FortreeCity_EventObjects, FortreeCity_MapWarps, 0x0, FortreeCity_MapBGEvents
 
diff --git a/data/maps/events/FortreeCity_DecorationShop.inc b/data/maps/events/FortreeCity_DecorationShop.inc
index 7c25059bf..6b7e0f39d 100644
--- a/data/maps/events/FortreeCity_DecorationShop.inc
+++ b/data/maps/events/FortreeCity_DecorationShop.inc
@@ -1,13 +1,13 @@
-FortreeCity_DecorationShop_MapObjects: @ 85310B0
-	object_event 1, MAP_OBJ_GFX_MAN_3, 0, 0, 6, 5, 3, 1, 17, 0, 0, 0, FortreeCity_DecorationShop_EventScript_21800E, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 0, 4, 3, 9, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218017, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218020, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 6, 2, 3, 8, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_21804C, 0, 0, 0
+FortreeCity_DecorationShop_EventObjects: @ 85310B0
+	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 0, 6, 5, 3, 1, 17, 0, 0, 0, FortreeCity_DecorationShop_EventScript_21800E, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 0, 4, 3, 9, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218017, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218020, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 6, 2, 3, 8, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_21804C, 0, 0, 0
 
 FortreeCity_DecorationShop_MapWarps: @ 8531110
 	warp_def 3, 5, 0, 8, FORTREE_CITY
 	warp_def 4, 5, 0, 8, FORTREE_CITY
 
 FortreeCity_DecorationShop_MapEvents:: @ 8531120
-	map_events FortreeCity_DecorationShop_MapObjects, FortreeCity_DecorationShop_MapWarps, 0x0, 0x0
+	map_events FortreeCity_DecorationShop_EventObjects, FortreeCity_DecorationShop_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/FortreeCity_Gym.inc b/data/maps/events/FortreeCity_Gym.inc
index 6e3904b88..a06882772 100644
--- a/data/maps/events/FortreeCity_Gym.inc
+++ b/data/maps/events/FortreeCity_Gym.inc
@@ -1,12 +1,12 @@
-FortreeCity_Gym_MapObjects: @ 8530C98
-	object_event 1, MAP_OBJ_GFX_WINONA, 0, 0, 15, 2, 3, 8, 0, 0, 0, 0, FortreeCity_Gym_EventScript_2165C8, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_6, 0, 0, 4, 14, 3, 8, 0, 0, 1, 3, FortreeCity_Gym_EventScript_2166A8, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_CAMPER, 0, 0, 10, 10, 3, 9, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166D6, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 0, 5, 17, 3, 9, 0, 0, 1, 1, FortreeCity_Gym_EventScript_2166ED, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAN_6, 0, 0, 9, 8, 3, 8, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166BF, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_2, 0, 0, 15, 21, 3, 8, 0, 0, 0, 0, FortreeCity_Gym_EventScript_216732, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_MAN_6, 0, 0, 4, 23, 3, 10, 17, 0, 1, 1, FortreeCity_Gym_EventScript_216704, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_MAN_6, 0, 0, 1, 10, 3, 7, 17, 0, 1, 3, FortreeCity_Gym_EventScript_21671B, 0, 0, 0
+FortreeCity_Gym_EventObjects: @ 8530C98
+	object_event 1, EVENT_OBJ_GFX_WINONA, 0, 0, 15, 2, 3, 8, 0, 0, 0, 0, FortreeCity_Gym_EventScript_2165C8, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 0, 4, 14, 3, 8, 0, 0, 1, 3, FortreeCity_Gym_EventScript_2166A8, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 0, 10, 10, 3, 9, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166D6, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 0, 5, 17, 3, 9, 0, 0, 1, 1, FortreeCity_Gym_EventScript_2166ED, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 0, 9, 8, 3, 8, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166BF, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 0, 15, 21, 3, 8, 0, 0, 0, 0, FortreeCity_Gym_EventScript_216732, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_MAN_6, 0, 0, 4, 23, 3, 10, 17, 0, 1, 1, FortreeCity_Gym_EventScript_216704, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 0, 1, 10, 3, 7, 17, 0, 1, 3, FortreeCity_Gym_EventScript_21671B, 0, 0, 0
 
 FortreeCity_Gym_MapWarps: @ 8530D58
 	warp_def 15, 24, 0, 2, FORTREE_CITY
@@ -17,5 +17,5 @@ FortreeCity_Gym_MapBGEvents: @ 8530D68
 	bg_event 17, 21, 0, 1, 0, FortreeCity_Gym_EventScript_216761
 
 FortreeCity_Gym_MapEvents:: @ 8530D80
-	map_events FortreeCity_Gym_MapObjects, FortreeCity_Gym_MapWarps, 0x0, FortreeCity_Gym_MapBGEvents
+	map_events FortreeCity_Gym_EventObjects, FortreeCity_Gym_MapWarps, 0x0, FortreeCity_Gym_MapBGEvents
 
diff --git a/data/maps/events/FortreeCity_House1.inc b/data/maps/events/FortreeCity_House1.inc
index d1eecfdef..abaae2d40 100644
--- a/data/maps/events/FortreeCity_House1.inc
+++ b/data/maps/events/FortreeCity_House1.inc
@@ -1,12 +1,12 @@
-FortreeCity_House1_MapObjects: @ 8530C2C
-	object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, FortreeCity_House1_EventScript_2162BB, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 2, 3, 3, 9, 0, 0, 0, 0, FortreeCity_House1_EventScript_216368, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 7, 4, 3, 1, 17, 0, 0, 0, FortreeCity_House1_EventScript_21635F, 0, 0, 0
+FortreeCity_House1_EventObjects: @ 8530C2C
+	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, FortreeCity_House1_EventScript_2162BB, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 2, 3, 3, 9, 0, 0, 0, 0, FortreeCity_House1_EventScript_216368, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 7, 4, 3, 1, 17, 0, 0, 0, FortreeCity_House1_EventScript_21635F, 0, 0, 0
 
 FortreeCity_House1_MapWarps: @ 8530C74
 	warp_def 3, 5, 0, 1, FORTREE_CITY
 	warp_def 4, 5, 0, 1, FORTREE_CITY
 
 FortreeCity_House1_MapEvents:: @ 8530C84
-	map_events FortreeCity_House1_MapObjects, FortreeCity_House1_MapWarps, 0x0, 0x0
+	map_events FortreeCity_House1_EventObjects, FortreeCity_House1_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/FortreeCity_House2.inc b/data/maps/events/FortreeCity_House2.inc
index c54b42a6d..513097503 100644
--- a/data/maps/events/FortreeCity_House2.inc
+++ b/data/maps/events/FortreeCity_House2.inc
@@ -1,11 +1,11 @@
-FortreeCity_House2_MapObjects: @ 8530F30
-	object_event 1, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 2, 3, 3, 5, 1, 0, 0, 0, FortreeCity_House2_EventScript_2177CB, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 6, 3, 3, 9, 1, 0, 0, 0, FortreeCity_House2_EventScript_2C811E, 0, 0, 0
+FortreeCity_House2_EventObjects: @ 8530F30
+	object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 2, 3, 3, 5, 1, 0, 0, 0, FortreeCity_House2_EventScript_2177CB, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 6, 3, 3, 9, 1, 0, 0, 0, FortreeCity_House2_EventScript_2C811E, 0, 0, 0
 
 FortreeCity_House2_MapWarps: @ 8530F60
 	warp_def 3, 5, 0, 4, FORTREE_CITY
 	warp_def 4, 5, 0, 4, FORTREE_CITY
 
 FortreeCity_House2_MapEvents:: @ 8530F70
-	map_events FortreeCity_House2_MapObjects, FortreeCity_House2_MapWarps, 0x0, 0x0
+	map_events FortreeCity_House2_EventObjects, FortreeCity_House2_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/FortreeCity_House3.inc b/data/maps/events/FortreeCity_House3.inc
index 7be159493..1b788cbe2 100644
--- a/data/maps/events/FortreeCity_House3.inc
+++ b/data/maps/events/FortreeCity_House3.inc
@@ -1,11 +1,11 @@
-FortreeCity_House3_MapObjects: @ 8530F84
-	object_event 1, MAP_OBJ_GFX_MANIAC, 0, 0, 0, 3, 3, 10, 0, 0, 0, 0, FortreeCity_House3_EventScript_217AE8, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 5, 4, 3, 2, 17, 0, 0, 0, FortreeCity_House3_EventScript_217AF1, 0, 0, 0
+FortreeCity_House3_EventObjects: @ 8530F84
+	object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 0, 3, 3, 10, 0, 0, 0, 0, FortreeCity_House3_EventScript_217AE8, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 5, 4, 3, 2, 17, 0, 0, 0, FortreeCity_House3_EventScript_217AF1, 0, 0, 0
 
 FortreeCity_House3_MapWarps: @ 8530FB4
 	warp_def 3, 5, 0, 5, FORTREE_CITY
 	warp_def 4, 5, 0, 5, FORTREE_CITY
 
 FortreeCity_House3_MapEvents:: @ 8530FC4
-	map_events FortreeCity_House3_MapObjects, FortreeCity_House3_MapWarps, 0x0, 0x0
+	map_events FortreeCity_House3_EventObjects, FortreeCity_House3_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/FortreeCity_House4.inc b/data/maps/events/FortreeCity_House4.inc
index d24c12520..a4050a5f6 100644
--- a/data/maps/events/FortreeCity_House4.inc
+++ b/data/maps/events/FortreeCity_House4.inc
@@ -1,12 +1,12 @@
-FortreeCity_House4_MapObjects: @ 8530FD8
-	object_event 1, MAP_OBJ_GFX_WOMAN_5, 0, 0, 6, 4, 3, 2, 17, 0, 0, 0, FortreeCity_House4_EventScript_217C81, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BOY_3, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House4_EventScript_217C8A, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WINGULL, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House4_EventScript_217D20, 933, 0, 0
+FortreeCity_House4_EventObjects: @ 8530FD8
+	object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 6, 4, 3, 2, 17, 0, 0, 0, FortreeCity_House4_EventScript_217C81, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House4_EventScript_217C8A, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House4_EventScript_217D20, 933, 0, 0
 
 FortreeCity_House4_MapWarps: @ 8531020
 	warp_def 3, 5, 0, 6, FORTREE_CITY
 	warp_def 4, 5, 0, 6, FORTREE_CITY
 
 FortreeCity_House4_MapEvents:: @ 8531030
-	map_events FortreeCity_House4_MapObjects, FortreeCity_House4_MapWarps, 0x0, 0x0
+	map_events FortreeCity_House4_EventObjects, FortreeCity_House4_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/FortreeCity_House5.inc b/data/maps/events/FortreeCity_House5.inc
index 3520e7249..b6bf34354 100644
--- a/data/maps/events/FortreeCity_House5.inc
+++ b/data/maps/events/FortreeCity_House5.inc
@@ -1,12 +1,12 @@
-FortreeCity_House5_MapObjects: @ 8531044
-	object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 4, 3, 20, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EF2, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 6, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House5_EventScript_217F04, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_1, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EFB, 0, 0, 0
+FortreeCity_House5_EventObjects: @ 8531044
+	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 6, 4, 3, 20, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EF2, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 6, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House5_EventScript_217F04, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EFB, 0, 0, 0
 
 FortreeCity_House5_MapWarps: @ 853108C
 	warp_def 3, 5, 0, 7, FORTREE_CITY
 	warp_def 4, 5, 0, 7, FORTREE_CITY
 
 FortreeCity_House5_MapEvents:: @ 853109C
-	map_events FortreeCity_House5_MapObjects, FortreeCity_House5_MapWarps, 0x0, 0x0
+	map_events FortreeCity_House5_EventObjects, FortreeCity_House5_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/FortreeCity_Mart.inc b/data/maps/events/FortreeCity_Mart.inc
index acb1e9471..df4877663 100644
--- a/data/maps/events/FortreeCity_Mart.inc
+++ b/data/maps/events/FortreeCity_Mart.inc
@@ -1,13 +1,13 @@
-FortreeCity_Mart_MapObjects: @ 8530EAC
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217666, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 0, 9, 3, 3, 7, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217698, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 0, 8, 5, 3, 2, 17, 0, 0, 0, FortreeCity_Mart_EventScript_2176A1, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BOY_2, 0, 0, 5, 6, 3, 10, 17, 0, 0, 0, FortreeCity_Mart_EventScript_2176AA, 0, 0, 0
+FortreeCity_Mart_EventObjects: @ 8530EAC
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217666, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 9, 3, 3, 7, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217698, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 0, 8, 5, 3, 2, 17, 0, 0, 0, FortreeCity_Mart_EventScript_2176A1, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 0, 5, 6, 3, 10, 17, 0, 0, 0, FortreeCity_Mart_EventScript_2176AA, 0, 0, 0
 
 FortreeCity_Mart_MapWarps: @ 8530F0C
 	warp_def 3, 7, 0, 3, FORTREE_CITY
 	warp_def 4, 7, 0, 3, FORTREE_CITY
 
 FortreeCity_Mart_MapEvents:: @ 8530F1C
-	map_events FortreeCity_Mart_MapObjects, FortreeCity_Mart_MapWarps, 0x0, 0x0
+	map_events FortreeCity_Mart_EventObjects, FortreeCity_Mart_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/FortreeCity_PokemonCenter_1F.inc b/data/maps/events/FortreeCity_PokemonCenter_1F.inc
index 922e825c7..b6b8cfdce 100644
--- a/data/maps/events/FortreeCity_PokemonCenter_1F.inc
+++ b/data/maps/events/FortreeCity_PokemonCenter_1F.inc
@@ -1,8 +1,8 @@
-FortreeCity_PokemonCenter_1F_MapObjects: @ 8530D94
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173E7, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 4, 7, 3, 1, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173F5, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 8, 5, 3, 1, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173FE, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BOY_3, 0, 0, 2, 3, 3, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_217407, 0, 0, 0
+FortreeCity_PokemonCenter_1F_EventObjects: @ 8530D94
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173E7, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 4, 7, 3, 1, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173F5, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 8, 5, 3, 1, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173FE, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_3, 0, 0, 2, 3, 3, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_217407, 0, 0, 0
 
 FortreeCity_PokemonCenter_1F_MapWarps: @ 8530DF4
 	warp_def 7, 8, 3, 0, FORTREE_CITY
@@ -10,5 +10,5 @@ FortreeCity_PokemonCenter_1F_MapWarps: @ 8530DF4
 	warp_def 1, 6, 4, 0, FORTREE_CITY_POKEMON_CENTER_2F
 
 FortreeCity_PokemonCenter_1F_MapEvents:: @ 8530E0C
-	map_events FortreeCity_PokemonCenter_1F_MapObjects, FortreeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
+	map_events FortreeCity_PokemonCenter_1F_EventObjects, FortreeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/FortreeCity_PokemonCenter_2F.inc b/data/maps/events/FortreeCity_PokemonCenter_2F.inc
index e5a3f1ac4..c8f2356c4 100644
--- a/data/maps/events/FortreeCity_PokemonCenter_2F.inc
+++ b/data/maps/events/FortreeCity_PokemonCenter_2F.inc
@@ -1,8 +1,8 @@
-FortreeCity_PokemonCenter_2F_MapObjects: @ 8530E20
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
+FortreeCity_PokemonCenter_2F_EventObjects: @ 8530E20
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
 
 FortreeCity_PokemonCenter_2F_MapWarps: @ 8530E80
 	warp_def 1, 6, 4, 2, FORTREE_CITY_POKEMON_CENTER_1F
@@ -10,5 +10,5 @@ FortreeCity_PokemonCenter_2F_MapWarps: @ 8530E80
 	warp_def 9, 1, 3, 0, TRADE_CENTER
 
 FortreeCity_PokemonCenter_2F_MapEvents:: @ 8530E98
-	map_events FortreeCity_PokemonCenter_2F_MapObjects, FortreeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
+	map_events FortreeCity_PokemonCenter_2F_EventObjects, FortreeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/GraniteCave_1F.inc b/data/maps/events/GraniteCave_1F.inc
index 1bad3837f..ed546c8df 100644
--- a/data/maps/events/GraniteCave_1F.inc
+++ b/data/maps/events/GraniteCave_1F.inc
@@ -1,6 +1,6 @@
-GraniteCave_1F_MapObjects: @ 85343BC
-	object_event 1, MAP_OBJ_GFX_HIKER, 0, 0, 36, 9, 3, 1, 0, 0, 0, 0, GraniteCave_1F_EventScript_22DA5E, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 17, 7, 3, 8, 0, 0, 0, 0, GraniteCave_1F_EventScript_291150, 1050, 0, 0
+GraniteCave_1F_EventObjects: @ 85343BC
+	object_event 1, EVENT_OBJ_GFX_HIKER, 0, 0, 36, 9, 3, 1, 0, 0, 0, 0, GraniteCave_1F_EventScript_22DA5E, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 17, 7, 3, 8, 0, 0, 0, 0, GraniteCave_1F_EventScript_291150, 1050, 0, 0
 
 GraniteCave_1F_MapWarps: @ 85343EC
 	warp_def 37, 12, 3, 0, ROUTE_106
@@ -9,5 +9,5 @@ GraniteCave_1F_MapWarps: @ 85343EC
 	warp_def 5, 10, 3, 0, GRANITE_CAVE_STEVENS_ROOM
 
 GraniteCave_1F_MapEvents:: @ 853440C
-	map_events GraniteCave_1F_MapObjects, GraniteCave_1F_MapWarps, 0x0, 0x0
+	map_events GraniteCave_1F_EventObjects, GraniteCave_1F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/GraniteCave_B1F.inc b/data/maps/events/GraniteCave_B1F.inc
index f5981fcbe..7f4e67f33 100644
--- a/data/maps/events/GraniteCave_B1F.inc
+++ b/data/maps/events/GraniteCave_B1F.inc
@@ -1,5 +1,5 @@
-GraniteCave_B1F_MapObjects: @ 8534420
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 15, 21, 3, 1, 0, 0, 0, 0, GraniteCave_B1F_EventScript_29115D, 1051, 0, 0
+GraniteCave_B1F_EventObjects: @ 8534420
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 15, 21, 3, 1, 0, 0, 0, 0, GraniteCave_B1F_EventScript_29115D, 1051, 0, 0
 
 GraniteCave_B1F_MapWarps: @ 8534438
 	warp_def 25, 13, 3, 1, GRANITE_CAVE_1F
@@ -11,5 +11,5 @@ GraniteCave_B1F_MapWarps: @ 8534438
 	warp_def 29, 2, 3, 4, GRANITE_CAVE_B2F
 
 GraniteCave_B1F_MapEvents:: @ 8534470
-	map_events GraniteCave_B1F_MapObjects, GraniteCave_B1F_MapWarps, 0x0, 0x0
+	map_events GraniteCave_B1F_EventObjects, GraniteCave_B1F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/GraniteCave_B2F.inc b/data/maps/events/GraniteCave_B2F.inc
index ebc9467f4..7c484e9a9 100644
--- a/data/maps/events/GraniteCave_B2F.inc
+++ b/data/maps/events/GraniteCave_B2F.inc
@@ -1,13 +1,13 @@
-GraniteCave_B2F_MapObjects: @ 8534484
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, 3, 1, 0, 0, 0, 0, GraniteCave_B2F_EventScript_29116A, 1053, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 29, 4, 3, 1, 0, 0, 0, 0, GraniteCave_B2F_EventScript_291177, 1054, 0, 0
-	object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 5, 14, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 17, 0, 0
-	object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 3, 14, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 18, 0, 0
-	object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 2, 16, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 19, 0, 0
-	object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 7, 12, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 20, 0, 0
-	object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 4, 22, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 21, 0, 0
-	object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 6, 22, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 22, 0, 0
-	object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 3, 21, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 23, 0, 0
+GraniteCave_B2F_EventObjects: @ 8534484
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, 3, 1, 0, 0, 0, 0, GraniteCave_B2F_EventScript_29116A, 1053, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 29, 4, 3, 1, 0, 0, 0, 0, GraniteCave_B2F_EventScript_291177, 1054, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 5, 14, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 17, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 3, 14, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 18, 0, 0
+	object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 2, 16, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 19, 0, 0
+	object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 7, 12, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 20, 0, 0
+	object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 4, 22, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 21, 0, 0
+	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 6, 22, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 22, 0, 0
+	object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 3, 21, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 23, 0, 0
 
 GraniteCave_B2F_MapWarps: @ 853455C
 	warp_def 29, 13, 3, 2, GRANITE_CAVE_B1F
@@ -21,5 +21,5 @@ GraniteCave_B2F_MapBGEvents: @ 8534584
 	bg_event 15, 11, 3, 7, 0, ITEM_EVERSTONE, 49, 0
 
 GraniteCave_B2F_MapEvents:: @ 853459C
-	map_events GraniteCave_B2F_MapObjects, GraniteCave_B2F_MapWarps, 0x0, GraniteCave_B2F_MapBGEvents
+	map_events GraniteCave_B2F_EventObjects, GraniteCave_B2F_MapWarps, 0x0, GraniteCave_B2F_MapBGEvents
 
diff --git a/data/maps/events/GraniteCave_StevensRoom.inc b/data/maps/events/GraniteCave_StevensRoom.inc
index eca46cd79..65b343202 100644
--- a/data/maps/events/GraniteCave_StevensRoom.inc
+++ b/data/maps/events/GraniteCave_StevensRoom.inc
@@ -1,9 +1,9 @@
-GraniteCave_StevensRoom_MapObjects: @ 85345B0
-	object_event 1, MAP_OBJ_GFX_STEVEN, 0, 0, 7, 8, 3, 1, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_22DC7B, 833, 0, 0
+GraniteCave_StevensRoom_EventObjects: @ 85345B0
+	object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 0, 7, 8, 3, 1, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_22DC7B, 833, 0, 0
 
 GraniteCave_StevensRoom_MapWarps: @ 85345C8
 	warp_def 7, 3, 3, 3, GRANITE_CAVE_1F
 
 GraniteCave_StevensRoom_MapEvents:: @ 85345D0
-	map_events GraniteCave_StevensRoom_MapObjects, GraniteCave_StevensRoom_MapWarps, 0x0, 0x0
+	map_events GraniteCave_StevensRoom_EventObjects, GraniteCave_StevensRoom_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/InsideOfTruck.inc b/data/maps/events/InsideOfTruck.inc
index 3e888ec44..4cf23e63d 100644
--- a/data/maps/events/InsideOfTruck.inc
+++ b/data/maps/events/InsideOfTruck.inc
@@ -1,7 +1,7 @@
-InsideOfTruck_MapObjects: @ 853A078
-	object_event 1, MAP_OBJ_GFX_MOVING_BOX, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MOVING_BOX, 0, 0, 0, 3, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MOVING_BOX, 0, 0, 2, 3, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0, 0, 0
+InsideOfTruck_EventObjects: @ 853A078
+	object_event 1, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 0, 3, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 2, 3, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0, 0, 0
 
 InsideOfTruck_MapWarps: @ 853A0C0
 	warp_def 4, 1, 0, 127, NONE
@@ -21,5 +21,5 @@ InsideOfTruck_MapBGEvents: @ 853A108
 	bg_event 0, 2, 0, 0, 0, InsideOfTruck_EventScript_23BF6C
 
 InsideOfTruck_MapEvents:: @ 853A144
-	map_events InsideOfTruck_MapObjects, InsideOfTruck_MapWarps, InsideOfTruck_MapCoordEvents, InsideOfTruck_MapBGEvents
+	map_events InsideOfTruck_EventObjects, InsideOfTruck_MapWarps, InsideOfTruck_MapCoordEvents, InsideOfTruck_MapBGEvents
 
diff --git a/data/maps/events/IslandCave.inc b/data/maps/events/IslandCave.inc
index 094852c5a..da1f94173 100644
--- a/data/maps/events/IslandCave.inc
+++ b/data/maps/events/IslandCave.inc
@@ -1,5 +1,5 @@
-IslandCave_MapObjects: @ 8536C74
-	object_event 1, MAP_OBJ_GFX_REGICE, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, IslandCave_EventScript_238F58, 936, 0, 0
+IslandCave_EventObjects: @ 8536C74
+	object_event 1, EVENT_OBJ_GFX_REGICE, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, IslandCave_EventScript_238F58, 936, 0, 0
 
 IslandCave_MapWarps: @ 8536C8C
 	warp_def 8, 29, 3, 0, ROUTE_105
@@ -12,5 +12,5 @@ IslandCave_MapBGEvents: @ 8536CA4
 	bg_event 9, 20, 0, 0, 0, IslandCave_EventScript_238F1D
 
 IslandCave_MapEvents:: @ 8536CC8
-	map_events IslandCave_MapObjects, IslandCave_MapWarps, 0x0, IslandCave_MapBGEvents
+	map_events IslandCave_EventObjects, IslandCave_MapWarps, 0x0, IslandCave_MapBGEvents
 
diff --git a/data/maps/events/JaggedPass.inc b/data/maps/events/JaggedPass.inc
index cc862fed1..5d970924d 100644
--- a/data/maps/events/JaggedPass.inc
+++ b/data/maps/events/JaggedPass.inc
@@ -1,11 +1,11 @@
-JaggedPass_MapObjects: @ 8534AE4
-	object_event 1, MAP_OBJ_GFX_HIKER, 0, 0, 10, 8, 3, 10, 0, 0, 1, 3, JaggedPass_EventScript_230785, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_CAMPER, 0, 0, 16, 35, 3, 14, 0, 0, 1, 4, JaggedPass_EventScript_2307FB, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 23, 24, 3, 1, 0, 0, 0, 0, JaggedPass_EventScript_291184, 1070, 0, 0
-	object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 0, 9, 21, 3, 16, 17, 0, 1, 3, JaggedPass_EventScript_23079C, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 16, 19, 3, 7, 17, 0, 0, 0, JaggedPass_EventScript_230718, 847, 0, 0
-	object_event 6, MAP_OBJ_GFX_PICNICKER, 0, 0, 14, 25, 3, 10, 17, 0, 1, 3, JaggedPass_EventScript_230871, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 18, 25, 3, 9, 17, 0, 1, 3, JaggedPass_EventScript_23085A, 0, 0, 0
+JaggedPass_EventObjects: @ 8534AE4
+	object_event 1, EVENT_OBJ_GFX_HIKER, 0, 0, 10, 8, 3, 10, 0, 0, 1, 3, JaggedPass_EventScript_230785, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 0, 16, 35, 3, 14, 0, 0, 1, 4, JaggedPass_EventScript_2307FB, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 23, 24, 3, 1, 0, 0, 0, 0, JaggedPass_EventScript_291184, 1070, 0, 0
+	object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 0, 9, 21, 3, 16, 17, 0, 1, 3, JaggedPass_EventScript_23079C, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 16, 19, 3, 7, 17, 0, 0, 0, JaggedPass_EventScript_230718, 847, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 0, 14, 25, 3, 10, 17, 0, 1, 3, JaggedPass_EventScript_230871, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 18, 25, 3, 9, 17, 0, 1, 3, JaggedPass_EventScript_23085A, 0, 0, 0
 
 JaggedPass_MapWarps: @ 8534B8C
 	warp_def 14, 40, 3, 2, ROUTE_112
@@ -31,5 +31,5 @@ JaggedPass_MapBGEvents: @ 8534C54
 	bg_event 7, 29, 3, 7, 0, ITEM_GREAT_BALL, 76, 0
 
 JaggedPass_MapEvents:: @ 8534C6C
-	map_events JaggedPass_MapObjects, JaggedPass_MapWarps, JaggedPass_MapCoordEvents, JaggedPass_MapBGEvents
+	map_events JaggedPass_EventObjects, JaggedPass_MapWarps, JaggedPass_MapCoordEvents, JaggedPass_MapBGEvents
 
diff --git a/data/maps/events/LavaridgeTown.inc b/data/maps/events/LavaridgeTown.inc
index 0e16fc60c..658056768 100644
--- a/data/maps/events/LavaridgeTown.inc
+++ b/data/maps/events/LavaridgeTown.inc
@@ -1,13 +1,13 @@
-LavaridgeTown_MapObjects: @ 8527A54
-	object_event 1, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA73B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA70E, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 5, 8, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA717, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 10, 13, 3, 3, 32, 0, 0, 0, LavaridgeTown_EventScript_1EA720, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 0, 4, 4, 3, 18, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA729, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 0, 5, 4, 3, 17, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA732, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_GIDDY, 0, 0, 6, 16, 3, 9, 0, 0, 0, 0, 0x0, 930, 0, 0
-	object_event 8, MAP_OBJ_GFX_HIPSTER, 0, 0, 12, 15, 0, 8, 0, 0, 0, 0, 0x0, 929, 0, 0
-	object_event 9, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 4, 7, 3, 8, 17, 0, 0, 0, LavaridgeTown_EventScript_1EA744, 0, 0, 0
+LavaridgeTown_EventObjects: @ 8527A54
+	object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA73B, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA70E, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 5, 8, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA717, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 10, 13, 3, 3, 32, 0, 0, 0, LavaridgeTown_EventScript_1EA720, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 0, 4, 4, 3, 18, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA729, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 0, 5, 4, 3, 17, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA732, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_GIDDY, 0, 0, 6, 16, 3, 9, 0, 0, 0, 0, 0x0, 930, 0, 0
+	object_event 8, EVENT_OBJ_GFX_HIPSTER, 0, 0, 12, 15, 0, 8, 0, 0, 0, 0, 0x0, 929, 0, 0
+	object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 4, 7, 3, 8, 17, 0, 0, 0, LavaridgeTown_EventScript_1EA744, 0, 0, 0
 
 LavaridgeTown_MapWarps: @ 8527B2C
 	warp_def 12, 15, 0, 0, LAVARIDGE_TOWN_HERB_SHOP
@@ -31,5 +31,5 @@ LavaridgeTown_MapBGEvents: @ 8527B6C
 	bg_event 4, 5, 3, 7, 0, ITEM_ICE_HEAL, 0, 0
 
 LavaridgeTown_MapEvents:: @ 8527BCC
-	map_events LavaridgeTown_MapObjects, LavaridgeTown_MapWarps, LavaridgeTown_MapCoordEvents, LavaridgeTown_MapBGEvents
+	map_events LavaridgeTown_EventObjects, LavaridgeTown_MapWarps, LavaridgeTown_MapCoordEvents, LavaridgeTown_MapBGEvents
 
diff --git a/data/maps/events/LavaridgeTown_Gym_1F.inc b/data/maps/events/LavaridgeTown_Gym_1F.inc
index a67522cb8..501cab67f 100644
--- a/data/maps/events/LavaridgeTown_Gym_1F.inc
+++ b/data/maps/events/LavaridgeTown_Gym_1F.inc
@@ -1,10 +1,10 @@
-LavaridgeTown_Gym_1F_MapObjects: @ 852DE1C
-	object_event 1, MAP_OBJ_GFX_FLANNERY, 0, 0, 13, 9, 3, 8, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE78C, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_6, 0, 0, 3, 14, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE87F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 2, 15, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE900, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_6, 0, 0, 3, 10, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8AF, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIRL_3, 0, 0, 5, 2, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8E5, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_2, 0, 0, 12, 16, 3, 10, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE96C, 0, 0, 0
+LavaridgeTown_Gym_1F_EventObjects: @ 852DE1C
+	object_event 1, EVENT_OBJ_GFX_FLANNERY, 0, 0, 13, 9, 3, 8, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE78C, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 0, 3, 14, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE87F, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 2, 15, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE900, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 0, 3, 10, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8AF, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_GIRL_3, 0, 0, 5, 2, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8E5, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 0, 12, 16, 3, 10, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE96C, 0, 0, 0
 
 LavaridgeTown_Gym_1F_MapWarps: @ 852DEAC
 	warp_def 13, 18, 3, 1, LAVARIDGE_TOWN
@@ -39,5 +39,5 @@ LavaridgeTown_Gym_1F_MapBGEvents: @ 852DF7C
 	bg_event 16, 15, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_1FE99B
 
 LavaridgeTown_Gym_1F_MapEvents:: @ 852DF94
-	map_events LavaridgeTown_Gym_1F_MapObjects, LavaridgeTown_Gym_1F_MapWarps, 0x0, LavaridgeTown_Gym_1F_MapBGEvents
+	map_events LavaridgeTown_Gym_1F_EventObjects, LavaridgeTown_Gym_1F_MapWarps, 0x0, LavaridgeTown_Gym_1F_MapBGEvents
 
diff --git a/data/maps/events/LavaridgeTown_Gym_B1F.inc b/data/maps/events/LavaridgeTown_Gym_B1F.inc
index 0c0c4adaa..af1f166ce 100644
--- a/data/maps/events/LavaridgeTown_Gym_B1F.inc
+++ b/data/maps/events/LavaridgeTown_Gym_B1F.inc
@@ -1,8 +1,8 @@
-LavaridgeTown_Gym_B1F_MapObjects: @ 852DFA8
-	object_event 1, MAP_OBJ_GFX_MAN_6, 0, 0, 4, 18, 3, 8, 17, 0, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE91B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_6, 0, 0, 3, 6, 0, 8, 17, 0, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE8CA, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_6, 0, 0, 13, 17, 0, 8, 17, 0, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE936, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_HIKER, 0, 0, 4, 16, 3, 8, 17, 0, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE951, 0, 0, 0
+LavaridgeTown_Gym_B1F_EventObjects: @ 852DFA8
+	object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 0, 4, 18, 3, 8, 17, 0, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE91B, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 0, 3, 6, 0, 8, 17, 0, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE8CA, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_6, 0, 0, 13, 17, 0, 8, 17, 0, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE936, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_HIKER, 0, 0, 4, 16, 3, 8, 17, 0, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE951, 0, 0, 0
 
 LavaridgeTown_Gym_B1F_MapWarps: @ 852E008
 	warp_def 10, 18, 3, 2, LAVARIDGE_TOWN_GYM_1F
@@ -31,5 +31,5 @@ LavaridgeTown_Gym_B1F_MapWarps: @ 852E008
 	warp_def 12, 12, 3, 25, LAVARIDGE_TOWN_GYM_1F
 
 LavaridgeTown_Gym_B1F_MapEvents:: @ 852E0C8
-	map_events LavaridgeTown_Gym_B1F_MapObjects, LavaridgeTown_Gym_B1F_MapWarps, 0x0, 0x0
+	map_events LavaridgeTown_Gym_B1F_EventObjects, LavaridgeTown_Gym_B1F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/LavaridgeTown_HerbShop.inc b/data/maps/events/LavaridgeTown_HerbShop.inc
index 76b5ac368..9fa4c6376 100644
--- a/data/maps/events/LavaridgeTown_HerbShop.inc
+++ b/data/maps/events/LavaridgeTown_HerbShop.inc
@@ -1,12 +1,12 @@
-LavaridgeTown_HerbShop_MapObjects: @ 852DDB0
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 3, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4D7, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 7, 5, 3, 1, 17, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE505, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 9, 3, 3, 5, 17, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4FC, 0, 0, 0
+LavaridgeTown_HerbShop_EventObjects: @ 852DDB0
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 3, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4D7, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 7, 5, 3, 1, 17, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE505, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 9, 3, 3, 5, 17, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4FC, 0, 0, 0
 
 LavaridgeTown_HerbShop_MapWarps: @ 852DDF8
 	warp_def 3, 7, 0, 0, LAVARIDGE_TOWN
 	warp_def 4, 7, 0, 0, LAVARIDGE_TOWN
 
 LavaridgeTown_HerbShop_MapEvents:: @ 852DE08
-	map_events LavaridgeTown_HerbShop_MapObjects, LavaridgeTown_HerbShop_MapWarps, 0x0, 0x0
+	map_events LavaridgeTown_HerbShop_EventObjects, LavaridgeTown_HerbShop_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/LavaridgeTown_House.inc b/data/maps/events/LavaridgeTown_House.inc
index 82ae945b4..669728b66 100644
--- a/data/maps/events/LavaridgeTown_House.inc
+++ b/data/maps/events/LavaridgeTown_House.inc
@@ -1,12 +1,12 @@
-LavaridgeTown_House_MapObjects: @ 852E0DC
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 2, 3, 3, 1, 17, 0, 0, 0, LavaridgeTown_House_EventScript_1FF912, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 6, 6, 3, 1, 17, 0, 0, 0, LavaridgeTown_House_EventScript_1FF91B, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 8, 4, 3, 2, 17, 0, 0, 0, LavaridgeTown_House_EventScript_2C804E, 0, 0, 0
+LavaridgeTown_House_EventObjects: @ 852E0DC
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 2, 3, 3, 1, 17, 0, 0, 0, LavaridgeTown_House_EventScript_1FF912, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 6, 6, 3, 1, 17, 0, 0, 0, LavaridgeTown_House_EventScript_1FF91B, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 8, 4, 3, 2, 17, 0, 0, 0, LavaridgeTown_House_EventScript_2C804E, 0, 0, 0
 
 LavaridgeTown_House_MapWarps: @ 852E124
 	warp_def 3, 7, 0, 4, LAVARIDGE_TOWN
 	warp_def 4, 7, 0, 4, LAVARIDGE_TOWN
 
 LavaridgeTown_House_MapEvents:: @ 852E134
-	map_events LavaridgeTown_House_MapObjects, LavaridgeTown_House_MapWarps, 0x0, 0x0
+	map_events LavaridgeTown_House_EventObjects, LavaridgeTown_House_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/LavaridgeTown_Mart.inc b/data/maps/events/LavaridgeTown_Mart.inc
index db9c02f5e..5230cead9 100644
--- a/data/maps/events/LavaridgeTown_Mart.inc
+++ b/data/maps/events/LavaridgeTown_Mart.inc
@@ -1,12 +1,12 @@
-LavaridgeTown_Mart_MapObjects: @ 852E148
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9CE, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9FE, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 0, 9, 5, 3, 10, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FFA07, 0, 0, 0
+LavaridgeTown_Mart_EventObjects: @ 852E148
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9CE, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9FE, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 9, 5, 3, 10, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FFA07, 0, 0, 0
 
 LavaridgeTown_Mart_MapWarps: @ 852E190
 	warp_def 3, 7, 0, 2, LAVARIDGE_TOWN
 	warp_def 4, 7, 0, 2, LAVARIDGE_TOWN
 
 LavaridgeTown_Mart_MapEvents:: @ 852E1A0
-	map_events LavaridgeTown_Mart_MapObjects, LavaridgeTown_Mart_MapWarps, 0x0, 0x0
+	map_events LavaridgeTown_Mart_EventObjects, LavaridgeTown_Mart_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc b/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc
index 11ed52f9a..8ebf9f16a 100644
--- a/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc
+++ b/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc
@@ -1,8 +1,8 @@
-LavaridgeTown_PokemonCenter_1F_MapObjects: @ 852E1B4
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 11, 8, 3, 7, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB1C, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_4, 0, 0, 10, 6, 0, 9, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB25, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB2E, 0, 0, 0
+LavaridgeTown_PokemonCenter_1F_EventObjects: @ 852E1B4
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 11, 8, 3, 7, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB1C, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 10, 6, 0, 9, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB25, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB2E, 0, 0, 0
 
 LavaridgeTown_PokemonCenter_1F_MapWarps: @ 852E214
 	warp_def 7, 8, 3, 3, LAVARIDGE_TOWN
@@ -11,5 +11,5 @@ LavaridgeTown_PokemonCenter_1F_MapWarps: @ 852E214
 	warp_def 2, 1, 0, 5, LAVARIDGE_TOWN
 
 LavaridgeTown_PokemonCenter_1F_MapEvents:: @ 852E234
-	map_events LavaridgeTown_PokemonCenter_1F_MapObjects, LavaridgeTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
+	map_events LavaridgeTown_PokemonCenter_1F_EventObjects, LavaridgeTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc b/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc
index dc0acec14..53fc2b2cc 100644
--- a/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc
+++ b/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc
@@ -1,8 +1,8 @@
-LavaridgeTown_PokemonCenter_2F_MapObjects: @ 852E248
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
+LavaridgeTown_PokemonCenter_2F_EventObjects: @ 852E248
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
 
 LavaridgeTown_PokemonCenter_2F_MapWarps: @ 852E2A8
 	warp_def 1, 6, 4, 2, LAVARIDGE_TOWN_POKEMON_CENTER_1F
@@ -10,5 +10,5 @@ LavaridgeTown_PokemonCenter_2F_MapWarps: @ 852E2A8
 	warp_def 9, 1, 3, 0, TRADE_CENTER
 
 LavaridgeTown_PokemonCenter_2F_MapEvents:: @ 852E2C0
-	map_events LavaridgeTown_PokemonCenter_2F_MapObjects, LavaridgeTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
+	map_events LavaridgeTown_PokemonCenter_2F_EventObjects, LavaridgeTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/LilycoveCity.inc b/data/maps/events/LilycoveCity.inc
index 63aed18f8..c7578bec3 100644
--- a/data/maps/events/LilycoveCity.inc
+++ b/data/maps/events/LilycoveCity.inc
@@ -1,26 +1,26 @@
-LilycoveCity_MapObjects: @ 8526CE8
-	object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 32, 20, 3, 3, 16, 0, 0, 0, LilycoveCity_EventScript_1E2C53, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_1, 0, 0, 15, 18, 3, 2, 17, 0, 0, 0, LilycoveCity_EventScript_1E2C2B, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_1, 0, 0, 28, 28, 3, 1, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C22, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BOY_4, 0, 0, 21, 15, 3, 2, 17, 0, 0, 0, LilycoveCity_EventScript_1E2C4A, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAN_2, 0, 0, 16, 9, 5, 5, 1, 0, 0, 0, LilycoveCity_EventScript_1E2C91, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_WOMAN_3, 0, 0, 35, 27, 3, 2, 17, 0, 0, 0, LilycoveCity_EventScript_1E2C72, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 35, 37, 5, 8, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C9A, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 34, 37, 5, 8, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CA3, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 57, 17, 3, 1, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CAC, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 73, 15, 3, 10, 0, 0, 0, 0, LilycoveCity_EventScript_1E2D7D, 852, 0, 0
-	object_event 11, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 61, 36, 5, 1, 0, 0, 0, 0, LilycoveCity_EventScript_2910E8, 1042, 0, 0
-	object_event 12, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 43, 18, 3, 5, 1, 0, 0, 0, LilycoveCity_EventScript_1E2DD5, 852, 0, 0
-	object_event 13, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 46, 12, 3, 9, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DBA, 852, 0, 0
-	object_event 14, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 45, 12, 3, 10, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DC3, 852, 0, 0
-	object_event 15, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 38, 9, 5, 9, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DCC, 852, 0, 0
-	object_event 16, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 50, 7, 5, 2, 17, 0, 0, 0, LilycoveCity_EventScript_1E2BD8, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_HIPSTER, 0, 0, 27, 7, 5, 8, 17, 0, 0, 0, LilycoveCity_EventScript_1E2DDE, 971, 0, 0
-	object_event 18, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 16, 23, 3, 10, 17, 0, 0, 0, LilycoveCity_EventScript_1E302D, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_WOMAN_4, 0, 0, 41, 25, 3, 9, 17, 0, 0, 0, LilycoveCity_EventScript_1E2CEE, 0, 0, 0
-	object_event 20, MAP_OBJ_GFX_MAN_2, 0, 0, 40, 25, 3, 10, 17, 0, 0, 0, LilycoveCity_EventScript_1E2CDD, 0, 0, 0
-	object_event 21, MAP_OBJ_GFX_SAILOR, 0, 0, 16, 34, 3, 8, 17, 0, 0, 0, LilycoveCity_EventScript_1E2CCB, 0, 0, 0
-	object_event 22, MAP_OBJ_GFX_FAT_MAN, 0, 0, 16, 35, 3, 7, 17, 0, 0, 0, LilycoveCity_EventScript_1E2CD4, 0, 0, 0
+LilycoveCity_EventObjects: @ 8526CE8
+	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 32, 20, 3, 3, 16, 0, 0, 0, LilycoveCity_EventScript_1E2C53, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 0, 15, 18, 3, 2, 17, 0, 0, 0, LilycoveCity_EventScript_1E2C2B, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 0, 28, 28, 3, 1, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C22, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 0, 21, 15, 3, 2, 17, 0, 0, 0, LilycoveCity_EventScript_1E2C4A, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 0, 16, 9, 5, 5, 1, 0, 0, 0, LilycoveCity_EventScript_1E2C91, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 35, 27, 3, 2, 17, 0, 0, 0, LilycoveCity_EventScript_1E2C72, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 35, 37, 5, 8, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C9A, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 34, 37, 5, 8, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CA3, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 57, 17, 3, 1, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CAC, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 73, 15, 3, 10, 0, 0, 0, 0, LilycoveCity_EventScript_1E2D7D, 852, 0, 0
+	object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 61, 36, 5, 1, 0, 0, 0, 0, LilycoveCity_EventScript_2910E8, 1042, 0, 0
+	object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 43, 18, 3, 5, 1, 0, 0, 0, LilycoveCity_EventScript_1E2DD5, 852, 0, 0
+	object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 46, 12, 3, 9, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DBA, 852, 0, 0
+	object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 45, 12, 3, 10, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DC3, 852, 0, 0
+	object_event 15, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 38, 9, 5, 9, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DCC, 852, 0, 0
+	object_event 16, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 50, 7, 5, 2, 17, 0, 0, 0, LilycoveCity_EventScript_1E2BD8, 0, 0, 0
+	object_event 17, EVENT_OBJ_GFX_HIPSTER, 0, 0, 27, 7, 5, 8, 17, 0, 0, 0, LilycoveCity_EventScript_1E2DDE, 971, 0, 0
+	object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 16, 23, 3, 10, 17, 0, 0, 0, LilycoveCity_EventScript_1E302D, 0, 0, 0
+	object_event 19, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 41, 25, 3, 9, 17, 0, 0, 0, LilycoveCity_EventScript_1E2CEE, 0, 0, 0
+	object_event 20, EVENT_OBJ_GFX_MAN_2, 0, 0, 40, 25, 3, 10, 17, 0, 0, 0, LilycoveCity_EventScript_1E2CDD, 0, 0, 0
+	object_event 21, EVENT_OBJ_GFX_SAILOR, 0, 0, 16, 34, 3, 8, 17, 0, 0, 0, LilycoveCity_EventScript_1E2CCB, 0, 0, 0
+	object_event 22, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 16, 35, 3, 7, 17, 0, 0, 0, LilycoveCity_EventScript_1E2CD4, 0, 0, 0
 
 LilycoveCity_MapWarps: @ 8526EF8
 	warp_def 27, 6, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_1F
@@ -54,5 +54,5 @@ LilycoveCity_MapBGEvents: @ 8526F68
 	bg_event 64, 31, 0, 7, 0, ITEM_POKE_BALL, 75, 0
 
 LilycoveCity_MapEvents:: @ 8527004
-	map_events LilycoveCity_MapObjects, LilycoveCity_MapWarps, 0x0, LilycoveCity_MapBGEvents
+	map_events LilycoveCity_EventObjects, LilycoveCity_MapWarps, 0x0, LilycoveCity_MapBGEvents
 
diff --git a/data/maps/events/LilycoveCity_ContestHall.inc b/data/maps/events/LilycoveCity_ContestHall.inc
index 15501ebfd..c450b0cd3 100644
--- a/data/maps/events/LilycoveCity_ContestHall.inc
+++ b/data/maps/events/LilycoveCity_ContestHall.inc
@@ -1,36 +1,36 @@
-LilycoveCity_ContestHall_MapObjects: @ 8531850
-	object_event 1, MAP_OBJ_GFX_BOY_1, 0, 0, 30, 30, 3, 2, 68, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B485, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BOY_3, 0, 0, 11, 7, 3, 2, 51, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B48E, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 0, 40, 8, 3, 2, 34, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B497, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_4, 0, 0, 12, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A9, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_CONTEST_JUDGE, 0, 0, 15, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4C0, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 10, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4D7, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4EE, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_MANIAC, 0, 0, 14, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B505, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_WOMAN_6, 0, 0, 16, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B51C, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 8, 24, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B533, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_WOMAN_7, 0, 0, 18, 24, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B56A, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_BOY_1, 0, 0, 8, 22, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B53C, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_WOMAN_4, 0, 0, 24, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B581, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_CONTEST_JUDGE, 0, 0, 27, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B598, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_WOMAN_5, 0, 0, 22, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5AF, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 24, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5C6, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 26, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5DD, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_WOMAN_2, 0, 0, 28, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5F4, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_WOMAN_3, 0, 0, 20, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B60B, 0, 0, 0
-	object_event 20, MAP_OBJ_GFX_WOMAN_1, 0, 0, 30, 11, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B639, 0, 0, 0
-	object_event 21, MAP_OBJ_GFX_MAN_1, 0, 0, 26, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B622, 0, 0, 0
-	object_event 22, MAP_OBJ_GFX_CAMPER, 0, 0, 13, 20, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B553, 0, 0, 0
-	object_event 23, MAP_OBJ_GFX_WOMAN_4, 0, 0, 36, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B650, 0, 0, 0
-	object_event 24, MAP_OBJ_GFX_CONTEST_JUDGE, 0, 0, 39, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B667, 0, 0, 0
-	object_event 25, MAP_OBJ_GFX_BOY_2, 0, 0, 34, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B67E, 0, 0, 0
-	object_event 26, MAP_OBJ_GFX_GIRL_2, 0, 0, 36, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B695, 0, 0, 0
-	object_event 27, MAP_OBJ_GFX_BOY_3, 0, 0, 38, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6AC, 0, 0, 0
-	object_event 28, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 40, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6C3, 0, 0, 0
-	object_event 29, MAP_OBJ_GFX_WOMAN_3, 0, 0, 32, 23, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6DA, 0, 0, 0
-	object_event 30, MAP_OBJ_GFX_MAN_1, 0, 0, 37, 20, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B71C, 0, 0, 0
-	object_event 31, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 42, 24, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B705, 0, 0, 0
-	object_event 32, MAP_OBJ_GFX_SAILOR, 0, 0, 23, 26, 3, 2, 17, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A0, 0, 0, 0
+LilycoveCity_ContestHall_EventObjects: @ 8531850
+	object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 0, 30, 30, 3, 2, 68, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B485, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 0, 11, 7, 3, 2, 51, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B48E, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 0, 40, 8, 3, 2, 34, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B497, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 12, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A9, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 0, 15, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4C0, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 10, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4D7, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4EE, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 0, 14, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B505, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 16, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B51C, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 8, 24, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B533, 0, 0, 0
+	object_event 11, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 18, 24, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B56A, 0, 0, 0
+	object_event 12, EVENT_OBJ_GFX_BOY_1, 0, 0, 8, 22, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B53C, 0, 0, 0
+	object_event 13, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 24, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B581, 0, 0, 0
+	object_event 14, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 0, 27, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B598, 0, 0, 0
+	object_event 15, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 22, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5AF, 0, 0, 0
+	object_event 16, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 24, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5C6, 0, 0, 0
+	object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 26, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5DD, 0, 0, 0
+	object_event 18, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 28, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5F4, 0, 0, 0
+	object_event 19, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 20, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B60B, 0, 0, 0
+	object_event 20, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 30, 11, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B639, 0, 0, 0
+	object_event 21, EVENT_OBJ_GFX_MAN_1, 0, 0, 26, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B622, 0, 0, 0
+	object_event 22, EVENT_OBJ_GFX_CAMPER, 0, 0, 13, 20, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B553, 0, 0, 0
+	object_event 23, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 36, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B650, 0, 0, 0
+	object_event 24, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 0, 39, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B667, 0, 0, 0
+	object_event 25, EVENT_OBJ_GFX_BOY_2, 0, 0, 34, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B67E, 0, 0, 0
+	object_event 26, EVENT_OBJ_GFX_GIRL_2, 0, 0, 36, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B695, 0, 0, 0
+	object_event 27, EVENT_OBJ_GFX_BOY_3, 0, 0, 38, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6AC, 0, 0, 0
+	object_event 28, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 40, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6C3, 0, 0, 0
+	object_event 29, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 32, 23, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6DA, 0, 0, 0
+	object_event 30, EVENT_OBJ_GFX_MAN_1, 0, 0, 37, 20, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B71C, 0, 0, 0
+	object_event 31, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 42, 24, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B705, 0, 0, 0
+	object_event 32, EVENT_OBJ_GFX_SAILOR, 0, 0, 23, 26, 3, 2, 17, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A0, 0, 0, 0
 
 LilycoveCity_ContestHall_MapWarps: @ 8531B50
 	warp_def 19, 32, 0, 2, LILYCOVE_CITY_CONTEST_LOBBY
@@ -47,5 +47,5 @@ LilycoveCity_ContestHall_MapBGEvents: @ 8531B70
 	bg_event 35, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B73C
 
 LilycoveCity_ContestHall_MapEvents:: @ 8531BB8
-	map_events LilycoveCity_ContestHall_MapObjects, LilycoveCity_ContestHall_MapWarps, 0x0, LilycoveCity_ContestHall_MapBGEvents
+	map_events LilycoveCity_ContestHall_EventObjects, LilycoveCity_ContestHall_MapWarps, 0x0, LilycoveCity_ContestHall_MapBGEvents
 
diff --git a/data/maps/events/LilycoveCity_ContestLobby.inc b/data/maps/events/LilycoveCity_ContestLobby.inc
index 6fc324f76..c6e900a18 100644
--- a/data/maps/events/LilycoveCity_ContestLobby.inc
+++ b/data/maps/events/LilycoveCity_ContestLobby.inc
@@ -1,29 +1,29 @@
-LilycoveCity_ContestLobby_MapObjects: @ 8531534
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 14, 2, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A554, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 15, 2, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A806, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_5, 0, 0, 26, 9, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FA2, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ARTIST, 0, 0, 9, 1, 0, 1, 0, 0, 0, 0, 0x0, 774, 0, 0
-	object_event 5, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 18, 8, 3, 2, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A708, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_GIRL_2, 0, 0, 4, 9, 3, 2, 34, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A711, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_ARTIST, 0, 0, 3, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A71A, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_REPORTER_M, 0, 0, 13, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_28CA59, 802, 0, 0
-	object_event 9, MAP_OBJ_GFX_BOY_1, 0, 0, 23, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A768, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 28, 9, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FB4, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_ARTIST, 0, 0, 21, 1, 0, 8, 0, 0, 0, 0, 0x0, 895, 0, 0
-	object_event 12, MAP_OBJ_GFX_FISHERMAN, 0, 0, 5, 6, 3, 2, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A72C, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_FAT_MAN, 0, 0, 0, 8, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A723, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 8, 7, 3, 3, 16, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A735, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_WOMAN_2, 0, 0, 22, 9, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FAB, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 26, 5, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FBD, 873, 0, 0
-	object_event 17, MAP_OBJ_GFX_GIRL_1, 0, 0, 24, 9, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A771, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_MAN_6, 0, 0, 27, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7B3, 832, 0, 0
-	object_event 19, MAP_OBJ_GFX_CAMPER, 0, 0, 28, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7BE, 832, 0, 0
-	object_event 20, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 28, 7, 3, 7, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7C9, 832, 0, 0
-	object_event 21, MAP_OBJ_GFX_SCIENTIST_2, 0, 0, 26, 7, 3, 7, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7D9, 832, 0, 0
-	object_event 22, MAP_OBJ_GFX_WOMAN_1, 0, 0, 27, 7, 3, 7, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7E9, 832, 0, 0
-	object_event 23, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 26, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7A8, 832, 0, 0
-	object_event 24, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 26, 5, 3, 10, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A798, 832, 0, 0
-	object_event 25, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 9, 10, 3, 10, 34, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21ACF1, 0, 0, 0
+LilycoveCity_ContestLobby_EventObjects: @ 8531534
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 14, 2, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A554, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 15, 2, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A806, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 0, 26, 9, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FA2, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 0, 9, 1, 0, 1, 0, 0, 0, 0, 0x0, 774, 0, 0
+	object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 18, 8, 3, 2, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A708, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_GIRL_2, 0, 0, 4, 9, 3, 2, 34, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A711, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_ARTIST, 0, 0, 3, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A71A, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_REPORTER_M, 0, 0, 13, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_28CA59, 802, 0, 0
+	object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 0, 23, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A768, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 28, 9, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FB4, 0, 0, 0
+	object_event 11, EVENT_OBJ_GFX_ARTIST, 0, 0, 21, 1, 0, 8, 0, 0, 0, 0, 0x0, 895, 0, 0
+	object_event 12, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 5, 6, 3, 2, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A72C, 0, 0, 0
+	object_event 13, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 0, 8, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A723, 0, 0, 0
+	object_event 14, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 8, 7, 3, 3, 16, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A735, 0, 0, 0
+	object_event 15, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 22, 9, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FAB, 0, 0, 0
+	object_event 16, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 26, 5, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FBD, 873, 0, 0
+	object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 0, 24, 9, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A771, 0, 0, 0
+	object_event 18, EVENT_OBJ_GFX_MAN_6, 0, 0, 27, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7B3, 832, 0, 0
+	object_event 19, EVENT_OBJ_GFX_CAMPER, 0, 0, 28, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7BE, 832, 0, 0
+	object_event 20, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 28, 7, 3, 7, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7C9, 832, 0, 0
+	object_event 21, EVENT_OBJ_GFX_SCIENTIST_2, 0, 0, 26, 7, 3, 7, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7D9, 832, 0, 0
+	object_event 22, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 27, 7, 3, 7, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7E9, 832, 0, 0
+	object_event 23, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 26, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7A8, 832, 0, 0
+	object_event 24, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 26, 5, 3, 10, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A798, 832, 0, 0
+	object_event 25, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 9, 10, 3, 10, 34, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21ACF1, 0, 0, 0
 
 LilycoveCity_ContestLobby_MapWarps: @ 853178C
 	warp_def 14, 11, 0, 4, LILYCOVE_CITY
@@ -46,5 +46,5 @@ LilycoveCity_ContestLobby_MapBGEvents: @ 85317AC
 	bg_event 18, 3, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A784
 
 LilycoveCity_ContestLobby_MapEvents:: @ 853183C
-	map_events LilycoveCity_ContestLobby_MapObjects, LilycoveCity_ContestLobby_MapWarps, 0x0, LilycoveCity_ContestLobby_MapBGEvents
+	map_events LilycoveCity_ContestLobby_EventObjects, LilycoveCity_ContestLobby_MapWarps, 0x0, LilycoveCity_ContestLobby_MapBGEvents
 
diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc b/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc
index e765a7390..d3e5374ff 100644
--- a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc
+++ b/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc
@@ -1,5 +1,5 @@
-LilycoveCity_CoveLilyMotel_1F_MapObjects: @ 8531134
-	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 10, 3, 3, 7, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218189, 0, 0, 0
+LilycoveCity_CoveLilyMotel_1F_EventObjects: @ 8531134
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 10, 3, 3, 7, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218189, 0, 0, 0
 
 LilycoveCity_CoveLilyMotel_1F_MapWarps: @ 853114C
 	warp_def 5, 8, 0, 1, LILYCOVE_CITY
@@ -10,5 +10,5 @@ LilycoveCity_CoveLilyMotel_1F_MapCoordEvents: @ 8531164
 	coord_event 10, 2, 3, 0, VAR_TEMP_1, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218211
 
 LilycoveCity_CoveLilyMotel_1F_MapEvents:: @ 8531174
-	map_events LilycoveCity_CoveLilyMotel_1F_MapObjects, LilycoveCity_CoveLilyMotel_1F_MapWarps, LilycoveCity_CoveLilyMotel_1F_MapCoordEvents, 0x0
+	map_events LilycoveCity_CoveLilyMotel_1F_EventObjects, LilycoveCity_CoveLilyMotel_1F_MapWarps, LilycoveCity_CoveLilyMotel_1F_MapCoordEvents, 0x0
 
diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc b/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc
index dfc0d3bd0..60016ffbf 100644
--- a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc
+++ b/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc
@@ -1,15 +1,15 @@
-LilycoveCity_CoveLilyMotel_2F_MapObjects: @ 8531188
-	object_event 1, MAP_OBJ_GFX_MAN_4, 0, 0, 4, 6, 3, 9, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3, 925, 0, 0
-	object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 1, 4, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218729, 925, 0, 0
-	object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 0, 7, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218732, 925, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_5, 0, 0, 10, 3, 3, 9, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218720, 925, 0, 0
-	object_event 5, MAP_OBJ_GFX_BOY_5, 0, 0, 7, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218744, 925, 0, 0
-	object_event 6, MAP_OBJ_GFX_WOMAN_3, 0, 0, 4, 4, 3, 9, 17, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21873B, 925, 0, 0
-	object_event 7, MAP_OBJ_GFX_SCOTT, 0, 0, 1, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21874D, 787, 0, 0
+LilycoveCity_CoveLilyMotel_2F_EventObjects: @ 8531188
+	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 0, 4, 6, 3, 9, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3, 925, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 1, 4, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218729, 925, 0, 0
+	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 7, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218732, 925, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 0, 10, 3, 3, 9, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218720, 925, 0, 0
+	object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 0, 7, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218744, 925, 0, 0
+	object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 4, 4, 3, 9, 17, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21873B, 925, 0, 0
+	object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 0, 1, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21874D, 787, 0, 0
 
 LilycoveCity_CoveLilyMotel_2F_MapWarps: @ 8531230
 	warp_def 2, 1, 0, 2, LILYCOVE_CITY_COVE_LILY_MOTEL_1F
 
 LilycoveCity_CoveLilyMotel_2F_MapEvents:: @ 8531238
-	map_events LilycoveCity_CoveLilyMotel_2F_MapObjects, LilycoveCity_CoveLilyMotel_2F_MapWarps, 0x0, 0x0
+	map_events LilycoveCity_CoveLilyMotel_2F_EventObjects, LilycoveCity_CoveLilyMotel_2F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc b/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc
index 6c572ce4d..d9d6b469e 100644
--- a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc
+++ b/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc
@@ -1,10 +1,10 @@
-LilycoveCity_DepartmentStoreElevator_MapObjects: @ 85324B0
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStoreElevator_EventScript_220624, 0, 0, 0
+LilycoveCity_DepartmentStoreElevator_EventObjects: @ 85324B0
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStoreElevator_EventScript_220624, 0, 0, 0
 
 LilycoveCity_DepartmentStoreElevator_MapWarps: @ 85324C8
 	warp_def 1, 5, 3, 127, NONE
 	warp_def 2, 5, 3, 127, NONE
 
 LilycoveCity_DepartmentStoreElevator_MapEvents:: @ 85324D8
-	map_events LilycoveCity_DepartmentStoreElevator_MapObjects, LilycoveCity_DepartmentStoreElevator_MapWarps, 0x0, 0x0
+	map_events LilycoveCity_DepartmentStoreElevator_EventObjects, LilycoveCity_DepartmentStoreElevator_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc b/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc
index eb0ee1a96..7a234183d 100644
--- a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc
+++ b/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc
@@ -1,8 +1,8 @@
-LilycoveCity_DepartmentStoreRooftop_MapObjects: @ 853241C
-	object_event 1, MAP_OBJ_GFX_MAN_2, 0, 0, 4, 4, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220268, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_4, 0, 0, 7, 5, 3, 5, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22028C, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 0, 6, 1, 3, 8, 17, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22022F, 962, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_4, 0, 0, 15, 5, 3, 8, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186, 0, 0, 0
+LilycoveCity_DepartmentStoreRooftop_EventObjects: @ 853241C
+	object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 4, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220268, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 0, 7, 5, 3, 5, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22028C, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 0, 6, 1, 3, 8, 17, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22022F, 962, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 15, 5, 3, 8, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186, 0, 0, 0
 
 LilycoveCity_DepartmentStoreRooftop_MapWarps: @ 853247C
 	warp_def 13, 3, 0, 2, LILYCOVE_CITY_DEPARTMENT_STORE_5F
@@ -12,5 +12,5 @@ LilycoveCity_DepartmentStoreRooftop_MapBGEvents: @ 8532484
 	bg_event 10, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220295
 
 LilycoveCity_DepartmentStoreRooftop_MapEvents:: @ 853249C
-	map_events LilycoveCity_DepartmentStoreRooftop_MapObjects, LilycoveCity_DepartmentStoreRooftop_MapWarps, 0x0, LilycoveCity_DepartmentStoreRooftop_MapBGEvents
+	map_events LilycoveCity_DepartmentStoreRooftop_EventObjects, LilycoveCity_DepartmentStoreRooftop_MapWarps, 0x0, LilycoveCity_DepartmentStoreRooftop_MapBGEvents
 
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_1F.inc b/data/maps/events/LilycoveCity_DepartmentStore_1F.inc
index 10fb7f16e..ad7d79ac5 100644
--- a/data/maps/events/LilycoveCity_DepartmentStore_1F.inc
+++ b/data/maps/events/LilycoveCity_DepartmentStore_1F.inc
@@ -1,10 +1,10 @@
-LilycoveCity_DepartmentStore_1F_MapObjects: @ 853208C
-	object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F693, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BEAUTY, 0, 0, 10, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F69C, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 14, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F82F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 4, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F838, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAN_3, 0, 0, 3, 6, 3, 1, 17, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F841, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_AZUMARILL, 0, 0, 2, 6, 3, 1, 17, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F84A, 0, 0, 0
+LilycoveCity_DepartmentStore_1F_EventObjects: @ 853208C
+	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F693, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 0, 10, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F69C, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 14, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F82F, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 4, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F838, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 0, 3, 6, 3, 1, 17, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F841, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 0, 2, 6, 3, 1, 17, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F84A, 0, 0, 0
 
 LilycoveCity_DepartmentStore_1F_MapWarps: @ 853211C
 	warp_def 8, 7, 0, 0, LILYCOVE_CITY
@@ -16,5 +16,5 @@ LilycoveCity_DepartmentStore_1F_MapBGEvents: @ 853213C
 	bg_event 0, 8, 0, 1, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F85D
 
 LilycoveCity_DepartmentStore_1F_MapEvents:: @ 8532148
-	map_events LilycoveCity_DepartmentStore_1F_MapObjects, LilycoveCity_DepartmentStore_1F_MapWarps, 0x0, LilycoveCity_DepartmentStore_1F_MapBGEvents
+	map_events LilycoveCity_DepartmentStore_1F_EventObjects, LilycoveCity_DepartmentStore_1F_MapWarps, 0x0, LilycoveCity_DepartmentStore_1F_MapBGEvents
 
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_2F.inc b/data/maps/events/LilycoveCity_DepartmentStore_2F.inc
index 95c4daee0..29169a491 100644
--- a/data/maps/events/LilycoveCity_DepartmentStore_2F.inc
+++ b/data/maps/events/LilycoveCity_DepartmentStore_2F.inc
@@ -1,9 +1,9 @@
-LilycoveCity_DepartmentStore_2F_MapObjects: @ 853215C
-	object_event 1, MAP_OBJ_GFX_COOK, 0, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB2D, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 0, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB36, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SAILOR, 0, 0, 13, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB3F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_4, 0, 0, 10, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB7A, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_4, 0, 0, 7, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB48, 0, 0, 0
+LilycoveCity_DepartmentStore_2F_EventObjects: @ 853215C
+	object_event 1, EVENT_OBJ_GFX_COOK, 0, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB2D, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 0, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB36, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 0, 13, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB3F, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 10, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB7A, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 7, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB48, 0, 0, 0
 
 LilycoveCity_DepartmentStore_2F_MapWarps: @ 85321D4
 	warp_def 16, 1, 0, 2, LILYCOVE_CITY_DEPARTMENT_STORE_1F
@@ -11,5 +11,5 @@ LilycoveCity_DepartmentStore_2F_MapWarps: @ 85321D4
 	warp_def 2, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR
 
 LilycoveCity_DepartmentStore_2F_MapEvents:: @ 85321EC
-	map_events LilycoveCity_DepartmentStore_2F_MapObjects, LilycoveCity_DepartmentStore_2F_MapWarps, 0x0, 0x0
+	map_events LilycoveCity_DepartmentStore_2F_EventObjects, LilycoveCity_DepartmentStore_2F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_3F.inc b/data/maps/events/LilycoveCity_DepartmentStore_3F.inc
index d51060bba..ff372e132 100644
--- a/data/maps/events/LilycoveCity_DepartmentStore_3F.inc
+++ b/data/maps/events/LilycoveCity_DepartmentStore_3F.inc
@@ -1,9 +1,9 @@
-LilycoveCity_DepartmentStore_3F_MapObjects: @ 8532200
-	object_event 1, MAP_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 0, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCB6, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_3, 0, 0, 7, 7, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCBF, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 0, 13, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCC8, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_4, 0, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC65, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_4, 0, 0, 10, 2, 3, 8, 17, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC8C, 0, 0, 0
+LilycoveCity_DepartmentStore_3F_EventObjects: @ 8532200
+	object_event 1, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 0, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCB6, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 0, 7, 7, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCBF, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 13, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCC8, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC65, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 10, 2, 3, 8, 17, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC8C, 0, 0, 0
 
 LilycoveCity_DepartmentStore_3F_MapWarps: @ 8532278
 	warp_def 13, 1, 0, 1, LILYCOVE_CITY_DEPARTMENT_STORE_2F
@@ -11,5 +11,5 @@ LilycoveCity_DepartmentStore_3F_MapWarps: @ 8532278
 	warp_def 2, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR
 
 LilycoveCity_DepartmentStore_3F_MapEvents:: @ 8532290
-	map_events LilycoveCity_DepartmentStore_3F_MapObjects, LilycoveCity_DepartmentStore_3F_MapWarps, 0x0, 0x0
+	map_events LilycoveCity_DepartmentStore_3F_EventObjects, LilycoveCity_DepartmentStore_3F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_4F.inc b/data/maps/events/LilycoveCity_DepartmentStore_4F.inc
index 4b2f0f00c..ba97f6a98 100644
--- a/data/maps/events/LilycoveCity_DepartmentStore_4F.inc
+++ b/data/maps/events/LilycoveCity_DepartmentStore_4F.inc
@@ -1,9 +1,9 @@
-LilycoveCity_DepartmentStore_4F_MapObjects: @ 85322A4
-	object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 0, 2, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDEB, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 0, 6, 2, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDF4, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 13, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDFD, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_4, 0, 0, 7, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE06, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_4, 0, 0, 9, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE2C, 0, 0, 0
+LilycoveCity_DepartmentStore_4F_EventObjects: @ 85322A4
+	object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 0, 2, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDEB, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 6, 2, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDF4, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 13, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDFD, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 7, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE06, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 9, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE2C, 0, 0, 0
 
 LilycoveCity_DepartmentStore_4F_MapWarps: @ 853231C
 	warp_def 16, 1, 0, 1, LILYCOVE_CITY_DEPARTMENT_STORE_3F
@@ -11,5 +11,5 @@ LilycoveCity_DepartmentStore_4F_MapWarps: @ 853231C
 	warp_def 2, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR
 
 LilycoveCity_DepartmentStore_4F_MapEvents:: @ 8532334
-	map_events LilycoveCity_DepartmentStore_4F_MapObjects, LilycoveCity_DepartmentStore_4F_MapWarps, 0x0, 0x0
+	map_events LilycoveCity_DepartmentStore_4F_EventObjects, LilycoveCity_DepartmentStore_4F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_5F.inc b/data/maps/events/LilycoveCity_DepartmentStore_5F.inc
index f459b4764..85a6e871a 100644
--- a/data/maps/events/LilycoveCity_DepartmentStore_5F.inc
+++ b/data/maps/events/LilycoveCity_DepartmentStore_5F.inc
@@ -1,11 +1,11 @@
-LilycoveCity_DepartmentStore_5F_MapObjects: @ 8532348
-	object_event 1, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 1, 6, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_2200BC, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 7, 7, 3, 17, 17, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22006C, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_4, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFA6, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_4, 0, 0, 9, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFDC, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_4, 0, 0, 15, 6, 3, 9, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22000A, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_WOMAN_4, 0, 0, 17, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22003A, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_WOMAN_3, 0, 0, 9, 5, 3, 10, 17, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_220075, 0, 0, 0
+LilycoveCity_DepartmentStore_5F_EventObjects: @ 8532348
+	object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 1, 6, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_2200BC, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 7, 7, 3, 17, 17, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22006C, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFA6, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 9, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFDC, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 15, 6, 3, 9, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22000A, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 17, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22003A, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 9, 5, 3, 10, 17, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_220075, 0, 0, 0
 
 LilycoveCity_DepartmentStore_5F_MapWarps: @ 85323F0
 	warp_def 13, 1, 0, 1, LILYCOVE_CITY_DEPARTMENT_STORE_4F
@@ -13,5 +13,5 @@ LilycoveCity_DepartmentStore_5F_MapWarps: @ 85323F0
 	warp_def 16, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP
 
 LilycoveCity_DepartmentStore_5F_MapEvents:: @ 8532408
-	map_events LilycoveCity_DepartmentStore_5F_MapObjects, LilycoveCity_DepartmentStore_5F_MapWarps, 0x0, 0x0
+	map_events LilycoveCity_DepartmentStore_5F_EventObjects, LilycoveCity_DepartmentStore_5F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/LilycoveCity_Harbor.inc b/data/maps/events/LilycoveCity_Harbor.inc
index f2088e9d2..d12e31646 100644
--- a/data/maps/events/LilycoveCity_Harbor.inc
+++ b/data/maps/events/LilycoveCity_Harbor.inc
@@ -1,14 +1,14 @@
-LilycoveCity_Harbor_MapObjects: @ 8531E1C
-	object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 0, 8, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_21E00F, 908, 0, 0
-	object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 0, 8, 9, 1, 10, 0, 0, 0, 0, 0x0, 861, 0, 0
-	object_event 3, MAP_OBJ_GFX_SAILOR, 0, 0, 3, 13, 3, 2, 17, 0, 0, 0, LilycoveCity_Harbor_EventScript_21E637, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SAILOR, 0, 0, 8, 10, 3, 8, 0, 0, 0, 0, 0x0, 909, 0, 0
-	object_event 5, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 8, 10, 3, 8, 17, 0, 0, 0, 0x0, 748, 0, 0
+LilycoveCity_Harbor_EventObjects: @ 8531E1C
+	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 0, 8, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_21E00F, 908, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 0, 8, 9, 1, 10, 0, 0, 0, 0, 0x0, 861, 0, 0
+	object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 0, 3, 13, 3, 2, 17, 0, 0, 0, LilycoveCity_Harbor_EventScript_21E637, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 0, 8, 10, 3, 8, 0, 0, 0, 0, 0x0, 909, 0, 0
+	object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 8, 10, 3, 8, 17, 0, 0, 0, 0x0, 748, 0, 0
 
 LilycoveCity_Harbor_MapWarps: @ 8531E94
 	warp_def 11, 14, 0, 12, LILYCOVE_CITY
 	warp_def 12, 14, 0, 12, LILYCOVE_CITY
 
 LilycoveCity_Harbor_MapEvents:: @ 8531EA4
-	map_events LilycoveCity_Harbor_MapObjects, LilycoveCity_Harbor_MapWarps, 0x0, 0x0
+	map_events LilycoveCity_Harbor_EventObjects, LilycoveCity_Harbor_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/LilycoveCity_House1.inc b/data/maps/events/LilycoveCity_House1.inc
index 1edca4904..f4bef7d8b 100644
--- a/data/maps/events/LilycoveCity_House1.inc
+++ b/data/maps/events/LilycoveCity_House1.inc
@@ -1,11 +1,11 @@
-LilycoveCity_House1_MapObjects: @ 8531EF4
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 5, 3, 9, 17, 0, 0, 0, LilycoveCity_House1_EventScript_21ECCE, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_KECLEON_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_House1_EventScript_21ECD7, 0, 0, 0
+LilycoveCity_House1_EventObjects: @ 8531EF4
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 5, 3, 9, 17, 0, 0, 0, LilycoveCity_House1_EventScript_21ECCE, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_House1_EventScript_21ECD7, 0, 0, 0
 
 LilycoveCity_House1_MapWarps: @ 8531F24
 	warp_def 3, 8, 0, 8, LILYCOVE_CITY
 	warp_def 4, 8, 0, 8, LILYCOVE_CITY
 
 LilycoveCity_House1_MapEvents:: @ 8531F34
-	map_events LilycoveCity_House1_MapObjects, LilycoveCity_House1_MapWarps, 0x0, 0x0
+	map_events LilycoveCity_House1_EventObjects, LilycoveCity_House1_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/LilycoveCity_House2.inc b/data/maps/events/LilycoveCity_House2.inc
index 2321844fa..36f9f50b2 100644
--- a/data/maps/events/LilycoveCity_House2.inc
+++ b/data/maps/events/LilycoveCity_House2.inc
@@ -1,10 +1,10 @@
-LilycoveCity_House2_MapObjects: @ 8531F48
-	object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_House2_EventScript_21ED75, 0, 0, 0
+LilycoveCity_House2_EventObjects: @ 8531F48
+	object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_House2_EventScript_21ED75, 0, 0, 0
 
 LilycoveCity_House2_MapWarps: @ 8531F60
 	warp_def 2, 7, 0, 9, LILYCOVE_CITY
 	warp_def 3, 7, 0, 9, LILYCOVE_CITY
 
 LilycoveCity_House2_MapEvents:: @ 8531F70
-	map_events LilycoveCity_House2_MapObjects, LilycoveCity_House2_MapWarps, 0x0, 0x0
+	map_events LilycoveCity_House2_EventObjects, LilycoveCity_House2_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/LilycoveCity_House3.inc b/data/maps/events/LilycoveCity_House3.inc
index 05b36263a..f7b2e561b 100644
--- a/data/maps/events/LilycoveCity_House3.inc
+++ b/data/maps/events/LilycoveCity_House3.inc
@@ -1,15 +1,15 @@
-LilycoveCity_House3_MapObjects: @ 8531F84
-	object_event 1, MAP_OBJ_GFX_BOY_5, 0, 0, 3, 4, 3, 8, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EF3D, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 7, 4, 3, 9, 0, 0, 0, 0, LilycoveCity_House3_EventScript_21EE4B, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_5, 0, 0, 1, 4, 3, 8, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EED5, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BOY_5, 0, 0, 2, 5, 3, 7, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EF09, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BOY_5, 0, 0, 2, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EEA1, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_1, 0, 0, 7, 5, 3, 9, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EE8A, 0, 0, 0
+LilycoveCity_House3_EventObjects: @ 8531F84
+	object_event 1, EVENT_OBJ_GFX_BOY_5, 0, 0, 3, 4, 3, 8, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EF3D, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 7, 4, 3, 9, 0, 0, 0, 0, LilycoveCity_House3_EventScript_21EE4B, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_5, 0, 0, 1, 4, 3, 8, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EED5, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_5, 0, 0, 2, 5, 3, 7, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EF09, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 0, 2, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EEA1, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 0, 7, 5, 3, 9, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EE8A, 0, 0, 0
 
 LilycoveCity_House3_MapWarps: @ 8532014
 	warp_def 3, 7, 0, 10, LILYCOVE_CITY
 	warp_def 4, 7, 0, 10, LILYCOVE_CITY
 
 LilycoveCity_House3_MapEvents:: @ 8532024
-	map_events LilycoveCity_House3_MapObjects, LilycoveCity_House3_MapWarps, 0x0, 0x0
+	map_events LilycoveCity_House3_EventObjects, LilycoveCity_House3_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/LilycoveCity_House4.inc b/data/maps/events/LilycoveCity_House4.inc
index 9212c1e0e..ebf845f91 100644
--- a/data/maps/events/LilycoveCity_House4.inc
+++ b/data/maps/events/LilycoveCity_House4.inc
@@ -1,11 +1,11 @@
-LilycoveCity_House4_MapObjects: @ 8532038
-	object_event 1, MAP_OBJ_GFX_MAN_5, 0, 0, 1, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_House4_EventScript_21F5B5, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_1, 0, 0, 7, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_House4_EventScript_21F5BE, 0, 0, 0
+LilycoveCity_House4_EventObjects: @ 8532038
+	object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 0, 1, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_House4_EventScript_21F5B5, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 7, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_House4_EventScript_21F5BE, 0, 0, 0
 
 LilycoveCity_House4_MapWarps: @ 8532068
 	warp_def 3, 8, 0, 11, LILYCOVE_CITY
 	warp_def 4, 8, 0, 11, LILYCOVE_CITY
 
 LilycoveCity_House4_MapEvents:: @ 8532078
-	map_events LilycoveCity_House4_MapObjects, LilycoveCity_House4_MapWarps, 0x0, 0x0
+	map_events LilycoveCity_House4_EventObjects, LilycoveCity_House4_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc b/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc
index 36b9b5ac2..297db7979 100644
--- a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc
+++ b/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc
@@ -1,14 +1,14 @@
-LilycoveCity_LilycoveMuseum_1F_MapObjects: @ 853124C
-	object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 0, 5, 12, 3, 10, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 16, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2, 775, 0, 0
-	object_event 3, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 13, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ARTIST, 0, 0, 13, 10, 3, 5, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DFE, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 2, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E07, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_WOMAN_5, 0, 0, 3, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E10, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_WOMAN_3, 0, 0, 11, 3, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E19, 776, 0, 0
-	object_event 8, MAP_OBJ_GFX_ARTIST, 0, 0, 19, 3, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B, 779, 0, 0
-	object_event 9, MAP_OBJ_GFX_FAT_MAN, 0, 0, 2, 2, 3, 2, 34, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E42, 780, 0, 0
-	object_event 10, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 6, 2, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E22, 778, 0, 0
+LilycoveCity_LilycoveMuseum_1F_EventObjects: @ 853124C
+	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 0, 5, 12, 3, 10, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 16, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2, 775, 0, 0
+	object_event 3, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 13, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 0, 13, 10, 3, 5, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DFE, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 2, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E07, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 3, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E10, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 11, 3, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E19, 776, 0, 0
+	object_event 8, EVENT_OBJ_GFX_ARTIST, 0, 0, 19, 3, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B, 779, 0, 0
+	object_event 9, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 2, 2, 3, 2, 34, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E42, 780, 0, 0
+	object_event 10, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 6, 2, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E22, 778, 0, 0
 
 LilycoveCity_LilycoveMuseum_1F_MapWarps: @ 853133C
 	warp_def 9, 13, 0, 3, LILYCOVE_CITY
@@ -34,5 +34,5 @@ LilycoveCity_LilycoveMuseum_1F_MapBGEvents: @ 8531354
 	bg_event 16, 9, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC
 
 LilycoveCity_LilycoveMuseum_1F_MapEvents:: @ 8531414
-	map_events LilycoveCity_LilycoveMuseum_1F_MapObjects, LilycoveCity_LilycoveMuseum_1F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_1F_MapBGEvents
+	map_events LilycoveCity_LilycoveMuseum_1F_EventObjects, LilycoveCity_LilycoveMuseum_1F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_1F_MapBGEvents
 
diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc b/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc
index 829db7b36..3e85e20a1 100644
--- a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc
+++ b/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc
@@ -1,8 +1,8 @@
-LilycoveCity_LilycoveMuseum_2F_MapObjects: @ 8531428
-	object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 10, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219866, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_2, 0, 0, 19, 10, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21998A, 777, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 7, 3, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219993, 780, 0, 0
-	object_event 4, MAP_OBJ_GFX_BOY_4, 0, 0, 14, 6, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21999C, 780, 0, 0
+LilycoveCity_LilycoveMuseum_2F_EventObjects: @ 8531428
+	object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 10, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219866, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 0, 19, 10, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21998A, 777, 0, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 7, 3, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219993, 780, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 0, 14, 6, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21999C, 780, 0, 0
 
 LilycoveCity_LilycoveMuseum_2F_MapWarps: @ 8531488
 	warp_def 13, 1, 0, 2, LILYCOVE_CITY_LILYCOVE_MUSEUM_1F
@@ -22,5 +22,5 @@ LilycoveCity_LilycoveMuseum_2F_MapBGEvents: @ 8531490
 	bg_event 15, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA
 
 LilycoveCity_LilycoveMuseum_2F_MapEvents:: @ 8531520
-	map_events LilycoveCity_LilycoveMuseum_2F_MapObjects, LilycoveCity_LilycoveMuseum_2F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_2F_MapBGEvents
+	map_events LilycoveCity_LilycoveMuseum_2F_EventObjects, LilycoveCity_LilycoveMuseum_2F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_2F_MapBGEvents
 
diff --git a/data/maps/events/LilycoveCity_MoveDeletersHouse.inc b/data/maps/events/LilycoveCity_MoveDeletersHouse.inc
index 1b5f4bda5..3f89c8aa9 100644
--- a/data/maps/events/LilycoveCity_MoveDeletersHouse.inc
+++ b/data/maps/events/LilycoveCity_MoveDeletersHouse.inc
@@ -1,10 +1,10 @@
-LilycoveCity_MoveDeletersHouse_MapObjects: @ 8531EB8
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_MoveDeletersHouse_EventScript_21EA0B, 0, 0, 0
+LilycoveCity_MoveDeletersHouse_EventObjects: @ 8531EB8
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_MoveDeletersHouse_EventScript_21EA0B, 0, 0, 0
 
 LilycoveCity_MoveDeletersHouse_MapWarps: @ 8531ED0
 	warp_def 3, 7, 0, 7, LILYCOVE_CITY
 	warp_def 4, 7, 0, 7, LILYCOVE_CITY
 
 LilycoveCity_MoveDeletersHouse_MapEvents:: @ 8531EE0
-	map_events LilycoveCity_MoveDeletersHouse_MapObjects, LilycoveCity_MoveDeletersHouse_MapWarps, 0x0, 0x0
+	map_events LilycoveCity_MoveDeletersHouse_EventObjects, LilycoveCity_MoveDeletersHouse_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/LilycoveCity_PokemonCenter_1F.inc b/data/maps/events/LilycoveCity_PokemonCenter_1F.inc
index ba8988b96..741866843 100644
--- a/data/maps/events/LilycoveCity_PokemonCenter_1F.inc
+++ b/data/maps/events/LilycoveCity_PokemonCenter_1F.inc
@@ -1,9 +1,9 @@
-LilycoveCity_PokemonCenter_1F_MapObjects: @ 8531BCC
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5E8, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BOY_1, 0, 0, 10, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5F6, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MANIAC, 0, 0, 11, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5FF, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_HIPSTER, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A836B, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_TRADER, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A89C7, 993, 0, 0
+LilycoveCity_PokemonCenter_1F_EventObjects: @ 8531BCC
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5E8, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 0, 10, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5F6, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 0, 11, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5FF, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_HIPSTER, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A836B, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_TRADER, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A89C7, 993, 0, 0
 
 LilycoveCity_PokemonCenter_1F_MapWarps: @ 8531C44
 	warp_def 7, 8, 3, 2, LILYCOVE_CITY
@@ -11,5 +11,5 @@ LilycoveCity_PokemonCenter_1F_MapWarps: @ 8531C44
 	warp_def 1, 6, 4, 0, LILYCOVE_CITY_POKEMON_CENTER_2F
 
 LilycoveCity_PokemonCenter_1F_MapEvents:: @ 8531C5C
-	map_events LilycoveCity_PokemonCenter_1F_MapObjects, LilycoveCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
+	map_events LilycoveCity_PokemonCenter_1F_EventObjects, LilycoveCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/LilycoveCity_PokemonCenter_2F.inc b/data/maps/events/LilycoveCity_PokemonCenter_2F.inc
index 024b56427..b8bd67368 100644
--- a/data/maps/events/LilycoveCity_PokemonCenter_2F.inc
+++ b/data/maps/events/LilycoveCity_PokemonCenter_2F.inc
@@ -1,8 +1,8 @@
-LilycoveCity_PokemonCenter_2F_MapObjects: @ 8531C70
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
+LilycoveCity_PokemonCenter_2F_EventObjects: @ 8531C70
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
 
 LilycoveCity_PokemonCenter_2F_MapWarps: @ 8531CD0
 	warp_def 1, 6, 4, 2, LILYCOVE_CITY_POKEMON_CENTER_1F
@@ -10,5 +10,5 @@ LilycoveCity_PokemonCenter_2F_MapWarps: @ 8531CD0
 	warp_def 9, 1, 3, 0, TRADE_CENTER
 
 LilycoveCity_PokemonCenter_2F_MapEvents:: @ 8531CE8
-	map_events LilycoveCity_PokemonCenter_2F_MapObjects, LilycoveCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
+	map_events LilycoveCity_PokemonCenter_2F_EventObjects, LilycoveCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc b/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc
index 886927d3e..427d8bc42 100644
--- a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc
+++ b/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc
@@ -1,18 +1,18 @@
-LilycoveCity_PokemonTrainerFanClub_MapObjects: @ 8531D20
-	object_event 1, MAP_OBJ_GFX_LASS, 0, 0, 3, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_5, 0, 0, 8, 10, 3, 9, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_3, 0, 0, 6, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 5, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 7, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3, 791, 0, 0
-	object_event 6, MAP_OBJ_GFX_BOY_2, 0, 0, 1, 9, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55, 790, 0, 0
-	object_event 7, MAP_OBJ_GFX_WOMAN_4, 0, 0, 3, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7, 792, 0, 0
-	object_event 8, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 10, 10, 3, 9, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19, 789, 0, 0
-	object_event 9, MAP_OBJ_GFX_BOY_1, 0, 0, 11, 5, 3, 8, 17, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B, 730, 0, 0
+LilycoveCity_PokemonTrainerFanClub_EventObjects: @ 8531D20
+	object_event 1, EVENT_OBJ_GFX_LASS, 0, 0, 3, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 0, 8, 10, 3, 9, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 0, 6, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 5, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 7, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3, 791, 0, 0
+	object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 0, 1, 9, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55, 790, 0, 0
+	object_event 7, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 3, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7, 792, 0, 0
+	object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 10, 10, 3, 9, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19, 789, 0, 0
+	object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 0, 11, 5, 3, 8, 17, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B, 730, 0, 0
 
 LilycoveCity_PokemonTrainerFanClub_MapWarps: @ 8531DF8
 	warp_def 6, 13, 0, 5, LILYCOVE_CITY
 	warp_def 5, 13, 0, 5, LILYCOVE_CITY
 
 LilycoveCity_PokemonTrainerFanClub_MapEvents:: @ 8531E08
-	map_events LilycoveCity_PokemonTrainerFanClub_MapObjects, LilycoveCity_PokemonTrainerFanClub_MapWarps, 0x0, 0x0
+	map_events LilycoveCity_PokemonTrainerFanClub_EventObjects, LilycoveCity_PokemonTrainerFanClub_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/LinkContestRoom1.inc b/data/maps/events/LinkContestRoom1.inc
index 248ca948d..641c1bdd1 100644
--- a/data/maps/events/LinkContestRoom1.inc
+++ b/data/maps/events/LinkContestRoom1.inc
@@ -1,18 +1,18 @@
-LinkContestRoom1_MapObjects: @ 8539EFC
-	object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 0, 6, 4, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_CONTEST_JUDGE, 0, 0, 7, 4, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_HIPSTER, 0, 0, 4, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_TRADER, 0, 0, 6, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_STORYTELLER, 0, 0, 8, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 2, 6, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0
+LinkContestRoom1_EventObjects: @ 8539EFC
+	object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 6, 4, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 0, 7, 4, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 0, 4, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_TRADER, 0, 0, 6, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 8, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 2, 6, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0
 	object_event 7, 246, 0, 0, 4, 2, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0
 	object_event 8, 247, 0, 0, 5, 2, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0
 	object_event 9, 248, 0, 0, 9, 2, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0
 	object_event 10, 249, 0, 0, 10, 2, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0
 	object_event 11, 250, 0, 0, 12, 5, 3, 9, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 2, 5, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 5, 3, 1, 0, 0, 0, 0, 0x0, 86, 0, 0
-	object_event 14, MAP_OBJ_GFX_GIDDY, 0, 0, 10, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_ARTIST, 0, 0, 12, 6, 3, 9, 0, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 12, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 2, 5, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 5, 3, 1, 0, 0, 0, 0, 0x0, 86, 0, 0
+	object_event 14, EVENT_OBJ_GFX_GIDDY, 0, 0, 10, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 15, EVENT_OBJ_GFX_ARTIST, 0, 0, 12, 6, 3, 9, 0, 0, 0, 0, 0x0, 0, 0, 0
 
 LinkContestRoom1_MapEvents:: @ 853A064
diff --git a/data/maps/events/LittlerootTown.inc b/data/maps/events/LittlerootTown.inc
index 763391b09..7a2ed7c9f 100644
--- a/data/maps/events/LittlerootTown.inc
+++ b/data/maps/events/LittlerootTown.inc
@@ -1,12 +1,12 @@
-LittlerootTown_MapObjects: @ 85276A8
-	object_event 1, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 16, 10, 3, 2, 33, 0, 0, 0, LittlerootTown_EventScript_1E8034, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 0, 12, 13, 3, 2, 18, 0, 0, 0, LittlerootTown_EventScript_1E8022, 868, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_2, 0, 0, 14, 17, 3, 2, 18, 0, 0, 0, LittlerootTown_EventScript_1E802B, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MOM, 0, 0, 5, 8, 3, 7, 0, 0, 0, 0, LittlerootTown_EventScript_1E863D, 752, 0, 0
-	object_event 5, MAP_OBJ_GFX_TRUCK, 0, 0, 2, 10, 4, 10, 0, 0, 0, 0, 0x0, 761, 0, 0
-	object_event 6, MAP_OBJ_GFX_TRUCK, 0, 0, 11, 10, 4, 10, 0, 0, 0, 0, 0x0, 762, 0, 0
-	object_event 7, MAP_OBJ_GFX_HIPSTER, 0, 0, 13, 10, 3, 7, 17, 0, 0, 0, 0x0, 794, 0, 0
-	object_event 8, MAP_OBJ_GFX_PROF_BIRCH, 0, 0, 14, 10, 3, 7, 17, 0, 0, 0, 0x0, 795, 0, 0
+LittlerootTown_EventObjects: @ 85276A8
+	object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 16, 10, 3, 2, 33, 0, 0, 0, LittlerootTown_EventScript_1E8034, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 12, 13, 3, 2, 18, 0, 0, 0, LittlerootTown_EventScript_1E8022, 868, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 0, 14, 17, 3, 2, 18, 0, 0, 0, LittlerootTown_EventScript_1E802B, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MOM, 0, 0, 5, 8, 3, 7, 0, 0, 0, 0, LittlerootTown_EventScript_1E863D, 752, 0, 0
+	object_event 5, EVENT_OBJ_GFX_TRUCK, 0, 0, 2, 10, 4, 10, 0, 0, 0, 0, 0x0, 761, 0, 0
+	object_event 6, EVENT_OBJ_GFX_TRUCK, 0, 0, 11, 10, 4, 10, 0, 0, 0, 0, 0x0, 762, 0, 0
+	object_event 7, EVENT_OBJ_GFX_HIPSTER, 0, 0, 13, 10, 3, 7, 17, 0, 0, 0, 0x0, 794, 0, 0
+	object_event 8, EVENT_OBJ_GFX_PROF_BIRCH, 0, 0, 14, 10, 3, 7, 17, 0, 0, 0, 0x0, 795, 0, 0
 
 LittlerootTown_MapWarps: @ 8527768
 	warp_def 14, 8, 0, 1, LITTLEROOT_TOWN_MAYS_HOUSE_1F
@@ -31,5 +31,5 @@ LittlerootTown_MapBGEvents: @ 8527810
 	bg_event 12, 8, 3, 0, 0, LittlerootTown_EventScript_1E818F
 
 LittlerootTown_MapEvents:: @ 8527840
-	map_events LittlerootTown_MapObjects, LittlerootTown_MapWarps, LittlerootTown_MapCoordEvents, LittlerootTown_MapBGEvents
+	map_events LittlerootTown_EventObjects, LittlerootTown_MapWarps, LittlerootTown_MapCoordEvents, LittlerootTown_MapBGEvents
 
diff --git a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc
index 6f6fc9df4..f97d49985 100644
--- a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc
+++ b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc
@@ -1,11 +1,11 @@
-LittlerootTown_BrendansHouse_1F_MapObjects: @ 852D08C
-	object_event 1, MAP_OBJ_GFX_MOM, 0, 0, 2, 6, 3, 10, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_2929C5, 758, 0, 0
-	object_event 2, MAP_OBJ_GFX_VIGAROTH_CARRYING_BOX, 0, 0, 1, 3, 3, 28, 3, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ACD, 755, 0, 0
-	object_event 3, MAP_OBJ_GFX_VIGAROTH_FACING_AWAY, 0, 0, 4, 5, 3, 65, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ABA, 754, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 0, 2, 7, 3, 10, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F89F3, 784, 0, 0
-	object_event 5, MAP_OBJ_GFX_NORMAN, 0, 0, 5, 6, 3, 9, 17, 0, 0, 0, 0x0, 734, 0, 0
-	object_event 6, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 1, 5, 3, 5, 17, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D, 735, 0, 0
-	object_event 7, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 8, 8, 3, 7, 17, 0, 0, 0, 0x0, 745, 0, 0
+LittlerootTown_BrendansHouse_1F_EventObjects: @ 852D08C
+	object_event 1, EVENT_OBJ_GFX_MOM, 0, 0, 2, 6, 3, 10, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_2929C5, 758, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VIGAROTH_CARRYING_BOX, 0, 0, 1, 3, 3, 28, 3, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ACD, 755, 0, 0
+	object_event 3, EVENT_OBJ_GFX_VIGAROTH_FACING_AWAY, 0, 0, 4, 5, 3, 65, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ABA, 754, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 2, 7, 3, 10, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F89F3, 784, 0, 0
+	object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 0, 5, 6, 3, 9, 17, 0, 0, 0, 0x0, 734, 0, 0
+	object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 1, 5, 3, 5, 17, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D, 735, 0, 0
+	object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 8, 8, 3, 7, 17, 0, 0, 0, 0x0, 745, 0, 0
 
 LittlerootTown_BrendansHouse_1F_MapWarps: @ 852D134
 	warp_def 9, 8, 0, 1, LITTLEROOT_TOWN
@@ -19,5 +19,5 @@ LittlerootTown_BrendansHouse_1F_MapCoordEvents: @ 852D14C
 	coord_event 9, 3, 0, 0, VAR_0x408D, 2, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F78D6
 
 LittlerootTown_BrendansHouse_1F_MapEvents:: @ 852D18C
-	map_events LittlerootTown_BrendansHouse_1F_MapObjects, LittlerootTown_BrendansHouse_1F_MapWarps, LittlerootTown_BrendansHouse_1F_MapCoordEvents, 0x0
+	map_events LittlerootTown_BrendansHouse_1F_EventObjects, LittlerootTown_BrendansHouse_1F_MapWarps, LittlerootTown_BrendansHouse_1F_MapCoordEvents, 0x0
 
diff --git a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc b/data/maps/events/LittlerootTown_BrendansHouse_2F.inc
index af470cca5..d7733b800 100644
--- a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc
+++ b/data/maps/events/LittlerootTown_BrendansHouse_2F.inc
@@ -1,20 +1,20 @@
-LittlerootTown_BrendansHouse_2F_MapObjects: @ 852D1A0
-	object_event 1, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 7, 1, 0, 8, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F94C1, 760, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 1, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 1, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 0, 1, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 4, 1, 0, 0, 0, 0, 0x0, 179, 0, 0
+LittlerootTown_BrendansHouse_2F_EventObjects: @ 852D1A0
+	object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 7, 1, 0, 8, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F94C1, 760, 0, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0x0, 174, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0x0, 175, 0, 0
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 1, 0, 0, 0, 0, 0x0, 176, 0, 0
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 1, 0, 0, 0, 0, 0x0, 177, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 0, 1, 0, 0, 0, 0, 0x0, 178, 0, 0
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 4, 1, 0, 0, 0, 0, 0x0, 179, 0, 0
 	object_event 8, 246, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0x0, 180, 0, 0
 	object_event 9, 247, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0x0, 181, 0, 0
 	object_event 10, 248, 0, 0, 1, 2, 3, 1, 0, 0, 0, 0, 0x0, 182, 0, 0
 	object_event 11, 249, 0, 0, 1, 3, 3, 1, 0, 0, 0, 0, 0x0, 183, 0, 0
 	object_event 12, 250, 0, 0, 1, 4, 3, 1, 0, 0, 0, 0, 0x0, 184, 0, 0
 	object_event 13, 251, 0, 0, 1, 5, 0, 1, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, MAP_OBJ_GFX_MOM, 0, 0, 7, 1, 3, 8, 1, 0, 0, 0, 0x0, 757, 0, 0
-	object_event 15, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, 0, 1, 17, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8481, 817, 0, 0
-	object_event 16, MAP_OBJ_GFX_SWABLU_DOLL, 0, 0, 5, 5, 3, 1, 17, 0, 0, 0, 0x0, 815, 0, 0
+	object_event 14, EVENT_OBJ_GFX_MOM, 0, 0, 7, 1, 3, 8, 1, 0, 0, 0, 0x0, 757, 0, 0
+	object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, 0, 1, 17, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8481, 817, 0, 0
+	object_event 16, EVENT_OBJ_GFX_SWABLU_DOLL, 0, 0, 5, 5, 3, 1, 17, 0, 0, 0, 0x0, 815, 0, 0
 
 LittlerootTown_BrendansHouse_2F_MapWarps: @ 852D320
 	warp_def 7, 1, 0, 2, LITTLEROOT_TOWN_BRENDANS_HOUSE_1F
@@ -26,5 +26,5 @@ LittlerootTown_BrendansHouse_2F_MapBGEvents: @ 852D328
 	bg_event 3, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F865F
 
 LittlerootTown_BrendansHouse_2F_MapEvents:: @ 852D358
-	map_events LittlerootTown_BrendansHouse_2F_MapObjects, LittlerootTown_BrendansHouse_2F_MapWarps, 0x0, LittlerootTown_BrendansHouse_2F_MapBGEvents
+	map_events LittlerootTown_BrendansHouse_2F_EventObjects, LittlerootTown_BrendansHouse_2F_MapWarps, 0x0, LittlerootTown_BrendansHouse_2F_MapBGEvents
 
diff --git a/data/maps/events/LittlerootTown_MaysHouse_1F.inc b/data/maps/events/LittlerootTown_MaysHouse_1F.inc
index 68bf13bcd..ccee2d442 100644
--- a/data/maps/events/LittlerootTown_MaysHouse_1F.inc
+++ b/data/maps/events/LittlerootTown_MaysHouse_1F.inc
@@ -1,11 +1,11 @@
-LittlerootTown_MaysHouse_1F_MapObjects: @ 852D36C
-	object_event 1, MAP_OBJ_GFX_MOM, 0, 0, 8, 6, 3, 9, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_2929C5, 759, 0, 0
-	object_event 2, MAP_OBJ_GFX_VIGAROTH_FACING_AWAY, 0, 0, 6, 5, 3, 65, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ABA, 754, 0, 0
-	object_event 3, MAP_OBJ_GFX_VIGAROTH_CARRYING_BOX, 0, 0, 9, 3, 3, 27, 3, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ACD, 755, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 0, 8, 7, 3, 9, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F89F3, 785, 0, 0
-	object_event 5, MAP_OBJ_GFX_NORMAN, 0, 0, 5, 6, 3, 10, 17, 0, 0, 0, 0x0, 734, 0, 0
-	object_event 6, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 9, 5, 3, 5, 17, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A3D, 736, 0, 0
-	object_event 7, MAP_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 0, 2, 8, 3, 7, 17, 0, 0, 0, 0x0, 746, 0, 0
+LittlerootTown_MaysHouse_1F_EventObjects: @ 852D36C
+	object_event 1, EVENT_OBJ_GFX_MOM, 0, 0, 8, 6, 3, 9, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_2929C5, 759, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VIGAROTH_FACING_AWAY, 0, 0, 6, 5, 3, 65, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ABA, 754, 0, 0
+	object_event 3, EVENT_OBJ_GFX_VIGAROTH_CARRYING_BOX, 0, 0, 9, 3, 3, 27, 3, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ACD, 755, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 8, 7, 3, 9, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F89F3, 785, 0, 0
+	object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 0, 5, 6, 3, 10, 17, 0, 0, 0, 0x0, 734, 0, 0
+	object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 9, 5, 3, 5, 17, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A3D, 736, 0, 0
+	object_event 7, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 0, 2, 8, 3, 7, 17, 0, 0, 0, 0x0, 746, 0, 0
 
 LittlerootTown_MaysHouse_1F_MapWarps: @ 852D414
 	warp_def 1, 8, 0, 0, LITTLEROOT_TOWN
@@ -19,5 +19,5 @@ LittlerootTown_MaysHouse_1F_MapCoordEvents: @ 852D42C
 	coord_event 3, 3, 0, 0, VAR_0x408D, 2, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A7F
 
 LittlerootTown_MaysHouse_1F_MapEvents:: @ 852D46C
-	map_events LittlerootTown_MaysHouse_1F_MapObjects, LittlerootTown_MaysHouse_1F_MapWarps, LittlerootTown_MaysHouse_1F_MapCoordEvents, 0x0
+	map_events LittlerootTown_MaysHouse_1F_EventObjects, LittlerootTown_MaysHouse_1F_MapWarps, LittlerootTown_MaysHouse_1F_MapCoordEvents, 0x0
 
diff --git a/data/maps/events/LittlerootTown_MaysHouse_2F.inc b/data/maps/events/LittlerootTown_MaysHouse_2F.inc
index 4d26b70d7..40d0f45dc 100644
--- a/data/maps/events/LittlerootTown_MaysHouse_2F.inc
+++ b/data/maps/events/LittlerootTown_MaysHouse_2F.inc
@@ -1,20 +1,20 @@
-LittlerootTown_MaysHouse_2F_MapObjects: @ 852D480
-	object_event 1, MAP_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 0, 1, 1, 0, 8, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F94C1, 722, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 6, 0, 1, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 1, 6, 3, 1, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 2, 6, 0, 1, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 3, 6, 3, 1, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 6, 3, 1, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 6, 3, 1, 0, 0, 0, 0, 0x0, 179, 0, 0
+LittlerootTown_MaysHouse_2F_EventObjects: @ 852D480
+	object_event 1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 0, 1, 1, 0, 8, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F94C1, 722, 0, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 6, 0, 1, 0, 0, 0, 0, 0x0, 174, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 6, 3, 1, 0, 0, 0, 0, 0x0, 175, 0, 0
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 6, 0, 1, 0, 0, 0, 0, 0x0, 176, 0, 0
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 6, 3, 1, 0, 0, 0, 0, 0x0, 177, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 6, 3, 1, 0, 0, 0, 0, 0x0, 178, 0, 0
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 6, 3, 1, 0, 0, 0, 0, 0x0, 179, 0, 0
 	object_event 8, 246, 0, 0, 0, 7, 3, 1, 0, 0, 0, 0, 0x0, 180, 0, 0
 	object_event 9, 247, 0, 0, 1, 7, 3, 1, 0, 0, 0, 0, 0x0, 181, 0, 0
 	object_event 10, 248, 0, 0, 2, 7, 3, 1, 0, 0, 0, 0, 0x0, 182, 0, 0
 	object_event 11, 249, 0, 0, 3, 7, 3, 1, 0, 0, 0, 0, 0x0, 183, 0, 0
 	object_event 12, 250, 0, 0, 4, 7, 3, 1, 0, 0, 0, 0, 0x0, 184, 0, 0
 	object_event 13, 251, 0, 0, 5, 7, 3, 1, 0, 0, 0, 0, 0x0, 185, 0, 0
-	object_event 14, MAP_OBJ_GFX_MOM, 0, 0, 1, 1, 3, 8, 1, 0, 0, 0, 0x0, 757, 0, 0
-	object_event 15, MAP_OBJ_GFX_PICHU_DOLL, 0, 0, 3, 4, 4, 8, 17, 0, 0, 0, 0x0, 849, 0, 0
-	object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 4, 0, 1, 17, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F9334, 818, 0, 0
+	object_event 14, EVENT_OBJ_GFX_MOM, 0, 0, 1, 1, 3, 8, 1, 0, 0, 0, 0x0, 757, 0, 0
+	object_event 15, EVENT_OBJ_GFX_PICHU_DOLL, 0, 0, 3, 4, 4, 8, 17, 0, 0, 0, 0x0, 849, 0, 0
+	object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 4, 0, 1, 17, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F9334, 818, 0, 0
 
 LittlerootTown_MaysHouse_2F_MapWarps: @ 852D600
 	warp_def 1, 1, 0, 2, LITTLEROOT_TOWN_MAYS_HOUSE_1F
@@ -26,5 +26,5 @@ LittlerootTown_MaysHouse_2F_MapBGEvents: @ 852D608
 	bg_event 8, 1, 0, 0, 0, gUnknown_081F9553
 
 LittlerootTown_MaysHouse_2F_MapEvents:: @ 852D638
-	map_events LittlerootTown_MaysHouse_2F_MapObjects, LittlerootTown_MaysHouse_2F_MapWarps, 0x0, LittlerootTown_MaysHouse_2F_MapBGEvents
+	map_events LittlerootTown_MaysHouse_2F_EventObjects, LittlerootTown_MaysHouse_2F_MapWarps, 0x0, LittlerootTown_MaysHouse_2F_MapBGEvents
 
diff --git a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc
index cd004bcb7..7930d0f63 100644
--- a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc
+++ b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc
@@ -1,10 +1,10 @@
-LittlerootTown_ProfessorBirchsLab_MapObjects: @ 852D64C
-	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 9, 8, 3, 2, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_PROF_BIRCH, 0, 0, 6, 4, 3, 8, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A, 721, 0, 0
-	object_event 3, MAP_OBJ_GFX_HIPSTER, 0, 0, 7, 4, 3, 8, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC, 889, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 8, 3, 8, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB, 811, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 8, 3, 8, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF, 812, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 8, 3, 8, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA023, 838, 0, 0
+LittlerootTown_ProfessorBirchsLab_EventObjects: @ 852D64C
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 9, 8, 3, 2, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 0, 6, 4, 3, 8, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A, 721, 0, 0
+	object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 0, 7, 4, 3, 8, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC, 889, 0, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 8, 3, 8, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB, 811, 0, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 8, 3, 8, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF, 812, 0, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 8, 3, 8, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA023, 838, 0, 0
 
 LittlerootTown_ProfessorBirchsLab_MapWarps: @ 852D6DC
 	warp_def 6, 12, 0, 2, LITTLEROOT_TOWN
@@ -28,5 +28,5 @@ LittlerootTown_ProfessorBirchsLab_MapBGEvents: @ 852D6EC
 	bg_event 11, 9, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB
 
 LittlerootTown_ProfessorBirchsLab_MapEvents:: @ 852D7A0
-	map_events LittlerootTown_ProfessorBirchsLab_MapObjects, LittlerootTown_ProfessorBirchsLab_MapWarps, 0x0, LittlerootTown_ProfessorBirchsLab_MapBGEvents
+	map_events LittlerootTown_ProfessorBirchsLab_EventObjects, LittlerootTown_ProfessorBirchsLab_MapWarps, 0x0, LittlerootTown_ProfessorBirchsLab_MapBGEvents
 
diff --git a/data/maps/events/MagmaHideout_1F.inc b/data/maps/events/MagmaHideout_1F.inc
index 33a8a4aa0..d590a6c98 100644
--- a/data/maps/events/MagmaHideout_1F.inc
+++ b/data/maps/events/MagmaHideout_1F.inc
@@ -1,10 +1,10 @@
-MagmaHideout_1F_MapObjects: @ 85371CC
-	object_event 1, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 4, 5, 0, 10, 17, 0, 1, 2, MagmaHideout_1F_EventScript_23988C, 857, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 20, 0, 1, 17, 0, 0, 0, MagmaHideout_1F_EventScript_2914DE, 1151, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 30, 20, 3, 9, 17, 0, 1, 4, MagmaHideout_1F_EventScript_2398A3, 857, 0, 0
-	object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 22, 3, 1, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 17, 0, 0
-	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 7, 22, 3, 1, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 18, 0, 0
-	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 23, 3, 1, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 19, 0, 0
+MagmaHideout_1F_EventObjects: @ 85371CC
+	object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 4, 5, 0, 10, 17, 0, 1, 2, MagmaHideout_1F_EventScript_23988C, 857, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 20, 0, 1, 17, 0, 0, 0, MagmaHideout_1F_EventScript_2914DE, 1151, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 30, 20, 3, 9, 17, 0, 1, 4, MagmaHideout_1F_EventScript_2398A3, 857, 0, 0
+	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 22, 3, 1, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 17, 0, 0
+	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 7, 22, 3, 1, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 18, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 23, 3, 1, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 19, 0, 0
 
 MagmaHideout_1F_MapWarps: @ 853725C
 	warp_def 10, 34, 3, 4, JAGGED_PASS
@@ -13,5 +13,5 @@ MagmaHideout_1F_MapWarps: @ 853725C
 	warp_def 20, 22, 0, 0, MAGMA_HIDEOUT_2F_3R
 
 MagmaHideout_1F_MapEvents:: @ 853727C
-	map_events MagmaHideout_1F_MapObjects, MagmaHideout_1F_MapWarps, 0x0, 0x0
+	map_events MagmaHideout_1F_EventObjects, MagmaHideout_1F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/MagmaHideout_2F_1R.inc b/data/maps/events/MagmaHideout_2F_1R.inc
index 4ac6e0fde..eb2cca275 100644
--- a/data/maps/events/MagmaHideout_2F_1R.inc
+++ b/data/maps/events/MagmaHideout_2F_1R.inc
@@ -1,8 +1,8 @@
-MagmaHideout_2F_1R_MapObjects: @ 8537290
-	object_event 1, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 18, 19, 3, 51, 69, 0, 1, 1, MagmaHideout_2F_1R_EventScript_239B7F, 857, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 12, 14, 3, 46, 103, 0, 1, 3, MagmaHideout_2F_1R_EventScript_239B96, 857, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 8, 8, 3, 10, 17, 0, 1, 7, MagmaHideout_2F_1R_EventScript_239B51, 857, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 21, 11, 3, 7, 17, 0, 1, 3, MagmaHideout_2F_1R_EventScript_239B68, 857, 0, 0
+MagmaHideout_2F_1R_EventObjects: @ 8537290
+	object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 18, 19, 3, 51, 69, 0, 1, 1, MagmaHideout_2F_1R_EventScript_239B7F, 857, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 12, 14, 3, 46, 103, 0, 1, 3, MagmaHideout_2F_1R_EventScript_239B96, 857, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 8, 8, 3, 10, 17, 0, 1, 7, MagmaHideout_2F_1R_EventScript_239B51, 857, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 21, 11, 3, 7, 17, 0, 1, 3, MagmaHideout_2F_1R_EventScript_239B68, 857, 0, 0
 
 MagmaHideout_2F_1R_MapWarps: @ 85372F0
 	warp_def 11, 23, 0, 0, MAGMA_HIDEOUT_2F_2R
@@ -10,5 +10,5 @@ MagmaHideout_2F_1R_MapWarps: @ 85372F0
 	warp_def 17, 33, 3, 2, MAGMA_HIDEOUT_3F_1R
 
 MagmaHideout_2F_1R_MapEvents:: @ 8537308
-	map_events MagmaHideout_2F_1R_MapObjects, MagmaHideout_2F_1R_MapWarps, 0x0, 0x0
+	map_events MagmaHideout_2F_1R_EventObjects, MagmaHideout_2F_1R_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/MagmaHideout_2F_2R.inc b/data/maps/events/MagmaHideout_2F_2R.inc
index 845da88b2..7d8fb6808 100644
--- a/data/maps/events/MagmaHideout_2F_2R.inc
+++ b/data/maps/events/MagmaHideout_2F_2R.inc
@@ -1,15 +1,15 @@
-MagmaHideout_2F_2R_MapObjects: @ 853731C
-	object_event 1, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 29, 8, 3, 9, 17, 0, 1, 7, MagmaHideout_2F_2R_EventScript_239E4D, 857, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 25, 11, 3, 10, 17, 0, 1, 2, MagmaHideout_2F_2R_EventScript_239E36, 857, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 21, 7, 3, 1, 17, 0, 0, 0, MagmaHideout_2F_2R_EventScript_2914EB, 1164, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 8, 9, 3, 8, 17, 0, 1, 4, MagmaHideout_2F_2R_EventScript_239E1F, 857, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 7, 13, 3, 10, 17, 0, 1, 1, MagmaHideout_2F_2R_EventScript_239E08, 857, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 14, 6, 3, 1, 17, 0, 0, 0, MagmaHideout_2F_2R_EventScript_2914F8, 1165, 0, 0
+MagmaHideout_2F_2R_EventObjects: @ 853731C
+	object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 29, 8, 3, 9, 17, 0, 1, 7, MagmaHideout_2F_2R_EventScript_239E4D, 857, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 25, 11, 3, 10, 17, 0, 1, 2, MagmaHideout_2F_2R_EventScript_239E36, 857, 0, 0
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 21, 7, 3, 1, 17, 0, 0, 0, MagmaHideout_2F_2R_EventScript_2914EB, 1164, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 8, 9, 3, 8, 17, 0, 1, 4, MagmaHideout_2F_2R_EventScript_239E1F, 857, 0, 0
+	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 7, 13, 3, 10, 17, 0, 1, 1, MagmaHideout_2F_2R_EventScript_239E08, 857, 0, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 14, 6, 3, 1, 17, 0, 0, 0, MagmaHideout_2F_2R_EventScript_2914F8, 1165, 0, 0
 
 MagmaHideout_2F_2R_MapWarps: @ 85373AC
 	warp_def 10, 22, 3, 0, MAGMA_HIDEOUT_2F_1R
 	warp_def 36, 4, 0, 2, MAGMA_HIDEOUT_1F
 
 MagmaHideout_2F_2R_MapEvents:: @ 85373BC
-	map_events MagmaHideout_2F_2R_MapObjects, MagmaHideout_2F_2R_MapWarps, 0x0, 0x0
+	map_events MagmaHideout_2F_2R_EventObjects, MagmaHideout_2F_2R_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/MagmaHideout_3F_1R.inc b/data/maps/events/MagmaHideout_3F_1R.inc
index 07a53f4fb..4d95b38c0 100644
--- a/data/maps/events/MagmaHideout_3F_1R.inc
+++ b/data/maps/events/MagmaHideout_3F_1R.inc
@@ -1,7 +1,7 @@
-MagmaHideout_3F_1R_MapObjects: @ 85373D0
-	object_event 1, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 2, 7, 4, 10, 17, 0, 1, 5, MagmaHideout_3F_1R_EventScript_23A1B3, 857, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 21, 21, 0, 9, 17, 0, 1, 4, MagmaHideout_3F_1R_EventScript_23A1CA, 857, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 9, 16, 0, 1, 17, 0, 0, 0, MagmaHideout_3F_1R_EventScript_291505, 1166, 0, 0
+MagmaHideout_3F_1R_EventObjects: @ 85373D0
+	object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 2, 7, 4, 10, 17, 0, 1, 5, MagmaHideout_3F_1R_EventScript_23A1B3, 857, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 21, 21, 0, 9, 17, 0, 1, 4, MagmaHideout_3F_1R_EventScript_23A1CA, 857, 0, 0
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 9, 16, 0, 1, 17, 0, 0, 0, MagmaHideout_3F_1R_EventScript_291505, 1166, 0, 0
 
 MagmaHideout_3F_1R_MapWarps: @ 8537418
 	warp_def 7, 21, 0, 0, MAGMA_HIDEOUT_4F
@@ -9,5 +9,5 @@ MagmaHideout_3F_1R_MapWarps: @ 8537418
 	warp_def 23, 3, 0, 2, MAGMA_HIDEOUT_2F_1R
 
 MagmaHideout_3F_1R_MapEvents:: @ 8537430
-	map_events MagmaHideout_3F_1R_MapObjects, MagmaHideout_3F_1R_MapWarps, 0x0, 0x0
+	map_events MagmaHideout_3F_1R_EventObjects, MagmaHideout_3F_1R_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/MagmaHideout_3F_2R.inc b/data/maps/events/MagmaHideout_3F_2R.inc
index faeacbd12..f653cb151 100644
--- a/data/maps/events/MagmaHideout_3F_2R.inc
+++ b/data/maps/events/MagmaHideout_3F_2R.inc
@@ -1,10 +1,10 @@
-MagmaHideout_3F_2R_MapObjects: @ 8537444
-	object_event 1, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 16, 3, 0, 17, 17, 0, 1, 3, MagmaHideout_3F_2R_EventScript_23A3D5, 857, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 9, 0, 1, 17, 0, 0, 0, MagmaHideout_3F_2R_EventScript_291512, 1167, 0, 0
+MagmaHideout_3F_2R_EventObjects: @ 8537444
+	object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 16, 3, 0, 17, 17, 0, 1, 3, MagmaHideout_3F_2R_EventScript_23A3D5, 857, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 9, 0, 1, 17, 0, 0, 0, MagmaHideout_3F_2R_EventScript_291512, 1167, 0, 0
 
 MagmaHideout_3F_2R_MapWarps: @ 8537474
 	warp_def 12, 15, 0, 1, MAGMA_HIDEOUT_3F_1R
 
 MagmaHideout_3F_2R_MapEvents:: @ 853747C
-	map_events MagmaHideout_3F_2R_MapObjects, MagmaHideout_3F_2R_MapWarps, 0x0, 0x0
+	map_events MagmaHideout_3F_2R_EventObjects, MagmaHideout_3F_2R_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/MagmaHideout_3F_3R.inc b/data/maps/events/MagmaHideout_3F_3R.inc
index 386696d9c..b662de7d9 100644
--- a/data/maps/events/MagmaHideout_3F_3R.inc
+++ b/data/maps/events/MagmaHideout_3F_3R.inc
@@ -1,10 +1,10 @@
-MagmaHideout_3F_3R_MapObjects: @ 8537574
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 9, 19, 0, 1, 17, 0, 0, 0, MagmaHideout_3F_3R_EventScript_29152C, 1059, 0, 0
+MagmaHideout_3F_3R_EventObjects: @ 8537574
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 9, 19, 0, 1, 17, 0, 0, 0, MagmaHideout_3F_3R_EventScript_29152C, 1059, 0, 0
 
 MagmaHideout_3F_3R_MapWarps: @ 853758C
 	warp_def 16, 1, 0, 1, MAGMA_HIDEOUT_2F_3R
 	warp_def 16, 21, 0, 1, MAGMA_HIDEOUT_4F
 
 MagmaHideout_3F_3R_MapEvents:: @ 853759C
-	map_events MagmaHideout_3F_3R_MapObjects, MagmaHideout_3F_3R_MapWarps, 0x0, 0x0
+	map_events MagmaHideout_3F_3R_EventObjects, MagmaHideout_3F_3R_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/MagmaHideout_4F.inc b/data/maps/events/MagmaHideout_4F.inc
index 545eeea92..221775788 100644
--- a/data/maps/events/MagmaHideout_4F.inc
+++ b/data/maps/events/MagmaHideout_4F.inc
@@ -1,17 +1,17 @@
-MagmaHideout_4F_MapObjects: @ 8537490
-	object_event 1, MAP_OBJ_GFX_GROUDON_1, 0, 0, 16, 17, 0, 8, 17, 0, 0, 0, 0x0, 853, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 31, 22, 0, 10, 17, 0, 1, 3, MagmaHideout_4F_EventScript_23A68C, 857, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 30, 13, 0, 9, 17, 0, 1, 3, MagmaHideout_4F_EventScript_23A6A3, 857, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 26, 13, 0, 10, 17, 0, 1, 3, MagmaHideout_4F_EventScript_23A6BA, 857, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 22, 4, 0, 8, 17, 0, 1, 4, MagmaHideout_4F_EventScript_23A6D1, 857, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAXIE, 0, 0, 16, 21, 0, 7, 17, 0, 0, 0, MagmaHideout_4F_EventScript_23A560, 857, 0, 0
-	object_event 7, MAP_OBJ_GFX_GROUDON_2, 0, 0, 16, 17, 3, 8, 17, 0, 0, 0, 0x0, 850, 0, 0
-	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 7, 0, 1, 17, 0, 0, 0, MagmaHideout_4F_EventScript_29151F, 1168, 0, 0
+MagmaHideout_4F_EventObjects: @ 8537490
+	object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 0, 16, 17, 0, 8, 17, 0, 0, 0, 0x0, 853, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 31, 22, 0, 10, 17, 0, 1, 3, MagmaHideout_4F_EventScript_23A68C, 857, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 30, 13, 0, 9, 17, 0, 1, 3, MagmaHideout_4F_EventScript_23A6A3, 857, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 26, 13, 0, 10, 17, 0, 1, 3, MagmaHideout_4F_EventScript_23A6BA, 857, 0, 0
+	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 22, 4, 0, 8, 17, 0, 1, 4, MagmaHideout_4F_EventScript_23A6D1, 857, 0, 0
+	object_event 6, EVENT_OBJ_GFX_MAXIE, 0, 0, 16, 21, 0, 7, 17, 0, 0, 0, MagmaHideout_4F_EventScript_23A560, 857, 0, 0
+	object_event 7, EVENT_OBJ_GFX_GROUDON_2, 0, 0, 16, 17, 3, 8, 17, 0, 0, 0, 0x0, 850, 0, 0
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 7, 0, 1, 17, 0, 0, 0, MagmaHideout_4F_EventScript_29151F, 1168, 0, 0
 
 MagmaHideout_4F_MapWarps: @ 8537550
 	warp_def 46, 7, 0, 0, MAGMA_HIDEOUT_3F_1R
 	warp_def 20, 21, 0, 1, MAGMA_HIDEOUT_3F_3R
 
 MagmaHideout_4F_MapEvents:: @ 8537560
-	map_events MagmaHideout_4F_MapObjects, MagmaHideout_4F_MapWarps, 0x0, 0x0
+	map_events MagmaHideout_4F_EventObjects, MagmaHideout_4F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/MarineCave_End.inc b/data/maps/events/MarineCave_End.inc
index ad11733e1..b9f6bb020 100644
--- a/data/maps/events/MarineCave_End.inc
+++ b/data/maps/events/MarineCave_End.inc
@@ -1,5 +1,5 @@
-MarineCave_End_MapObjects: @ 85377E8
-	object_event 1, MAP_OBJ_GFX_KYOGRE_1, 0, 0, 9, 22, 1, 8, 17, 0, 0, 0, 0x0, 782, 0, 0
+MarineCave_End_EventObjects: @ 85377E8
+	object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 0, 9, 22, 1, 8, 17, 0, 0, 0, 0x0, 782, 0, 0
 
 MarineCave_End_MapWarps: @ 8537800
 	warp_def 20, 4, 0, 0, MARINE_CAVE_ENTRANCE
@@ -8,5 +8,5 @@ MarineCave_End_MapCoordEvents: @ 8537808
 	coord_event 9, 26, 3, 0, VAR_TEMP_1, 1, 0, MarineCave_End_EventScript_23B01B
 
 MarineCave_End_MapEvents:: @ 8537818
-	map_events MarineCave_End_MapObjects, MarineCave_End_MapWarps, MarineCave_End_MapCoordEvents, 0x0
+	map_events MarineCave_End_EventObjects, MarineCave_End_MapWarps, MarineCave_End_MapCoordEvents, 0x0
 
diff --git a/data/maps/events/MauvilleCity.inc b/data/maps/events/MauvilleCity.inc
index c6da0eb61..6d89267c6 100644
--- a/data/maps/events/MauvilleCity.inc
+++ b/data/maps/events/MauvilleCity.inc
@@ -1,15 +1,15 @@
-MauvilleCity_MapObjects: @ 852662C
-	object_event 1, MAP_OBJ_GFX_BOY_3, 0, 0, 29, 16, 3, 5, 17, 0, 0, 0, MauvilleCity_EventScript_1DF3B3, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BOY_4, 0, 0, 24, 10, 3, 5, 1, 0, 0, 0, MauvilleCity_EventScript_1DF3CE, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MANIAC, 0, 0, 14, 11, 3, 10, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3BC, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 0, 18, 6, 3, 1, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3C5, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 17, 14, 3, 8, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3FB, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_WALLY, 0, 0, 8, 6, 3, 7, 0, 0, 0, 0, MauvilleCity_EventScript_1DF452, 804, 0, 0
-	object_event 7, MAP_OBJ_GFX_MAN_3, 0, 0, 9, 6, 3, 9, 0, 0, 0, 0, MauvilleCity_EventScript_1DF41D, 805, 0, 0
-	object_event 8, MAP_OBJ_GFX_WATTSON, 0, 0, 29, 9, 3, 1, 0, 0, 0, 0, MauvilleCity_EventScript_1DF73A, 912, 0, 0
-	object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 28, 19, 3, 1, 17, 0, 0, 0, MauvilleCity_EventScript_2910CE, 1116, 0, 0
-	object_event 10, MAP_OBJ_GFX_FAT_MAN, 0, 0, 13, 7, 3, 9, 0, 0, 0, 0, MauvilleCity_EventScript_2C7F7E, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_SCOTT, 0, 0, 12, 14, 3, 7, 0, 0, 0, 0, 0x0, 765, 0, 0
+MauvilleCity_EventObjects: @ 852662C
+	object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 0, 29, 16, 3, 5, 17, 0, 0, 0, MauvilleCity_EventScript_1DF3B3, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 0, 24, 10, 3, 5, 1, 0, 0, 0, MauvilleCity_EventScript_1DF3CE, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 0, 14, 11, 3, 10, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3BC, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 18, 6, 3, 1, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3C5, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 17, 14, 3, 8, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3FB, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_WALLY, 0, 0, 8, 6, 3, 7, 0, 0, 0, 0, MauvilleCity_EventScript_1DF452, 804, 0, 0
+	object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 0, 9, 6, 3, 9, 0, 0, 0, 0, MauvilleCity_EventScript_1DF41D, 805, 0, 0
+	object_event 8, EVENT_OBJ_GFX_WATTSON, 0, 0, 29, 9, 3, 1, 0, 0, 0, 0, MauvilleCity_EventScript_1DF73A, 912, 0, 0
+	object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 28, 19, 3, 1, 17, 0, 0, 0, MauvilleCity_EventScript_2910CE, 1116, 0, 0
+	object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 13, 7, 3, 9, 0, 0, 0, 0, MauvilleCity_EventScript_2C7F7E, 0, 0, 0
+	object_event 11, EVENT_OBJ_GFX_SCOTT, 0, 0, 12, 14, 3, 7, 0, 0, 0, 0, 0x0, 765, 0, 0
 
 MauvilleCity_MapWarps: @ 8526734
 	warp_def 8, 5, 0, 0, MAUVILLE_CITY_GYM
@@ -31,5 +31,5 @@ MauvilleCity_MapBGEvents: @ 852676C
 	bg_event 11, 15, 0, 0, 0, MauvilleCity_EventScript_1DF3F2
 
 MauvilleCity_MapEvents:: @ 85267CC
-	map_events MauvilleCity_MapObjects, MauvilleCity_MapWarps, 0x0, MauvilleCity_MapBGEvents
+	map_events MauvilleCity_EventObjects, MauvilleCity_MapWarps, 0x0, MauvilleCity_MapBGEvents
 
diff --git a/data/maps/events/MauvilleCity_BikeShop.inc b/data/maps/events/MauvilleCity_BikeShop.inc
index e8e3ef7be..0252834f4 100644
--- a/data/maps/events/MauvilleCity_BikeShop.inc
+++ b/data/maps/events/MauvilleCity_BikeShop.inc
@@ -1,6 +1,6 @@
-MauvilleCity_BikeShop_MapObjects: @ 852FE80
-	object_event 1, MAP_OBJ_GFX_MAN_2, 0, 0, 2, 5, 3, 9, 0, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20EBBC, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_6, 0, 0, 7, 6, 3, 2, 17, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20ED31, 0, 0, 0
+MauvilleCity_BikeShop_EventObjects: @ 852FE80
+	object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 0, 2, 5, 3, 9, 0, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20EBBC, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 0, 7, 6, 3, 2, 17, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20ED31, 0, 0, 0
 
 MauvilleCity_BikeShop_MapWarps: @ 852FEB0
 	warp_def 3, 8, 0, 2, MAUVILLE_CITY
@@ -11,5 +11,5 @@ MauvilleCity_BikeShop_MapBGEvents: @ 852FEC0
 	bg_event 11, 1, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20EDAE
 
 MauvilleCity_BikeShop_MapEvents:: @ 852FED8
-	map_events MauvilleCity_BikeShop_MapObjects, MauvilleCity_BikeShop_MapWarps, 0x0, MauvilleCity_BikeShop_MapBGEvents
+	map_events MauvilleCity_BikeShop_EventObjects, MauvilleCity_BikeShop_MapWarps, 0x0, MauvilleCity_BikeShop_MapBGEvents
 
diff --git a/data/maps/events/MauvilleCity_GameCorner.inc b/data/maps/events/MauvilleCity_GameCorner.inc
index 1a84504f5..57e34caad 100644
--- a/data/maps/events/MauvilleCity_GameCorner.inc
+++ b/data/maps/events/MauvilleCity_GameCorner.inc
@@ -1,16 +1,16 @@
-MauvilleCity_GameCorner_MapObjects: @ 852FF28
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 12, 7, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210125, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 16, 5, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21012E, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BEAUTY, 0, 0, 11, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FBB9, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BEAUTY, 0, 0, 14, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FCF1, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIRL_2, 0, 0, 7, 3, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210137, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_3, 0, 0, 19, 4, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21021D, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 20, 8, 3, 9, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210279, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_COOK, 0, 0, 6, 8, 3, 10, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210289, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_BEAUTY, 0, 0, 13, 2, 3, 8, 17, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FE9F, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_MAN_4, 0, 0, 1, 7, 3, 10, 17, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210299, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_MANIAC, 0, 0, 9, 8, 3, 9, 17, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2102B6, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_WOMAN_7, 0, 0, 4, 6, 3, 9, 17, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2102C6, 0, 0, 0
+MauvilleCity_GameCorner_EventObjects: @ 852FF28
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 12, 7, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210125, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 16, 5, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21012E, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 0, 11, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FBB9, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 0, 14, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FCF1, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 0, 7, 3, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210137, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_3, 0, 0, 19, 4, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21021D, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 20, 8, 3, 9, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210279, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_COOK, 0, 0, 6, 8, 3, 10, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210289, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_BEAUTY, 0, 0, 13, 2, 3, 8, 17, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FE9F, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_MAN_4, 0, 0, 1, 7, 3, 10, 17, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210299, 0, 0, 0
+	object_event 11, EVENT_OBJ_GFX_MANIAC, 0, 0, 9, 8, 3, 9, 17, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2102B6, 0, 0, 0
+	object_event 12, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 6, 3, 9, 17, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2102C6, 0, 0, 0
 
 MauvilleCity_GameCorner_MapWarps: @ 8530048
 	warp_def 11, 10, 3, 5, MAUVILLE_CITY
@@ -43,5 +43,5 @@ MauvilleCity_GameCorner_MapBGEvents: @ 8530058
 	bg_event 19, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5ADF
 
 MauvilleCity_GameCorner_MapEvents:: @ 8530178
-	map_events MauvilleCity_GameCorner_MapObjects, MauvilleCity_GameCorner_MapWarps, 0x0, MauvilleCity_GameCorner_MapBGEvents
+	map_events MauvilleCity_GameCorner_EventObjects, MauvilleCity_GameCorner_MapWarps, 0x0, MauvilleCity_GameCorner_MapBGEvents
 
diff --git a/data/maps/events/MauvilleCity_Gym.inc b/data/maps/events/MauvilleCity_Gym.inc
index 44ae41601..c493d4b8b 100644
--- a/data/maps/events/MauvilleCity_Gym.inc
+++ b/data/maps/events/MauvilleCity_Gym.inc
@@ -1,11 +1,11 @@
-MauvilleCity_Gym_MapObjects: @ 852FD5C
-	object_event 1, MAP_OBJ_GFX_WATTSON, 0, 0, 5, 2, 0, 8, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20DEEB, 913, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_6, 0, 0, 7, 8, 3, 8, 0, 0, 1, 1, MauvilleCity_Gym_EventScript_20E0D0, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 0, 1, 16, 0, 7, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0FE, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 5, 10, 0, 9, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0E7, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAN_6, 0, 0, 1, 13, 0, 8, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0B9, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_2, 0, 0, 7, 20, 0, 9, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20E12C, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_MANIAC, 0, 0, 7, 10, 3, 7, 17, 0, 1, 1, MauvilleCity_Gym_EventScript_20E115, 0, 0, 0
+MauvilleCity_Gym_EventObjects: @ 852FD5C
+	object_event 1, EVENT_OBJ_GFX_WATTSON, 0, 0, 5, 2, 0, 8, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20DEEB, 913, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 0, 7, 8, 3, 8, 0, 0, 1, 1, MauvilleCity_Gym_EventScript_20E0D0, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 0, 1, 16, 0, 7, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0FE, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 5, 10, 0, 9, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0E7, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 0, 1, 13, 0, 8, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0B9, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 0, 7, 20, 0, 9, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20E12C, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 0, 7, 10, 3, 7, 17, 0, 1, 1, MauvilleCity_Gym_EventScript_20E115, 0, 0, 0
 
 MauvilleCity_Gym_MapWarps: @ 852FE04
 	warp_def 4, 20, 0, 0, MAUVILLE_CITY
@@ -22,5 +22,5 @@ MauvilleCity_Gym_MapBGEvents: @ 852FE54
 	bg_event 6, 18, 0, 1, 0, MauvilleCity_Gym_EventScript_20E15B
 
 MauvilleCity_Gym_MapEvents:: @ 852FE6C
-	map_events MauvilleCity_Gym_MapObjects, MauvilleCity_Gym_MapWarps, MauvilleCity_Gym_MapCoordEvents, MauvilleCity_Gym_MapBGEvents
+	map_events MauvilleCity_Gym_EventObjects, MauvilleCity_Gym_MapWarps, MauvilleCity_Gym_MapCoordEvents, MauvilleCity_Gym_MapBGEvents
 
diff --git a/data/maps/events/MauvilleCity_House1.inc b/data/maps/events/MauvilleCity_House1.inc
index 9b30d3119..1a1f241b5 100644
--- a/data/maps/events/MauvilleCity_House1.inc
+++ b/data/maps/events/MauvilleCity_House1.inc
@@ -1,10 +1,10 @@
-MauvilleCity_House1_MapObjects: @ 852FEEC
-	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, MauvilleCity_House1_EventScript_20F976, 0, 0, 0
+MauvilleCity_House1_EventObjects: @ 852FEEC
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, MauvilleCity_House1_EventScript_20F976, 0, 0, 0
 
 MauvilleCity_House1_MapWarps: @ 852FF04
 	warp_def 3, 7, 0, 4, MAUVILLE_CITY
 	warp_def 4, 7, 0, 4, MAUVILLE_CITY
 
 MauvilleCity_House1_MapEvents:: @ 852FF14
-	map_events MauvilleCity_House1_MapObjects, MauvilleCity_House1_MapWarps, 0x0, 0x0
+	map_events MauvilleCity_House1_EventObjects, MauvilleCity_House1_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/MauvilleCity_House2.inc b/data/maps/events/MauvilleCity_House2.inc
index 5328de49f..a51483770 100644
--- a/data/maps/events/MauvilleCity_House2.inc
+++ b/data/maps/events/MauvilleCity_House2.inc
@@ -1,10 +1,10 @@
-MauvilleCity_House2_MapObjects: @ 853018C
-	object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 0, 4, 5, 3, 9, 0, 0, 0, 0, MauvilleCity_House2_EventScript_210C5D, 0, 0, 0
+MauvilleCity_House2_EventObjects: @ 853018C
+	object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 4, 5, 3, 9, 0, 0, 0, 0, MauvilleCity_House2_EventScript_210C5D, 0, 0, 0
 
 MauvilleCity_House2_MapWarps: @ 85301A4
 	warp_def 3, 8, 0, 6, MAUVILLE_CITY
 	warp_def 4, 8, 0, 6, MAUVILLE_CITY
 
 MauvilleCity_House2_MapEvents:: @ 85301B4
-	map_events MauvilleCity_House2_MapObjects, MauvilleCity_House2_MapWarps, 0x0, 0x0
+	map_events MauvilleCity_House2_EventObjects, MauvilleCity_House2_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/MauvilleCity_Mart.inc b/data/maps/events/MauvilleCity_Mart.inc
index 257d047cd..866c0c311 100644
--- a/data/maps/events/MauvilleCity_Mart.inc
+++ b/data/maps/events/MauvilleCity_Mart.inc
@@ -1,12 +1,12 @@
-MauvilleCity_Mart_MapObjects: @ 8530310
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_2110E6, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 4, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_21111C, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_211125, 0, 0, 0
+MauvilleCity_Mart_EventObjects: @ 8530310
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_2110E6, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 4, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_21111C, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_211125, 0, 0, 0
 
 MauvilleCity_Mart_MapWarps: @ 8530358
 	warp_def 3, 7, 0, 3, MAUVILLE_CITY
 	warp_def 4, 7, 0, 3, MAUVILLE_CITY
 
 MauvilleCity_Mart_MapEvents:: @ 8530368
-	map_events MauvilleCity_Mart_MapObjects, MauvilleCity_Mart_MapWarps, 0x0, 0x0
+	map_events MauvilleCity_Mart_EventObjects, MauvilleCity_Mart_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc b/data/maps/events/MauvilleCity_PokemonCenter_1F.inc
index 725e52ef3..b8b7ed7d6 100644
--- a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc
+++ b/data/maps/events/MauvilleCity_PokemonCenter_1F.inc
@@ -1,9 +1,9 @@
-MauvilleCity_PokemonCenter_1F_MapObjects: @ 85301C8
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E78, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 2, 3, 3, 9, 1, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_28E066, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_1, 0, 0, 8, 6, 3, 1, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E86, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_7, 0, 0, 11, 4, 3, 3, 16, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E8F, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 2, 8, 3, 1, 17, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E98, 0, 0, 0
+MauvilleCity_PokemonCenter_1F_EventObjects: @ 85301C8
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E78, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 2, 3, 3, 9, 1, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_28E066, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 8, 6, 3, 1, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E86, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 11, 4, 3, 3, 16, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E8F, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 2, 8, 3, 1, 17, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E98, 0, 0, 0
 
 MauvilleCity_PokemonCenter_1F_MapWarps: @ 8530240
 	warp_def 7, 8, 3, 1, MAUVILLE_CITY
@@ -11,5 +11,5 @@ MauvilleCity_PokemonCenter_1F_MapWarps: @ 8530240
 	warp_def 1, 6, 4, 0, MAUVILLE_CITY_POKEMON_CENTER_2F
 
 MauvilleCity_PokemonCenter_1F_MapEvents:: @ 8530258
-	map_events MauvilleCity_PokemonCenter_1F_MapObjects, MauvilleCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
+	map_events MauvilleCity_PokemonCenter_1F_EventObjects, MauvilleCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/MauvilleCity_PokemonCenter_2F.inc b/data/maps/events/MauvilleCity_PokemonCenter_2F.inc
index 9e5cb6e81..9e8de4b75 100644
--- a/data/maps/events/MauvilleCity_PokemonCenter_2F.inc
+++ b/data/maps/events/MauvilleCity_PokemonCenter_2F.inc
@@ -1,9 +1,9 @@
-MauvilleCity_PokemonCenter_2F_MapObjects: @ 853026C
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
-	object_event 5, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 8, 8, 3, 7, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_21102F, 0, 0, 0
+MauvilleCity_PokemonCenter_2F_EventObjects: @ 853026C
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
+	object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 8, 8, 3, 7, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_21102F, 0, 0, 0
 
 MauvilleCity_PokemonCenter_2F_MapWarps: @ 85302E4
 	warp_def 1, 6, 4, 2, MAUVILLE_CITY_POKEMON_CENTER_1F
@@ -11,5 +11,5 @@ MauvilleCity_PokemonCenter_2F_MapWarps: @ 85302E4
 	warp_def 9, 1, 3, 0, TRADE_CENTER
 
 MauvilleCity_PokemonCenter_2F_MapEvents:: @ 85302FC
-	map_events MauvilleCity_PokemonCenter_2F_MapObjects, MauvilleCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
+	map_events MauvilleCity_PokemonCenter_2F_EventObjects, MauvilleCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/MeteorFalls_1F_1R.inc b/data/maps/events/MeteorFalls_1F_1R.inc
index 29ecbf043..76eb4f6dd 100644
--- a/data/maps/events/MeteorFalls_1F_1R.inc
+++ b/data/maps/events/MeteorFalls_1F_1R.inc
@@ -1,14 +1,14 @@
-MeteorFalls_1F_1R_MapObjects: @ 8533F74
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 2, 4, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911AB, 1044, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 2, 14, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911C5, 1046, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 27, 5, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911B8, 1045, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 26, 32, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911D2, 1047, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 12, 20, 3, 8, 0, 0, 0, 0, 0x0, 939, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 14, 21, 3, 9, 0, 0, 0, 0, 0x0, 939, 0, 0
-	object_event 7, MAP_OBJ_GFX_ARCHIE, 0, 0, 6, 20, 3, 10, 0, 0, 0, 0, 0x0, 938, 0, 0
-	object_event 8, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 20, 3, 10, 0, 0, 0, 0, 0x0, 938, 0, 0
-	object_event 9, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 21, 3, 1, 0, 0, 0, 0, 0x0, 938, 0, 0
-	object_event 10, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 13, 23, 3, 21, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_22BF25, 942, 0, 0
+MeteorFalls_1F_1R_EventObjects: @ 8533F74
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 4, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911AB, 1044, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 14, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911C5, 1046, 0, 0
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 27, 5, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911B8, 1045, 0, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 26, 32, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911D2, 1047, 0, 0
+	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 12, 20, 3, 8, 0, 0, 0, 0, 0x0, 939, 0, 0
+	object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 14, 21, 3, 9, 0, 0, 0, 0, 0x0, 939, 0, 0
+	object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 0, 6, 20, 3, 10, 0, 0, 0, 0, 0x0, 938, 0, 0
+	object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 20, 3, 10, 0, 0, 0, 0, 0x0, 938, 0, 0
+	object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 21, 3, 1, 0, 0, 0, 0, 0x0, 938, 0, 0
+	object_event 10, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 13, 23, 3, 21, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_22BF25, 942, 0, 0
 
 MeteorFalls_1F_1R_MapWarps: @ 8534064
 	warp_def 27, 18, 4, 0, ROUTE_114
@@ -25,5 +25,5 @@ MeteorFalls_1F_1R_MapBGEvents: @ 85340A4
 	bg_event 9, 58, 0, 0, 0, 0x0
 
 MeteorFalls_1F_1R_MapEvents:: @ 85340B0
-	map_events MeteorFalls_1F_1R_MapObjects, MeteorFalls_1F_1R_MapWarps, MeteorFalls_1F_1R_MapCoordEvents, MeteorFalls_1F_1R_MapBGEvents
+	map_events MeteorFalls_1F_1R_EventObjects, MeteorFalls_1F_1R_MapWarps, MeteorFalls_1F_1R_MapCoordEvents, MeteorFalls_1F_1R_MapBGEvents
 
diff --git a/data/maps/events/MeteorFalls_1F_2R.inc b/data/maps/events/MeteorFalls_1F_2R.inc
index 180b4f722..1a85565fa 100644
--- a/data/maps/events/MeteorFalls_1F_2R.inc
+++ b/data/maps/events/MeteorFalls_1F_2R.inc
@@ -1,7 +1,7 @@
-MeteorFalls_1F_2R_MapObjects: @ 85340C4
-	object_event 1, MAP_OBJ_GFX_MAN_4, 0, 0, 13, 2, 3, 8, 0, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C4DE, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 6, 12, 3, 8, 17, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C540, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 7, 12, 3, 8, 17, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C5A4, 0, 0, 0
+MeteorFalls_1F_2R_EventObjects: @ 85340C4
+	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 0, 13, 2, 3, 8, 0, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C4DE, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 6, 12, 3, 8, 17, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C540, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 7, 12, 3, 8, 17, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C5A4, 0, 0, 0
 
 MeteorFalls_1F_2R_MapWarps: @ 853410C
 	warp_def 10, 29, 3, 2, METEOR_FALLS_1F_1R
@@ -13,5 +13,5 @@ MeteorFalls_1F_2R_MapBGEvents: @ 853412C
 	bg_event 9, 58, 0, 0, 0, 0x0
 
 MeteorFalls_1F_2R_MapEvents:: @ 8534138
-	map_events MeteorFalls_1F_2R_MapObjects, MeteorFalls_1F_2R_MapWarps, 0x0, MeteorFalls_1F_2R_MapBGEvents
+	map_events MeteorFalls_1F_2R_EventObjects, MeteorFalls_1F_2R_MapWarps, 0x0, MeteorFalls_1F_2R_MapBGEvents
 
diff --git a/data/maps/events/MeteorFalls_B1F_2R.inc b/data/maps/events/MeteorFalls_B1F_2R.inc
index e208273cf..454946506 100644
--- a/data/maps/events/MeteorFalls_B1F_2R.inc
+++ b/data/maps/events/MeteorFalls_B1F_2R.inc
@@ -1,9 +1,9 @@
-MeteorFalls_B1F_2R_MapObjects: @ 8534190
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 3, 1, 17, 0, 0, 0, MeteorFalls_B1F_2R_EventScript_2911DF, 1080, 0, 0
+MeteorFalls_B1F_2R_EventObjects: @ 8534190
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 3, 1, 17, 0, 0, 0, MeteorFalls_B1F_2R_EventScript_2911DF, 1080, 0, 0
 
 MeteorFalls_B1F_2R_MapWarps: @ 85341A8
 	warp_def 5, 15, 3, 3, METEOR_FALLS_B1F_1R
 
 MeteorFalls_B1F_2R_MapEvents:: @ 85341B0
-	map_events MeteorFalls_B1F_2R_MapObjects, MeteorFalls_B1F_2R_MapWarps, 0x0, 0x0
+	map_events MeteorFalls_B1F_2R_EventObjects, MeteorFalls_B1F_2R_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/MeteorFalls_StevensCave.inc b/data/maps/events/MeteorFalls_StevensCave.inc
index e9f3d0db6..e66dda119 100644
--- a/data/maps/events/MeteorFalls_StevensCave.inc
+++ b/data/maps/events/MeteorFalls_StevensCave.inc
@@ -1,9 +1,9 @@
-MeteorFalls_StevensCave_MapObjects: @ 85378B0
-	object_event 1, MAP_OBJ_GFX_STEVEN, 0, 0, 19, 3, 3, 7, 17, 0, 0, 0, MeteorFalls_StevensCave_EventScript_23B182, 0, 0, 0
+MeteorFalls_StevensCave_EventObjects: @ 85378B0
+	object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 0, 19, 3, 3, 7, 17, 0, 0, 0, MeteorFalls_StevensCave_EventScript_23B182, 0, 0, 0
 
 MeteorFalls_StevensCave_MapWarps: @ 85378C8
 	warp_def 10, 29, 3, 5, METEOR_FALLS_1F_1R
 
 MeteorFalls_StevensCave_MapEvents:: @ 85378D0
-	map_events MeteorFalls_StevensCave_MapObjects, MeteorFalls_StevensCave_MapWarps, 0x0, 0x0
+	map_events MeteorFalls_StevensCave_EventObjects, MeteorFalls_StevensCave_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/MirageTower_3F.inc b/data/maps/events/MirageTower_3F.inc
index 956965d5f..fe6a0f73f 100644
--- a/data/maps/events/MirageTower_3F.inc
+++ b/data/maps/events/MirageTower_3F.inc
@@ -1,11 +1,11 @@
-MirageTower_3F_MapObjects: @ 853761C
-	object_event 1, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 3, 7, 3, 1, 17, 0, 0, 0, MirageTower_3F_EventScript_2907A6, 17, 0, 0
-	object_event 2, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 4, 8, 3, 1, 17, 0, 0, 0, MirageTower_3F_EventScript_2907A6, 18, 0, 0
+MirageTower_3F_EventObjects: @ 853761C
+	object_event 1, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 3, 7, 3, 1, 17, 0, 0, 0, MirageTower_3F_EventScript_2907A6, 17, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 4, 8, 3, 1, 17, 0, 0, 0, MirageTower_3F_EventScript_2907A6, 18, 0, 0
 
 MirageTower_3F_MapWarps: @ 853764C
 	warp_def 18, 12, 3, 0, MIRAGE_TOWER_2F
 	warp_def 2, 4, 0, 0, MIRAGE_TOWER_4F
 
 MirageTower_3F_MapEvents:: @ 853765C
-	map_events MirageTower_3F_MapObjects, MirageTower_3F_MapWarps, 0x0, 0x0
+	map_events MirageTower_3F_EventObjects, MirageTower_3F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/MirageTower_4F.inc b/data/maps/events/MirageTower_4F.inc
index 1042dc803..4d07ff4c3 100644
--- a/data/maps/events/MirageTower_4F.inc
+++ b/data/maps/events/MirageTower_4F.inc
@@ -1,11 +1,11 @@
-MirageTower_4F_MapObjects: @ 8537670
-	object_event 1, MAP_OBJ_GFX_FOSSIL, 0, 0, 5, 4, 4, 8, 17, 0, 0, 0, MirageTower_4F_EventScript_23AD48, 963, 0, 0
-	object_event 2, MAP_OBJ_GFX_FOSSIL, 0, 0, 7, 4, 0, 8, 17, 0, 0, 0, MirageTower_4F_EventScript_23AD89, 964, 0, 0
-	object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 6, 7, 3, 1, 17, 0, 0, 0, MirageTower_4F_EventScript_2907A6, 17, 0, 0
+MirageTower_4F_EventObjects: @ 8537670
+	object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 0, 5, 4, 4, 8, 17, 0, 0, 0, MirageTower_4F_EventScript_23AD48, 963, 0, 0
+	object_event 2, EVENT_OBJ_GFX_FOSSIL, 0, 0, 7, 4, 0, 8, 17, 0, 0, 0, MirageTower_4F_EventScript_23AD89, 964, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 6, 7, 3, 1, 17, 0, 0, 0, MirageTower_4F_EventScript_2907A6, 17, 0, 0
 
 MirageTower_4F_MapWarps: @ 85376B8
 	warp_def 1, 4, 3, 1, MIRAGE_TOWER_3F
 
 MirageTower_4F_MapEvents:: @ 85376C0
-	map_events MirageTower_4F_MapObjects, MirageTower_4F_MapWarps, 0x0, 0x0
+	map_events MirageTower_4F_EventObjects, MirageTower_4F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/MossdeepCity.inc b/data/maps/events/MossdeepCity.inc
index d048ecb5d..a5dfb9df9 100644
--- a/data/maps/events/MossdeepCity.inc
+++ b/data/maps/events/MossdeepCity.inc
@@ -1,21 +1,21 @@
-MossdeepCity_MapObjects: @ 8527018
-	object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 38, 12, 5, 2, 17, 0, 0, 0, MossdeepCity_EventScript_1E4AD1, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 50, 34, 5, 5, 1, 0, 0, 0, MossdeepCity_EventScript_1E4AF9, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 32, 12, 5, 2, 17, 0, 0, 0, MossdeepCity_EventScript_1E4AB2, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 26, 21, 5, 3, 16, 0, 0, 0, MossdeepCity_EventScript_1E4AF0, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIRL_1, 0, 0, 45, 18, 7, 9, 0, 0, 0, 0, MossdeepCity_EventScript_1E4B02, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 62, 35, 5, 1, 0, 0, 0, 0, MossdeepCity_EventScript_2910F5, 1043, 0, 0
-	object_event 7, MAP_OBJ_GFX_MAN_1, 0, 0, 55, 5, 7, 7, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C10, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_WOMAN_1, 0, 0, 56, 21, 7, 10, 17, 0, 0, 0, MossdeepCity_EventScript_1E4B0B, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_BOY_2, 0, 0, 23, 13, 5, 2, 17, 0, 0, 0, MossdeepCity_EventScript_1E4C26, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 44, 23, 5, 8, 17, 0, 0, 0, 0x0, 823, 0, 0
-	object_event 11, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 44, 24, 5, 7, 17, 0, 0, 0, 0x0, 823, 0, 0
-	object_event 12, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 44, 25, 5, 8, 17, 0, 0, 0, 0x0, 823, 0, 0
-	object_event 13, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 44, 26, 5, 7, 17, 0, 0, 0, 0x0, 823, 0, 0
-	object_event 14, MAP_OBJ_GFX_MAXIE, 0, 0, 45, 25, 5, 9, 17, 0, 0, 0, 0x0, 823, 0, 0
-	object_event 15, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 19, 25, 3, 64, 51, 0, 0, 0, MossdeepCity_EventScript_2C81EE, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_SCOTT, 0, 0, 61, 29, 5, 17, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C85, 788, 0, 0
-	object_event 17, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 31, 29, 3, 64, 51, 0, 0, 0, MossdeepCity_EventScript_1E4C7C, 0, 0, 0
+MossdeepCity_EventObjects: @ 8527018
+	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 38, 12, 5, 2, 17, 0, 0, 0, MossdeepCity_EventScript_1E4AD1, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 50, 34, 5, 5, 1, 0, 0, 0, MossdeepCity_EventScript_1E4AF9, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 32, 12, 5, 2, 17, 0, 0, 0, MossdeepCity_EventScript_1E4AB2, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 26, 21, 5, 3, 16, 0, 0, 0, MossdeepCity_EventScript_1E4AF0, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_GIRL_1, 0, 0, 45, 18, 7, 9, 0, 0, 0, 0, MossdeepCity_EventScript_1E4B02, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 62, 35, 5, 1, 0, 0, 0, 0, MossdeepCity_EventScript_2910F5, 1043, 0, 0
+	object_event 7, EVENT_OBJ_GFX_MAN_1, 0, 0, 55, 5, 7, 7, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C10, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 56, 21, 7, 10, 17, 0, 0, 0, MossdeepCity_EventScript_1E4B0B, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_BOY_2, 0, 0, 23, 13, 5, 2, 17, 0, 0, 0, MossdeepCity_EventScript_1E4C26, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 44, 23, 5, 8, 17, 0, 0, 0, 0x0, 823, 0, 0
+	object_event 11, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 44, 24, 5, 7, 17, 0, 0, 0, 0x0, 823, 0, 0
+	object_event 12, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 44, 25, 5, 8, 17, 0, 0, 0, 0x0, 823, 0, 0
+	object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 44, 26, 5, 7, 17, 0, 0, 0, 0x0, 823, 0, 0
+	object_event 14, EVENT_OBJ_GFX_MAXIE, 0, 0, 45, 25, 5, 9, 17, 0, 0, 0, 0x0, 823, 0, 0
+	object_event 15, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 19, 25, 3, 64, 51, 0, 0, 0, MossdeepCity_EventScript_2C81EE, 0, 0, 0
+	object_event 16, EVENT_OBJ_GFX_SCOTT, 0, 0, 61, 29, 5, 17, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C85, 788, 0, 0
+	object_event 17, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 31, 29, 3, 64, 51, 0, 0, 0, MossdeepCity_EventScript_1E4C7C, 0, 0, 0
 
 MossdeepCity_MapWarps: @ 85271B0
 	warp_def 28, 9, 0, 0, MOSSDEEP_CITY_HOUSE_1
@@ -52,5 +52,5 @@ MossdeepCity_MapBGEvents: @ 85272A0
 	bg_event 57, 21, 7, 0, 0, MossdeepCity_EventScript_1E4B14
 
 MossdeepCity_MapEvents:: @ 8527300
-	map_events MossdeepCity_MapObjects, MossdeepCity_MapWarps, MossdeepCity_MapCoordEvents, MossdeepCity_MapBGEvents
+	map_events MossdeepCity_EventObjects, MossdeepCity_MapWarps, MossdeepCity_MapCoordEvents, MossdeepCity_MapBGEvents
 
diff --git a/data/maps/events/MossdeepCity_GameCorner_1F.inc b/data/maps/events/MossdeepCity_GameCorner_1F.inc
index c4477a44b..cbcb8b76f 100644
--- a/data/maps/events/MossdeepCity_GameCorner_1F.inc
+++ b/data/maps/events/MossdeepCity_GameCorner_1F.inc
@@ -1,6 +1,6 @@
-MossdeepCity_GameCorner_1F_MapObjects: @ 8532F40
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 6, 2, 0, 8, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B54, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_5, 0, 0, 4, 2, 0, 8, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B4B, 0, 0, 0
+MossdeepCity_GameCorner_1F_EventObjects: @ 8532F40
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 6, 2, 0, 8, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B54, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 0, 4, 2, 0, 8, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B4B, 0, 0, 0
 
 MossdeepCity_GameCorner_1F_MapWarps: @ 8532F70
 	warp_def 5, 9, 0, 9, MOSSDEEP_CITY
@@ -13,5 +13,5 @@ MossdeepCity_GameCorner_1F_MapBGEvents: @ 8532F88
 	bg_event 1, 1, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_277E96
 
 MossdeepCity_GameCorner_1F_MapEvents:: @ 8532FAC
-	map_events MossdeepCity_GameCorner_1F_MapObjects, MossdeepCity_GameCorner_1F_MapWarps, 0x0, MossdeepCity_GameCorner_1F_MapBGEvents
+	map_events MossdeepCity_GameCorner_1F_EventObjects, MossdeepCity_GameCorner_1F_MapWarps, 0x0, MossdeepCity_GameCorner_1F_MapBGEvents
 
diff --git a/data/maps/events/MossdeepCity_GameCorner_B1F.inc b/data/maps/events/MossdeepCity_GameCorner_B1F.inc
index ed9b4f660..a043926a7 100644
--- a/data/maps/events/MossdeepCity_GameCorner_B1F.inc
+++ b/data/maps/events/MossdeepCity_GameCorner_B1F.inc
@@ -1,9 +1,9 @@
-MossdeepCity_GameCorner_B1F_MapObjects: @ 8532FC0
-	object_event 1, MAP_OBJ_GFX_HIPSTER, 0, 0, 6, 5, 3, 9, 0, 0, 0, 0, 0x0, 0, 0, 0
+MossdeepCity_GameCorner_B1F_EventObjects: @ 8532FC0
+	object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 0, 6, 5, 3, 9, 0, 0, 0, 0, 0x0, 0, 0, 0
 
 MossdeepCity_GameCorner_B1F_MapWarps: @ 8532FD8
 	warp_def 3, 1, 0, 2, MOSSDEEP_CITY_GAME_CORNER_1F
 
 MossdeepCity_GameCorner_B1F_MapEvents:: @ 8532FE0
-	map_events MossdeepCity_GameCorner_B1F_MapObjects, MossdeepCity_GameCorner_B1F_MapWarps, 0x0, 0x0
+	map_events MossdeepCity_GameCorner_B1F_EventObjects, MossdeepCity_GameCorner_B1F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/MossdeepCity_Gym.inc b/data/maps/events/MossdeepCity_Gym.inc
index 57a717638..2a152d8f6 100644
--- a/data/maps/events/MossdeepCity_Gym.inc
+++ b/data/maps/events/MossdeepCity_Gym.inc
@@ -1,40 +1,40 @@
-MossdeepCity_Gym_MapObjects: @ 85324EC
-	object_event 1, MAP_OBJ_GFX_TATE, 0, 0, 23, 7, 0, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 1, 30, 3, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220AFD, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 5, 20, 3, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B2B, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LASS, 0, 0, 4, 29, 3, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B70, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_LASS, 0, 0, 4, 23, 0, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B59, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 6, 9, 3, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B14, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_LASS, 0, 0, 6, 3, 0, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B42, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_MAN_2, 0, 0, 5, 33, 0, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220C11, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_LIZA, 0, 0, 24, 7, 0, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 2, 30, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 1, 29, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 4, 30, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 5, 29, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 5, 21, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 7, 9, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 10, 8, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 9, 8, 3, 7, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220B9E, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 7, 5, 3, 10, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220B87, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 6, 6, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 20, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 12, 5, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 21, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 11, 5, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 22, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 11, 34, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 23, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 12, 33, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 24, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 12, 34, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 25, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 22, 25, 3, 7, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220BCC, 0, 0, 0
-	object_event 26, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 23, 26, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 27, MAP_OBJ_GFX_LASS, 0, 0, 25, 25, 0, 9, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220BB5, 0, 0, 0
-	object_event 28, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 22, 23, 3, 8, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220BFA, 0, 0, 0
-	object_event 29, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 21, 23, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 30, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 21, 22, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 31, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 22, 22, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 32, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 25, 22, 3, 7, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220BE3, 0, 0, 0
-	object_event 33, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 24, 22, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 34, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 24, 23, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 35, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 6, 5, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 36, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 23, 25, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+MossdeepCity_Gym_EventObjects: @ 85324EC
+	object_event 1, EVENT_OBJ_GFX_TATE, 0, 0, 23, 7, 0, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 1, 30, 3, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220AFD, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 5, 20, 3, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B2B, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_LASS, 0, 0, 4, 29, 3, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B70, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_LASS, 0, 0, 4, 23, 0, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B59, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 6, 9, 3, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B14, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_LASS, 0, 0, 6, 3, 0, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B42, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_MAN_2, 0, 0, 5, 33, 0, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220C11, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_LIZA, 0, 0, 24, 7, 0, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 2, 30, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 11, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 1, 29, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 12, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 4, 30, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 13, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 5, 29, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 14, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 5, 21, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 15, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 7, 9, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 16, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 10, 8, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 17, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 9, 8, 3, 7, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220B9E, 0, 0, 0
+	object_event 18, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 7, 5, 3, 10, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220B87, 0, 0, 0
+	object_event 19, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 6, 6, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 20, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 12, 5, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 21, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 11, 5, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 22, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 11, 34, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 23, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 12, 33, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 24, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 12, 34, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 25, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 22, 25, 3, 7, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220BCC, 0, 0, 0
+	object_event 26, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 23, 26, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 27, EVENT_OBJ_GFX_LASS, 0, 0, 25, 25, 0, 9, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220BB5, 0, 0, 0
+	object_event 28, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 22, 23, 3, 8, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220BFA, 0, 0, 0
+	object_event 29, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 21, 23, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 30, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 21, 22, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 31, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 22, 22, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 32, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 25, 22, 3, 7, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220BE3, 0, 0, 0
+	object_event 33, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 24, 22, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 34, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 24, 23, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 35, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 6, 5, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 36, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 23, 25, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
 
 MossdeepCity_Gym_MapWarps: @ 853284C
 	warp_def 6, 35, 3, 1, MOSSDEEP_CITY
@@ -68,5 +68,5 @@ MossdeepCity_Gym_MapBGEvents: @ 853294C
 	bg_event 8, 34, 0, 1, 0, MossdeepCity_Gym_EventScript_220C43
 
 MossdeepCity_Gym_MapEvents:: @ 8532964
-	map_events MossdeepCity_Gym_MapObjects, MossdeepCity_Gym_MapWarps, MossdeepCity_Gym_MapCoordEvents, MossdeepCity_Gym_MapBGEvents
+	map_events MossdeepCity_Gym_EventObjects, MossdeepCity_Gym_MapWarps, MossdeepCity_Gym_MapCoordEvents, MossdeepCity_Gym_MapBGEvents
 
diff --git a/data/maps/events/MossdeepCity_House1.inc b/data/maps/events/MossdeepCity_House1.inc
index c83a09c5c..bddde5c81 100644
--- a/data/maps/events/MossdeepCity_House1.inc
+++ b/data/maps/events/MossdeepCity_House1.inc
@@ -1,11 +1,11 @@
-MossdeepCity_House1_MapObjects: @ 8532978
-	object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 3, 3, 3, 3, 17, 0, 0, 0, MossdeepCity_House1_EventScript_221FD6, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 0, 7, 4, 3, 9, 0, 0, 0, 0, MossdeepCity_House1_EventScript_222006, 0, 0, 0
+MossdeepCity_House1_EventObjects: @ 8532978
+	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 3, 3, 3, 3, 17, 0, 0, 0, MossdeepCity_House1_EventScript_221FD6, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 7, 4, 3, 9, 0, 0, 0, 0, MossdeepCity_House1_EventScript_222006, 0, 0, 0
 
 MossdeepCity_House1_MapWarps: @ 85329A8
 	warp_def 3, 7, 0, 0, MOSSDEEP_CITY
 	warp_def 4, 7, 0, 0, MOSSDEEP_CITY
 
 MossdeepCity_House1_MapEvents:: @ 85329B8
-	map_events MossdeepCity_House1_MapObjects, MossdeepCity_House1_MapWarps, 0x0, 0x0
+	map_events MossdeepCity_House1_EventObjects, MossdeepCity_House1_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/MossdeepCity_House2.inc b/data/maps/events/MossdeepCity_House2.inc
index 08ab80348..e8e120c77 100644
--- a/data/maps/events/MossdeepCity_House2.inc
+++ b/data/maps/events/MossdeepCity_House2.inc
@@ -1,12 +1,12 @@
-MossdeepCity_House2_MapObjects: @ 85329CC
-	object_event 1, MAP_OBJ_GFX_MAN_5, 0, 0, 6, 6, 3, 9, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220DF, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220E8, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WINGULL, 0, 0, 4, 5, 3, 7, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220F1, 934, 0, 0
+MossdeepCity_House2_EventObjects: @ 85329CC
+	object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 0, 6, 6, 3, 9, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220DF, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220E8, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 4, 5, 3, 7, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220F1, 934, 0, 0
 
 MossdeepCity_House2_MapWarps: @ 8532A14
 	warp_def 3, 8, 0, 3, MOSSDEEP_CITY
 	warp_def 4, 8, 0, 3, MOSSDEEP_CITY
 
 MossdeepCity_House2_MapEvents:: @ 8532A24
-	map_events MossdeepCity_House2_MapObjects, MossdeepCity_House2_MapWarps, 0x0, 0x0
+	map_events MossdeepCity_House2_EventObjects, MossdeepCity_House2_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/MossdeepCity_House3.inc b/data/maps/events/MossdeepCity_House3.inc
index 21c008770..5fec469e8 100644
--- a/data/maps/events/MossdeepCity_House3.inc
+++ b/data/maps/events/MossdeepCity_House3.inc
@@ -1,10 +1,10 @@
-MossdeepCity_House3_MapObjects: @ 8532BD4
-	object_event 1, MAP_OBJ_GFX_FISHERMAN, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, MossdeepCity_House3_EventScript_2225C3, 0, 0, 0
+MossdeepCity_House3_EventObjects: @ 8532BD4
+	object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, MossdeepCity_House3_EventScript_2225C3, 0, 0, 0
 
 MossdeepCity_House3_MapWarps: @ 8532BEC
 	warp_def 3, 7, 0, 5, MOSSDEEP_CITY
 	warp_def 4, 7, 0, 5, MOSSDEEP_CITY
 
 MossdeepCity_House3_MapEvents:: @ 8532BFC
-	map_events MossdeepCity_House3_MapObjects, MossdeepCity_House3_MapWarps, 0x0, 0x0
+	map_events MossdeepCity_House3_EventObjects, MossdeepCity_House3_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/MossdeepCity_House4.inc b/data/maps/events/MossdeepCity_House4.inc
index 76245850f..923bbe86d 100644
--- a/data/maps/events/MossdeepCity_House4.inc
+++ b/data/maps/events/MossdeepCity_House4.inc
@@ -1,12 +1,12 @@
-MossdeepCity_House4_MapObjects: @ 8532CAC
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 3, 4, 3, 9, 0, 0, 0, 0, MossdeepCity_House4_EventScript_222DD8, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 6, 6, 3, 5, 1, 0, 0, 0, MossdeepCity_House4_EventScript_222DF7, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SKITTY, 0, 0, 2, 4, 3, 1, 17, 0, 0, 0, MossdeepCity_House4_EventScript_222E1E, 0, 0, 0
+MossdeepCity_House4_EventObjects: @ 8532CAC
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 3, 4, 3, 9, 0, 0, 0, 0, MossdeepCity_House4_EventScript_222DD8, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 6, 6, 3, 5, 1, 0, 0, 0, MossdeepCity_House4_EventScript_222DF7, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_SKITTY, 0, 0, 2, 4, 3, 1, 17, 0, 0, 0, MossdeepCity_House4_EventScript_222E1E, 0, 0, 0
 
 MossdeepCity_House4_MapWarps: @ 8532CF4
 	warp_def 4, 7, 0, 7, MOSSDEEP_CITY
 	warp_def 3, 7, 0, 7, MOSSDEEP_CITY
 
 MossdeepCity_House4_MapEvents:: @ 8532D04
-	map_events MossdeepCity_House4_MapObjects, MossdeepCity_House4_MapWarps, 0x0, 0x0
+	map_events MossdeepCity_House4_EventObjects, MossdeepCity_House4_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/MossdeepCity_Mart.inc b/data/maps/events/MossdeepCity_Mart.inc
index 4a49376ba..c8bbd0a41 100644
--- a/data/maps/events/MossdeepCity_Mart.inc
+++ b/data/maps/events/MossdeepCity_Mart.inc
@@ -1,13 +1,13 @@
-MossdeepCity_Mart_MapObjects: @ 8532B50
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223C8, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 0, 1, 5, 3, 7, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223F6, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_2, 0, 0, 8, 3, 3, 3, 16, 0, 0, 0, MossdeepCity_Mart_EventScript_2223FF, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SAILOR, 0, 0, 5, 3, 3, 2, 17, 0, 0, 0, MossdeepCity_Mart_EventScript_222408, 0, 0, 0
+MossdeepCity_Mart_EventObjects: @ 8532B50
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223C8, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 1, 5, 3, 7, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223F6, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 0, 8, 3, 3, 3, 16, 0, 0, 0, MossdeepCity_Mart_EventScript_2223FF, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 0, 5, 3, 3, 2, 17, 0, 0, 0, MossdeepCity_Mart_EventScript_222408, 0, 0, 0
 
 MossdeepCity_Mart_MapWarps: @ 8532BB0
 	warp_def 3, 7, 0, 4, MOSSDEEP_CITY
 	warp_def 4, 7, 0, 4, MOSSDEEP_CITY
 
 MossdeepCity_Mart_MapEvents:: @ 8532BC0
-	map_events MossdeepCity_Mart_MapObjects, MossdeepCity_Mart_MapWarps, 0x0, 0x0
+	map_events MossdeepCity_Mart_EventObjects, MossdeepCity_Mart_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/MossdeepCity_PokemonCenter_1F.inc b/data/maps/events/MossdeepCity_PokemonCenter_1F.inc
index 30e5d395c..17052105d 100644
--- a/data/maps/events/MossdeepCity_PokemonCenter_1F.inc
+++ b/data/maps/events/MossdeepCity_PokemonCenter_1F.inc
@@ -1,7 +1,7 @@
-MossdeepCity_PokemonCenter_1F_MapObjects: @ 8532A38
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22224E, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 0, 8, 4, 3, 7, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22225C, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GIRL_1, 0, 0, 3, 5, 3, 1, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_222265, 0, 0, 0
+MossdeepCity_PokemonCenter_1F_EventObjects: @ 8532A38
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22224E, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 8, 4, 3, 7, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22225C, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 0, 3, 5, 3, 1, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_222265, 0, 0, 0
 
 MossdeepCity_PokemonCenter_1F_MapWarps: @ 8532A80
 	warp_def 7, 8, 3, 2, MOSSDEEP_CITY
@@ -9,5 +9,5 @@ MossdeepCity_PokemonCenter_1F_MapWarps: @ 8532A80
 	warp_def 1, 6, 4, 0, MOSSDEEP_CITY_POKEMON_CENTER_2F
 
 MossdeepCity_PokemonCenter_1F_MapEvents:: @ 8532A98
-	map_events MossdeepCity_PokemonCenter_1F_MapObjects, MossdeepCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
+	map_events MossdeepCity_PokemonCenter_1F_EventObjects, MossdeepCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/MossdeepCity_PokemonCenter_2F.inc b/data/maps/events/MossdeepCity_PokemonCenter_2F.inc
index 7eda9d522..13a189b51 100644
--- a/data/maps/events/MossdeepCity_PokemonCenter_2F.inc
+++ b/data/maps/events/MossdeepCity_PokemonCenter_2F.inc
@@ -1,9 +1,9 @@
-MossdeepCity_PokemonCenter_2F_MapObjects: @ 8532AAC
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_7, 0, 0, 11, 7, 3, 5, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_22235B, 0, 0, 0
+MossdeepCity_PokemonCenter_2F_EventObjects: @ 8532AAC
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 11, 7, 3, 5, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_22235B, 0, 0, 0
 
 MossdeepCity_PokemonCenter_2F_MapWarps: @ 8532B24
 	warp_def 1, 6, 4, 2, MOSSDEEP_CITY_POKEMON_CENTER_1F
@@ -11,5 +11,5 @@ MossdeepCity_PokemonCenter_2F_MapWarps: @ 8532B24
 	warp_def 9, 1, 3, 0, TRADE_CENTER
 
 MossdeepCity_PokemonCenter_2F_MapEvents:: @ 8532B3C
-	map_events MossdeepCity_PokemonCenter_2F_MapObjects, MossdeepCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
+	map_events MossdeepCity_PokemonCenter_2F_EventObjects, MossdeepCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/MossdeepCity_SpaceCenter_1F.inc b/data/maps/events/MossdeepCity_SpaceCenter_1F.inc
index 4e2062365..8352fe02c 100644
--- a/data/maps/events/MossdeepCity_SpaceCenter_1F.inc
+++ b/data/maps/events/MossdeepCity_SpaceCenter_1F.inc
@@ -1,15 +1,15 @@
-MossdeepCity_SpaceCenter_1F_MapObjects: @ 8532D18
-	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 7, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_222FD8, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 2, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223063, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SAILOR, 0, 0, 6, 6, 3, 9, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22308E, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 10, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223168, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_5, 0, 0, 14, 7, 3, 3, 17, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22312D, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 12, 9, 3, 9, 17, 0, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231DA, 756, 0, 0
-	object_event 7, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 11, 6, 3, 9, 17, 0, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231F1, 756, 0, 0
-	object_event 8, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 10, 2, 3, 8, 17, 0, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_223208, 756, 0, 0
-	object_event 9, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 13, 2, 3, 8, 17, 0, 1, 0, MossdeepCity_SpaceCenter_1F_EventScript_22321F, 756, 0, 0
-	object_event 10, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 2, 5, 0, 76, 17, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231CF, 737, 0, 0
-	object_event 11, MAP_OBJ_GFX_STEVEN, 0, 0, 1, 4, 3, 8, 17, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231B9, 753, 0, 0
+MossdeepCity_SpaceCenter_1F_EventObjects: @ 8532D18
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 7, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_222FD8, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 2, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223063, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 0, 6, 6, 3, 9, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22308E, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 10, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223168, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 14, 7, 3, 3, 17, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22312D, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 12, 9, 3, 9, 17, 0, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231DA, 756, 0, 0
+	object_event 7, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 11, 6, 3, 9, 17, 0, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231F1, 756, 0, 0
+	object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 10, 2, 3, 8, 17, 0, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_223208, 756, 0, 0
+	object_event 9, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 13, 2, 3, 8, 17, 0, 1, 0, MossdeepCity_SpaceCenter_1F_EventScript_22321F, 756, 0, 0
+	object_event 10, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 2, 5, 0, 76, 17, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231CF, 737, 0, 0
+	object_event 11, EVENT_OBJ_GFX_STEVEN, 0, 0, 1, 4, 3, 8, 17, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231B9, 753, 0, 0
 
 MossdeepCity_SpaceCenter_1F_MapWarps: @ 8532E20
 	warp_def 7, 9, 0, 8, MOSSDEEP_CITY
@@ -17,5 +17,5 @@ MossdeepCity_SpaceCenter_1F_MapWarps: @ 8532E20
 	warp_def 13, 1, 0, 0, MOSSDEEP_CITY_SPACE_CENTER_2F
 
 MossdeepCity_SpaceCenter_1F_MapEvents:: @ 8532E38
-	map_events MossdeepCity_SpaceCenter_1F_MapObjects, MossdeepCity_SpaceCenter_1F_MapWarps, 0x0, 0x0
+	map_events MossdeepCity_SpaceCenter_1F_EventObjects, MossdeepCity_SpaceCenter_1F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/MossdeepCity_SpaceCenter_2F.inc b/data/maps/events/MossdeepCity_SpaceCenter_2F.inc
index 3de11be87..ac3bc8c7a 100644
--- a/data/maps/events/MossdeepCity_SpaceCenter_2F.inc
+++ b/data/maps/events/MossdeepCity_SpaceCenter_2F.inc
@@ -1,17 +1,17 @@
-MossdeepCity_SpaceCenter_2F_MapObjects: @ 8532E4C
-	object_event 1, MAP_OBJ_GFX_BOY_4, 0, 0, 6, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F03, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 11, 8, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223EC8, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 5, 6, 3, 2, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223E8D, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_STEVEN, 0, 0, 1, 8, 3, 8, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F7A, 863, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 12, 2, 3, 10, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F3E, 862, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 13, 3, 3, 7, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F50, 862, 0, 0
-	object_event 7, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 14, 2, 3, 9, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F47, 862, 0, 0
-	object_event 8, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 0, 8, 3, 10, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F59, 862, 0, 0
-	object_event 9, MAP_OBJ_GFX_MAXIE, 0, 0, 1, 9, 3, 7, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F6F, 862, 0, 0
+MossdeepCity_SpaceCenter_2F_EventObjects: @ 8532E4C
+	object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 0, 6, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F03, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 11, 8, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223EC8, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 5, 6, 3, 2, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223E8D, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_STEVEN, 0, 0, 1, 8, 3, 8, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F7A, 863, 0, 0
+	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 12, 2, 3, 10, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F3E, 862, 0, 0
+	object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 13, 3, 3, 7, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F50, 862, 0, 0
+	object_event 7, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 14, 2, 3, 9, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F47, 862, 0, 0
+	object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 0, 8, 3, 10, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F59, 862, 0, 0
+	object_event 9, EVENT_OBJ_GFX_MAXIE, 0, 0, 1, 9, 3, 7, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F6F, 862, 0, 0
 
 MossdeepCity_SpaceCenter_2F_MapWarps: @ 8532F24
 	warp_def 13, 1, 0, 2, MOSSDEEP_CITY_SPACE_CENTER_1F
 
 MossdeepCity_SpaceCenter_2F_MapEvents:: @ 8532F2C
-	map_events MossdeepCity_SpaceCenter_2F_MapObjects, MossdeepCity_SpaceCenter_2F_MapWarps, 0x0, 0x0
+	map_events MossdeepCity_SpaceCenter_2F_EventObjects, MossdeepCity_SpaceCenter_2F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/MossdeepCity_StevensHouse.inc b/data/maps/events/MossdeepCity_StevensHouse.inc
index 523088c40..4d9658312 100644
--- a/data/maps/events/MossdeepCity_StevensHouse.inc
+++ b/data/maps/events/MossdeepCity_StevensHouse.inc
@@ -1,7 +1,7 @@
-MossdeepCity_StevensHouse_MapObjects: @ 8532C10
-	object_event 1, MAP_OBJ_GFX_STEVEN, 0, 0, 9, 6, 3, 10, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222912, 967, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 3, 1, 17, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222841, 968, 0, 0
-	object_event 3, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 6, 4, 3, 76, 17, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_22291B, 727, 0, 0
+MossdeepCity_StevensHouse_EventObjects: @ 8532C10
+	object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 0, 9, 6, 3, 10, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222912, 967, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 3, 1, 17, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222841, 968, 0, 0
+	object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 6, 4, 3, 76, 17, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_22291B, 727, 0, 0
 
 MossdeepCity_StevensHouse_MapWarps: @ 8532C58
 	warp_def 3, 7, 0, 6, MOSSDEEP_CITY
@@ -14,5 +14,5 @@ MossdeepCity_StevensHouse_MapBGEvents: @ 8532C68
 	bg_event 10, 6, 3, 0, 0, MossdeepCity_StevensHouse_EventScript_222909
 
 MossdeepCity_StevensHouse_MapEvents:: @ 8532C98
-	map_events MossdeepCity_StevensHouse_MapObjects, MossdeepCity_StevensHouse_MapWarps, 0x0, MossdeepCity_StevensHouse_MapBGEvents
+	map_events MossdeepCity_StevensHouse_EventObjects, MossdeepCity_StevensHouse_MapWarps, 0x0, MossdeepCity_StevensHouse_MapBGEvents
 
diff --git a/data/maps/events/MtChimney.inc b/data/maps/events/MtChimney.inc
index 5f026066a..e4eeb764d 100644
--- a/data/maps/events/MtChimney.inc
+++ b/data/maps/events/MtChimney.inc
@@ -1,34 +1,34 @@
-MtChimney_MapObjects: @ 85347C8
-	object_event 1, MAP_OBJ_GFX_ARCHIE, 0, 0, 24, 19, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22EDD5, 926, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAXIE, 0, 0, 13, 6, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22EE0B, 927, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 12, 11, 3, 9, 0, 0, 1, 2, MtChimney_EventScript_22F06E, 927, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 32, 5, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22F0C0, 927, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 28, 12, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F0B7, 927, 0, 0
-	object_event 6, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 19, 39, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F05C, 926, 0, 0
-	object_event 7, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 29, 5, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F053, 926, 0, 0
-	object_event 8, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 31, 12, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22F065, 926, 0, 0
-	object_event 9, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 0, 19, 39, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22EEF3, 994, 0, 0
-	object_event 10, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 22, 39, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22F0C9, 927, 0, 0
-	object_event 11, MAP_OBJ_GFX_POOCHYENA, 0, 0, 23, 19, 3, 74, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926, 0, 0
-	object_event 12, MAP_OBJ_GFX_POOCHYENA, 0, 0, 23, 18, 3, 64, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0
-	object_event 13, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 23, 17, 3, 8, 0, 0, 0, 0, MtChimney_EventScript_22F0A5, 927, 0, 0
-	object_event 14, MAP_OBJ_GFX_POOCHYENA, 0, 0, 23, 20, 3, 65, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0
-	object_event 15, MAP_OBJ_GFX_POOCHYENA, 0, 0, 22, 19, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0
-	object_event 16, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 23, 21, 3, 7, 0, 0, 0, 0, MtChimney_EventScript_22F0AE, 927, 0, 0
-	object_event 17, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 21, 19, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F09C, 927, 0, 0
-	object_event 18, MAP_OBJ_GFX_POOCHYENA, 0, 0, 30, 12, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926, 0, 0
-	object_event 19, MAP_OBJ_GFX_POOCHYENA, 0, 0, 29, 12, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0
-	object_event 20, MAP_OBJ_GFX_POOCHYENA, 0, 0, 30, 5, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926, 0, 0
-	object_event 21, MAP_OBJ_GFX_POOCHYENA, 0, 0, 31, 5, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0
-	object_event 22, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 9, 16, 3, 10, 0, 0, 1, 3, MtChimney_EventScript_22F085, 927, 0, 0
-	object_event 23, MAP_OBJ_GFX_POOCHYENA, 0, 0, 20, 39, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926, 0, 0
-	object_event 24, MAP_OBJ_GFX_POOCHYENA, 0, 0, 21, 39, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0
-	object_event 25, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 16, 18, 3, 13, 0, 0, 1, 3, MtChimney_EventScript_22F14A, 877, 0, 0
-	object_event 26, MAP_OBJ_GFX_BEAUTY, 0, 0, 14, 7, 3, 70, 0, 0, 1, 6, MtChimney_EventScript_22F1AC, 877, 0, 0
-	object_event 27, MAP_OBJ_GFX_BEAUTY, 0, 0, 29, 7, 3, 17, 17, 0, 1, 3, MtChimney_EventScript_22F1C3, 877, 0, 0
-	object_event 28, MAP_OBJ_GFX_BEAUTY, 0, 0, 27, 17, 3, 16, 17, 0, 1, 3, MtChimney_EventScript_22F1DA, 877, 0, 0
-	object_event 29, MAP_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 13, 16, 3, 9, 17, 0, 1, 3, MtChimney_EventScript_22F1F1, 927, 0, 0
-	object_event 30, MAP_OBJ_GFX_HIKER, 0, 0, 7, 7, 3, 10, 17, 0, 1, 6, MtChimney_EventScript_22F208, 877, 0, 0
+MtChimney_EventObjects: @ 85347C8
+	object_event 1, EVENT_OBJ_GFX_ARCHIE, 0, 0, 24, 19, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22EDD5, 926, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAXIE, 0, 0, 13, 6, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22EE0B, 927, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 12, 11, 3, 9, 0, 0, 1, 2, MtChimney_EventScript_22F06E, 927, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 32, 5, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22F0C0, 927, 0, 0
+	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 28, 12, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F0B7, 927, 0, 0
+	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 19, 39, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F05C, 926, 0, 0
+	object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 29, 5, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F053, 926, 0, 0
+	object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 31, 12, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22F065, 926, 0, 0
+	object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 19, 39, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22EEF3, 994, 0, 0
+	object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 22, 39, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22F0C9, 927, 0, 0
+	object_event 11, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 23, 19, 3, 74, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926, 0, 0
+	object_event 12, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 23, 18, 3, 64, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0
+	object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 23, 17, 3, 8, 0, 0, 0, 0, MtChimney_EventScript_22F0A5, 927, 0, 0
+	object_event 14, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 23, 20, 3, 65, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0
+	object_event 15, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 22, 19, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0
+	object_event 16, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 23, 21, 3, 7, 0, 0, 0, 0, MtChimney_EventScript_22F0AE, 927, 0, 0
+	object_event 17, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 21, 19, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F09C, 927, 0, 0
+	object_event 18, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 30, 12, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926, 0, 0
+	object_event 19, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 29, 12, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0
+	object_event 20, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 30, 5, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926, 0, 0
+	object_event 21, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 31, 5, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0
+	object_event 22, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 9, 16, 3, 10, 0, 0, 1, 3, MtChimney_EventScript_22F085, 927, 0, 0
+	object_event 23, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 20, 39, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926, 0, 0
+	object_event 24, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 21, 39, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0
+	object_event 25, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 16, 18, 3, 13, 0, 0, 1, 3, MtChimney_EventScript_22F14A, 877, 0, 0
+	object_event 26, EVENT_OBJ_GFX_BEAUTY, 0, 0, 14, 7, 3, 70, 0, 0, 1, 6, MtChimney_EventScript_22F1AC, 877, 0, 0
+	object_event 27, EVENT_OBJ_GFX_BEAUTY, 0, 0, 29, 7, 3, 17, 17, 0, 1, 3, MtChimney_EventScript_22F1C3, 877, 0, 0
+	object_event 28, EVENT_OBJ_GFX_BEAUTY, 0, 0, 27, 17, 3, 16, 17, 0, 1, 3, MtChimney_EventScript_22F1DA, 877, 0, 0
+	object_event 29, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 13, 16, 3, 9, 17, 0, 1, 3, MtChimney_EventScript_22F1F1, 927, 0, 0
+	object_event 30, EVENT_OBJ_GFX_HIKER, 0, 0, 7, 7, 3, 10, 17, 0, 1, 6, MtChimney_EventScript_22F208, 877, 0, 0
 
 MtChimney_MapWarps: @ 8534A98
 	warp_def 17, 36, 0, 0, MT_CHIMNEY_CABLE_CAR_STATION
@@ -41,5 +41,5 @@ MtChimney_MapBGEvents: @ 8534AB8
 	bg_event 24, 37, 3, 0, 0, MtChimney_EventScript_22F141
 
 MtChimney_MapEvents:: @ 8534AD0
-	map_events MtChimney_MapObjects, MtChimney_MapWarps, 0x0, MtChimney_MapBGEvents
+	map_events MtChimney_EventObjects, MtChimney_MapWarps, 0x0, MtChimney_MapBGEvents
 
diff --git a/data/maps/events/MtChimney_CableCarStation.inc b/data/maps/events/MtChimney_CableCarStation.inc
index deb754157..1c791072c 100644
--- a/data/maps/events/MtChimney_CableCarStation.inc
+++ b/data/maps/events/MtChimney_CableCarStation.inc
@@ -1,11 +1,11 @@
-MtChimney_CableCarStation_MapObjects: @ 8533CA8
-	object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 0, 6, 6, 3, 8, 0, 0, 0, 0, MtChimney_CableCarStation_EventScript_22AC4B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_CABLE_CAR, 0, 0, 6, 3, 3, 1, 0, 0, 0, 0, 0x0, 0, 0, 0
+MtChimney_CableCarStation_EventObjects: @ 8533CA8
+	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 0, 6, 6, 3, 8, 0, 0, 0, 0, MtChimney_CableCarStation_EventScript_22AC4B, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 0, 6, 3, 3, 1, 0, 0, 0, 0, 0x0, 0, 0, 0
 
 MtChimney_CableCarStation_MapWarps: @ 8533CD8
 	warp_def 6, 11, 0, 0, MT_CHIMNEY
 	warp_def 7, 11, 0, 1, MT_CHIMNEY
 
 MtChimney_CableCarStation_MapEvents:: @ 8533CE8
-	map_events MtChimney_CableCarStation_MapObjects, MtChimney_CableCarStation_MapWarps, 0x0, 0x0
+	map_events MtChimney_CableCarStation_EventObjects, MtChimney_CableCarStation_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/MtPyre_1F.inc b/data/maps/events/MtPyre_1F.inc
index 5270f92fd..aedb94c2f 100644
--- a/data/maps/events/MtPyre_1F.inc
+++ b/data/maps/events/MtPyre_1F.inc
@@ -1,7 +1,7 @@
-MtPyre_1F_MapObjects: @ 8534D64
-	object_event 1, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 0, 21, 2, 3, 8, 17, 0, 0, 0, MtPyre_1F_EventScript_230F3F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 17, 8, 3, 7, 17, 0, 0, 0, MtPyre_1F_EventScript_230F78, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_5, 0, 0, 13, 10, 3, 9, 17, 0, 0, 0, MtPyre_1F_EventScript_230F81, 0, 0, 0
+MtPyre_1F_EventObjects: @ 8534D64
+	object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 21, 2, 3, 8, 17, 0, 0, 0, MtPyre_1F_EventScript_230F3F, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 17, 8, 3, 7, 17, 0, 0, 0, MtPyre_1F_EventScript_230F78, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 0, 13, 10, 3, 9, 17, 0, 0, 0, MtPyre_1F_EventScript_230F81, 0, 0, 0
 
 MtPyre_1F_MapWarps: @ 8534DAC
 	warp_def 17, 18, 3, 0, ROUTE_122
@@ -12,5 +12,5 @@ MtPyre_1F_MapWarps: @ 8534DAC
 	warp_def 20, 9, 3, 4, MT_PYRE_2F
 
 MtPyre_1F_MapEvents:: @ 8534DDC
-	map_events MtPyre_1F_MapObjects, MtPyre_1F_MapWarps, 0x0, 0x0
+	map_events MtPyre_1F_EventObjects, MtPyre_1F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/MtPyre_2F.inc b/data/maps/events/MtPyre_2F.inc
index 86659ac47..d75442cd6 100644
--- a/data/maps/events/MtPyre_2F.inc
+++ b/data/maps/events/MtPyre_2F.inc
@@ -1,12 +1,12 @@
-MtPyre_2F_MapObjects: @ 8534DF0
-	object_event 1, MAP_OBJ_GFX_MANIAC, 0, 0, 3, 6, 3, 10, 17, 0, 1, 2, MtPyre_2F_EventScript_231128, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 10, 3, 1, 17, 0, 0, 0, MtPyre_2F_EventScript_2912FD, 1129, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_1, 0, 0, 9, 3, 3, 10, 17, 0, 0, 0, MtPyre_2F_EventScript_231116, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_3, 0, 0, 12, 10, 3, 8, 17, 0, 0, 0, MtPyre_2F_EventScript_23111F, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_5, 0, 0, 2, 9, 3, 8, 17, 0, 1, 1, MtPyre_2F_EventScript_23115A, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_5, 0, 0, 3, 9, 3, 8, 17, 0, 1, 1, MtPyre_2F_EventScript_23113F, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 6, 9, 3, 7, 17, 0, 1, 2, MtPyre_2F_EventScript_23118C, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 6, 6, 3, 17, 17, 0, 1, 2, MtPyre_2F_EventScript_231175, 0, 0, 0
+MtPyre_2F_EventObjects: @ 8534DF0
+	object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 3, 6, 3, 10, 17, 0, 1, 2, MtPyre_2F_EventScript_231128, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 10, 3, 1, 17, 0, 0, 0, MtPyre_2F_EventScript_2912FD, 1129, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 9, 3, 3, 10, 17, 0, 0, 0, MtPyre_2F_EventScript_231116, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 0, 12, 10, 3, 8, 17, 0, 0, 0, MtPyre_2F_EventScript_23111F, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 2, 9, 3, 8, 17, 0, 1, 1, MtPyre_2F_EventScript_23115A, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 0, 3, 9, 3, 8, 17, 0, 1, 1, MtPyre_2F_EventScript_23113F, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 6, 9, 3, 7, 17, 0, 1, 2, MtPyre_2F_EventScript_23118C, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 6, 6, 3, 17, 17, 0, 1, 2, MtPyre_2F_EventScript_231175, 0, 0, 0
 
 MtPyre_2F_MapWarps: @ 8534EB0
 	warp_def 2, 1, 3, 4, MT_PYRE_1F
@@ -16,5 +16,5 @@ MtPyre_2F_MapWarps: @ 8534EB0
 	warp_def 11, 9, 3, 5, MT_PYRE_1F
 
 MtPyre_2F_MapEvents:: @ 8534ED8
-	map_events MtPyre_2F_MapObjects, MtPyre_2F_MapWarps, 0x0, 0x0
+	map_events MtPyre_2F_EventObjects, MtPyre_2F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/MtPyre_3F.inc b/data/maps/events/MtPyre_3F.inc
index 96dcae630..e52cd546b 100644
--- a/data/maps/events/MtPyre_3F.inc
+++ b/data/maps/events/MtPyre_3F.inc
@@ -1,8 +1,8 @@
-MtPyre_3F_MapObjects: @ 8534EEC
-	object_event 1, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 1, 4, 3, 18, 17, 0, 1, 4, MtPyre_3F_EventScript_231753, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LASS, 0, 0, 11, 4, 3, 17, 17, 0, 1, 4, MtPyre_3F_EventScript_23176A, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 3, 1, 17, 0, 0, 0, MtPyre_3F_EventScript_29130A, 1120, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_3, 0, 0, 6, 4, 3, 14, 17, 0, 1, 4, MtPyre_3F_EventScript_231781, 0, 0, 0
+MtPyre_3F_EventObjects: @ 8534EEC
+	object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 1, 4, 3, 18, 17, 0, 1, 4, MtPyre_3F_EventScript_231753, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_LASS, 0, 0, 11, 4, 3, 17, 17, 0, 1, 4, MtPyre_3F_EventScript_23176A, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 3, 1, 17, 0, 0, 0, MtPyre_3F_EventScript_29130A, 1120, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 6, 4, 3, 14, 17, 0, 1, 4, MtPyre_3F_EventScript_231781, 0, 0, 0
 
 MtPyre_3F_MapWarps: @ 8534F4C
 	warp_def 10, 1, 3, 1, MT_PYRE_2F
@@ -13,5 +13,5 @@ MtPyre_3F_MapWarps: @ 8534F4C
 	warp_def 6, 12, 3, 3, MT_PYRE_2F
 
 MtPyre_3F_MapEvents:: @ 8534F7C
-	map_events MtPyre_3F_MapObjects, MtPyre_3F_MapWarps, 0x0, 0x0
+	map_events MtPyre_3F_EventObjects, MtPyre_3F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/MtPyre_4F.inc b/data/maps/events/MtPyre_4F.inc
index 2792fa422..1804f4615 100644
--- a/data/maps/events/MtPyre_4F.inc
+++ b/data/maps/events/MtPyre_4F.inc
@@ -1,6 +1,6 @@
-MtPyre_4F_MapObjects: @ 8534F90
-	object_event 1, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 11, 7, 3, 24, 17, 0, 1, 2, MtPyre_4F_EventScript_231C6E, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 11, 3, 1, 17, 0, 0, 0, MtPyre_4F_EventScript_291317, 1130, 0, 0
+MtPyre_4F_EventObjects: @ 8534F90
+	object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 11, 7, 3, 24, 17, 0, 1, 2, MtPyre_4F_EventScript_231C6E, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 11, 3, 1, 17, 0, 0, 0, MtPyre_4F_EventScript_291317, 1130, 0, 0
 
 MtPyre_4F_MapWarps: @ 8534FC0
 	warp_def 10, 1, 3, 1, MT_PYRE_5F
@@ -11,5 +11,5 @@ MtPyre_4F_MapWarps: @ 8534FC0
 	warp_def 2, 12, 3, 3, MT_PYRE_3F
 
 MtPyre_4F_MapEvents:: @ 8534FF0
-	map_events MtPyre_4F_MapObjects, MtPyre_4F_MapWarps, 0x0, 0x0
+	map_events MtPyre_4F_EventObjects, MtPyre_4F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/MtPyre_5F.inc b/data/maps/events/MtPyre_5F.inc
index f92f77965..ce7851f62 100644
--- a/data/maps/events/MtPyre_5F.inc
+++ b/data/maps/events/MtPyre_5F.inc
@@ -1,6 +1,6 @@
-MtPyre_5F_MapObjects: @ 8535004
-	object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 3, 7, 3, 17, 17, 0, 1, 2, MtPyre_5F_EventScript_231BC9, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 11, 3, 1, 17, 0, 0, 0, MtPyre_5F_EventScript_291324, 1052, 0, 0
+MtPyre_5F_EventObjects: @ 8535004
+	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 3, 7, 3, 17, 17, 0, 1, 2, MtPyre_5F_EventScript_231BC9, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 11, 3, 1, 17, 0, 0, 0, MtPyre_5F_EventScript_291324, 1052, 0, 0
 
 MtPyre_5F_MapWarps: @ 8535034
 	warp_def 2, 1, 3, 0, MT_PYRE_6F
@@ -10,5 +10,5 @@ MtPyre_5F_MapWarps: @ 8535034
 	warp_def 12, 12, 3, 3, MT_PYRE_4F
 
 MtPyre_5F_MapEvents:: @ 853505C
-	map_events MtPyre_5F_MapObjects, MtPyre_5F_MapWarps, 0x0, 0x0
+	map_events MtPyre_5F_EventObjects, MtPyre_5F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/MtPyre_6F.inc b/data/maps/events/MtPyre_6F.inc
index be6459981..b271e116c 100644
--- a/data/maps/events/MtPyre_6F.inc
+++ b/data/maps/events/MtPyre_6F.inc
@@ -1,12 +1,12 @@
-MtPyre_6F_MapObjects: @ 8535070
-	object_event 1, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 6, 3, 3, 23, 17, 0, 1, 3, MtPyre_6F_EventScript_231D3B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 9, 3, 1, 17, 0, 0, 0, MtPyre_6F_EventScript_291331, 1089, 0, 0
-	object_event 3, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 10, 3, 3, 24, 17, 0, 1, 3, MtPyre_6F_EventScript_231D9D, 0, 0, 0
+MtPyre_6F_EventObjects: @ 8535070
+	object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 6, 3, 3, 23, 17, 0, 1, 3, MtPyre_6F_EventScript_231D3B, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 9, 3, 1, 17, 0, 0, 0, MtPyre_6F_EventScript_291331, 1089, 0, 0
+	object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 10, 3, 3, 24, 17, 0, 1, 3, MtPyre_6F_EventScript_231D9D, 0, 0, 0
 
 MtPyre_6F_MapWarps: @ 85350B8
 	warp_def 2, 1, 3, 0, MT_PYRE_5F
 	warp_def 1, 10, 3, 2, MT_PYRE_5F
 
 MtPyre_6F_MapEvents:: @ 85350C8
-	map_events MtPyre_6F_MapObjects, MtPyre_6F_MapWarps, 0x0, 0x0
+	map_events MtPyre_6F_EventObjects, MtPyre_6F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/MtPyre_Exterior.inc b/data/maps/events/MtPyre_Exterior.inc
index 5a6101968..a45d2ec2e 100644
--- a/data/maps/events/MtPyre_Exterior.inc
+++ b/data/maps/events/MtPyre_Exterior.inc
@@ -1,6 +1,6 @@
-MtPyre_Exterior_MapObjects: @ 85350DC
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 27, 15, 3, 1, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29133E, 1073, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 19, 40, 3, 1, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29134B, 1074, 0, 0
+MtPyre_Exterior_EventObjects: @ 85350DC
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 27, 15, 3, 1, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29133E, 1073, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 19, 40, 3, 1, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29134B, 1074, 0, 0
 
 MtPyre_Exterior_MapWarps: @ 853510C
 	warp_def 10, 42, 3, 1, MT_PYRE_1F
@@ -19,5 +19,5 @@ MtPyre_Exterior_MapBGEvents: @ 8535174
 	bg_event 16, 22, 0, 7, 0, ITEM_MAX_ETHER, 78, 0
 
 MtPyre_Exterior_MapEvents:: @ 853518C
-	map_events MtPyre_Exterior_MapObjects, MtPyre_Exterior_MapWarps, MtPyre_Exterior_MapCoordEvents, MtPyre_Exterior_MapBGEvents
+	map_events MtPyre_Exterior_EventObjects, MtPyre_Exterior_MapWarps, MtPyre_Exterior_MapCoordEvents, MtPyre_Exterior_MapBGEvents
 
diff --git a/data/maps/events/MtPyre_Summit.inc b/data/maps/events/MtPyre_Summit.inc
index 261721fb9..696d9ead3 100644
--- a/data/maps/events/MtPyre_Summit.inc
+++ b/data/maps/events/MtPyre_Summit.inc
@@ -1,12 +1,12 @@
-MtPyre_Summit_MapObjects: @ 85351A0
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 22, 5, 3, 8, 0, 0, 0, 0, MtPyre_Summit_EventScript_23213C, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ARCHIE, 0, 0, 23, 6, 3, 7, 0, 0, 0, 0, 0x0, 916, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 23, 5, 3, 8, 0, 0, 0, 0, MtPyre_Summit_EventScript_2321A2, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 21, 15, 3, 10, 0, 0, 1, 3, MtPyre_Summit_EventScript_2323FD, 917, 0, 0
-	object_event 5, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 25, 18, 3, 9, 0, 0, 1, 3, MtPyre_Summit_EventScript_232414, 917, 0, 0
-	object_event 6, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 21, 11, 3, 10, 0, 0, 1, 3, MtPyre_Summit_EventScript_23242B, 917, 0, 0
-	object_event 7, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 25, 11, 3, 9, 17, 0, 1, 3, MtPyre_Summit_EventScript_232442, 917, 0, 0
-	object_event 8, MAP_OBJ_GFX_MAXIE, 0, 0, 23, 6, 3, 7, 17, 0, 0, 0, 0x0, 856, 0, 0
+MtPyre_Summit_EventObjects: @ 85351A0
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 22, 5, 3, 8, 0, 0, 0, 0, MtPyre_Summit_EventScript_23213C, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 0, 23, 6, 3, 7, 0, 0, 0, 0, 0x0, 916, 0, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 23, 5, 3, 8, 0, 0, 0, 0, MtPyre_Summit_EventScript_2321A2, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 21, 15, 3, 10, 0, 0, 1, 3, MtPyre_Summit_EventScript_2323FD, 917, 0, 0
+	object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 25, 18, 3, 9, 0, 0, 1, 3, MtPyre_Summit_EventScript_232414, 917, 0, 0
+	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 21, 11, 3, 10, 0, 0, 1, 3, MtPyre_Summit_EventScript_23242B, 917, 0, 0
+	object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 25, 11, 3, 9, 17, 0, 1, 3, MtPyre_Summit_EventScript_232442, 917, 0, 0
+	object_event 8, EVENT_OBJ_GFX_MAXIE, 0, 0, 23, 6, 3, 7, 17, 0, 0, 0, 0x0, 856, 0, 0
 
 MtPyre_Summit_MapWarps: @ 8535260
 	warp_def 22, 31, 3, 1, MT_PYRE_EXTERIOR
@@ -26,5 +26,5 @@ MtPyre_Summit_MapBGEvents: @ 85352D8
 	bg_event 37, 7, 3, 7, 0, ITEM_RARE_CANDY, 80, 0
 
 MtPyre_Summit_MapEvents:: @ 85352F0
-	map_events MtPyre_Summit_MapObjects, MtPyre_Summit_MapWarps, MtPyre_Summit_MapCoordEvents, MtPyre_Summit_MapBGEvents
+	map_events MtPyre_Summit_EventObjects, MtPyre_Summit_MapWarps, MtPyre_Summit_MapCoordEvents, MtPyre_Summit_MapBGEvents
 
diff --git a/data/maps/events/NavelRock_Bottom.inc b/data/maps/events/NavelRock_Bottom.inc
index 6de1313e9..af7cffea3 100644
--- a/data/maps/events/NavelRock_Bottom.inc
+++ b/data/maps/events/NavelRock_Bottom.inc
@@ -1,9 +1,9 @@
-NavelRock_Bottom_MapObjects: @ 853DD50
-	object_event 1, MAP_OBJ_GFX_LUGIA, 0, 0, 11, 13, 0, 8, 17, 0, 0, 0, NavelRock_Bottom_EventScript_2692A2, 800, 0, 0
+NavelRock_Bottom_EventObjects: @ 853DD50
+	object_event 1, EVENT_OBJ_GFX_LUGIA, 0, 0, 11, 13, 0, 8, 17, 0, 0, 0, NavelRock_Bottom_EventScript_2692A2, 800, 0, 0
 
 NavelRock_Bottom_MapWarps: @ 853DD68
 	warp_def 14, 19, 0, 0, NAVEL_ROCK_DOWN_11
 
 NavelRock_Bottom_MapEvents:: @ 853DD70
-	map_events NavelRock_Bottom_MapObjects, NavelRock_Bottom_MapWarps, 0x0, 0x0
+	map_events NavelRock_Bottom_EventObjects, NavelRock_Bottom_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/NavelRock_Harbor.inc b/data/maps/events/NavelRock_Harbor.inc
index eab9c8fc6..21102a474 100644
--- a/data/maps/events/NavelRock_Harbor.inc
+++ b/data/maps/events/NavelRock_Harbor.inc
@@ -1,10 +1,10 @@
-NavelRock_Harbor_MapObjects: @ 853DA24
-	object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 8, 5, 0, 7, 17, 0, 0, 0, NavelRock_Harbor_EventScript_2690BD, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 0, 8, 7, 1, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
+NavelRock_Harbor_EventObjects: @ 853DA24
+	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 8, 5, 0, 7, 17, 0, 0, 0, NavelRock_Harbor_EventScript_2690BD, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 0, 8, 7, 1, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
 
 NavelRock_Harbor_MapWarps: @ 853DA54
 	warp_def 8, 2, 0, 0, NAVEL_ROCK_EXTERIOR
 
 NavelRock_Harbor_MapEvents:: @ 853DA5C
-	map_events NavelRock_Harbor_MapObjects, NavelRock_Harbor_MapWarps, 0x0, 0x0
+	map_events NavelRock_Harbor_EventObjects, NavelRock_Harbor_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/NavelRock_Top.inc b/data/maps/events/NavelRock_Top.inc
index 695011311..34e93223f 100644
--- a/data/maps/events/NavelRock_Top.inc
+++ b/data/maps/events/NavelRock_Top.inc
@@ -1,5 +1,5 @@
-NavelRock_Top_MapObjects: @ 853DB74
-	object_event 1, MAP_OBJ_GFX_HOOH, 0, 0, 12, 4, 0, 8, 17, 0, 0, 0, 0x0, 801, 0, 0
+NavelRock_Top_EventObjects: @ 853DB74
+	object_event 1, EVENT_OBJ_GFX_HOOH, 0, 0, 12, 4, 0, 8, 17, 0, 0, 0, 0x0, 801, 0, 0
 
 NavelRock_Top_MapWarps: @ 853DB8C
 	warp_def 13, 20, 3, 1, NAVEL_ROCK_UP_4
@@ -11,5 +11,5 @@ NavelRock_Top_MapBGEvents: @ 853DBA4
 	bg_event 12, 9, 3, 7, 0, ITEM_SACRED_ASH, 109, 0
 
 NavelRock_Top_MapEvents:: @ 853DBB0
-	map_events NavelRock_Top_MapObjects, NavelRock_Top_MapWarps, NavelRock_Top_MapCoordEvents, NavelRock_Top_MapBGEvents
+	map_events NavelRock_Top_EventObjects, NavelRock_Top_MapWarps, NavelRock_Top_MapCoordEvents, NavelRock_Top_MapBGEvents
 
diff --git a/data/maps/events/NewMauville_Inside.inc b/data/maps/events/NewMauville_Inside.inc
index a2d81c9c1..141fd04d4 100644
--- a/data/maps/events/NewMauville_Inside.inc
+++ b/data/maps/events/NewMauville_Inside.inc
@@ -1,12 +1,12 @@
-NewMauville_Inside_MapObjects: @ 85364A8
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 32, 25, 3, 1, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911EC, 1075, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 16, 22, 3, 1, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911F9, 1076, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 39, 4, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_291206, 1110, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 17, 10, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_291213, 1122, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 2, 11, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_291220, 1123, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 25, 18, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_2377AF, 974, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 11, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_2377FC, 975, 0, 0
-	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 13, 10, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_237849, 976, 0, 0
+NewMauville_Inside_EventObjects: @ 85364A8
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 32, 25, 3, 1, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911EC, 1075, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 16, 22, 3, 1, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911F9, 1076, 0, 0
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 39, 4, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_291206, 1110, 0, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 17, 10, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_291213, 1122, 0, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 11, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_291220, 1123, 0, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 25, 18, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_2377AF, 974, 0, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 11, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_2377FC, 975, 0, 0
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 13, 10, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_237849, 976, 0, 0
 
 NewMauville_Inside_MapWarps: @ 8536568
 	warp_def 32, 33, 3, 1, NEW_MAUVILLE_ENTRANCE
@@ -34,5 +34,5 @@ NewMauville_Inside_MapBGEvents: @ 8536610
 	bg_event 35, 2, 0, 0, 0, NewMauville_Inside_EventScript_23778F
 
 NewMauville_Inside_MapEvents:: @ 8536670
-	map_events NewMauville_Inside_MapObjects, NewMauville_Inside_MapWarps, NewMauville_Inside_MapCoordEvents, NewMauville_Inside_MapBGEvents
+	map_events NewMauville_Inside_EventObjects, NewMauville_Inside_MapWarps, NewMauville_Inside_MapCoordEvents, NewMauville_Inside_MapBGEvents
 
diff --git a/data/maps/events/OldaleTown.inc b/data/maps/events/OldaleTown.inc
index 2f2929eb5..6278db428 100644
--- a/data/maps/events/OldaleTown.inc
+++ b/data/maps/events/OldaleTown.inc
@@ -1,8 +1,8 @@
-OldaleTown_MapObjects: @ 8527854
-	object_event 1, MAP_OBJ_GFX_GIRL_3, 0, 0, 16, 11, 3, 9, 0, 0, 0, 0, OldaleTown_EventScript_1E8EF3, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 13, 7, 3, 8, 0, 0, 0, 0, OldaleTown_EventScript_1E8EFC, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MANIAC, 0, 0, 8, 9, 3, 10, 0, 0, 0, 0, OldaleTown_EventScript_1E901F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_HIPSTER, 0, 0, 11, 19, 3, 7, 17, 0, 0, 0, OldaleTown_EventScript_1E9070, 979, 0, 0
+OldaleTown_EventObjects: @ 8527854
+	object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 0, 16, 11, 3, 9, 0, 0, 0, 0, OldaleTown_EventScript_1E8EF3, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 13, 7, 3, 8, 0, 0, 0, 0, OldaleTown_EventScript_1E8EFC, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 0, 8, 9, 3, 10, 0, 0, 0, 0, OldaleTown_EventScript_1E901F, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_HIPSTER, 0, 0, 11, 19, 3, 7, 17, 0, 0, 0, OldaleTown_EventScript_1E9070, 979, 0, 0
 
 OldaleTown_MapWarps: @ 85278B4
 	warp_def 5, 7, 0, 0, OLDALE_TOWN_HOUSE_1
@@ -24,5 +24,5 @@ OldaleTown_MapBGEvents: @ 8527914
 	bg_event 16, 6, 0, 1, 0, OldaleTown_EventScript_271E6A
 
 OldaleTown_MapEvents:: @ 8527950
-	map_events OldaleTown_MapObjects, OldaleTown_MapWarps, OldaleTown_MapCoordEvents, OldaleTown_MapBGEvents
+	map_events OldaleTown_EventObjects, OldaleTown_MapWarps, OldaleTown_MapCoordEvents, OldaleTown_MapBGEvents
 
diff --git a/data/maps/events/OldaleTown_House1.inc b/data/maps/events/OldaleTown_House1.inc
index 1a8edcbc6..93ffb8d72 100644
--- a/data/maps/events/OldaleTown_House1.inc
+++ b/data/maps/events/OldaleTown_House1.inc
@@ -1,10 +1,10 @@
-OldaleTown_House1_MapObjects: @ 852D7B4
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 6, 4, 3, 2, 17, 0, 0, 0, OldaleTown_House1_EventScript_1FBE86, 0, 0, 0
+OldaleTown_House1_EventObjects: @ 852D7B4
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 6, 4, 3, 2, 17, 0, 0, 0, OldaleTown_House1_EventScript_1FBE86, 0, 0, 0
 
 OldaleTown_House1_MapWarps: @ 852D7CC
 	warp_def 3, 8, 0, 0, OLDALE_TOWN
 	warp_def 4, 8, 0, 0, OLDALE_TOWN
 
 OldaleTown_House1_MapEvents:: @ 852D7DC
-	map_events OldaleTown_House1_MapObjects, OldaleTown_House1_MapWarps, 0x0, 0x0
+	map_events OldaleTown_House1_EventObjects, OldaleTown_House1_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/OldaleTown_House2.inc b/data/maps/events/OldaleTown_House2.inc
index c86bc109c..474487423 100644
--- a/data/maps/events/OldaleTown_House2.inc
+++ b/data/maps/events/OldaleTown_House2.inc
@@ -1,11 +1,11 @@
-OldaleTown_House2_MapObjects: @ 852D7F0
-	object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF5B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 7, 4, 3, 9, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF64, 0, 0, 0
+OldaleTown_House2_EventObjects: @ 852D7F0
+	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF5B, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 7, 4, 3, 9, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF64, 0, 0, 0
 
 OldaleTown_House2_MapWarps: @ 852D820
 	warp_def 3, 7, 0, 1, OLDALE_TOWN
 	warp_def 4, 7, 0, 1, OLDALE_TOWN
 
 OldaleTown_House2_MapEvents:: @ 852D830
-	map_events OldaleTown_House2_MapObjects, OldaleTown_House2_MapWarps, 0x0, 0x0
+	map_events OldaleTown_House2_EventObjects, OldaleTown_House2_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/OldaleTown_Mart.inc b/data/maps/events/OldaleTown_Mart.inc
index 6a58118c8..57e963cd5 100644
--- a/data/maps/events/OldaleTown_Mart.inc
+++ b/data/maps/events/OldaleTown_Mart.inc
@@ -1,12 +1,12 @@
-OldaleTown_Mart_MapObjects: @ 852D95C
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC240, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC28A, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_1, 0, 0, 9, 4, 3, 3, 16, 0, 0, 0, OldaleTown_Mart_EventScript_1FC2A9, 0, 0, 0
+OldaleTown_Mart_EventObjects: @ 852D95C
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC240, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC28A, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 9, 4, 3, 3, 16, 0, 0, 0, OldaleTown_Mart_EventScript_1FC2A9, 0, 0, 0
 
 OldaleTown_Mart_MapWarps: @ 852D9A4
 	warp_def 3, 7, 0, 3, OLDALE_TOWN
 	warp_def 4, 7, 0, 3, OLDALE_TOWN
 
 OldaleTown_Mart_MapEvents:: @ 852D9B4
-	map_events OldaleTown_Mart_MapObjects, OldaleTown_Mart_MapWarps, 0x0, 0x0
+	map_events OldaleTown_Mart_EventObjects, OldaleTown_Mart_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/OldaleTown_PokemonCenter_1F.inc b/data/maps/events/OldaleTown_PokemonCenter_1F.inc
index a6e424f27..65465578b 100644
--- a/data/maps/events/OldaleTown_PokemonCenter_1F.inc
+++ b/data/maps/events/OldaleTown_PokemonCenter_1F.inc
@@ -1,8 +1,8 @@
-OldaleTown_PokemonCenter_1F_MapObjects: @ 852D844
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC01A, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC028, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_1, 0, 0, 10, 6, 3, 10, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC031, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 0, 3, 7, 3, 10, 17, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC03A, 0, 0, 0
+OldaleTown_PokemonCenter_1F_EventObjects: @ 852D844
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC01A, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC028, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 10, 6, 3, 10, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC031, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 3, 7, 3, 10, 17, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC03A, 0, 0, 0
 
 OldaleTown_PokemonCenter_1F_MapWarps: @ 852D8A4
 	warp_def 7, 8, 3, 2, OLDALE_TOWN
@@ -10,5 +10,5 @@ OldaleTown_PokemonCenter_1F_MapWarps: @ 852D8A4
 	warp_def 1, 6, 4, 0, OLDALE_TOWN_POKEMON_CENTER_2F
 
 OldaleTown_PokemonCenter_1F_MapEvents:: @ 852D8BC
-	map_events OldaleTown_PokemonCenter_1F_MapObjects, OldaleTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
+	map_events OldaleTown_PokemonCenter_1F_EventObjects, OldaleTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/OldaleTown_PokemonCenter_2F.inc b/data/maps/events/OldaleTown_PokemonCenter_2F.inc
index d520c6bcf..cbf3356a0 100644
--- a/data/maps/events/OldaleTown_PokemonCenter_2F.inc
+++ b/data/maps/events/OldaleTown_PokemonCenter_2F.inc
@@ -1,8 +1,8 @@
-OldaleTown_PokemonCenter_2F_MapObjects: @ 852D8D0
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 3, 8, 17, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 3, 8, 17, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
+OldaleTown_PokemonCenter_2F_EventObjects: @ 852D8D0
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 3, 8, 17, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 3, 8, 17, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
 
 OldaleTown_PokemonCenter_2F_MapWarps: @ 852D930
 	warp_def 1, 6, 4, 2, OLDALE_TOWN_POKEMON_CENTER_1F
@@ -10,5 +10,5 @@ OldaleTown_PokemonCenter_2F_MapWarps: @ 852D930
 	warp_def 9, 1, 3, 0, TRADE_CENTER
 
 OldaleTown_PokemonCenter_2F_MapEvents:: @ 852D948
-	map_events OldaleTown_PokemonCenter_2F_MapObjects, OldaleTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
+	map_events OldaleTown_PokemonCenter_2F_EventObjects, OldaleTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/PacifidlogTown.inc b/data/maps/events/PacifidlogTown.inc
index 1667ccc87..b0df30af1 100644
--- a/data/maps/events/PacifidlogTown.inc
+++ b/data/maps/events/PacifidlogTown.inc
@@ -1,7 +1,7 @@
-PacifidlogTown_MapObjects: @ 8527DE8
-	object_event 1, MAP_OBJ_GFX_GIRL_1, 0, 0, 10, 23, 3, 9, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBACC, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_FISHERMAN, 0, 0, 11, 14, 3, 10, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAD5, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 9, 16, 3, 8, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAC3, 0, 0, 0
+PacifidlogTown_EventObjects: @ 8527DE8
+	object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 0, 10, 23, 3, 9, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBACC, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 11, 14, 3, 10, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAD5, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 9, 16, 3, 8, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAC3, 0, 0, 0
 
 PacifidlogTown_MapWarps: @ 8527E30
 	warp_def 8, 15, 0, 0, PACIFIDLOG_TOWN_POKEMON_CENTER_1F
@@ -17,5 +17,5 @@ PacifidlogTown_MapBGEvents: @ 8527E60
 	bg_event 10, 15, 0, 1, 0, PacifidlogTown_EventScript_271E73
 
 PacifidlogTown_MapEvents:: @ 8527E84
-	map_events PacifidlogTown_MapObjects, PacifidlogTown_MapWarps, 0x0, PacifidlogTown_MapBGEvents
+	map_events PacifidlogTown_EventObjects, PacifidlogTown_MapWarps, 0x0, PacifidlogTown_MapBGEvents
 
diff --git a/data/maps/events/PacifidlogTown_House1.inc b/data/maps/events/PacifidlogTown_House1.inc
index 5f2c3b905..a60d8eedc 100644
--- a/data/maps/events/PacifidlogTown_House1.inc
+++ b/data/maps/events/PacifidlogTown_House1.inc
@@ -1,11 +1,11 @@
-PacifidlogTown_House1_MapObjects: @ 852EBA0
-	object_event 1, MAP_OBJ_GFX_MAN_6, 0, 0, 3, 5, 3, 8, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_20365D, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 0, 6, 4, 3, 9, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_203666, 0, 0, 0
+PacifidlogTown_House1_EventObjects: @ 852EBA0
+	object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 0, 3, 5, 3, 8, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_20365D, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 6, 4, 3, 9, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_203666, 0, 0, 0
 
 PacifidlogTown_House1_MapWarps: @ 852EBD0
 	warp_def 4, 8, 0, 1, PACIFIDLOG_TOWN
 	warp_def 5, 8, 0, 1, PACIFIDLOG_TOWN
 
 PacifidlogTown_House1_MapEvents:: @ 852EBE0
-	map_events PacifidlogTown_House1_MapObjects, PacifidlogTown_House1_MapWarps, 0x0, 0x0
+	map_events PacifidlogTown_House1_EventObjects, PacifidlogTown_House1_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/PacifidlogTown_House2.inc b/data/maps/events/PacifidlogTown_House2.inc
index 743395c72..26147f726 100644
--- a/data/maps/events/PacifidlogTown_House2.inc
+++ b/data/maps/events/PacifidlogTown_House2.inc
@@ -1,12 +1,12 @@
-PacifidlogTown_House2_MapObjects: @ 852EBF4
-	object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 3, 5, 3, 8, 17, 0, 0, 0, PacifidlogTown_House2_EventScript_203792, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_AZURILL, 0, 0, 8, 6, 3, 1, 17, 0, 0, 0, PacifidlogTown_House2_EventScript_203891, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_AZURILL, 0, 0, 1, 7, 3, 1, 17, 0, 0, 0, PacifidlogTown_House2_EventScript_2038AC, 0, 0, 0
+PacifidlogTown_House2_EventObjects: @ 852EBF4
+	object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 3, 5, 3, 8, 17, 0, 0, 0, PacifidlogTown_House2_EventScript_203792, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 0, 8, 6, 3, 1, 17, 0, 0, 0, PacifidlogTown_House2_EventScript_203891, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_AZURILL, 0, 0, 1, 7, 3, 1, 17, 0, 0, 0, PacifidlogTown_House2_EventScript_2038AC, 0, 0, 0
 
 PacifidlogTown_House2_MapWarps: @ 852EC3C
 	warp_def 4, 8, 0, 2, PACIFIDLOG_TOWN
 	warp_def 5, 8, 0, 2, PACIFIDLOG_TOWN
 
 PacifidlogTown_House2_MapEvents:: @ 852EC4C
-	map_events PacifidlogTown_House2_MapObjects, PacifidlogTown_House2_MapWarps, 0x0, 0x0
+	map_events PacifidlogTown_House2_EventObjects, PacifidlogTown_House2_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/PacifidlogTown_House3.inc b/data/maps/events/PacifidlogTown_House3.inc
index 85d7c4f53..8f3292936 100644
--- a/data/maps/events/PacifidlogTown_House3.inc
+++ b/data/maps/events/PacifidlogTown_House3.inc
@@ -1,11 +1,11 @@
-PacifidlogTown_House3_MapObjects: @ 852EC60
-	object_event 1, MAP_OBJ_GFX_GIRL_2, 0, 0, 3, 5, 3, 18, 0, 0, 0, 0, PacifidlogTown_House3_EventScript_203CB5, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_4, 0, 0, 4, 2, 3, 10, 17, 0, 0, 0, PacifidlogTown_House3_EventScript_203C11, 0, 0, 0
+PacifidlogTown_House3_EventObjects: @ 852EC60
+	object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 0, 3, 5, 3, 18, 0, 0, 0, 0, PacifidlogTown_House3_EventScript_203CB5, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 0, 4, 2, 3, 10, 17, 0, 0, 0, PacifidlogTown_House3_EventScript_203C11, 0, 0, 0
 
 PacifidlogTown_House3_MapWarps: @ 852EC90
 	warp_def 4, 8, 0, 3, PACIFIDLOG_TOWN
 	warp_def 5, 8, 0, 3, PACIFIDLOG_TOWN
 
 PacifidlogTown_House3_MapEvents:: @ 852ECA0
-	map_events PacifidlogTown_House3_MapObjects, PacifidlogTown_House3_MapWarps, 0x0, 0x0
+	map_events PacifidlogTown_House3_EventObjects, PacifidlogTown_House3_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/PacifidlogTown_House4.inc b/data/maps/events/PacifidlogTown_House4.inc
index b552a566c..1d88d3be7 100644
--- a/data/maps/events/PacifidlogTown_House4.inc
+++ b/data/maps/events/PacifidlogTown_House4.inc
@@ -1,12 +1,12 @@
-PacifidlogTown_House4_MapObjects: @ 852ECB4
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 3, 4, 3, 8, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_203F55, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 7, 5, 3, 2, 17, 0, 0, 0, PacifidlogTown_House4_EventScript_203F4C, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_1, 0, 0, 7, 4, 3, 2, 17, 0, 0, 0, PacifidlogTown_House4_EventScript_203F5E, 0, 0, 0
+PacifidlogTown_House4_EventObjects: @ 852ECB4
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 3, 4, 3, 8, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_203F55, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 7, 5, 3, 2, 17, 0, 0, 0, PacifidlogTown_House4_EventScript_203F4C, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 7, 4, 3, 2, 17, 0, 0, 0, PacifidlogTown_House4_EventScript_203F5E, 0, 0, 0
 
 PacifidlogTown_House4_MapWarps: @ 852ECFC
 	warp_def 4, 8, 0, 4, PACIFIDLOG_TOWN
 	warp_def 5, 8, 0, 4, PACIFIDLOG_TOWN
 
 PacifidlogTown_House4_MapEvents:: @ 852ED0C
-	map_events PacifidlogTown_House4_MapObjects, PacifidlogTown_House4_MapWarps, 0x0, 0x0
+	map_events PacifidlogTown_House4_EventObjects, PacifidlogTown_House4_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/PacifidlogTown_House5.inc b/data/maps/events/PacifidlogTown_House5.inc
index e078fc612..51cbaaa39 100644
--- a/data/maps/events/PacifidlogTown_House5.inc
+++ b/data/maps/events/PacifidlogTown_House5.inc
@@ -1,11 +1,11 @@
-PacifidlogTown_House5_MapObjects: @ 852ED20
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 9, 4, 3, 10, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204111, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 3, 4, 3, 10, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204137, 0, 0, 0
+PacifidlogTown_House5_EventObjects: @ 852ED20
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 9, 4, 3, 10, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204111, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 3, 4, 3, 10, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204137, 0, 0, 0
 
 PacifidlogTown_House5_MapWarps: @ 852ED50
 	warp_def 4, 8, 0, 5, PACIFIDLOG_TOWN
 	warp_def 5, 8, 0, 5, PACIFIDLOG_TOWN
 
 PacifidlogTown_House5_MapEvents:: @ 852ED60
-	map_events PacifidlogTown_House5_MapObjects, PacifidlogTown_House5_MapWarps, 0x0, 0x0
+	map_events PacifidlogTown_House5_EventObjects, PacifidlogTown_House5_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc b/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc
index 3a28af372..f67b4269e 100644
--- a/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc
+++ b/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc
@@ -1,9 +1,9 @@
-PacifidlogTown_PokemonCenter_1F_MapObjects: @ 852EA70
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034B6, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 10, 6, 3, 9, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034D6, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GIRL_2, 0, 0, 2, 2, 3, 7, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034C4, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_1, 0, 0, 4, 5, 3, 1, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034CD, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAN_6, 0, 0, 12, 8, 3, 7, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE, 0, 0, 0
+PacifidlogTown_PokemonCenter_1F_EventObjects: @ 852EA70
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034B6, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 10, 6, 3, 9, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034D6, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 0, 2, 2, 3, 7, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034C4, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 4, 5, 3, 1, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034CD, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 0, 12, 8, 3, 7, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE, 0, 0, 0
 
 PacifidlogTown_PokemonCenter_1F_MapWarps: @ 852EAE8
 	warp_def 7, 8, 3, 0, PACIFIDLOG_TOWN
@@ -11,5 +11,5 @@ PacifidlogTown_PokemonCenter_1F_MapWarps: @ 852EAE8
 	warp_def 1, 6, 4, 0, PACIFIDLOG_TOWN_POKEMON_CENTER_2F
 
 PacifidlogTown_PokemonCenter_1F_MapEvents:: @ 852EB00
-	map_events PacifidlogTown_PokemonCenter_1F_MapObjects, PacifidlogTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
+	map_events PacifidlogTown_PokemonCenter_1F_EventObjects, PacifidlogTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc b/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc
index 2ae1cc480..26b9cf591 100644
--- a/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc
+++ b/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc
@@ -1,8 +1,8 @@
-PacifidlogTown_PokemonCenter_2F_MapObjects: @ 852EB14
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
+PacifidlogTown_PokemonCenter_2F_EventObjects: @ 852EB14
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
 
 PacifidlogTown_PokemonCenter_2F_MapWarps: @ 852EB74
 	warp_def 1, 6, 4, 2, PACIFIDLOG_TOWN_POKEMON_CENTER_1F
@@ -10,5 +10,5 @@ PacifidlogTown_PokemonCenter_2F_MapWarps: @ 852EB74
 	warp_def 9, 1, 3, 0, TRADE_CENTER
 
 PacifidlogTown_PokemonCenter_2F_MapEvents:: @ 852EB8C
-	map_events PacifidlogTown_PokemonCenter_2F_MapObjects, PacifidlogTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
+	map_events PacifidlogTown_PokemonCenter_2F_EventObjects, PacifidlogTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/PetalburgCity.inc b/data/maps/events/PetalburgCity.inc
index ad696f7ff..171790f56 100644
--- a/data/maps/events/PetalburgCity.inc
+++ b/data/maps/events/PetalburgCity.inc
@@ -1,13 +1,13 @@
-PetalburgCity_MapObjects: @ 8525FD0
-	object_event 1, MAP_OBJ_GFX_WOMAN_5, 0, 0, 16, 18, 3, 2, 17, 0, 0, 0, PetalburgCity_EventScript_1DC3FD, 728, 0, 0
-	object_event 2, MAP_OBJ_GFX_WALLY, 0, 0, 15, 10, 3, 7, 0, 0, 0, 0, 0x0, 726, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_1, 0, 0, 8, 22, 3, 8, 0, 0, 0, 0, PetalburgCity_EventScript_1DC3E6, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 20, 10, 3, 3, 16, 0, 0, 0, PetalburgCity_EventScript_1DC488, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAN_3, 0, 0, 15, 10, 3, 7, 0, 0, 0, 0, 0x0, 830, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 19, 2, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_2910B4, 1039, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 28, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_2910C1, 1040, 0, 0
-	object_event 8, MAP_OBJ_GFX_BOY_2, 0, 0, 12, 15, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_1DC82E, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_SCOTT, 0, 0, 13, 12, 3, 1, 17, 0, 0, 0, 0x0, 995, 0, 0
+PetalburgCity_EventObjects: @ 8525FD0
+	object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 16, 18, 3, 2, 17, 0, 0, 0, PetalburgCity_EventScript_1DC3FD, 728, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WALLY, 0, 0, 15, 10, 3, 7, 0, 0, 0, 0, 0x0, 726, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 8, 22, 3, 8, 0, 0, 0, 0, PetalburgCity_EventScript_1DC3E6, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 20, 10, 3, 3, 16, 0, 0, 0, PetalburgCity_EventScript_1DC488, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 0, 15, 10, 3, 7, 0, 0, 0, 0, 0x0, 830, 0, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 19, 2, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_2910B4, 1039, 0, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 28, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_2910C1, 1040, 0, 0
+	object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 0, 12, 15, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_1DC82E, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_SCOTT, 0, 0, 13, 12, 3, 1, 17, 0, 0, 0, 0x0, 995, 0, 0
 
 PetalburgCity_MapWarps: @ 85260A8
 	warp_def 10, 19, 0, 0, PETALBURG_CITY_HOUSE_1
@@ -38,5 +38,5 @@ PetalburgCity_MapBGEvents: @ 8526158
 	bg_event 11, 29, 3, 7, 0, ITEM_RARE_CANDY, 95, 0
 
 PetalburgCity_MapEvents:: @ 85261B8
-	map_events PetalburgCity_MapObjects, PetalburgCity_MapWarps, PetalburgCity_MapCoordEvents, PetalburgCity_MapBGEvents
+	map_events PetalburgCity_EventObjects, PetalburgCity_MapWarps, PetalburgCity_MapCoordEvents, PetalburgCity_MapBGEvents
 
diff --git a/data/maps/events/PetalburgCity_Gym.inc b/data/maps/events/PetalburgCity_Gym.inc
index 2ee8771a0..bdd6d2da4 100644
--- a/data/maps/events/PetalburgCity_Gym.inc
+++ b/data/maps/events/PetalburgCity_Gym.inc
@@ -1,15 +1,15 @@
-PetalburgCity_Gym_MapObjects: @ 852EDC8
-	object_event 1, MAP_OBJ_GFX_NORMAN, 0, 0, 4, 2, 0, 8, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_2049F1, 772, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 0, 4, 94, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054AA, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 4, 81, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053BA, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_4, 0, 0, 4, 42, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053F6, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_7, 0, 0, 4, 55, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054E6, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_4, 0, 0, 4, 68, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205432, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_WOMAN_7, 0, 0, 4, 16, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205522, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_MAN_4, 0, 0, 4, 29, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_20546E, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_MAN_2, 0, 0, 3, 109, 3, 8, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_20574F, 781, 0, 0
-	object_event 10, MAP_OBJ_GFX_WALLY, 0, 0, 4, 111, 3, 7, 0, 0, 0, 0, 0x0, 866, 0, 0
-	object_event 11, MAP_OBJ_GFX_MAN_3, 0, 0, 1, 7, 3, 7, 17, 0, 0, 0, 0x0, 824, 0, 0
+PetalburgCity_Gym_EventObjects: @ 852EDC8
+	object_event 1, EVENT_OBJ_GFX_NORMAN, 0, 0, 4, 2, 0, 8, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_2049F1, 772, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 94, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054AA, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 4, 81, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053BA, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 0, 4, 42, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053F6, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 55, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054E6, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 0, 4, 68, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205432, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 16, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205522, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_MAN_4, 0, 0, 4, 29, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_20546E, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 0, 3, 109, 3, 8, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_20574F, 781, 0, 0
+	object_event 10, EVENT_OBJ_GFX_WALLY, 0, 0, 4, 111, 3, 7, 0, 0, 0, 0, 0x0, 866, 0, 0
+	object_event 11, EVENT_OBJ_GFX_MAN_3, 0, 0, 1, 7, 3, 7, 17, 0, 0, 0, 0x0, 824, 0, 0
 
 PetalburgCity_Gym_MapWarps: @ 852EED0
 	warp_def 4, 111, 3, 2, PETALBURG_CITY
@@ -68,5 +68,5 @@ PetalburgCity_Gym_MapBGEvents: @ 852F000
 	bg_event 7, 110, 3, 1, 0, PetalburgCity_Gym_EventScript_20577E
 
 PetalburgCity_Gym_MapEvents:: @ 852F0A8
-	map_events PetalburgCity_Gym_MapObjects, PetalburgCity_Gym_MapWarps, 0x0, PetalburgCity_Gym_MapBGEvents
+	map_events PetalburgCity_Gym_EventObjects, PetalburgCity_Gym_MapWarps, 0x0, PetalburgCity_Gym_MapBGEvents
 
diff --git a/data/maps/events/PetalburgCity_House1.inc b/data/maps/events/PetalburgCity_House1.inc
index 59ffd7eca..c078d6876 100644
--- a/data/maps/events/PetalburgCity_House1.inc
+++ b/data/maps/events/PetalburgCity_House1.inc
@@ -1,11 +1,11 @@
-PetalburgCity_House1_MapObjects: @ 852F0BC
-	object_event 1, MAP_OBJ_GFX_GIRL_1, 0, 0, 7, 4, 3, 2, 34, 0, 0, 0, PetalburgCity_House1_EventScript_2077A3, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, PetalburgCity_House1_EventScript_20779A, 0, 0, 0
+PetalburgCity_House1_EventObjects: @ 852F0BC
+	object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 0, 7, 4, 3, 2, 34, 0, 0, 0, PetalburgCity_House1_EventScript_2077A3, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, PetalburgCity_House1_EventScript_20779A, 0, 0, 0
 
 PetalburgCity_House1_MapWarps: @ 852F0EC
 	warp_def 3, 8, 0, 0, PETALBURG_CITY
 	warp_def 4, 8, 0, 0, PETALBURG_CITY
 
 PetalburgCity_House1_MapEvents:: @ 852F0FC
-	map_events PetalburgCity_House1_MapObjects, PetalburgCity_House1_MapWarps, 0x0, 0x0
+	map_events PetalburgCity_House1_EventObjects, PetalburgCity_House1_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/PetalburgCity_House2.inc b/data/maps/events/PetalburgCity_House2.inc
index 14ca86ab8..b6570b5e9 100644
--- a/data/maps/events/PetalburgCity_House2.inc
+++ b/data/maps/events/PetalburgCity_House2.inc
@@ -1,11 +1,11 @@
-PetalburgCity_House2_MapObjects: @ 852F110
-	object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 2, 5, 3, 2, 17, 0, 0, 0, PetalburgCity_House2_EventScript_2078F3, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 7, 5, 3, 8, 0, 0, 0, 0, PetalburgCity_House2_EventScript_2078FC, 0, 0, 0
+PetalburgCity_House2_EventObjects: @ 852F110
+	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 2, 5, 3, 2, 17, 0, 0, 0, PetalburgCity_House2_EventScript_2078F3, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 7, 5, 3, 8, 0, 0, 0, 0, PetalburgCity_House2_EventScript_2078FC, 0, 0, 0
 
 PetalburgCity_House2_MapWarps: @ 852F140
 	warp_def 3, 7, 0, 4, PETALBURG_CITY
 	warp_def 4, 7, 0, 4, PETALBURG_CITY
 
 PetalburgCity_House2_MapEvents:: @ 852F150
-	map_events PetalburgCity_House2_MapObjects, PetalburgCity_House2_MapWarps, 0x0, 0x0
+	map_events PetalburgCity_House2_EventObjects, PetalburgCity_House2_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/PetalburgCity_Mart.inc b/data/maps/events/PetalburgCity_Mart.inc
index e5f1a1d3d..0413f795a 100644
--- a/data/maps/events/PetalburgCity_Mart.inc
+++ b/data/maps/events/PetalburgCity_Mart.inc
@@ -1,13 +1,13 @@
-PetalburgCity_Mart_MapObjects: @ 852F294
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207D69, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_1, 0, 0, 9, 4, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DE8, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_1, 0, 0, 6, 3, 3, 8, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DDF, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_3, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DD6, 0, 0, 0
+PetalburgCity_Mart_EventObjects: @ 852F294
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207D69, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 9, 4, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DE8, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 6, 3, 3, 8, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DDF, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DD6, 0, 0, 0
 
 PetalburgCity_Mart_MapWarps: @ 852F2F4
 	warp_def 3, 7, 0, 5, PETALBURG_CITY
 	warp_def 4, 7, 0, 5, PETALBURG_CITY
 
 PetalburgCity_Mart_MapEvents:: @ 852F304
-	map_events PetalburgCity_Mart_MapObjects, PetalburgCity_Mart_MapWarps, 0x0, 0x0
+	map_events PetalburgCity_Mart_EventObjects, PetalburgCity_Mart_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/PetalburgCity_PokemonCenter_1F.inc b/data/maps/events/PetalburgCity_PokemonCenter_1F.inc
index 3395f43b4..5c940de5a 100644
--- a/data/maps/events/PetalburgCity_PokemonCenter_1F.inc
+++ b/data/maps/events/PetalburgCity_PokemonCenter_1F.inc
@@ -1,9 +1,9 @@
-PetalburgCity_PokemonCenter_1F_MapObjects: @ 852F164
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_2079FC, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_5, 0, 0, 11, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_291539, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A0A, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 9, 6, 3, 2, 17, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A13, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_7, 0, 0, 5, 4, 3, 1, 17, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A1C, 0, 0, 0
+PetalburgCity_PokemonCenter_1F_EventObjects: @ 852F164
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_2079FC, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 0, 11, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_291539, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A0A, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 9, 6, 3, 2, 17, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A13, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 5, 4, 3, 1, 17, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A1C, 0, 0, 0
 
 PetalburgCity_PokemonCenter_1F_MapWarps: @ 852F1DC
 	warp_def 7, 8, 3, 3, PETALBURG_CITY
@@ -11,5 +11,5 @@ PetalburgCity_PokemonCenter_1F_MapWarps: @ 852F1DC
 	warp_def 1, 6, 4, 0, PETALBURG_CITY_POKEMON_CENTER_2F
 
 PetalburgCity_PokemonCenter_1F_MapEvents:: @ 852F1F4
-	map_events PetalburgCity_PokemonCenter_1F_MapObjects, PetalburgCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
+	map_events PetalburgCity_PokemonCenter_1F_EventObjects, PetalburgCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/PetalburgCity_PokemonCenter_2F.inc b/data/maps/events/PetalburgCity_PokemonCenter_2F.inc
index 5506670c5..99312ac96 100644
--- a/data/maps/events/PetalburgCity_PokemonCenter_2F.inc
+++ b/data/maps/events/PetalburgCity_PokemonCenter_2F.inc
@@ -1,8 +1,8 @@
-PetalburgCity_PokemonCenter_2F_MapObjects: @ 852F208
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
+PetalburgCity_PokemonCenter_2F_EventObjects: @ 852F208
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
 
 PetalburgCity_PokemonCenter_2F_MapWarps: @ 852F268
 	warp_def 1, 6, 4, 2, PETALBURG_CITY_POKEMON_CENTER_1F
@@ -10,5 +10,5 @@ PetalburgCity_PokemonCenter_2F_MapWarps: @ 852F268
 	warp_def 9, 1, 3, 0, TRADE_CENTER
 
 PetalburgCity_PokemonCenter_2F_MapEvents:: @ 852F280
-	map_events PetalburgCity_PokemonCenter_2F_MapObjects, PetalburgCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
+	map_events PetalburgCity_PokemonCenter_2F_EventObjects, PetalburgCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/PetalburgCity_WallysHouse.inc b/data/maps/events/PetalburgCity_WallysHouse.inc
index df04a0695..e7107f07a 100644
--- a/data/maps/events/PetalburgCity_WallysHouse.inc
+++ b/data/maps/events/PetalburgCity_WallysHouse.inc
@@ -1,11 +1,11 @@
-PetalburgCity_WallysHouse_MapObjects: @ 852ED74
-	object_event 1, MAP_OBJ_GFX_MAN_3, 0, 0, 3, 4, 3, 10, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_204278, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 0, 7, 5, 3, 9, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_2042C0, 0, 0, 0
+PetalburgCity_WallysHouse_EventObjects: @ 852ED74
+	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 0, 3, 4, 3, 10, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_204278, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 7, 5, 3, 9, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_2042C0, 0, 0, 0
 
 PetalburgCity_WallysHouse_MapWarps: @ 852EDA4
 	warp_def 3, 7, 0, 1, PETALBURG_CITY
 	warp_def 4, 7, 0, 1, PETALBURG_CITY
 
 PetalburgCity_WallysHouse_MapEvents:: @ 852EDB4
-	map_events PetalburgCity_WallysHouse_MapObjects, PetalburgCity_WallysHouse_MapWarps, 0x0, 0x0
+	map_events PetalburgCity_WallysHouse_EventObjects, PetalburgCity_WallysHouse_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/PetalburgWoods.inc b/data/maps/events/PetalburgWoods.inc
index 5d6c10149..bb9b69f35 100644
--- a/data/maps/events/PetalburgWoods.inc
+++ b/data/maps/events/PetalburgWoods.inc
@@ -1,17 +1,17 @@
-PetalburgWoods_MapObjects: @ 85345E4
-	object_event 1, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 19, 10, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, 17, 0, 0
-	object_event 2, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 19, 11, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, 18, 0, 0
-	object_event 3, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 26, 17, 3, 10, 0, 0, 0, 0, 0x0, 725, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_2, 0, 0, 26, 20, 3, 1, 0, 0, 0, 0, 0x0, 724, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 45, 7, 3, 8, 0, 0, 0, 0, PetalburgWoods_EventScript_29110F, 1056, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 35, 20, 3, 8, 0, 0, 0, 0, PetalburgWoods_EventScript_291102, 1055, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 8, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_29111C, 1058, 0, 0
-	object_event 8, MAP_OBJ_GFX_BOY_2, 0, 0, 15, 19, 3, 3, 33, 0, 0, 0, PetalburgWoods_EventScript_22E210, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_BUG_CATCHER, 0, 0, 7, 32, 3, 22, 0, 0, 1, 3, PetalburgWoods_EventScript_22E26D, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_BUG_CATCHER, 0, 0, 4, 14, 3, 20, 0, 0, 1, 3, PetalburgWoods_EventScript_22E284, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_BOY_3, 0, 0, 30, 34, 3, 2, 18, 0, 0, 0, PetalburgWoods_EventScript_22E219, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 26, 3, 1, 17, 0, 0, 0, PetalburgWoods_EventScript_291129, 1117, 0, 0
-	object_event 13, MAP_OBJ_GFX_GIRL_2, 0, 0, 33, 5, 3, 1, 17, 0, 0, 0, PetalburgWoods_EventScript_22E222, 0, 0, 0
+PetalburgWoods_EventObjects: @ 85345E4
+	object_event 1, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 19, 10, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, 17, 0, 0
+	object_event 2, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 19, 11, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, 18, 0, 0
+	object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 26, 17, 3, 10, 0, 0, 0, 0, 0x0, 725, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 0, 26, 20, 3, 1, 0, 0, 0, 0, 0x0, 724, 0, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 45, 7, 3, 8, 0, 0, 0, 0, PetalburgWoods_EventScript_29110F, 1056, 0, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 35, 20, 3, 8, 0, 0, 0, 0, PetalburgWoods_EventScript_291102, 1055, 0, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 8, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_29111C, 1058, 0, 0
+	object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 0, 15, 19, 3, 3, 33, 0, 0, 0, PetalburgWoods_EventScript_22E210, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 7, 32, 3, 22, 0, 0, 1, 3, PetalburgWoods_EventScript_22E26D, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 4, 14, 3, 20, 0, 0, 1, 3, PetalburgWoods_EventScript_22E284, 0, 0, 0
+	object_event 11, EVENT_OBJ_GFX_BOY_3, 0, 0, 30, 34, 3, 2, 18, 0, 0, 0, PetalburgWoods_EventScript_22E219, 0, 0, 0
+	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 26, 3, 1, 17, 0, 0, 0, PetalburgWoods_EventScript_291129, 1117, 0, 0
+	object_event 13, EVENT_OBJ_GFX_GIRL_2, 0, 0, 33, 5, 3, 1, 17, 0, 0, 0, PetalburgWoods_EventScript_22E222, 0, 0, 0
 
 PetalburgWoods_MapWarps: @ 853471C
 	warp_def 14, 5, 0, 2, ROUTE_104
@@ -34,5 +34,5 @@ PetalburgWoods_MapBGEvents: @ 853476C
 	bg_event 11, 8, 3, 0, 0, PetalburgWoods_EventScript_22E264
 
 PetalburgWoods_MapEvents:: @ 85347B4
-	map_events PetalburgWoods_MapObjects, PetalburgWoods_MapWarps, PetalburgWoods_MapCoordEvents, PetalburgWoods_MapBGEvents
+	map_events PetalburgWoods_EventObjects, PetalburgWoods_MapWarps, PetalburgWoods_MapCoordEvents, PetalburgWoods_MapBGEvents
 
diff --git a/data/maps/events/RecordCorner.inc b/data/maps/events/RecordCorner.inc
index 672abbbd4..ad9f6625d 100644
--- a/data/maps/events/RecordCorner.inc
+++ b/data/maps/events/RecordCorner.inc
@@ -1,5 +1,5 @@
-RecordCorner_MapObjects: @ 8539DFC
-	object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 0, 10, 5, 3, 8, 0, 0, 0, 0, RecordCorner_EventScript_2774C6, 0, 0, 0
+RecordCorner_EventObjects: @ 8539DFC
+	object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 10, 5, 3, 8, 0, 0, 0, 0, RecordCorner_EventScript_2774C6, 0, 0, 0
 
 RecordCorner_MapWarps: @ 8539E14
 	warp_def 8, 9, 3, 127, NONE
@@ -14,5 +14,5 @@ RecordCorner_MapCoordEvents: @ 8539E34
 	coord_event 13, 6, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_0827745C
 
 RecordCorner_MapEvents:: @ 8539E74
-	map_events RecordCorner_MapObjects, RecordCorner_MapWarps, RecordCorner_MapCoordEvents, 0x0
+	map_events RecordCorner_EventObjects, RecordCorner_MapWarps, RecordCorner_MapCoordEvents, 0x0
 
diff --git a/data/maps/events/Route101.inc b/data/maps/events/Route101.inc
index aa8389e29..e942526ba 100644
--- a/data/maps/events/Route101.inc
+++ b/data/maps/events/Route101.inc
@@ -1,10 +1,10 @@
-Route101_MapObjects: @ 8527E98
-	object_event 1, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 16, 8, 3, 1, 0, 0, 0, 0, Route101_EventScript_1EBDFB, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_PROF_BIRCH, 0, 0, 9, 13, 0, 71, 0, 0, 0, 0, 0x0, 720, 0, 0
-	object_event 3, MAP_OBJ_GFX_BIRCHS_BAG, 0, 0, 7, 14, 3, 1, 0, 0, 0, 0, Route101_EventScript_1EBE16, 700, 0, 0
-	object_event 4, MAP_OBJ_GFX_ZIGZAGOON_1, 0, 0, 10, 13, 0, 70, 0, 0, 0, 0, 0x0, 750, 0, 0
-	object_event 5, MAP_OBJ_GFX_PROF_BIRCH, 0, 0, 5, 11, 3, 1, 0, 0, 0, 0, Route101_EventScript_272141, 897, 0, 0
-	object_event 6, MAP_OBJ_GFX_BOY_2, 0, 0, 2, 13, 3, 5, 17, 0, 0, 0, Route101_EventScript_1EBE04, 991, 0, 0
+Route101_EventObjects: @ 8527E98
+	object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 16, 8, 3, 1, 0, 0, 0, 0, Route101_EventScript_1EBDFB, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 0, 9, 13, 0, 71, 0, 0, 0, 0, 0x0, 720, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BIRCHS_BAG, 0, 0, 7, 14, 3, 1, 0, 0, 0, 0, Route101_EventScript_1EBE16, 700, 0, 0
+	object_event 4, EVENT_OBJ_GFX_ZIGZAGOON_1, 0, 0, 10, 13, 0, 70, 0, 0, 0, 0, 0x0, 750, 0, 0
+	object_event 5, EVENT_OBJ_GFX_PROF_BIRCH, 0, 0, 5, 11, 3, 1, 0, 0, 0, 0, Route101_EventScript_272141, 897, 0, 0
+	object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 0, 2, 13, 3, 5, 17, 0, 0, 0, Route101_EventScript_1EBE04, 991, 0, 0
 
 Route101_MapCoordEvents: @ 8527F28
 	coord_event 10, 19, 3, 0, VAR_0x4060, 1, 0, Route101_EventScript_1EBCDE
@@ -21,5 +21,5 @@ Route101_MapBGEvents: @ 8527FB8
 	bg_event 5, 9, 0, 0, 0, Route101_EventScript_1EBE0D
 
 Route101_MapEvents:: @ 8527FC4
-	map_events Route101_MapObjects, 0x0, Route101_MapCoordEvents, Route101_MapBGEvents
+	map_events Route101_EventObjects, 0x0, Route101_MapCoordEvents, Route101_MapBGEvents
 
diff --git a/data/maps/events/Route102.inc b/data/maps/events/Route102.inc
index e128d9652..8b1551f09 100644
--- a/data/maps/events/Route102.inc
+++ b/data/maps/events/Route102.inc
@@ -1,18 +1,18 @@
-Route102_MapObjects: @ 8527FD8
-	object_event 1, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 18, 11, 3, 1, 0, 0, 0, 0, Route102_EventScript_1EC0E1, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 33, 14, 3, 8, 0, 0, 1, 3, Route102_EventScript_1EC105, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BUG_CATCHER, 0, 0, 25, 15, 3, 7, 0, 0, 1, 2, Route102_EventScript_1EC1B3, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LASS, 0, 0, 8, 7, 3, 18, 0, 0, 1, 3, Route102_EventScript_1EC1CA, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BOY_1, 0, 0, 37, 4, 3, 2, 17, 0, 0, 0, Route102_EventScript_1EC0FC, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 11, 15, 3, 8, 0, 0, 0, 0, Route102_EventScript_290CD8, 1000, 0, 0
-	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 24, 2, 3, 12, 0, 0, 0, 2, BerryTreeScript, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 25, 2, 3, 12, 0, 0, 0, 1, BerryTreeScript, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 19, 4, 3, 8, 17, 0, 1, 3, Route102_EventScript_1EC1E1, 0, 0, 0
+Route102_EventObjects: @ 8527FD8
+	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 18, 11, 3, 1, 0, 0, 0, 0, Route102_EventScript_1EC0E1, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 33, 14, 3, 8, 0, 0, 1, 3, Route102_EventScript_1EC105, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 25, 15, 3, 7, 0, 0, 1, 2, Route102_EventScript_1EC1B3, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_LASS, 0, 0, 8, 7, 3, 18, 0, 0, 1, 3, Route102_EventScript_1EC1CA, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 0, 37, 4, 3, 2, 17, 0, 0, 0, Route102_EventScript_1EC0FC, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 11, 15, 3, 8, 0, 0, 0, 0, Route102_EventScript_290CD8, 1000, 0, 0
+	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 24, 2, 3, 12, 0, 0, 0, 2, BerryTreeScript, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 25, 2, 3, 12, 0, 0, 0, 1, BerryTreeScript, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 19, 4, 3, 8, 17, 0, 1, 3, Route102_EventScript_1EC1E1, 0, 0, 0
 
 Route102_MapBGEvents: @ 85280B0
 	bg_event 17, 2, 0, 0, 0, Route102_EventScript_1EC0F3
 	bg_event 40, 9, 0, 0, 0, Route102_EventScript_1EC0EA
 
 Route102_MapEvents:: @ 85280C8
-	map_events Route102_MapObjects, 0x0, 0x0, Route102_MapBGEvents
+	map_events Route102_EventObjects, 0x0, 0x0, Route102_MapBGEvents
 
diff --git a/data/maps/events/Route103.inc b/data/maps/events/Route103.inc
index 0b1bae04a..cdd07bab1 100644
--- a/data/maps/events/Route103.inc
+++ b/data/maps/events/Route103.inc
@@ -1,24 +1,24 @@
-Route103_MapObjects: @ 85280DC
-	object_event 1, MAP_OBJ_GFX_MAN_4, 0, 0, 49, 12, 3, 9, 0, 0, 0, 0, Route103_EventScript_1EC5E2, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 10, 3, 3, 10, 0, 0, 0, 0, Route103_EventScript_1EC3C1, 723, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_3, 0, 0, 71, 11, 3, 18, 0, 0, 1, 3, Route103_EventScript_1EC5F4, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 65, 12, 3, 8, 0, 0, 1, 1, Route103_EventScript_1EC66E, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 64, 12, 3, 8, 0, 0, 1, 1, Route103_EventScript_1EC60B, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_FISHERMAN, 0, 0, 50, 8, 3, 26, 16, 0, 1, 3, Route103_EventScript_1EC6D1, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 58, 5, 3, 12, 0, 0, 0, 5, BerryTreeScript, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 59, 5, 3, 12, 0, 0, 0, 6, BerryTreeScript, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 60, 5, 3, 12, 0, 0, 0, 7, BerryTreeScript, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_BOY_1, 0, 0, 20, 10, 3, 2, 33, 0, 0, 0, Route103_EventScript_1EC5D9, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_PROF_BIRCH, 0, 0, 7, 3, 3, 2, 17, 0, 0, 0, Route103_EventScript_272141, 898, 0, 0
-	object_event 12, MAP_OBJ_GFX_MAN_3, 0, 0, 56, 13, 3, 10, 0, 0, 1, 5, Route103_EventScript_1EC6E8, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 50, 5, 3, 1, 17, 0, 0, 0, Route103_EventScript_290CE5, 1114, 0, 0
-	object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 67, 7, 3, 1, 17, 0, 0, 0, Route103_EventScript_2906BB, 18, 0, 0
-	object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 72, 8, 3, 1, 17, 0, 0, 0, Route103_EventScript_2906BB, 19, 0, 0
-	object_event 16, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 67, 5, 3, 8, 17, 0, 1, 2, Route103_EventScript_1EC761, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_MAN_6, 0, 0, 67, 9, 3, 7, 17, 0, 1, 2, Route103_EventScript_1EC74A, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 36, 6, 1, 26, 49, 0, 1, 5, Route103_EventScript_1EC78F, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 36, 13, 1, 25, 49, 0, 1, 5, Route103_EventScript_1EC778, 0, 0, 0
-	object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 64, 7, 0, 1, 17, 0, 0, 0, Route103_EventScript_290CF2, 1137, 0, 0
+Route103_EventObjects: @ 85280DC
+	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 0, 49, 12, 3, 9, 0, 0, 0, 0, Route103_EventScript_1EC5E2, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 10, 3, 3, 10, 0, 0, 0, 0, Route103_EventScript_1EC3C1, 723, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 71, 11, 3, 18, 0, 0, 1, 3, Route103_EventScript_1EC5F4, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 65, 12, 3, 8, 0, 0, 1, 1, Route103_EventScript_1EC66E, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 64, 12, 3, 8, 0, 0, 1, 1, Route103_EventScript_1EC60B, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 50, 8, 3, 26, 16, 0, 1, 3, Route103_EventScript_1EC6D1, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 58, 5, 3, 12, 0, 0, 0, 5, BerryTreeScript, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 59, 5, 3, 12, 0, 0, 0, 6, BerryTreeScript, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 60, 5, 3, 12, 0, 0, 0, 7, BerryTreeScript, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_BOY_1, 0, 0, 20, 10, 3, 2, 33, 0, 0, 0, Route103_EventScript_1EC5D9, 0, 0, 0
+	object_event 11, EVENT_OBJ_GFX_PROF_BIRCH, 0, 0, 7, 3, 3, 2, 17, 0, 0, 0, Route103_EventScript_272141, 898, 0, 0
+	object_event 12, EVENT_OBJ_GFX_MAN_3, 0, 0, 56, 13, 3, 10, 0, 0, 1, 5, Route103_EventScript_1EC6E8, 0, 0, 0
+	object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 50, 5, 3, 1, 17, 0, 0, 0, Route103_EventScript_290CE5, 1114, 0, 0
+	object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 67, 7, 3, 1, 17, 0, 0, 0, Route103_EventScript_2906BB, 18, 0, 0
+	object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 72, 8, 3, 1, 17, 0, 0, 0, Route103_EventScript_2906BB, 19, 0, 0
+	object_event 16, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 67, 5, 3, 8, 17, 0, 1, 2, Route103_EventScript_1EC761, 0, 0, 0
+	object_event 17, EVENT_OBJ_GFX_MAN_6, 0, 0, 67, 9, 3, 7, 17, 0, 1, 2, Route103_EventScript_1EC74A, 0, 0, 0
+	object_event 18, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 36, 6, 1, 26, 49, 0, 1, 5, Route103_EventScript_1EC78F, 0, 0, 0
+	object_event 19, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 36, 13, 1, 25, 49, 0, 1, 5, Route103_EventScript_1EC778, 0, 0, 0
+	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 64, 7, 0, 1, 17, 0, 0, 0, Route103_EventScript_290CF2, 1137, 0, 0
 
 Route103_MapWarps: @ 85282BC
 	warp_def 45, 6, 0, 0, ALTERING_CAVE
@@ -27,5 +27,5 @@ Route103_MapBGEvents: @ 85282C4
 	bg_event 11, 9, 0, 0, 0, Route103_EventScript_1EC5EB
 
 Route103_MapEvents:: @ 85282D0
-	map_events Route103_MapObjects, Route103_MapWarps, 0x0, Route103_MapBGEvents
+	map_events Route103_EventObjects, Route103_MapWarps, 0x0, Route103_MapBGEvents
 
diff --git a/data/maps/events/Route104.inc b/data/maps/events/Route104.inc
index 2913f96c4..66a9e0edb 100644
--- a/data/maps/events/Route104.inc
+++ b/data/maps/events/Route104.inc
@@ -1,38 +1,38 @@
-Route104_MapObjects: @ 85282E4
-	object_event 1, MAP_OBJ_GFX_BUG_CATCHER, 0, 0, 15, 60, 3, 9, 0, 0, 0, 0, Route104_EventScript_1ED00F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_2, 0, 0, 25, 49, 3, 2, 17, 0, 0, 0, Route104_EventScript_1ED006, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_LASS, 0, 0, 31, 24, 3, 9, 0, 0, 1, 7, Route104_EventScript_1ED38D, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BOY_1, 0, 0, 27, 63, 3, 3, 16, 0, 0, 0, Route104_EventScript_1ED045, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_3, 0, 0, 30, 50, 3, 2, 17, 0, 0, 0, Route104_EventScript_1ED04E, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_GIRL_3, 0, 0, 28, 74, 3, 7, 0, 0, 0, 0, Route104_EventScript_1ED090, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 0, 12, 54, 1, 7, 0, 0, 0, 0, 0x0, 742, 0, 0
-	object_event 8, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 51, 4, 10, 0, 0, 0, 0, 0x0, 738, 0, 0
-	object_event 9, MAP_OBJ_GFX_FISHERMAN, 0, 0, 29, 8, 3, 8, 0, 0, 1, 0, Route104_EventScript_1ED35F, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 34, 6, 3, 12, 0, 0, 0, 8, BerryTreeScript, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 35, 6, 3, 12, 0, 0, 0, 9, BerryTreeScript, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 36, 6, 3, 12, 0, 0, 0, 10, BerryTreeScript, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 22, 41, 3, 12, 0, 0, 0, 11, BerryTreeScript, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 23, 41, 3, 12, 0, 0, 0, 12, BerryTreeScript, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 24, 41, 3, 12, 0, 0, 0, 13, BerryTreeScript, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 37, 8, 3, 9, 17, 0, 0, 0, Route104_EventScript_1ECF8C, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 3, 22, 3, 12, 0, 0, 0, 3, BerryTreeScript, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 3, 23, 3, 12, 0, 0, 0, 4, BerryTreeScript, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 3, 24, 3, 12, 0, 0, 0, 75, BerryTreeScript, 0, 0, 0
-	object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 3, 25, 3, 12, 0, 0, 0, 76, BerryTreeScript, 0, 0, 0
-	object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 39, 15, 3, 1, 0, 0, 0, 0, Route104_EventScript_290CFF, 1002, 0, 0
-	object_event 22, MAP_OBJ_GFX_WOMAN_7, 0, 0, 8, 19, 3, 5, 1, 0, 0, 0, Route104_EventScript_1ECFCD, 906, 0, 0
-	object_event 23, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 27, 15, 3, 8, 0, 0, 1, 1, Route104_EventScript_1ED597, 0, 0, 0
-	object_event 24, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 28, 15, 3, 8, 0, 0, 1, 1, Route104_EventScript_1ED5B6, 0, 0, 0
-	object_event 25, MAP_OBJ_GFX_BOY_4, 0, 0, 21, 25, 3, 23, 0, 0, 1, 3, Route104_EventScript_1ED43B, 0, 0, 0
-	object_event 26, MAP_OBJ_GFX_WOMAN_3, 0, 0, 11, 44, 3, 16, 0, 0, 1, 3, Route104_EventScript_1ED4E9, 0, 0, 0
-	object_event 27, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 29, 53, 3, 1, 17, 0, 0, 0, Route104_EventScript_290D0C, 1057, 0, 0
-	object_event 28, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 18, 67, 3, 46, 101, 0, 1, 2, Route104_EventScript_1ED376, 0, 0, 0
-	object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 37, 22, 3, 1, 17, 0, 0, 0, Route104_EventScript_290D19, 1115, 0, 0
-	object_event 30, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 35, 22, 3, 1, 17, 0, 0, 0, Route104_EventScript_2906BB, 17, 0, 0
-	object_event 31, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 8, 3, 1, 17, 0, 0, 0, Route104_EventScript_290D26, 1135, 0, 0
-	object_event 32, MAP_OBJ_GFX_BOY_2, 0, 0, 5, 26, 3, 1, 17, 0, 0, 0, Route104_EventScript_1ED057, 0, 0, 0
-	object_event 33, MAP_OBJ_GFX_FISHERMAN, 0, 0, 15, 59, 3, 9, 0, 0, 1, 0, Route104_EventScript_1ED5D5, 0, 0, 0
-	object_event 34, MAP_OBJ_GFX_HIPSTER, 0, 0, 17, 50, 0, 1, 17, 0, 0, 0, Route104_EventScript_1ECC9E, 719, 0, 0
+Route104_EventObjects: @ 85282E4
+	object_event 1, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 15, 60, 3, 9, 0, 0, 0, 0, Route104_EventScript_1ED00F, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 0, 25, 49, 3, 2, 17, 0, 0, 0, Route104_EventScript_1ED006, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_LASS, 0, 0, 31, 24, 3, 9, 0, 0, 1, 7, Route104_EventScript_1ED38D, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 0, 27, 63, 3, 3, 16, 0, 0, 0, Route104_EventScript_1ED045, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 30, 50, 3, 2, 17, 0, 0, 0, Route104_EventScript_1ED04E, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_GIRL_3, 0, 0, 28, 74, 3, 7, 0, 0, 0, 0, Route104_EventScript_1ED090, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 0, 12, 54, 1, 7, 0, 0, 0, 0, 0x0, 742, 0, 0
+	object_event 8, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 51, 4, 10, 0, 0, 0, 0, 0x0, 738, 0, 0
+	object_event 9, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 29, 8, 3, 8, 0, 0, 1, 0, Route104_EventScript_1ED35F, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 34, 6, 3, 12, 0, 0, 0, 8, BerryTreeScript, 0, 0, 0
+	object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 35, 6, 3, 12, 0, 0, 0, 9, BerryTreeScript, 0, 0, 0
+	object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 36, 6, 3, 12, 0, 0, 0, 10, BerryTreeScript, 0, 0, 0
+	object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 22, 41, 3, 12, 0, 0, 0, 11, BerryTreeScript, 0, 0, 0
+	object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 23, 41, 3, 12, 0, 0, 0, 12, BerryTreeScript, 0, 0, 0
+	object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 24, 41, 3, 12, 0, 0, 0, 13, BerryTreeScript, 0, 0, 0
+	object_event 16, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 37, 8, 3, 9, 17, 0, 0, 0, Route104_EventScript_1ECF8C, 0, 0, 0
+	object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 3, 22, 3, 12, 0, 0, 0, 3, BerryTreeScript, 0, 0, 0
+	object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 3, 23, 3, 12, 0, 0, 0, 4, BerryTreeScript, 0, 0, 0
+	object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 3, 24, 3, 12, 0, 0, 0, 75, BerryTreeScript, 0, 0, 0
+	object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 3, 25, 3, 12, 0, 0, 0, 76, BerryTreeScript, 0, 0, 0
+	object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 39, 15, 3, 1, 0, 0, 0, 0, Route104_EventScript_290CFF, 1002, 0, 0
+	object_event 22, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 8, 19, 3, 5, 1, 0, 0, 0, Route104_EventScript_1ECFCD, 906, 0, 0
+	object_event 23, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 27, 15, 3, 8, 0, 0, 1, 1, Route104_EventScript_1ED597, 0, 0, 0
+	object_event 24, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 28, 15, 3, 8, 0, 0, 1, 1, Route104_EventScript_1ED5B6, 0, 0, 0
+	object_event 25, EVENT_OBJ_GFX_BOY_4, 0, 0, 21, 25, 3, 23, 0, 0, 1, 3, Route104_EventScript_1ED43B, 0, 0, 0
+	object_event 26, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 11, 44, 3, 16, 0, 0, 1, 3, Route104_EventScript_1ED4E9, 0, 0, 0
+	object_event 27, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 29, 53, 3, 1, 17, 0, 0, 0, Route104_EventScript_290D0C, 1057, 0, 0
+	object_event 28, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 18, 67, 3, 46, 101, 0, 1, 2, Route104_EventScript_1ED376, 0, 0, 0
+	object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 37, 22, 3, 1, 17, 0, 0, 0, Route104_EventScript_290D19, 1115, 0, 0
+	object_event 30, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 35, 22, 3, 1, 17, 0, 0, 0, Route104_EventScript_2906BB, 17, 0, 0
+	object_event 31, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 8, 3, 1, 17, 0, 0, 0, Route104_EventScript_290D26, 1135, 0, 0
+	object_event 32, EVENT_OBJ_GFX_BOY_2, 0, 0, 5, 26, 3, 1, 17, 0, 0, 0, Route104_EventScript_1ED057, 0, 0, 0
+	object_event 33, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 15, 59, 3, 9, 0, 0, 1, 0, Route104_EventScript_1ED5D5, 0, 0, 0
+	object_event 34, EVENT_OBJ_GFX_HIPSTER, 0, 0, 17, 50, 0, 1, 17, 0, 0, 0, Route104_EventScript_1ECC9E, 719, 0, 0
 
 Route104_MapWarps: @ 8528614
 	warp_def 17, 50, 0, 0, ROUTE_104_MR_BRINEYS_HOUSE
@@ -60,5 +60,5 @@ Route104_MapBGEvents: @ 8528664
 	bg_event 16, 64, 3, 7, 0, ITEM_HEART_SCALE, 88, 0
 
 Route104_MapEvents:: @ 85286DC
-	map_events Route104_MapObjects, Route104_MapWarps, Route104_MapCoordEvents, Route104_MapBGEvents
+	map_events Route104_EventObjects, Route104_MapWarps, Route104_MapCoordEvents, Route104_MapBGEvents
 
diff --git a/data/maps/events/Route104_MrBrineysHouse.inc b/data/maps/events/Route104_MrBrineysHouse.inc
index c643b364b..2088faf16 100644
--- a/data/maps/events/Route104_MrBrineysHouse.inc
+++ b/data/maps/events/Route104_MrBrineysHouse.inc
@@ -1,11 +1,11 @@
-Route104_MrBrineysHouse_MapObjects: @ 8533AD4
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 3, 3, 50, 51, 0, 0, 0, Route104_MrBrineysHouse_EventScript_229D67, 739, 0, 0
-	object_event 2, MAP_OBJ_GFX_WINGULL, 0, 0, 6, 3, 3, 8, 51, 0, 0, 0, Route104_MrBrineysHouse_EventScript_229E5D, 881, 0, 0
+Route104_MrBrineysHouse_EventObjects: @ 8533AD4
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 3, 3, 50, 51, 0, 0, 0, Route104_MrBrineysHouse_EventScript_229D67, 739, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 0, 6, 3, 3, 8, 51, 0, 0, 0, Route104_MrBrineysHouse_EventScript_229E5D, 881, 0, 0
 
 Route104_MrBrineysHouse_MapWarps: @ 8533B04
 	warp_def 5, 8, 0, 0, ROUTE_104
 	warp_def 6, 8, 0, 0, ROUTE_104
 
 Route104_MrBrineysHouse_MapEvents:: @ 8533B14
-	map_events Route104_MrBrineysHouse_MapObjects, Route104_MrBrineysHouse_MapWarps, 0x0, 0x0
+	map_events Route104_MrBrineysHouse_EventObjects, Route104_MrBrineysHouse_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/Route104_PrettyPetalFlowerShop.inc b/data/maps/events/Route104_PrettyPetalFlowerShop.inc
index 08f2390c0..2d6d7fe37 100644
--- a/data/maps/events/Route104_PrettyPetalFlowerShop.inc
+++ b/data/maps/events/Route104_PrettyPetalFlowerShop.inc
@@ -1,12 +1,12 @@
-Route104_PrettyPetalFlowerShop_MapObjects: @ 8533B28
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 0, 3, 3, 10, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A373, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 7, 3, 3, 5, 1, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A40C, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GIRL_1, 0, 0, 11, 6, 4, 2, 34, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A442, 0, 0, 0
+Route104_PrettyPetalFlowerShop_EventObjects: @ 8533B28
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 0, 3, 3, 10, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A373, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 7, 3, 3, 5, 1, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A40C, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 0, 11, 6, 4, 2, 34, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A442, 0, 0, 0
 
 Route104_PrettyPetalFlowerShop_MapWarps: @ 8533B70
 	warp_def 2, 8, 0, 1, ROUTE_104
 	warp_def 3, 8, 0, 1, ROUTE_104
 
 Route104_PrettyPetalFlowerShop_MapEvents:: @ 8533B80
-	map_events Route104_PrettyPetalFlowerShop_MapObjects, Route104_PrettyPetalFlowerShop_MapWarps, 0x0, 0x0
+	map_events Route104_PrettyPetalFlowerShop_EventObjects, Route104_PrettyPetalFlowerShop_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/Route105.inc b/data/maps/events/Route105.inc
index c27cff262..b7583aabd 100644
--- a/data/maps/events/Route105.inc
+++ b/data/maps/events/Route105.inc
@@ -1,12 +1,12 @@
-Route105_MapObjects: @ 85286F0
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 19, 60, 1, 10, 0, 0, 1, 6, Route105_EventScript_1EE261, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 27, 36, 1, 27, 7, 0, 1, 3, Route105_EventScript_1EE278, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 8, 45, 1, 25, 112, 0, 1, 3, Route105_EventScript_1EE28F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 19, 9, 1, 24, 80, 0, 1, 3, Route105_EventScript_1EE2A6, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 8, 73, 3, 1, 0, 0, 0, 0, Route105_EventScript_290D33, 1003, 0, 0
-	object_event 6, MAP_OBJ_GFX_HIKER, 0, 0, 17, 48, 3, 26, 112, 0, 1, 3, Route105_EventScript_1EE24A, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_MAN_6, 0, 0, 4, 54, 3, 8, 32, 0, 1, 2, Route105_EventScript_1EE2BD, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_HIKER, 0, 0, 4, 58, 3, 7, 32, 0, 1, 4, Route105_EventScript_1EE2D4, 0, 0, 0
+Route105_EventObjects: @ 85286F0
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 19, 60, 1, 10, 0, 0, 1, 6, Route105_EventScript_1EE261, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 27, 36, 1, 27, 7, 0, 1, 3, Route105_EventScript_1EE278, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 8, 45, 1, 25, 112, 0, 1, 3, Route105_EventScript_1EE28F, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 19, 9, 1, 24, 80, 0, 1, 3, Route105_EventScript_1EE2A6, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 8, 73, 3, 1, 0, 0, 0, 0, Route105_EventScript_290D33, 1003, 0, 0
+	object_event 6, EVENT_OBJ_GFX_HIKER, 0, 0, 17, 48, 3, 26, 112, 0, 1, 3, Route105_EventScript_1EE24A, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_MAN_6, 0, 0, 4, 54, 3, 8, 32, 0, 1, 2, Route105_EventScript_1EE2BD, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_HIKER, 0, 0, 4, 58, 3, 7, 32, 0, 1, 4, Route105_EventScript_1EE2D4, 0, 0, 0
 
 Route105_MapWarps: @ 85287B0
 	warp_def 9, 20, 0, 0, ISLAND_CAVE
@@ -16,5 +16,5 @@ Route105_MapBGEvents: @ 85287B8
 	bg_event 5, 56, 3, 7, 0, ITEM_BIG_PEARL, 111, 0
 
 Route105_MapEvents:: @ 85287D0
-	map_events Route105_MapObjects, Route105_MapWarps, 0x0, Route105_MapBGEvents
+	map_events Route105_EventObjects, Route105_MapWarps, 0x0, Route105_MapBGEvents
 
diff --git a/data/maps/events/Route106.inc b/data/maps/events/Route106.inc
index ee4beeddd..866a894fa 100644
--- a/data/maps/events/Route106.inc
+++ b/data/maps/events/Route106.inc
@@ -1,9 +1,9 @@
-Route106_MapObjects: @ 85287E4
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 18, 5, 1, 27, 4, 0, 1, 3, Route106_EventScript_1EE493, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 29, 10, 1, 1, 0, 0, 1, 3, Route106_EventScript_1EE4AA, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_FISHERMAN, 0, 0, 51, 14, 3, 10, 0, 0, 1, 4, Route106_EventScript_1EE4C1, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_FISHERMAN, 0, 0, 65, 14, 3, 1, 0, 0, 1, 3, Route106_EventScript_1EE523, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 29, 14, 3, 1, 0, 0, 0, 0, Route106_EventScript_290D40, 1004, 0, 0
+Route106_EventObjects: @ 85287E4
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 18, 5, 1, 27, 4, 0, 1, 3, Route106_EventScript_1EE493, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 29, 10, 1, 1, 0, 0, 1, 3, Route106_EventScript_1EE4AA, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 51, 14, 3, 10, 0, 0, 1, 4, Route106_EventScript_1EE4C1, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 65, 14, 3, 1, 0, 0, 1, 3, Route106_EventScript_1EE523, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 29, 14, 3, 1, 0, 0, 0, 0, Route106_EventScript_290D40, 1004, 0, 0
 
 Route106_MapWarps: @ 852885C
 	warp_def 48, 16, 0, 0, GRANITE_CAVE_1F
@@ -15,5 +15,5 @@ Route106_MapBGEvents: @ 8528864
 	bg_event 59, 13, 3, 0, 0, Route106_EventScript_1EE48A
 
 Route106_MapEvents:: @ 8528894
-	map_events Route106_MapObjects, Route106_MapWarps, 0x0, Route106_MapBGEvents
+	map_events Route106_EventObjects, Route106_MapWarps, 0x0, Route106_MapBGEvents
 
diff --git a/data/maps/events/Route107.inc b/data/maps/events/Route107.inc
index 8498a0f42..87d734ed4 100644
--- a/data/maps/events/Route107.inc
+++ b/data/maps/events/Route107.inc
@@ -1,12 +1,12 @@
-Route107_MapObjects: @ 85288A8
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 41, 10, 1, 24, 17, 0, 1, 3, Route107_EventScript_1EE595, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 23, 11, 1, 52, 38, 0, 1, 2, Route107_EventScript_1EE5AC, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 16, 7, 1, 13, 0, 0, 1, 5, Route107_EventScript_1EE60E, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 50, 11, 1, 65, 17, 0, 1, 5, Route107_EventScript_1EE625, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 33, 4, 1, 8, 17, 0, 1, 1, Route107_EventScript_1EE63C, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_TUBER_M_SWIMMING, 0, 0, 32, 4, 1, 8, 17, 0, 1, 1, Route107_EventScript_1EE657, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 50, 5, 1, 64, 17, 0, 1, 5, Route107_EventScript_1EE672, 0, 0, 0
+Route107_EventObjects: @ 85288A8
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 41, 10, 1, 24, 17, 0, 1, 3, Route107_EventScript_1EE595, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 23, 11, 1, 52, 38, 0, 1, 2, Route107_EventScript_1EE5AC, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 16, 7, 1, 13, 0, 0, 1, 5, Route107_EventScript_1EE60E, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 50, 11, 1, 65, 17, 0, 1, 5, Route107_EventScript_1EE625, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 33, 4, 1, 8, 17, 0, 1, 1, Route107_EventScript_1EE63C, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 0, 32, 4, 1, 8, 17, 0, 1, 1, Route107_EventScript_1EE657, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 50, 5, 1, 64, 17, 0, 1, 5, Route107_EventScript_1EE672, 0, 0, 0
 
 Route107_MapEvents:: @ 8528950
-	map_events Route107_MapObjects, 0x0, 0x0, 0x0
+	map_events Route107_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/Route108.inc b/data/maps/events/Route108.inc
index 340a3bd3f..61a4b521a 100644
--- a/data/maps/events/Route108.inc
+++ b/data/maps/events/Route108.inc
@@ -1,11 +1,11 @@
-Route108_MapObjects: @ 8528964
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 52, 13, 1, 45, 51, 0, 1, 3, Route108_EventScript_1EE68A, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 35, 12, 1, 13, 17, 0, 1, 3, Route108_EventScript_1EE6B8, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 13, 13, 1, 24, 0, 0, 1, 3, Route108_EventScript_1EE6A1, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 8, 7, 1, 20, 6, 0, 1, 3, Route108_EventScript_1EE6CF, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_7, 0, 0, 41, 5, 3, 10, 17, 0, 1, 1, Route108_EventScript_1EE6E6, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_SAILOR, 0, 0, 43, 5, 3, 9, 17, 0, 1, 1, Route108_EventScript_1EE6FD, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 42, 4, 3, 1, 17, 0, 0, 0, Route108_EventScript_290D4D, 1139, 0, 0
+Route108_EventObjects: @ 8528964
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 52, 13, 1, 45, 51, 0, 1, 3, Route108_EventScript_1EE68A, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 35, 12, 1, 13, 17, 0, 1, 3, Route108_EventScript_1EE6B8, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 13, 13, 1, 24, 0, 0, 1, 3, Route108_EventScript_1EE6A1, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 8, 7, 1, 20, 6, 0, 1, 3, Route108_EventScript_1EE6CF, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 41, 5, 3, 10, 17, 0, 1, 1, Route108_EventScript_1EE6E6, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 0, 43, 5, 3, 9, 17, 0, 1, 1, Route108_EventScript_1EE6FD, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 42, 4, 3, 1, 17, 0, 0, 0, Route108_EventScript_290D4D, 1139, 0, 0
 
 Route108_MapWarps: @ 8528A0C
 	warp_def 29, 6, 3, 0, ABANDONED_SHIP_DECK
@@ -14,5 +14,5 @@ Route108_MapBGEvents: @ 8528A14
 	bg_event 38, 14, 3, 7, 0, ITEM_RARE_CANDY, 86, 0
 
 Route108_MapEvents:: @ 8528A20
-	map_events Route108_MapObjects, Route108_MapWarps, 0x0, Route108_MapBGEvents
+	map_events Route108_EventObjects, Route108_MapWarps, 0x0, Route108_MapBGEvents
 
diff --git a/data/maps/events/Route109.inc b/data/maps/events/Route109.inc
index aab8c40c0..d1e85b36c 100644
--- a/data/maps/events/Route109.inc
+++ b/data/maps/events/Route109.inc
@@ -1,28 +1,28 @@
-Route109_MapObjects: @ 8528A34
-	object_event 1, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 0, 21, 26, 1, 7, 0, 0, 0, 0, 0x0, 744, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 21, 24, 3, 7, 0, 0, 0, 0, Route109_EventScript_1EE910, 741, 0, 0
-	object_event 3, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 12, 36, 3, 10, 0, 0, 1, 5, Route109_EventScript_1EEA3D, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 25, 39, 1, 15, 0, 0, 1, 5, Route109_EventScript_1EEA54, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_SAILOR, 0, 0, 15, 17, 4, 8, 0, 0, 1, 1, Route109_EventScript_1EEA6B, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_SAILOR, 0, 0, 24, 13, 3, 9, 0, 0, 1, 6, Route109_EventScript_1EEA82, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_TUBER_M, 0, 0, 19, 10, 3, 8, 0, 0, 1, 3, Route109_EventScript_1EEA99, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_TUBER_F, 0, 0, 22, 7, 3, 80, 0, 0, 1, 4, Route109_EventScript_1EEAFB, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 11, 6, 3, 8, 0, 0, 0, 0, Route109_EventScript_1EE995, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 27, 46, 3, 1, 0, 0, 0, 0, Route109_EventScript_290D5A, 1005, 0, 0
-	object_event 11, MAP_OBJ_GFX_TUBER_F, 0, 0, 29, 32, 3, 13, 0, 0, 1, 3, Route109_EventScript_1EEB74, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_TUBER_F, 0, 0, 28, 31, 3, 17, 0, 0, 1, 3, Route109_EventScript_1EEB5D, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_FISHERMAN, 0, 0, 21, 56, 0, 9, 0, 0, 1, 3, Route109_EventScript_1EEB8B, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_TUBER_M, 0, 0, 24, 18, 3, 10, 17, 0, 0, 0, Route109_EventScript_1EE99E, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_TUBER_F, 0, 0, 25, 18, 3, 9, 17, 0, 0, 0, Route109_EventScript_1EE9B5, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_WOMAN_2, 0, 0, 30, 32, 3, 8, 17, 0, 0, 0, Route109_EventScript_1EEA06, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_WOMAN_5, 0, 0, 8, 41, 3, 8, 17, 0, 1, 1, Route109_EventScript_1EEBBD, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_MAN_5, 0, 0, 9, 41, 3, 8, 17, 0, 1, 1, Route109_EventScript_1EEBA2, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 33, 6, 3, 1, 17, 0, 0, 0, Route109_EventScript_1EEA0F, 0, 0, 0
-	object_event 20, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 32, 6, 3, 1, 17, 0, 0, 0, Route109_EventScript_1EEA18, 0, 0, 0
-	object_event 21, MAP_OBJ_GFX_TUBER_F, 0, 0, 17, 13, 3, 80, 17, 0, 1, 6, Route109_EventScript_1EEBEF, 0, 0, 0
-	object_event 22, MAP_OBJ_GFX_TUBER_M, 0, 0, 27, 7, 3, 79, 17, 0, 1, 4, Route109_EventScript_1EEBD8, 0, 0, 0
-	object_event 23, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 25, 6, 3, 1, 17, 0, 0, 0, Route109_EventScript_290D67, 1140, 0, 0
-	object_event 24, MAP_OBJ_GFX_MAN_6, 0, 0, 17, 56, 3, 80, 17, 0, 1, 3, Route109_EventScript_1EEC06, 0, 0, 0
+Route109_EventObjects: @ 8528A34
+	object_event 1, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 0, 21, 26, 1, 7, 0, 0, 0, 0, 0x0, 744, 0, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 21, 24, 3, 7, 0, 0, 0, 0, Route109_EventScript_1EE910, 741, 0, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 12, 36, 3, 10, 0, 0, 1, 5, Route109_EventScript_1EEA3D, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 25, 39, 1, 15, 0, 0, 1, 5, Route109_EventScript_1EEA54, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 0, 15, 17, 4, 8, 0, 0, 1, 1, Route109_EventScript_1EEA6B, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 0, 24, 13, 3, 9, 0, 0, 1, 6, Route109_EventScript_1EEA82, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_TUBER_M, 0, 0, 19, 10, 3, 8, 0, 0, 1, 3, Route109_EventScript_1EEA99, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_TUBER_F, 0, 0, 22, 7, 3, 80, 0, 0, 1, 4, Route109_EventScript_1EEAFB, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 11, 6, 3, 8, 0, 0, 0, 0, Route109_EventScript_1EE995, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 27, 46, 3, 1, 0, 0, 0, 0, Route109_EventScript_290D5A, 1005, 0, 0
+	object_event 11, EVENT_OBJ_GFX_TUBER_F, 0, 0, 29, 32, 3, 13, 0, 0, 1, 3, Route109_EventScript_1EEB74, 0, 0, 0
+	object_event 12, EVENT_OBJ_GFX_TUBER_F, 0, 0, 28, 31, 3, 17, 0, 0, 1, 3, Route109_EventScript_1EEB5D, 0, 0, 0
+	object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 21, 56, 0, 9, 0, 0, 1, 3, Route109_EventScript_1EEB8B, 0, 0, 0
+	object_event 14, EVENT_OBJ_GFX_TUBER_M, 0, 0, 24, 18, 3, 10, 17, 0, 0, 0, Route109_EventScript_1EE99E, 0, 0, 0
+	object_event 15, EVENT_OBJ_GFX_TUBER_F, 0, 0, 25, 18, 3, 9, 17, 0, 0, 0, Route109_EventScript_1EE9B5, 0, 0, 0
+	object_event 16, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 30, 32, 3, 8, 17, 0, 0, 0, Route109_EventScript_1EEA06, 0, 0, 0
+	object_event 17, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 8, 41, 3, 8, 17, 0, 1, 1, Route109_EventScript_1EEBBD, 0, 0, 0
+	object_event 18, EVENT_OBJ_GFX_MAN_5, 0, 0, 9, 41, 3, 8, 17, 0, 1, 1, Route109_EventScript_1EEBA2, 0, 0, 0
+	object_event 19, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 33, 6, 3, 1, 17, 0, 0, 0, Route109_EventScript_1EEA0F, 0, 0, 0
+	object_event 20, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 32, 6, 3, 1, 17, 0, 0, 0, Route109_EventScript_1EEA18, 0, 0, 0
+	object_event 21, EVENT_OBJ_GFX_TUBER_F, 0, 0, 17, 13, 3, 80, 17, 0, 1, 6, Route109_EventScript_1EEBEF, 0, 0, 0
+	object_event 22, EVENT_OBJ_GFX_TUBER_M, 0, 0, 27, 7, 3, 79, 17, 0, 1, 4, Route109_EventScript_1EEBD8, 0, 0, 0
+	object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 25, 6, 3, 1, 17, 0, 0, 0, Route109_EventScript_290D67, 1140, 0, 0
+	object_event 24, EVENT_OBJ_GFX_MAN_6, 0, 0, 17, 56, 3, 80, 17, 0, 1, 3, Route109_EventScript_1EEC06, 0, 0, 0
 
 Route109_MapWarps: @ 8528C74
 	warp_def 12, 5, 0, 0, ROUTE_109_SEASHORE_HOUSE
@@ -38,5 +38,5 @@ Route109_MapBGEvents: @ 8528C7C
 	bg_event 8, 42, 3, 7, 0, ITEM_HEART_SCALE, 91, 0
 
 Route109_MapEvents:: @ 8528CDC
-	map_events Route109_MapObjects, Route109_MapWarps, 0x0, Route109_MapBGEvents
+	map_events Route109_EventObjects, Route109_MapWarps, 0x0, Route109_MapBGEvents
 
diff --git a/data/maps/events/Route109_SeashoreHouse.inc b/data/maps/events/Route109_SeashoreHouse.inc
index 1e2332451..7ded7ed23 100644
--- a/data/maps/events/Route109_SeashoreHouse.inc
+++ b/data/maps/events/Route109_SeashoreHouse.inc
@@ -1,13 +1,13 @@
-Route109_SeashoreHouse_MapObjects: @ 853DDE8
-	object_event 1, MAP_OBJ_GFX_MAN_3, 0, 0, 6, 2, 3, 8, 0, 0, 0, 0, Route109_SeashoreHouse_EventScript_2693FE, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SAILOR, 0, 0, 2, 3, 3, 8, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694E2, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TUBER_M, 0, 0, 14, 9, 3, 9, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_269518, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BEAUTY, 0, 0, 10, 5, 3, 14, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694FD, 0, 0, 0
+Route109_SeashoreHouse_EventObjects: @ 853DDE8
+	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 0, 6, 2, 3, 8, 0, 0, 0, 0, Route109_SeashoreHouse_EventScript_2693FE, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 0, 2, 3, 3, 8, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694E2, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TUBER_M, 0, 0, 14, 9, 3, 9, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_269518, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 0, 10, 5, 3, 14, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694FD, 0, 0, 0
 
 Route109_SeashoreHouse_MapWarps: @ 853DE48
 	warp_def 6, 9, 0, 0, ROUTE_109
 	warp_def 7, 9, 0, 0, ROUTE_109
 
 Route109_SeashoreHouse_MapEvents:: @ 853DE58
-	map_events Route109_SeashoreHouse_MapObjects, Route109_SeashoreHouse_MapWarps, 0x0, 0x0
+	map_events Route109_SeashoreHouse_EventObjects, Route109_SeashoreHouse_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/Route110.inc b/data/maps/events/Route110.inc
index 2b8e1571d..9dd5649fb 100644
--- a/data/maps/events/Route110.inc
+++ b/data/maps/events/Route110.inc
@@ -1,40 +1,40 @@
-Route110_MapObjects: @ 8528CF0
-	object_event 1, MAP_OBJ_GFX_CAMPER, 0, 0, 17, 90, 3, 8, 0, 0, 0, 0, Route110_EventScript_1EF338, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 29, 79, 4, 8, 0, 0, 0, 0, Route110_EventScript_1EF32F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 14, 69, 3, 3, 16, 0, 0, 0, Route110_EventScript_1EF326, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 9, 57, 4, 2, 17, 0, 0, 0, Route110_EventScript_1EF314, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 10, 11, 3, 2, 17, 0, 0, 0, Route110_EventScript_1EF31D, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 27, 24, 4, 2, 49, 0, 0, 0, Route110_EventScript_1EF30B, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_BOY_3, 0, 0, 15, 7, 3, 2, 17, 0, 0, 0, Route110_EventScript_1EF302, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 16, 73, 4, 49, 226, 0, 1, 3, Route110_EventScript_1EF529, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 19, 31, 4, 51, 26, 0, 1, 3, Route110_EventScript_1EF4B0, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 30, 31, 4, 9, 17, 0, 1, 4, Route110_EventScript_1EF540, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 16, 55, 4, 45, 68, 0, 1, 3, Route110_EventScript_1EF4C7, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 3, 39, 3, 10, 0, 0, 1, 6, Route110_EventScript_1EF3F2, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_LASS, 0, 0, 33, 15, 3, 9, 0, 0, 1, 1, Route110_EventScript_1EF409, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_MANIAC, 0, 0, 34, 40, 3, 67, 0, 0, 1, 4, Route110_EventScript_1EF420, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 0, 10, 19, 3, 8, 0, 0, 1, 1, Route110_EventScript_1EF482, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 5, 11, 3, 12, 0, 0, 0, 16, BerryTreeScript, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 6, 11, 3, 12, 0, 0, 0, 17, BerryTreeScript, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 7, 11, 3, 12, 0, 0, 0, 18, BerryTreeScript, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 30, 69, 3, 1, 0, 0, 0, 0, Route110_EventScript_290D81, 1007, 0, 0
-	object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 26, 47, 3, 1, 0, 0, 0, 0, Route110_EventScript_290D74, 1006, 0, 0
-	object_event 21, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 27, 92, 3, 8, 0, 0, 0, 0, Route110_EventScript_1EF3B7, 0, 0, 0
-	object_event 22, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 7, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2AA, 900, 0, 0
-	object_event 23, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 8, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2C0, 900, 0, 0
-	object_event 24, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 9, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2D6, 900, 0, 0
-	object_event 25, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 10, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2EC, 900, 0, 0
-	object_event 26, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 8, 82, 3, 8, 0, 0, 0, 0, 0x0, 900, 0, 0
-	object_event 27, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 21, 78, 4, 51, 23, 0, 1, 2, Route110_EventScript_1EF499, 0, 0, 0
-	object_event 28, MAP_OBJ_GFX_HIPSTER, 0, 0, 34, 54, 3, 14, 0, 0, 0, 0, 0x0, 919, 0, 0
-	object_event 29, MAP_OBJ_GFX_GIDDY, 0, 0, 34, 54, 3, 8, 0, 0, 0, 0, 0x0, 922, 0, 0
-	object_event 30, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 33, 69, 3, 14, 0, 0, 1, 3, Route110_EventScript_1EF604, 0, 0, 0
-	object_event 31, MAP_OBJ_GFX_WOMAN_2, 0, 0, 10, 76, 3, 9, 0, 0, 1, 2, Route110_EventScript_1EF5A2, 0, 0, 0
-	object_event 32, MAP_OBJ_GFX_MAN_3, 0, 0, 7, 76, 3, 10, 17, 0, 1, 2, Route110_EventScript_1EF61C, 0, 0, 0
-	object_event 33, MAP_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 10, 39, 3, 9, 17, 0, 1, 6, Route110_EventScript_1EF64A, 0, 0, 0
-	object_event 34, MAP_OBJ_GFX_MAN_6, 0, 0, 36, 40, 3, 66, 17, 0, 1, 3, Route110_EventScript_1EF633, 0, 0, 0
-	object_event 35, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 38, 3, 1, 17, 0, 0, 0, Route110_EventScript_290D8E, 1141, 0, 0
-	object_event 36, MAP_OBJ_GFX_PROF_BIRCH, 0, 0, 9, 79, 3, 1, 17, 0, 0, 0, 0x0, 837, 0, 0
+Route110_EventObjects: @ 8528CF0
+	object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 0, 17, 90, 3, 8, 0, 0, 0, 0, Route110_EventScript_1EF338, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 29, 79, 4, 8, 0, 0, 0, 0, Route110_EventScript_1EF32F, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 14, 69, 3, 3, 16, 0, 0, 0, Route110_EventScript_1EF326, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 9, 57, 4, 2, 17, 0, 0, 0, Route110_EventScript_1EF314, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 10, 11, 3, 2, 17, 0, 0, 0, Route110_EventScript_1EF31D, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 27, 24, 4, 2, 49, 0, 0, 0, Route110_EventScript_1EF30B, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_BOY_3, 0, 0, 15, 7, 3, 2, 17, 0, 0, 0, Route110_EventScript_1EF302, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 16, 73, 4, 49, 226, 0, 1, 3, Route110_EventScript_1EF529, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 19, 31, 4, 51, 26, 0, 1, 3, Route110_EventScript_1EF4B0, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 30, 31, 4, 9, 17, 0, 1, 4, Route110_EventScript_1EF540, 0, 0, 0
+	object_event 11, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 16, 55, 4, 45, 68, 0, 1, 3, Route110_EventScript_1EF4C7, 0, 0, 0
+	object_event 12, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 3, 39, 3, 10, 0, 0, 1, 6, Route110_EventScript_1EF3F2, 0, 0, 0
+	object_event 13, EVENT_OBJ_GFX_LASS, 0, 0, 33, 15, 3, 9, 0, 0, 1, 1, Route110_EventScript_1EF409, 0, 0, 0
+	object_event 14, EVENT_OBJ_GFX_MANIAC, 0, 0, 34, 40, 3, 67, 0, 0, 1, 4, Route110_EventScript_1EF420, 0, 0, 0
+	object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 10, 19, 3, 8, 0, 0, 1, 1, Route110_EventScript_1EF482, 0, 0, 0
+	object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 5, 11, 3, 12, 0, 0, 0, 16, BerryTreeScript, 0, 0, 0
+	object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 6, 11, 3, 12, 0, 0, 0, 17, BerryTreeScript, 0, 0, 0
+	object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 7, 11, 3, 12, 0, 0, 0, 18, BerryTreeScript, 0, 0, 0
+	object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 30, 69, 3, 1, 0, 0, 0, 0, Route110_EventScript_290D81, 1007, 0, 0
+	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 26, 47, 3, 1, 0, 0, 0, 0, Route110_EventScript_290D74, 1006, 0, 0
+	object_event 21, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 27, 92, 3, 8, 0, 0, 0, 0, Route110_EventScript_1EF3B7, 0, 0, 0
+	object_event 22, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 7, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2AA, 900, 0, 0
+	object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 8, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2C0, 900, 0, 0
+	object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 9, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2D6, 900, 0, 0
+	object_event 25, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 10, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2EC, 900, 0, 0
+	object_event 26, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 8, 82, 3, 8, 0, 0, 0, 0, 0x0, 900, 0, 0
+	object_event 27, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 21, 78, 4, 51, 23, 0, 1, 2, Route110_EventScript_1EF499, 0, 0, 0
+	object_event 28, EVENT_OBJ_GFX_HIPSTER, 0, 0, 34, 54, 3, 14, 0, 0, 0, 0, 0x0, 919, 0, 0
+	object_event 29, EVENT_OBJ_GFX_GIDDY, 0, 0, 34, 54, 3, 8, 0, 0, 0, 0, 0x0, 922, 0, 0
+	object_event 30, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 33, 69, 3, 14, 0, 0, 1, 3, Route110_EventScript_1EF604, 0, 0, 0
+	object_event 31, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 10, 76, 3, 9, 0, 0, 1, 2, Route110_EventScript_1EF5A2, 0, 0, 0
+	object_event 32, EVENT_OBJ_GFX_MAN_3, 0, 0, 7, 76, 3, 10, 17, 0, 1, 2, Route110_EventScript_1EF61C, 0, 0, 0
+	object_event 33, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 10, 39, 3, 9, 17, 0, 1, 6, Route110_EventScript_1EF64A, 0, 0, 0
+	object_event 34, EVENT_OBJ_GFX_MAN_6, 0, 0, 36, 40, 3, 66, 17, 0, 1, 3, Route110_EventScript_1EF633, 0, 0, 0
+	object_event 35, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 38, 3, 1, 17, 0, 0, 0, Route110_EventScript_290D8E, 1141, 0, 0
+	object_event 36, EVENT_OBJ_GFX_PROF_BIRCH, 0, 0, 9, 79, 3, 1, 17, 0, 0, 0, 0x0, 837, 0, 0
 
 Route110_MapWarps: @ 8529050
 	warp_def 35, 24, 3, 0, NEW_MAUVILLE_ENTRANCE
@@ -75,5 +75,5 @@ Route110_MapBGEvents: @ 8529110
 	bg_event 13, 16, 0, 0, 0, Route110_EventScript_1EF34A
 
 Route110_MapEvents:: @ 85291DC
-	map_events Route110_MapObjects, Route110_MapWarps, Route110_MapCoordEvents, Route110_MapBGEvents
+	map_events Route110_EventObjects, Route110_MapWarps, Route110_MapCoordEvents, Route110_MapBGEvents
 
diff --git a/data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc b/data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc
index 37d3065c5..23f896e4b 100644
--- a/data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc
+++ b/data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc
@@ -1,5 +1,5 @@
-Route110_SeasideCyclingRoadEntrance1_MapObjects: @ 853E9A0
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadEntrance1_EventScript_26EA78, 0, 0, 0
+Route110_SeasideCyclingRoadEntrance1_EventObjects: @ 853E9A0
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadEntrance1_EventScript_26EA78, 0, 0, 0
 
 Route110_SeasideCyclingRoadEntrance1_MapWarps: @ 853E9B8
 	warp_def 1, 5, 0, 4, ROUTE_110
@@ -12,5 +12,5 @@ Route110_SeasideCyclingRoadEntrance1_MapCoordEvents: @ 853E9D8
 	coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadEntrance1_EventScript_26EAB6
 
 Route110_SeasideCyclingRoadEntrance1_MapEvents:: @ 853E9F8
-	map_events Route110_SeasideCyclingRoadEntrance1_MapObjects, Route110_SeasideCyclingRoadEntrance1_MapWarps, Route110_SeasideCyclingRoadEntrance1_MapCoordEvents, 0x0
+	map_events Route110_SeasideCyclingRoadEntrance1_EventObjects, Route110_SeasideCyclingRoadEntrance1_MapWarps, Route110_SeasideCyclingRoadEntrance1_MapCoordEvents, 0x0
 
diff --git a/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc b/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc
index 38e02b9ce..f988f9751 100644
--- a/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc
+++ b/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc
@@ -1,5 +1,5 @@
-Route110_SeasideCyclingRoadEntrance2_MapObjects: @ 853EA0C
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBC4, 0, 0, 0
+Route110_SeasideCyclingRoadEntrance2_EventObjects: @ 853EA0C
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBC4, 0, 0, 0
 
 Route110_SeasideCyclingRoadEntrance2_MapWarps: @ 853EA24
 	warp_def 1, 5, 0, 2, ROUTE_110
@@ -12,5 +12,5 @@ Route110_SeasideCyclingRoadEntrance2_MapCoordEvents: @ 853EA44
 	coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadEntrance2_EventScript_26EC13
 
 Route110_SeasideCyclingRoadEntrance2_MapEvents:: @ 853EA64
-	map_events Route110_SeasideCyclingRoadEntrance2_MapObjects, Route110_SeasideCyclingRoadEntrance2_MapWarps, Route110_SeasideCyclingRoadEntrance2_MapCoordEvents, 0x0
+	map_events Route110_SeasideCyclingRoadEntrance2_EventObjects, Route110_SeasideCyclingRoadEntrance2_MapWarps, Route110_SeasideCyclingRoadEntrance2_MapCoordEvents, 0x0
 
diff --git a/data/maps/events/Route110_TrickHouseEnd.inc b/data/maps/events/Route110_TrickHouseEnd.inc
index 34ebbc229..62640ab29 100644
--- a/data/maps/events/Route110_TrickHouseEnd.inc
+++ b/data/maps/events/Route110_TrickHouseEnd.inc
@@ -1,5 +1,5 @@
-Route110_TrickHouseEnd_MapObjects: @ 853DEFC
-	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 4, 5, 3, 10, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_26AD17, 899, 0, 0
+Route110_TrickHouseEnd_EventObjects: @ 853DEFC
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 4, 5, 3, 10, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_26AD17, 899, 0, 0
 
 Route110_TrickHouseEnd_MapWarps: @ 853DF14
 	warp_def 10, 1, 3, 2, ROUTE_110_TRICK_HOUSE_PUZZLE_1
@@ -12,5 +12,5 @@ Route110_TrickHouseEnd_MapBGEvents: @ 853DF34
 	bg_event 4, 5, 3, 7, 0, ITEM_NUGGET, 1, 0
 
 Route110_TrickHouseEnd_MapEvents:: @ 853DF40
-	map_events Route110_TrickHouseEnd_MapObjects, Route110_TrickHouseEnd_MapWarps, Route110_TrickHouseEnd_MapCoordEvents, Route110_TrickHouseEnd_MapBGEvents
+	map_events Route110_TrickHouseEnd_EventObjects, Route110_TrickHouseEnd_MapWarps, Route110_TrickHouseEnd_MapCoordEvents, Route110_TrickHouseEnd_MapBGEvents
 
diff --git a/data/maps/events/Route110_TrickHouseEntrance.inc b/data/maps/events/Route110_TrickHouseEntrance.inc
index a87df306b..c6a31119f 100644
--- a/data/maps/events/Route110_TrickHouseEntrance.inc
+++ b/data/maps/events/Route110_TrickHouseEntrance.inc
@@ -1,5 +1,5 @@
-Route110_TrickHouseEntrance_MapObjects: @ 853DE6C
-	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 6, 2, 3, 9, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_269D3B, 872, 0, 0
+Route110_TrickHouseEntrance_EventObjects: @ 853DE6C
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 6, 2, 3, 9, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_269D3B, 872, 0, 0
 
 Route110_TrickHouseEntrance_MapWarps: @ 853DE84
 	warp_def 5, 7, 3, 1, ROUTE_110
@@ -16,5 +16,5 @@ Route110_TrickHouseEntrance_MapBGEvents: @ 853DEDC
 	bg_event 5, 1, 0, 1, 0, Route110_TrickHouseEntrance_EventScript_26A0D3
 
 Route110_TrickHouseEntrance_MapEvents:: @ 853DEE8
-	map_events Route110_TrickHouseEntrance_MapObjects, Route110_TrickHouseEntrance_MapWarps, Route110_TrickHouseEntrance_MapCoordEvents, Route110_TrickHouseEntrance_MapBGEvents
+	map_events Route110_TrickHouseEntrance_EventObjects, Route110_TrickHouseEntrance_MapWarps, Route110_TrickHouseEntrance_MapCoordEvents, Route110_TrickHouseEntrance_MapBGEvents
 
diff --git a/data/maps/events/Route110_TrickHousePuzzle1.inc b/data/maps/events/Route110_TrickHousePuzzle1.inc
index 002ad0532..40da83bb8 100644
--- a/data/maps/events/Route110_TrickHousePuzzle1.inc
+++ b/data/maps/events/Route110_TrickHousePuzzle1.inc
@@ -1,19 +1,19 @@
-Route110_TrickHousePuzzle1_MapObjects: @ 853DF88
-	object_event 1, MAP_OBJ_GFX_LASS, 0, 0, 14, 20, 3, 9, 0, 0, 1, 6, Route110_TrickHousePuzzle1_EventScript_26B948, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 14, 8, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B95F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_LASS, 0, 0, 2, 15, 3, 8, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B976, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 11, 16, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 19, 0, 0
-	object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 13, 18, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 18, 0, 0
-	object_event 6, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 14, 14, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 20, 0, 0
-	object_event 7, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 11, 8, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 23, 0, 0
-	object_event 8, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 8, 10, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 22, 0, 0
-	object_event 9, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 11, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 21, 0, 0
-	object_event 10, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 2, 4, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 25, 0, 0
-	object_event 11, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 13, 6, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 24, 0, 0
-	object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 6, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 27, 0, 0
-	object_event 13, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 9, 4, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_29140E, 1060, 0, 0
-	object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 4, 8, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 28, 0, 0
-	object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 2, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 30, 0, 0
+Route110_TrickHousePuzzle1_EventObjects: @ 853DF88
+	object_event 1, EVENT_OBJ_GFX_LASS, 0, 0, 14, 20, 3, 9, 0, 0, 1, 6, Route110_TrickHousePuzzle1_EventScript_26B948, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 14, 8, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B95F, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_LASS, 0, 0, 2, 15, 3, 8, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B976, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 11, 16, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 19, 0, 0
+	object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 13, 18, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 18, 0, 0
+	object_event 6, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 14, 14, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 20, 0, 0
+	object_event 7, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 11, 8, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 23, 0, 0
+	object_event 8, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 8, 10, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 22, 0, 0
+	object_event 9, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 11, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 21, 0, 0
+	object_event 10, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 2, 4, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 25, 0, 0
+	object_event 11, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 13, 6, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 24, 0, 0
+	object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 6, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 27, 0, 0
+	object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 9, 4, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_29140E, 1060, 0, 0
+	object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 4, 8, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 28, 0, 0
+	object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 2, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 30, 0, 0
 
 Route110_TrickHousePuzzle1_MapWarps: @ 853E0F0
 	warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE
@@ -24,5 +24,5 @@ Route110_TrickHousePuzzle1_MapBGEvents: @ 853E108
 	bg_event 3, 16, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_26B92B
 
 Route110_TrickHousePuzzle1_MapEvents:: @ 853E114
-	map_events Route110_TrickHousePuzzle1_MapObjects, Route110_TrickHousePuzzle1_MapWarps, 0x0, Route110_TrickHousePuzzle1_MapBGEvents
+	map_events Route110_TrickHousePuzzle1_EventObjects, Route110_TrickHousePuzzle1_MapWarps, 0x0, Route110_TrickHousePuzzle1_MapBGEvents
 
diff --git a/data/maps/events/Route110_TrickHousePuzzle2.inc b/data/maps/events/Route110_TrickHousePuzzle2.inc
index 92f2bad01..ed03f5d79 100644
--- a/data/maps/events/Route110_TrickHousePuzzle2.inc
+++ b/data/maps/events/Route110_TrickHousePuzzle2.inc
@@ -1,9 +1,9 @@
-Route110_TrickHousePuzzle2_MapObjects: @ 853E128
-	object_event 1, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 13, 10, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle2_EventScript_26BC75, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 10, 17, 3, 8, 0, 0, 1, 4, Route110_TrickHousePuzzle2_EventScript_26BC8C, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 0, 11, 9, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle2_EventScript_26BCA3, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 8, 17, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_291428, 1062, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 13, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_29141B, 1061, 0, 0
+Route110_TrickHousePuzzle2_EventObjects: @ 853E128
+	object_event 1, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 13, 10, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle2_EventScript_26BC75, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 10, 17, 3, 8, 0, 0, 1, 4, Route110_TrickHousePuzzle2_EventScript_26BC8C, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 0, 11, 9, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle2_EventScript_26BCA3, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 8, 17, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_291428, 1062, 0, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 13, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_29141B, 1061, 0, 0
 
 Route110_TrickHousePuzzle2_MapWarps: @ 853E1A0
 	warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE
@@ -20,5 +20,5 @@ Route110_TrickHousePuzzle2_MapBGEvents: @ 853E1F8
 	bg_event 14, 14, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_26BBC0
 
 Route110_TrickHousePuzzle2_MapEvents:: @ 853E204
-	map_events Route110_TrickHousePuzzle2_MapObjects, Route110_TrickHousePuzzle2_MapWarps, Route110_TrickHousePuzzle2_MapCoordEvents, Route110_TrickHousePuzzle2_MapBGEvents
+	map_events Route110_TrickHousePuzzle2_EventObjects, Route110_TrickHousePuzzle2_MapWarps, Route110_TrickHousePuzzle2_MapCoordEvents, Route110_TrickHousePuzzle2_MapBGEvents
 
diff --git a/data/maps/events/Route110_TrickHousePuzzle3.inc b/data/maps/events/Route110_TrickHousePuzzle3.inc
index c3070fafe..0097717fa 100644
--- a/data/maps/events/Route110_TrickHousePuzzle3.inc
+++ b/data/maps/events/Route110_TrickHousePuzzle3.inc
@@ -1,11 +1,11 @@
-Route110_TrickHousePuzzle3_MapObjects: @ 853E218
-	object_event 1, MAP_OBJ_GFX_CAMPER, 0, 0, 7, 19, 3, 8, 0, 0, 1, 2, Route110_TrickHousePuzzle3_EventScript_26C5C4, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_PICNICKER, 0, 0, 4, 4, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5DB, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_HIKER, 0, 0, 10, 10, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5F2, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291442, 1064, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291435, 1063, 0, 0
-	object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 1, 20, 3, 1, 17, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, 21, 0, 0
-	object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 2, 21, 3, 1, 17, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, 22, 0, 0
+Route110_TrickHousePuzzle3_EventObjects: @ 853E218
+	object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 0, 7, 19, 3, 8, 0, 0, 1, 2, Route110_TrickHousePuzzle3_EventScript_26C5C4, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_PICNICKER, 0, 0, 4, 4, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5DB, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_HIKER, 0, 0, 10, 10, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5F2, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291442, 1064, 0, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291435, 1063, 0, 0
+	object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 1, 20, 3, 1, 17, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, 21, 0, 0
+	object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 2, 21, 3, 1, 17, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, 22, 0, 0
 
 Route110_TrickHousePuzzle3_MapWarps: @ 853E2C0
 	warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE
@@ -22,5 +22,5 @@ Route110_TrickHousePuzzle3_MapBGEvents: @ 853E318
 	bg_event 0, 14, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_26C5A7
 
 Route110_TrickHousePuzzle3_MapEvents:: @ 853E324
-	map_events Route110_TrickHousePuzzle3_MapObjects, Route110_TrickHousePuzzle3_MapWarps, Route110_TrickHousePuzzle3_MapCoordEvents, Route110_TrickHousePuzzle3_MapBGEvents
+	map_events Route110_TrickHousePuzzle3_EventObjects, Route110_TrickHousePuzzle3_MapWarps, Route110_TrickHousePuzzle3_MapCoordEvents, Route110_TrickHousePuzzle3_MapBGEvents
 
diff --git a/data/maps/events/Route110_TrickHousePuzzle4.inc b/data/maps/events/Route110_TrickHousePuzzle4.inc
index 79731353c..b6e4b2f07 100644
--- a/data/maps/events/Route110_TrickHousePuzzle4.inc
+++ b/data/maps/events/Route110_TrickHousePuzzle4.inc
@@ -1,18 +1,18 @@
-Route110_TrickHousePuzzle4_MapObjects: @ 853E338
-	object_event 1, MAP_OBJ_GFX_GIRL_3, 0, 0, 2, 2, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle4_EventScript_26C87E, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 14, 7, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C8AC, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 2, 14, 3, 10, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C895, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 2, 5, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_29144F, 1065, 0, 0
-	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 3, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 17, 0, 0
-	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 5, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 18, 0, 0
-	object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 16, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 19, 0, 0
-	object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 6, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 20, 0, 0
-	object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 21, 0, 0
-	object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 7, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 22, 0, 0
-	object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 9, 3, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 23, 0, 0
-	object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 10, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 24, 0, 0
-	object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 14, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 25, 0, 0
-	object_event 14, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 10, 15, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 26, 0, 0
+Route110_TrickHousePuzzle4_EventObjects: @ 853E338
+	object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 0, 2, 2, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle4_EventScript_26C87E, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 14, 7, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C8AC, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 2, 14, 3, 10, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C895, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 5, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_29144F, 1065, 0, 0
+	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 3, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 17, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 5, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 18, 0, 0
+	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 16, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 19, 0, 0
+	object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 6, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 20, 0, 0
+	object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 21, 0, 0
+	object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 7, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 22, 0, 0
+	object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 9, 3, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 23, 0, 0
+	object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 10, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 24, 0, 0
+	object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 14, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 25, 0, 0
+	object_event 14, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 10, 15, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 26, 0, 0
 
 Route110_TrickHousePuzzle4_MapWarps: @ 853E488
 	warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE
@@ -23,5 +23,5 @@ Route110_TrickHousePuzzle4_MapBGEvents: @ 853E4A0
 	bg_event 14, 13, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_26C861
 
 Route110_TrickHousePuzzle4_MapEvents:: @ 853E4AC
-	map_events Route110_TrickHousePuzzle4_MapObjects, Route110_TrickHousePuzzle4_MapWarps, 0x0, Route110_TrickHousePuzzle4_MapBGEvents
+	map_events Route110_TrickHousePuzzle4_EventObjects, Route110_TrickHousePuzzle4_MapWarps, 0x0, Route110_TrickHousePuzzle4_MapBGEvents
 
diff --git a/data/maps/events/Route110_TrickHousePuzzle5.inc b/data/maps/events/Route110_TrickHousePuzzle5.inc
index 801448b12..7ae53cdad 100644
--- a/data/maps/events/Route110_TrickHousePuzzle5.inc
+++ b/data/maps/events/Route110_TrickHousePuzzle5.inc
@@ -1,9 +1,9 @@
-Route110_TrickHousePuzzle5_MapObjects: @ 853E4C0
-	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 6, 17, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB32, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_1, 0, 0, 0, 7, 3, 10, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB53, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_1, 0, 0, 14, 10, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB74, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_1, 0, 0, 14, 19, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB95, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAN_1, 0, 0, 10, 4, 3, 10, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBB6, 0, 0, 0
+Route110_TrickHousePuzzle5_EventObjects: @ 853E4C0
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 6, 17, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB32, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 0, 7, 3, 10, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB53, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 0, 14, 10, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB74, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_1, 0, 0, 14, 19, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB95, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_1, 0, 0, 10, 4, 3, 10, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBB6, 0, 0, 0
 
 Route110_TrickHousePuzzle5_MapWarps: @ 853E538
 	warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE
@@ -38,5 +38,5 @@ Route110_TrickHousePuzzle5_MapBGEvents: @ 853E6B0
 	bg_event 11, 21, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB15
 
 Route110_TrickHousePuzzle5_MapEvents:: @ 853E6BC
-	map_events Route110_TrickHousePuzzle5_MapObjects, Route110_TrickHousePuzzle5_MapWarps, Route110_TrickHousePuzzle5_MapCoordEvents, Route110_TrickHousePuzzle5_MapBGEvents
+	map_events Route110_TrickHousePuzzle5_EventObjects, Route110_TrickHousePuzzle5_MapWarps, Route110_TrickHousePuzzle5_MapCoordEvents, Route110_TrickHousePuzzle5_MapBGEvents
 
diff --git a/data/maps/events/Route110_TrickHousePuzzle6.inc b/data/maps/events/Route110_TrickHousePuzzle6.inc
index d08169a76..a36e7cd72 100644
--- a/data/maps/events/Route110_TrickHousePuzzle6.inc
+++ b/data/maps/events/Route110_TrickHousePuzzle6.inc
@@ -1,8 +1,8 @@
-Route110_TrickHousePuzzle6_MapObjects: @ 853E6D0
-	object_event 1, MAP_OBJ_GFX_PICNICKER, 0, 0, 7, 9, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DDE1, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_6, 0, 0, 11, 10, 3, 10, 0, 0, 1, 3, Route110_TrickHousePuzzle6_EventScript_26DDF8, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_CAMPER, 0, 0, 4, 5, 3, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DE0F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 11, 21, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_29145C, 1067, 0, 0
+Route110_TrickHousePuzzle6_EventObjects: @ 853E6D0
+	object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 0, 7, 9, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DDE1, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 0, 11, 10, 3, 10, 0, 0, 1, 3, Route110_TrickHousePuzzle6_EventScript_26DDF8, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 0, 4, 5, 3, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DE0F, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 11, 21, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_29145C, 1067, 0, 0
 
 Route110_TrickHousePuzzle6_MapWarps: @ 853E730
 	warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE
@@ -13,5 +13,5 @@ Route110_TrickHousePuzzle6_MapBGEvents: @ 853E748
 	bg_event 0, 10, 3, 0, 0, Route110_TrickHousePuzzle6_EventScript_26DDC4
 
 Route110_TrickHousePuzzle6_MapEvents:: @ 853E754
-	map_events Route110_TrickHousePuzzle6_MapObjects, Route110_TrickHousePuzzle6_MapWarps, 0x0, Route110_TrickHousePuzzle6_MapBGEvents
+	map_events Route110_TrickHousePuzzle6_EventObjects, Route110_TrickHousePuzzle6_MapWarps, 0x0, Route110_TrickHousePuzzle6_MapBGEvents
 
diff --git a/data/maps/events/Route110_TrickHousePuzzle7.inc b/data/maps/events/Route110_TrickHousePuzzle7.inc
index 8da2bab85..39ee27853 100644
--- a/data/maps/events/Route110_TrickHousePuzzle7.inc
+++ b/data/maps/events/Route110_TrickHousePuzzle7.inc
@@ -1,13 +1,13 @@
-Route110_TrickHousePuzzle7_MapObjects: @ 853E768
-	object_event 1, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 9, 20, 0, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E389, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LASS, 0, 0, 10, 2, 0, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3B7, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 8, 17, 0, 9, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3A0, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_291469, 1068, 0, 0
-	object_event 5, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 9, 2, 3, 8, 17, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3E5, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_LASS, 0, 0, 8, 13, 3, 7, 17, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3CE, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 9, 12, 3, 9, 17, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3FC, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 4, 17, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 4, 6, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+Route110_TrickHousePuzzle7_EventObjects: @ 853E768
+	object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 9, 20, 0, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E389, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_LASS, 0, 0, 10, 2, 0, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3B7, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 8, 17, 0, 9, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3A0, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_291469, 1068, 0, 0
+	object_event 5, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 9, 2, 3, 8, 17, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3E5, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_LASS, 0, 0, 8, 13, 3, 7, 17, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3CE, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 9, 12, 3, 9, 17, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3FC, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 4, 17, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 4, 6, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
 
 Route110_TrickHousePuzzle7_MapWarps: @ 853E840
 	warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE
@@ -34,5 +34,5 @@ Route110_TrickHousePuzzle7_MapBGEvents: @ 853E8E8
 	bg_event 6, 17, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_26E1D0
 
 Route110_TrickHousePuzzle7_MapEvents:: @ 853E8F4
-	map_events Route110_TrickHousePuzzle7_MapObjects, Route110_TrickHousePuzzle7_MapWarps, Route110_TrickHousePuzzle7_MapCoordEvents, Route110_TrickHousePuzzle7_MapBGEvents
+	map_events Route110_TrickHousePuzzle7_EventObjects, Route110_TrickHousePuzzle7_MapWarps, Route110_TrickHousePuzzle7_MapCoordEvents, Route110_TrickHousePuzzle7_MapBGEvents
 
diff --git a/data/maps/events/Route110_TrickHousePuzzle8.inc b/data/maps/events/Route110_TrickHousePuzzle8.inc
index 5d942affa..2e44e5b74 100644
--- a/data/maps/events/Route110_TrickHousePuzzle8.inc
+++ b/data/maps/events/Route110_TrickHousePuzzle8.inc
@@ -1,8 +1,8 @@
-Route110_TrickHousePuzzle8_MapObjects: @ 853E908
-	object_event 1, MAP_OBJ_GFX_MAN_4, 0, 0, 1, 10, 3, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E81F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_4, 0, 0, 4, 2, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E84D, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 0, 8, 17, 3, 9, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E836, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 2, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_291476, 1069, 0, 0
+Route110_TrickHousePuzzle8_EventObjects: @ 853E908
+	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 0, 1, 10, 3, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E81F, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 0, 4, 2, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E84D, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 8, 17, 3, 9, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E836, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_291476, 1069, 0, 0
 
 Route110_TrickHousePuzzle8_MapWarps: @ 853E968
 	warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE
@@ -13,5 +13,5 @@ Route110_TrickHousePuzzle8_MapBGEvents: @ 853E980
 	bg_event 3, 21, 3, 0, 0, Route110_TrickHousePuzzle8_EventScript_26E802
 
 Route110_TrickHousePuzzle8_MapEvents:: @ 853E98C
-	map_events Route110_TrickHousePuzzle8_MapObjects, Route110_TrickHousePuzzle8_MapWarps, 0x0, Route110_TrickHousePuzzle8_MapBGEvents
+	map_events Route110_TrickHousePuzzle8_EventObjects, Route110_TrickHousePuzzle8_MapWarps, 0x0, Route110_TrickHousePuzzle8_MapBGEvents
 
diff --git a/data/maps/events/Route111.inc b/data/maps/events/Route111.inc
index 9c79e2c52..bfd09e58e 100644
--- a/data/maps/events/Route111.inc
+++ b/data/maps/events/Route111.inc
@@ -1,50 +1,50 @@
-Route111_MapObjects: @ 85291F0
-	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 13, 114, 3, 8, 0, 0, 0, 0, Route111_EventScript_1F0FC5, 768, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 13, 113, 0, 8, 0, 0, 0, 0, 0x0, 769, 0, 0
-	object_event 3, MAP_OBJ_GFX_LASS, 0, 0, 13, 113, 0, 8, 1, 0, 0, 0, 0x0, 770, 0, 0
-	object_event 4, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 13, 113, 0, 8, 0, 0, 0, 0, 0x0, 771, 0, 0
-	object_event 5, MAP_OBJ_GFX_PICNICKER, 0, 0, 28, 51, 3, 17, 0, 0, 1, 3, Route111_EventScript_1F121B, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 22, 5, 3, 12, 0, 0, 0, 19, BerryTreeScript, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 23, 5, 3, 12, 0, 0, 0, 20, BerryTreeScript, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_MAN_4, 0, 0, 8, 91, 3, 2, 17, 0, 0, 0, Route111_EventScript_1F1189, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_CAMPER, 0, 0, 29, 37, 3, 17, 0, 0, 1, 3, Route111_EventScript_1F1204, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_HIKER, 0, 0, 27, 69, 3, 50, 34, 0, 1, 2, Route111_EventScript_1F1260, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_CAMPER, 0, 0, 21, 47, 3, 9, 0, 0, 1, 4, Route111_EventScript_1F1232, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_PICNICKER, 0, 0, 32, 66, 3, 24, 0, 0, 1, 3, Route111_EventScript_1F1249, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CDF6, 796, 0, 0
-	object_event 14, MAP_OBJ_GFX_REPORTER_F, 0, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CDD6, 796, 0, 0
-	object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 18, 101, 3, 1, 0, 0, 0, 0, Route111_EventScript_2907A6, 17, 0, 0
-	object_event 16, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 19, 100, 3, 1, 0, 0, 0, 0, Route111_EventScript_2907A6, 18, 0, 0
-	object_event 17, MAP_OBJ_GFX_GIRL_1, 0, 0, 23, 8, 3, 5, 1, 0, 0, 0, Route111_EventScript_1F0EB9, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 33, 104, 3, 1, 0, 0, 0, 0, Route111_EventScript_290D9B, 1008, 0, 0
-	object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 18, 5, 3, 12, 0, 0, 0, 80, BerryTreeScript, 0, 0, 0
-	object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 19, 5, 3, 12, 0, 0, 0, 81, BerryTreeScript, 0, 0, 0
-	object_event 21, MAP_OBJ_GFX_REPORTER_F, 0, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CE96, 799, 0, 0
-	object_event 22, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CEB6, 799, 0, 0
-	object_event 23, MAP_OBJ_GFX_REPORTER_F, 0, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CF16, 903, 0, 0
-	object_event 24, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CF36, 903, 0, 0
-	object_event 25, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 12, 54, 3, 1, 0, 0, 0, 0, Route111_EventScript_290DA8, 1009, 0, 0
-	object_event 26, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 114, 3, 1, 0, 0, 0, 0, Route111_EventScript_290DB5, 1010, 0, 0
-	object_event 27, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 22, 21, 3, 1, 0, 0, 0, 0, Route111_EventScript_2906BB, 19, 0, 0
-	object_event 28, MAP_OBJ_GFX_PICNICKER, 0, 0, 10, 82, 3, 14, 0, 0, 1, 2, Route111_EventScript_1F12D9, 0, 0, 0
-	object_event 29, MAP_OBJ_GFX_CAMPER, 0, 0, 11, 71, 3, 22, 0, 0, 1, 3, Route111_EventScript_1F12C2, 0, 0, 0
-	object_event 30, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 32, 29, 3, 28, 1, 0, 1, 2, Route111_EventScript_1F12F0, 0, 0, 0
-	object_event 31, MAP_OBJ_GFX_WOMAN_7, 0, 0, 11, 11, 3, 7, 4, 0, 1, 4, Route111_EventScript_1F1369, 0, 0, 0
-	object_event 32, MAP_OBJ_GFX_MAN_4, 0, 0, 9, 27, 3, 17, 0, 0, 1, 3, Route111_EventScript_1F1307, 0, 0, 0
-	object_event 33, MAP_OBJ_GFX_BOY_1, 0, 0, 13, 20, 3, 7, 17, 0, 0, 0, Route111_EventScript_2765FF, 960, 0, 0
-	object_event 34, MAP_OBJ_GFX_MAN_5, 0, 0, 20, 114, 3, 2, 17, 0, 0, 0, Route111_EventScript_1F1192, 0, 0, 0
-	object_event 35, MAP_OBJ_GFX_CAMPER, 0, 0, 26, 132, 3, 9, 17, 0, 1, 5, Route111_EventScript_1F13F9, 0, 0, 0
-	object_event 36, MAP_OBJ_GFX_WOMAN_3, 0, 0, 20, 132, 3, 10, 17, 0, 1, 5, Route111_EventScript_1F1410, 0, 0, 0
-	object_event 37, MAP_OBJ_GFX_PICNICKER, 0, 0, 19, 121, 3, 7, 17, 0, 1, 2, Route111_EventScript_1F13E2, 0, 0, 0
-	object_event 38, MAP_OBJ_GFX_MAN_6, 0, 0, 16, 119, 3, 10, 17, 0, 1, 3, Route111_EventScript_1F13CB, 0, 0, 0
-	object_event 39, MAP_OBJ_GFX_HIKER, 0, 0, 29, 77, 3, 14, 17, 0, 1, 7, Route111_EventScript_1F143E, 0, 0, 0
-	object_event 40, MAP_OBJ_GFX_PICNICKER, 0, 0, 22, 77, 3, 10, 17, 0, 1, 6, Route111_EventScript_1F1427, 0, 0, 0
-	object_event 41, MAP_OBJ_GFX_CAMPER, 0, 0, 37, 77, 3, 9, 17, 0, 1, 7, Route111_EventScript_1F1455, 0, 0, 0
-	object_event 42, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 19, 118, 3, 1, 17, 0, 0, 0, Route111_EventScript_290DC2, 1142, 0, 0
-	object_event 43, MAP_OBJ_GFX_HIKER, 0, 0, 14, 56, 3, 16, 17, 0, 0, 0, Route111_EventScript_1F119B, 0, 0, 0
-	object_event 44, MAP_OBJ_GFX_FOSSIL, 0, 0, 20, 53, 3, 8, 17, 0, 0, 0, 0x0, 876, 0, 0
-	object_event 45, MAP_OBJ_GFX_HIPSTER, 0, 0, 19, 53, 3, 8, 17, 0, 0, 0, 0x0, 875, 0, 0
-	object_event 46, MAP_OBJ_GFX_FAT_MAN, 0, 0, 19, 101, 3, 7, 17, 0, 0, 0, Route111_EventScript_1F11E4, 843, 0, 0
+Route111_EventObjects: @ 85291F0
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 13, 114, 3, 8, 0, 0, 0, 0, Route111_EventScript_1F0FC5, 768, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 13, 113, 0, 8, 0, 0, 0, 0, 0x0, 769, 0, 0
+	object_event 3, EVENT_OBJ_GFX_LASS, 0, 0, 13, 113, 0, 8, 1, 0, 0, 0, 0x0, 770, 0, 0
+	object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 13, 113, 0, 8, 0, 0, 0, 0, 0x0, 771, 0, 0
+	object_event 5, EVENT_OBJ_GFX_PICNICKER, 0, 0, 28, 51, 3, 17, 0, 0, 1, 3, Route111_EventScript_1F121B, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 22, 5, 3, 12, 0, 0, 0, 19, BerryTreeScript, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 23, 5, 3, 12, 0, 0, 0, 20, BerryTreeScript, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_MAN_4, 0, 0, 8, 91, 3, 2, 17, 0, 0, 0, Route111_EventScript_1F1189, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_CAMPER, 0, 0, 29, 37, 3, 17, 0, 0, 1, 3, Route111_EventScript_1F1204, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_HIKER, 0, 0, 27, 69, 3, 50, 34, 0, 1, 2, Route111_EventScript_1F1260, 0, 0, 0
+	object_event 11, EVENT_OBJ_GFX_CAMPER, 0, 0, 21, 47, 3, 9, 0, 0, 1, 4, Route111_EventScript_1F1232, 0, 0, 0
+	object_event 12, EVENT_OBJ_GFX_PICNICKER, 0, 0, 32, 66, 3, 24, 0, 0, 1, 3, Route111_EventScript_1F1249, 0, 0, 0
+	object_event 13, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CDF6, 796, 0, 0
+	object_event 14, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CDD6, 796, 0, 0
+	object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 18, 101, 3, 1, 0, 0, 0, 0, Route111_EventScript_2907A6, 17, 0, 0
+	object_event 16, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 19, 100, 3, 1, 0, 0, 0, 0, Route111_EventScript_2907A6, 18, 0, 0
+	object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 0, 23, 8, 3, 5, 1, 0, 0, 0, Route111_EventScript_1F0EB9, 0, 0, 0
+	object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 33, 104, 3, 1, 0, 0, 0, 0, Route111_EventScript_290D9B, 1008, 0, 0
+	object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 18, 5, 3, 12, 0, 0, 0, 80, BerryTreeScript, 0, 0, 0
+	object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 19, 5, 3, 12, 0, 0, 0, 81, BerryTreeScript, 0, 0, 0
+	object_event 21, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CE96, 799, 0, 0
+	object_event 22, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CEB6, 799, 0, 0
+	object_event 23, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CF16, 903, 0, 0
+	object_event 24, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CF36, 903, 0, 0
+	object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 12, 54, 3, 1, 0, 0, 0, 0, Route111_EventScript_290DA8, 1009, 0, 0
+	object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 114, 3, 1, 0, 0, 0, 0, Route111_EventScript_290DB5, 1010, 0, 0
+	object_event 27, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 22, 21, 3, 1, 0, 0, 0, 0, Route111_EventScript_2906BB, 19, 0, 0
+	object_event 28, EVENT_OBJ_GFX_PICNICKER, 0, 0, 10, 82, 3, 14, 0, 0, 1, 2, Route111_EventScript_1F12D9, 0, 0, 0
+	object_event 29, EVENT_OBJ_GFX_CAMPER, 0, 0, 11, 71, 3, 22, 0, 0, 1, 3, Route111_EventScript_1F12C2, 0, 0, 0
+	object_event 30, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 32, 29, 3, 28, 1, 0, 1, 2, Route111_EventScript_1F12F0, 0, 0, 0
+	object_event 31, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 11, 11, 3, 7, 4, 0, 1, 4, Route111_EventScript_1F1369, 0, 0, 0
+	object_event 32, EVENT_OBJ_GFX_MAN_4, 0, 0, 9, 27, 3, 17, 0, 0, 1, 3, Route111_EventScript_1F1307, 0, 0, 0
+	object_event 33, EVENT_OBJ_GFX_BOY_1, 0, 0, 13, 20, 3, 7, 17, 0, 0, 0, Route111_EventScript_2765FF, 960, 0, 0
+	object_event 34, EVENT_OBJ_GFX_MAN_5, 0, 0, 20, 114, 3, 2, 17, 0, 0, 0, Route111_EventScript_1F1192, 0, 0, 0
+	object_event 35, EVENT_OBJ_GFX_CAMPER, 0, 0, 26, 132, 3, 9, 17, 0, 1, 5, Route111_EventScript_1F13F9, 0, 0, 0
+	object_event 36, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 20, 132, 3, 10, 17, 0, 1, 5, Route111_EventScript_1F1410, 0, 0, 0
+	object_event 37, EVENT_OBJ_GFX_PICNICKER, 0, 0, 19, 121, 3, 7, 17, 0, 1, 2, Route111_EventScript_1F13E2, 0, 0, 0
+	object_event 38, EVENT_OBJ_GFX_MAN_6, 0, 0, 16, 119, 3, 10, 17, 0, 1, 3, Route111_EventScript_1F13CB, 0, 0, 0
+	object_event 39, EVENT_OBJ_GFX_HIKER, 0, 0, 29, 77, 3, 14, 17, 0, 1, 7, Route111_EventScript_1F143E, 0, 0, 0
+	object_event 40, EVENT_OBJ_GFX_PICNICKER, 0, 0, 22, 77, 3, 10, 17, 0, 1, 6, Route111_EventScript_1F1427, 0, 0, 0
+	object_event 41, EVENT_OBJ_GFX_CAMPER, 0, 0, 37, 77, 3, 9, 17, 0, 1, 7, Route111_EventScript_1F1455, 0, 0, 0
+	object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 19, 118, 3, 1, 17, 0, 0, 0, Route111_EventScript_290DC2, 1142, 0, 0
+	object_event 43, EVENT_OBJ_GFX_HIKER, 0, 0, 14, 56, 3, 16, 17, 0, 0, 0, Route111_EventScript_1F119B, 0, 0, 0
+	object_event 44, EVENT_OBJ_GFX_FOSSIL, 0, 0, 20, 53, 3, 8, 17, 0, 0, 0, 0x0, 876, 0, 0
+	object_event 45, EVENT_OBJ_GFX_HIPSTER, 0, 0, 19, 53, 3, 8, 17, 0, 0, 0, 0x0, 875, 0, 0
+	object_event 46, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 19, 101, 3, 7, 17, 0, 0, 0, Route111_EventScript_1F11E4, 843, 0, 0
 
 Route111_MapWarps: @ 8529640
 	warp_def 13, 113, 0, 0, ROUTE_111_WINSTRATE_FAMILYS_HOUSE
@@ -110,5 +110,5 @@ Route111_MapBGEvents: @ 8529888
 	bg_event 24, 116, 0, 0, 0, Route111_EventScript_1F146C
 
 Route111_MapEvents:: @ 8529960
-	map_events Route111_MapObjects, Route111_MapWarps, Route111_MapCoordEvents, Route111_MapBGEvents
+	map_events Route111_EventObjects, Route111_MapWarps, Route111_MapCoordEvents, Route111_MapBGEvents
 
diff --git a/data/maps/events/Route111_OldLadysRestStop.inc b/data/maps/events/Route111_OldLadysRestStop.inc
index 05510b62d..3cb500bdc 100644
--- a/data/maps/events/Route111_OldLadysRestStop.inc
+++ b/data/maps/events/Route111_OldLadysRestStop.inc
@@ -1,10 +1,10 @@
-Route111_OldLadysRestStop_MapObjects: @ 8533C18
-	object_event 1, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 6, 3, 3, 9, 0, 0, 0, 0, Route111_OldLadysRestStop_EventScript_22A920, 0, 0, 0
+Route111_OldLadysRestStop_EventObjects: @ 8533C18
+	object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 6, 3, 3, 9, 0, 0, 0, 0, Route111_OldLadysRestStop_EventScript_22A920, 0, 0, 0
 
 Route111_OldLadysRestStop_MapWarps: @ 8533C30
 	warp_def 3, 7, 0, 2, ROUTE_111
 	warp_def 4, 7, 0, 2, ROUTE_111
 
 Route111_OldLadysRestStop_MapEvents:: @ 8533C40
-	map_events Route111_OldLadysRestStop_MapObjects, Route111_OldLadysRestStop_MapWarps, 0x0, 0x0
+	map_events Route111_OldLadysRestStop_EventObjects, Route111_OldLadysRestStop_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/Route111_WinstrateFamilysHouse.inc b/data/maps/events/Route111_WinstrateFamilysHouse.inc
index 402b6e180..bd7567d81 100644
--- a/data/maps/events/Route111_WinstrateFamilysHouse.inc
+++ b/data/maps/events/Route111_WinstrateFamilysHouse.inc
@@ -1,13 +1,13 @@
-Route111_WinstrateFamilysHouse_MapObjects: @ 8533B94
-	object_event 1, MAP_OBJ_GFX_LASS, 0, 0, 7, 5, 3, 9, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4E8, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_1, 0, 0, 4, 5, 3, 10, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A48D, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 7, 4, 3, 9, 1, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4A2, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4FD, 0, 0, 0
+Route111_WinstrateFamilysHouse_EventObjects: @ 8533B94
+	object_event 1, EVENT_OBJ_GFX_LASS, 0, 0, 7, 5, 3, 9, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4E8, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 4, 5, 3, 10, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A48D, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 7, 4, 3, 9, 1, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4A2, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4FD, 0, 0, 0
 
 Route111_WinstrateFamilysHouse_MapWarps: @ 8533BF4
 	warp_def 3, 7, 0, 0, ROUTE_111
 	warp_def 4, 7, 0, 0, ROUTE_111
 
 Route111_WinstrateFamilysHouse_MapEvents:: @ 8533C04
-	map_events Route111_WinstrateFamilysHouse_MapObjects, Route111_WinstrateFamilysHouse_MapWarps, 0x0, 0x0
+	map_events Route111_WinstrateFamilysHouse_EventObjects, Route111_WinstrateFamilysHouse_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/Route112.inc b/data/maps/events/Route112.inc
index 56bd16935..e2b26846e 100644
--- a/data/maps/events/Route112.inc
+++ b/data/maps/events/Route112.inc
@@ -1,18 +1,18 @@
-Route112_MapObjects: @ 8529974
-	object_event 1, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 26, 30, 3, 7, 17, 0, 0, 0, Route112_EventScript_1F1DB7, 819, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIKER, 0, 0, 24, 34, 3, 14, 0, 0, 1, 2, Route112_EventScript_1F1E6A, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_CAMPER, 0, 0, 29, 49, 3, 8, 0, 0, 1, 3, Route112_EventScript_1F1EE3, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 0, 22, 46, 3, 23, 0, 0, 1, 3, Route112_EventScript_1F1EFA, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_HIKER, 0, 0, 15, 40, 3, 16, 0, 0, 1, 3, Route112_EventScript_1F1E81, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 27, 30, 3, 7, 0, 0, 0, 0, Route112_EventScript_1F1DB7, 819, 0, 0
-	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 27, 6, 0, 12, 0, 0, 0, 24, BerryTreeScript, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 28, 6, 0, 12, 0, 0, 0, 23, BerryTreeScript, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 29, 6, 0, 12, 0, 0, 0, 22, BerryTreeScript, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 30, 6, 3, 12, 0, 0, 0, 21, BerryTreeScript, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_HIKER, 0, 0, 8, 50, 3, 26, 48, 0, 0, 0, Route112_EventScript_1F1E61, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 14, 43, 3, 1, 0, 0, 0, 0, Route112_EventScript_290DCF, 1011, 0, 0
-	object_event 13, MAP_OBJ_GFX_MAN_6, 0, 0, 31, 7, 3, 18, 17, 0, 1, 3, Route112_EventScript_1F1F11, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_WOMAN_3, 0, 0, 31, 11, 3, 15, 17, 0, 1, 3, Route112_EventScript_1F1F28, 0, 0, 0
+Route112_EventObjects: @ 8529974
+	object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 26, 30, 3, 7, 17, 0, 0, 0, Route112_EventScript_1F1DB7, 819, 0, 0
+	object_event 2, EVENT_OBJ_GFX_HIKER, 0, 0, 24, 34, 3, 14, 0, 0, 1, 2, Route112_EventScript_1F1E6A, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 0, 29, 49, 3, 8, 0, 0, 1, 3, Route112_EventScript_1F1EE3, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 0, 22, 46, 3, 23, 0, 0, 1, 3, Route112_EventScript_1F1EFA, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_HIKER, 0, 0, 15, 40, 3, 16, 0, 0, 1, 3, Route112_EventScript_1F1E81, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 27, 30, 3, 7, 0, 0, 0, 0, Route112_EventScript_1F1DB7, 819, 0, 0
+	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 27, 6, 0, 12, 0, 0, 0, 24, BerryTreeScript, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 28, 6, 0, 12, 0, 0, 0, 23, BerryTreeScript, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 29, 6, 0, 12, 0, 0, 0, 22, BerryTreeScript, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 30, 6, 3, 12, 0, 0, 0, 21, BerryTreeScript, 0, 0, 0
+	object_event 11, EVENT_OBJ_GFX_HIKER, 0, 0, 8, 50, 3, 26, 48, 0, 0, 0, Route112_EventScript_1F1E61, 0, 0, 0
+	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 14, 43, 3, 1, 0, 0, 0, 0, Route112_EventScript_290DCF, 1011, 0, 0
+	object_event 13, EVENT_OBJ_GFX_MAN_6, 0, 0, 31, 7, 3, 18, 17, 0, 1, 3, Route112_EventScript_1F1F11, 0, 0, 0
+	object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 31, 11, 3, 15, 17, 0, 1, 3, Route112_EventScript_1F1F28, 0, 0, 0
 
 Route112_MapWarps: @ 8529AC4
 	warp_def 28, 27, 0, 0, ROUTE_112_CABLE_CAR_STATION
@@ -28,5 +28,5 @@ Route112_MapBGEvents: @ 8529AF4
 	bg_event 4, 49, 0, 0, 0, Route112_EventScript_1F1E58
 
 Route112_MapEvents:: @ 8529B18
-	map_events Route112_MapObjects, Route112_MapWarps, 0x0, Route112_MapBGEvents
+	map_events Route112_EventObjects, Route112_MapWarps, 0x0, Route112_MapBGEvents
 
diff --git a/data/maps/events/Route112_CableCarStation.inc b/data/maps/events/Route112_CableCarStation.inc
index e1f001aad..e33f6cb77 100644
--- a/data/maps/events/Route112_CableCarStation.inc
+++ b/data/maps/events/Route112_CableCarStation.inc
@@ -1,11 +1,11 @@
-Route112_CableCarStation_MapObjects: @ 8533C54
-	object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 0, 6, 6, 3, 8, 0, 0, 0, 0, Route112_CableCarStation_EventScript_22AB17, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_CABLE_CAR, 0, 0, 6, 3, 3, 1, 0, 0, 0, 0, 0x0, 0, 0, 0
+Route112_CableCarStation_EventObjects: @ 8533C54
+	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 0, 6, 6, 3, 8, 0, 0, 0, 0, Route112_CableCarStation_EventScript_22AB17, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 0, 6, 3, 3, 1, 0, 0, 0, 0, 0x0, 0, 0, 0
 
 Route112_CableCarStation_MapWarps: @ 8533C84
 	warp_def 6, 11, 0, 0, ROUTE_112
 	warp_def 7, 11, 0, 1, ROUTE_112
 
 Route112_CableCarStation_MapEvents:: @ 8533C94
-	map_events Route112_CableCarStation_MapObjects, Route112_CableCarStation_MapWarps, 0x0, 0x0
+	map_events Route112_CableCarStation_EventObjects, Route112_CableCarStation_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/Route113.inc b/data/maps/events/Route113.inc
index f1d07a671..4d5376cce 100644
--- a/data/maps/events/Route113.inc
+++ b/data/maps/events/Route113.inc
@@ -1,20 +1,20 @@
-Route113_MapObjects: @ 8529B2C
-	object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 66, 12, 3, 5, 1, 0, 0, 0, Route113_EventScript_1F2193, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 36, 10, 3, 3, 16, 0, 0, 0, Route113_EventScript_1F218A, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 62, 8, 3, 8, 0, 0, 1, 3, Route113_EventScript_1F21C0, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 21, 11, 3, 17, 0, 0, 1, 3, Route113_EventScript_1F21D7, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_7, 0, 0, 51, 11, 3, 23, 0, 0, 1, 2, Route113_EventScript_1F21EE, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 53, 7, 3, 1, 0, 0, 0, 0, Route113_EventScript_290DDC, 1012, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 79, 5, 3, 1, 0, 0, 0, 0, Route113_EventScript_290DE9, 1013, 0, 0
-	object_event 8, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 29, 6, 3, 63, 0, 0, 3, 1, Route113_EventScript_1F2250, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 71, 2, 3, 63, 0, 0, 3, 1, Route113_EventScript_1F22B2, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 45, 6, 3, 8, 17, 0, 1, 1, Route113_EventScript_1F22C9, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 46, 6, 3, 8, 17, 0, 1, 1, Route113_EventScript_1F22E4, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 15, 15, 3, 1, 17, 0, 0, 0, Route113_EventScript_290DF6, 1143, 0, 0
-	object_event 13, MAP_OBJ_GFX_MANIAC, 0, 0, 75, 3, 3, 9, 17, 0, 1, 4, Route113_EventScript_1F2344, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_CAMPER, 0, 0, 71, 4, 3, 7, 17, 0, 1, 1, Route113_EventScript_1F232D, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_PICNICKER, 0, 0, 7, 6, 3, 26, 49, 0, 1, 6, Route113_EventScript_1F22FF, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_MAN_6, 0, 0, 7, 13, 3, 25, 49, 0, 1, 6, Route113_EventScript_1F2316, 0, 0, 0
+Route113_EventObjects: @ 8529B2C
+	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 66, 12, 3, 5, 1, 0, 0, 0, Route113_EventScript_1F2193, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 36, 10, 3, 3, 16, 0, 0, 0, Route113_EventScript_1F218A, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 62, 8, 3, 8, 0, 0, 1, 3, Route113_EventScript_1F21C0, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 21, 11, 3, 17, 0, 0, 1, 3, Route113_EventScript_1F21D7, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 51, 11, 3, 23, 0, 0, 1, 2, Route113_EventScript_1F21EE, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 53, 7, 3, 1, 0, 0, 0, 0, Route113_EventScript_290DDC, 1012, 0, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 79, 5, 3, 1, 0, 0, 0, 0, Route113_EventScript_290DE9, 1013, 0, 0
+	object_event 8, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 29, 6, 3, 63, 0, 0, 3, 1, Route113_EventScript_1F2250, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 71, 2, 3, 63, 0, 0, 3, 1, Route113_EventScript_1F22B2, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 45, 6, 3, 8, 17, 0, 1, 1, Route113_EventScript_1F22C9, 0, 0, 0
+	object_event 11, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 46, 6, 3, 8, 17, 0, 1, 1, Route113_EventScript_1F22E4, 0, 0, 0
+	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 15, 15, 3, 1, 17, 0, 0, 0, Route113_EventScript_290DF6, 1143, 0, 0
+	object_event 13, EVENT_OBJ_GFX_MANIAC, 0, 0, 75, 3, 3, 9, 17, 0, 1, 4, Route113_EventScript_1F2344, 0, 0, 0
+	object_event 14, EVENT_OBJ_GFX_CAMPER, 0, 0, 71, 4, 3, 7, 17, 0, 1, 1, Route113_EventScript_1F232D, 0, 0, 0
+	object_event 15, EVENT_OBJ_GFX_PICNICKER, 0, 0, 7, 6, 3, 26, 49, 0, 1, 6, Route113_EventScript_1F22FF, 0, 0, 0
+	object_event 16, EVENT_OBJ_GFX_MAN_6, 0, 0, 7, 13, 3, 25, 49, 0, 1, 6, Route113_EventScript_1F2316, 0, 0, 0
 
 Route113_MapWarps: @ 8529CAC
 	warp_def 33, 5, 0, 0, ROUTE_113_GLASS_WORKSHOP
@@ -53,5 +53,5 @@ Route113_MapBGEvents: @ 8529DF4
 	bg_event 73, 3, 3, 7, 0, ITEM_NUGGET, 98, 0
 
 Route113_MapEvents:: @ 8529E54
-	map_events Route113_MapObjects, Route113_MapWarps, Route113_MapCoordEvents, Route113_MapBGEvents
+	map_events Route113_EventObjects, Route113_MapWarps, Route113_MapCoordEvents, Route113_MapBGEvents
 
diff --git a/data/maps/events/Route113_GlassWorkshop.inc b/data/maps/events/Route113_GlassWorkshop.inc
index 0191f8578..85d84324c 100644
--- a/data/maps/events/Route113_GlassWorkshop.inc
+++ b/data/maps/events/Route113_GlassWorkshop.inc
@@ -1,11 +1,11 @@
-Route113_GlassWorkshop_MapObjects: @ 853EA78
-	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, Route113_GlassWorkshop_EventScript_26ED1E, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 5, 4, 3, 2, 17, 0, 0, 0, Route113_GlassWorkshop_EventScript_26F194, 0, 0, 0
+Route113_GlassWorkshop_EventObjects: @ 853EA78
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, Route113_GlassWorkshop_EventScript_26ED1E, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 5, 4, 3, 2, 17, 0, 0, 0, Route113_GlassWorkshop_EventScript_26F194, 0, 0, 0
 
 Route113_GlassWorkshop_MapWarps: @ 853EAA8
 	warp_def 3, 8, 0, 0, ROUTE_113
 	warp_def 4, 8, 0, 0, ROUTE_113
 
 Route113_GlassWorkshop_MapEvents:: @ 853EAB8
-	map_events Route113_GlassWorkshop_MapObjects, Route113_GlassWorkshop_MapWarps, 0x0, 0x0
+	map_events Route113_GlassWorkshop_EventObjects, Route113_GlassWorkshop_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/Route114.inc b/data/maps/events/Route114.inc
index 800af012c..1a7b58289 100644
--- a/data/maps/events/Route114.inc
+++ b/data/maps/events/Route114.inc
@@ -1,31 +1,31 @@
-Route114_MapObjects: @ 8529E68
-	object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 31, 43, 3, 12, 0, 0, 0, 77, BerryTreeScript, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 31, 44, 3, 12, 0, 0, 0, 78, BerryTreeScript, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_HIKER, 0, 0, 15, 65, 7, 10, 0, 0, 1, 6, Route114_EventScript_1F2640, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_HIKER, 0, 0, 30, 72, 5, 9, 0, 0, 1, 4, Route114_EventScript_1F2657, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_CAMPER, 0, 0, 22, 50, 3, 10, 0, 0, 1, 3, Route114_EventScript_1F266E, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_PICNICKER, 0, 0, 19, 35, 3, 1, 0, 0, 1, 3, Route114_EventScript_1F2685, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_MANIAC, 0, 0, 20, 56, 3, 7, 0, 0, 1, 3, Route114_EventScript_1F269C, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 31, 45, 3, 12, 0, 0, 0, 68, BerryTreeScript, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 6, 3, 1, 0, 0, 0, 0, Route114_EventScript_290E03, 1014, 0, 0
-	object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 11, 37, 4, 1, 0, 0, 0, 0, Route114_EventScript_290E10, 1015, 0, 0
-	object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 12, 43, 4, 1, 0, 0, 0, 0, Route114_EventScript_2907A6, 17, 0, 0
-	object_event 12, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 19, 11, 3, 10, 0, 0, 0, 0, Route114_EventScript_1F25D1, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_POOCHYENA, 0, 0, 19, 12, 3, 10, 0, 0, 0, 0, Route114_EventScript_1F2612, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_MAN_5, 0, 0, 27, 42, 3, 3, 16, 0, 0, 0, Route114_EventScript_1F2582, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 0, 25, 6, 3, 8, 0, 0, 1, 0, Route114_EventScript_1F2777, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_FISHERMAN, 0, 0, 19, 26, 3, 9, 0, 0, 1, 0, Route114_EventScript_1F2760, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_MAN_6, 0, 0, 30, 58, 5, 23, 0, 0, 1, 3, Route114_EventScript_1F26FE, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 29, 53, 5, 1, 17, 0, 0, 0, Route114_EventScript_2907A6, 18, 0, 0
-	object_event 19, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 30, 54, 5, 1, 17, 0, 0, 0, Route114_EventScript_2907A6, 19, 0, 0
-	object_event 20, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 22, 69, 7, 1, 17, 0, 0, 0, Route114_EventScript_2907A6, 20, 0, 0
-	object_event 21, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 11, 64, 5, 1, 17, 0, 0, 0, Route114_EventScript_2907A6, 21, 0, 0
-	object_event 22, MAP_OBJ_GFX_LASS, 0, 0, 24, 44, 3, 8, 17, 0, 1, 1, Route114_EventScript_1F27A9, 0, 0, 0
-	object_event 23, MAP_OBJ_GFX_LASS, 0, 0, 23, 44, 3, 8, 17, 0, 1, 1, Route114_EventScript_1F278E, 0, 0, 0
-	object_event 24, MAP_OBJ_GFX_PICNICKER, 0, 0, 28, 20, 3, 7, 17, 0, 1, 3, Route114_EventScript_1F27DB, 0, 0, 0
-	object_event 25, MAP_OBJ_GFX_PICNICKER, 0, 0, 26, 72, 5, 18, 17, 0, 1, 4, Route114_EventScript_1F27C4, 0, 0, 0
-	object_event 26, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 31, 19, 3, 1, 17, 0, 0, 0, Route114_EventScript_290E1D, 1160, 0, 0
-	object_event 27, MAP_OBJ_GFX_FISHERMAN, 0, 0, 28, 16, 3, 17, 17, 0, 1, 3, Route114_EventScript_1F27F2, 0, 0, 0
+Route114_EventObjects: @ 8529E68
+	object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 31, 43, 3, 12, 0, 0, 0, 77, BerryTreeScript, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 31, 44, 3, 12, 0, 0, 0, 78, BerryTreeScript, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_HIKER, 0, 0, 15, 65, 7, 10, 0, 0, 1, 6, Route114_EventScript_1F2640, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_HIKER, 0, 0, 30, 72, 5, 9, 0, 0, 1, 4, Route114_EventScript_1F2657, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 0, 22, 50, 3, 10, 0, 0, 1, 3, Route114_EventScript_1F266E, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 0, 19, 35, 3, 1, 0, 0, 1, 3, Route114_EventScript_1F2685, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 0, 20, 56, 3, 7, 0, 0, 1, 3, Route114_EventScript_1F269C, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 31, 45, 3, 12, 0, 0, 0, 68, BerryTreeScript, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 6, 3, 1, 0, 0, 0, 0, Route114_EventScript_290E03, 1014, 0, 0
+	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 11, 37, 4, 1, 0, 0, 0, 0, Route114_EventScript_290E10, 1015, 0, 0
+	object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 12, 43, 4, 1, 0, 0, 0, 0, Route114_EventScript_2907A6, 17, 0, 0
+	object_event 12, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 19, 11, 3, 10, 0, 0, 0, 0, Route114_EventScript_1F25D1, 0, 0, 0
+	object_event 13, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 19, 12, 3, 10, 0, 0, 0, 0, Route114_EventScript_1F2612, 0, 0, 0
+	object_event 14, EVENT_OBJ_GFX_MAN_5, 0, 0, 27, 42, 3, 3, 16, 0, 0, 0, Route114_EventScript_1F2582, 0, 0, 0
+	object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 25, 6, 3, 8, 0, 0, 1, 0, Route114_EventScript_1F2777, 0, 0, 0
+	object_event 16, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 19, 26, 3, 9, 0, 0, 1, 0, Route114_EventScript_1F2760, 0, 0, 0
+	object_event 17, EVENT_OBJ_GFX_MAN_6, 0, 0, 30, 58, 5, 23, 0, 0, 1, 3, Route114_EventScript_1F26FE, 0, 0, 0
+	object_event 18, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 29, 53, 5, 1, 17, 0, 0, 0, Route114_EventScript_2907A6, 18, 0, 0
+	object_event 19, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 30, 54, 5, 1, 17, 0, 0, 0, Route114_EventScript_2907A6, 19, 0, 0
+	object_event 20, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 22, 69, 7, 1, 17, 0, 0, 0, Route114_EventScript_2907A6, 20, 0, 0
+	object_event 21, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 11, 64, 5, 1, 17, 0, 0, 0, Route114_EventScript_2907A6, 21, 0, 0
+	object_event 22, EVENT_OBJ_GFX_LASS, 0, 0, 24, 44, 3, 8, 17, 0, 1, 1, Route114_EventScript_1F27A9, 0, 0, 0
+	object_event 23, EVENT_OBJ_GFX_LASS, 0, 0, 23, 44, 3, 8, 17, 0, 1, 1, Route114_EventScript_1F278E, 0, 0, 0
+	object_event 24, EVENT_OBJ_GFX_PICNICKER, 0, 0, 28, 20, 3, 7, 17, 0, 1, 3, Route114_EventScript_1F27DB, 0, 0, 0
+	object_event 25, EVENT_OBJ_GFX_PICNICKER, 0, 0, 26, 72, 5, 18, 17, 0, 1, 4, Route114_EventScript_1F27C4, 0, 0, 0
+	object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 31, 19, 3, 1, 17, 0, 0, 0, Route114_EventScript_290E1D, 1160, 0, 0
+	object_event 27, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 28, 16, 3, 17, 17, 0, 1, 3, Route114_EventScript_1F27F2, 0, 0, 0
 
 Route114_MapWarps: @ 852A0F0
 	warp_def 8, 63, 0, 0, METEOR_FALLS_1F_1R
@@ -49,5 +49,5 @@ Route114_MapBGEvents: @ 852A118
 	bg_event 7, 30, 3, 7, 0, ITEM_REVIVE, 42, 0
 
 Route114_MapEvents:: @ 852A1A8
-	map_events Route114_MapObjects, Route114_MapWarps, 0x0, Route114_MapBGEvents
+	map_events Route114_EventObjects, Route114_MapWarps, 0x0, Route114_MapBGEvents
 
diff --git a/data/maps/events/Route114_FossilManiacsHouse.inc b/data/maps/events/Route114_FossilManiacsHouse.inc
index e20e9c54c..ef9ad911a 100644
--- a/data/maps/events/Route114_FossilManiacsHouse.inc
+++ b/data/maps/events/Route114_FossilManiacsHouse.inc
@@ -1,5 +1,5 @@
-Route114_FossilManiacsHouse_MapObjects: @ 8533CFC
-	object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 3, 2, 3, 8, 17, 0, 0, 0, Route114_FossilManiacsHouse_EventScript_22AD3A, 0, 0, 0
+Route114_FossilManiacsHouse_EventObjects: @ 8533CFC
+	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 3, 2, 3, 8, 17, 0, 0, 0, Route114_FossilManiacsHouse_EventScript_22AD3A, 0, 0, 0
 
 Route114_FossilManiacsHouse_MapWarps: @ 8533D14
 	warp_def 4, 7, 0, 1, ROUTE_114
@@ -13,5 +13,5 @@ Route114_FossilManiacsHouse_MapBGEvents: @ 8533D2C
 	bg_event 8, 2, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_22AD7C
 
 Route114_FossilManiacsHouse_MapEvents:: @ 8533D5C
-	map_events Route114_FossilManiacsHouse_MapObjects, Route114_FossilManiacsHouse_MapWarps, 0x0, Route114_FossilManiacsHouse_MapBGEvents
+	map_events Route114_FossilManiacsHouse_EventObjects, Route114_FossilManiacsHouse_MapWarps, 0x0, Route114_FossilManiacsHouse_MapBGEvents
 
diff --git a/data/maps/events/Route114_FossilManiacsTunnel.inc b/data/maps/events/Route114_FossilManiacsTunnel.inc
index 3fb19d06e..5521303f7 100644
--- a/data/maps/events/Route114_FossilManiacsTunnel.inc
+++ b/data/maps/events/Route114_FossilManiacsTunnel.inc
@@ -1,5 +1,5 @@
-Route114_FossilManiacsTunnel_MapObjects: @ 8533D70
-	object_event 1, MAP_OBJ_GFX_MANIAC, 0, 0, 5, 3, 3, 7, 17, 0, 0, 0, Route114_FossilManiacsTunnel_EventScript_22AF87, 0, 0, 0
+Route114_FossilManiacsTunnel_EventObjects: @ 8533D70
+	object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 5, 3, 3, 7, 17, 0, 0, 0, Route114_FossilManiacsTunnel_EventScript_22AF87, 0, 0, 0
 
 Route114_FossilManiacsTunnel_MapWarps: @ 8533D88
 	warp_def 6, 25, 3, 2, ROUTE_114_FOSSIL_MANIACS_HOUSE
@@ -11,5 +11,5 @@ Route114_FossilManiacsTunnel_MapCoordEvents: @ 8533DA0
 	coord_event 6, 4, 3, 0, VAR_0x40CC, 1, 0, Route114_FossilManiacsTunnel_EventScript_22AF66
 
 Route114_FossilManiacsTunnel_MapEvents:: @ 8533DC0
-	map_events Route114_FossilManiacsTunnel_MapObjects, Route114_FossilManiacsTunnel_MapWarps, Route114_FossilManiacsTunnel_MapCoordEvents, 0x0
+	map_events Route114_FossilManiacsTunnel_EventObjects, Route114_FossilManiacsTunnel_MapWarps, Route114_FossilManiacsTunnel_MapCoordEvents, 0x0
 
diff --git a/data/maps/events/Route114_LanettesHouse.inc b/data/maps/events/Route114_LanettesHouse.inc
index c6e493c73..1182d95f2 100644
--- a/data/maps/events/Route114_LanettesHouse.inc
+++ b/data/maps/events/Route114_LanettesHouse.inc
@@ -1,5 +1,5 @@
-Route114_LanettesHouse_MapObjects: @ 8533DD4
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 5, 4, 3, 1, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_22B2D2, 870, 0, 0
+Route114_LanettesHouse_EventObjects: @ 8533DD4
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 5, 4, 3, 1, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_22B2D2, 870, 0, 0
 
 Route114_LanettesHouse_MapWarps: @ 8533DEC
 	warp_def 5, 7, 0, 2, ROUTE_114
@@ -11,5 +11,5 @@ Route114_LanettesHouse_MapBGEvents: @ 8533DFC
 	bg_event 7, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_22B345
 
 Route114_LanettesHouse_MapEvents:: @ 8533E20
-	map_events Route114_LanettesHouse_MapObjects, Route114_LanettesHouse_MapWarps, 0x0, Route114_LanettesHouse_MapBGEvents
+	map_events Route114_LanettesHouse_EventObjects, Route114_LanettesHouse_MapWarps, 0x0, Route114_LanettesHouse_MapBGEvents
 
diff --git a/data/maps/events/Route115.inc b/data/maps/events/Route115.inc
index e59081620..63924166c 100644
--- a/data/maps/events/Route115.inc
+++ b/data/maps/events/Route115.inc
@@ -1,27 +1,27 @@
-Route115_MapObjects: @ 852A1BC
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 18, 68, 3, 2, 17, 0, 0, 0, Route115_EventScript_1F2973, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 15, 3, 10, 0, 0, 1, 6, Route115_EventScript_1F298E, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 27, 53, 3, 15, 17, 0, 1, 4, Route115_EventScript_1F2A07, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 12, 5, 3, 12, 0, 0, 0, 69, BerryTreeScript, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 13, 5, 3, 12, 0, 0, 0, 70, BerryTreeScript, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 14, 5, 3, 12, 0, 0, 0, 71, BerryTreeScript, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_GIRL_3, 0, 0, 15, 50, 3, 64, 0, 0, 1, 3, Route115_EventScript_1F2A69, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 19, 15, 3, 27, 5, 0, 1, 2, Route115_EventScript_1F29F0, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_MANIAC, 0, 0, 24, 62, 3, 18, 0, 0, 1, 4, Route115_EventScript_1F2ACB, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 20, 60, 3, 1, 0, 0, 0, 0, Route115_EventScript_290E2A, 1016, 0, 0
-	object_event 11, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 18, 7, 3, 1, 0, 0, 0, 0, Route115_EventScript_290E37, 1017, 0, 0
-	object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 23, 29, 3, 1, 0, 0, 0, 0, Route115_EventScript_290E44, 1018, 0, 0
-	object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 31, 64, 3, 12, 0, 0, 0, 55, BerryTreeScript, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 31, 65, 3, 12, 0, 0, 0, 56, BerryTreeScript, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 29, 50, 3, 1, 17, 0, 0, 0, Route115_EventScript_2907A6, 17, 0, 0
-	object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 31, 56, 3, 1, 17, 0, 0, 0, Route115_EventScript_290E51, 1118, 0, 0
-	object_event 17, MAP_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 0, 10, 15, 3, 46, 51, 0, 1, 2, Route115_EventScript_1F2AE2, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 11, 12, 3, 57, 17, 0, 1, 3, Route115_EventScript_1F2AF9, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_GIRL_3, 0, 0, 15, 7, 3, 9, 17, 0, 1, 4, Route115_EventScript_1F2B27, 0, 0, 0
-	object_event 20, MAP_OBJ_GFX_LASS, 0, 0, 10, 7, 3, 10, 17, 0, 1, 4, Route115_EventScript_1F2B10, 0, 0, 0
-	object_event 21, MAP_OBJ_GFX_LASS, 0, 0, 28, 62, 3, 9, 17, 0, 1, 4, Route115_EventScript_1F2B3E, 0, 0, 0
-	object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 26, 67, 3, 1, 17, 0, 0, 0, Route115_EventScript_290E6B, 1161, 0, 0
-	object_event 23, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 12, 14, 3, 1, 17, 0, 0, 0, Route115_EventScript_290E5E, 1144, 0, 0
+Route115_EventObjects: @ 852A1BC
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 18, 68, 3, 2, 17, 0, 0, 0, Route115_EventScript_1F2973, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 15, 3, 10, 0, 0, 1, 6, Route115_EventScript_1F298E, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 27, 53, 3, 15, 17, 0, 1, 4, Route115_EventScript_1F2A07, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 12, 5, 3, 12, 0, 0, 0, 69, BerryTreeScript, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 13, 5, 3, 12, 0, 0, 0, 70, BerryTreeScript, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 14, 5, 3, 12, 0, 0, 0, 71, BerryTreeScript, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 0, 15, 50, 3, 64, 0, 0, 1, 3, Route115_EventScript_1F2A69, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 19, 15, 3, 27, 5, 0, 1, 2, Route115_EventScript_1F29F0, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 0, 24, 62, 3, 18, 0, 0, 1, 4, Route115_EventScript_1F2ACB, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 20, 60, 3, 1, 0, 0, 0, 0, Route115_EventScript_290E2A, 1016, 0, 0
+	object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 18, 7, 3, 1, 0, 0, 0, 0, Route115_EventScript_290E37, 1017, 0, 0
+	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 23, 29, 3, 1, 0, 0, 0, 0, Route115_EventScript_290E44, 1018, 0, 0
+	object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 31, 64, 3, 12, 0, 0, 0, 55, BerryTreeScript, 0, 0, 0
+	object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 31, 65, 3, 12, 0, 0, 0, 56, BerryTreeScript, 0, 0, 0
+	object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 29, 50, 3, 1, 17, 0, 0, 0, Route115_EventScript_2907A6, 17, 0, 0
+	object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 31, 56, 3, 1, 17, 0, 0, 0, Route115_EventScript_290E51, 1118, 0, 0
+	object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 0, 10, 15, 3, 46, 51, 0, 1, 2, Route115_EventScript_1F2AE2, 0, 0, 0
+	object_event 18, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 11, 12, 3, 57, 17, 0, 1, 3, Route115_EventScript_1F2AF9, 0, 0, 0
+	object_event 19, EVENT_OBJ_GFX_GIRL_3, 0, 0, 15, 7, 3, 9, 17, 0, 1, 4, Route115_EventScript_1F2B27, 0, 0, 0
+	object_event 20, EVENT_OBJ_GFX_LASS, 0, 0, 10, 7, 3, 10, 17, 0, 1, 4, Route115_EventScript_1F2B10, 0, 0, 0
+	object_event 21, EVENT_OBJ_GFX_LASS, 0, 0, 28, 62, 3, 9, 17, 0, 1, 4, Route115_EventScript_1F2B3E, 0, 0, 0
+	object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 26, 67, 3, 1, 17, 0, 0, 0, Route115_EventScript_290E6B, 1161, 0, 0
+	object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 12, 14, 3, 1, 17, 0, 0, 0, Route115_EventScript_290E5E, 1144, 0, 0
 
 Route115_MapWarps: @ 852A3E4
 	warp_def 27, 37, 0, 1, METEOR_FALLS_1F_1R
@@ -45,5 +45,5 @@ Route115_MapBGEvents: @ 852A3FC
 	bg_event 15, 49, 3, 7, 0, ITEM_HEART_SCALE, 97, 0
 
 Route115_MapEvents:: @ 852A4A4
-	map_events Route115_MapObjects, Route115_MapWarps, 0x0, Route115_MapBGEvents
+	map_events Route115_EventObjects, Route115_MapWarps, 0x0, Route115_MapBGEvents
 
diff --git a/data/maps/events/Route116.inc b/data/maps/events/Route116.inc
index a28f44e92..25bc3891c 100644
--- a/data/maps/events/Route116.inc
+++ b/data/maps/events/Route116.inc
@@ -1,32 +1,32 @@
-Route116_MapObjects: @ 852A4B8
-	object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 18, 2, 3, 12, 0, 0, 0, 25, BerryTreeScript, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 19, 2, 3, 12, 0, 0, 0, 26, BerryTreeScript, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 12, 7, 3, 16, 0, 0, 1, 3, Route116_EventScript_1F2E89, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 21, 6, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 17, 0, 0
-	object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 32, 10, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 18, 0, 0
-	object_event 6, MAP_OBJ_GFX_BUG_CATCHER, 0, 0, 13, 17, 3, 24, 0, 0, 1, 2, Route116_EventScript_1F2EA0, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 19, 6, 3, 1, 0, 0, 0, 0, Route116_EventScript_290E85, 1019, 0, 0
-	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 10, 17, 3, 1, 0, 0, 0, 0, Route116_EventScript_290E92, 1020, 0, 0
-	object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 20, 2, 3, 12, 0, 0, 0, 66, BerryTreeScript, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 21, 2, 3, 12, 0, 0, 0, 67, BerryTreeScript, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 46, 9, 3, 1, 0, 0, 0, 0, Route116_EventScript_1F2D84, 891, 0, 0
-	object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 28, 11, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 19, 0, 0
-	object_event 13, MAP_OBJ_GFX_HIKER, 0, 0, 36, 17, 3, 15, 0, 0, 1, 3, Route116_EventScript_1F2F65, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 24, 9, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 20, 0, 0
-	object_event 15, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 80, 8, 3, 1, 0, 0, 0, 0, Route116_EventScript_290E9F, 1021, 0, 0
-	object_event 16, MAP_OBJ_GFX_LASS, 0, 0, 26, 6, 3, 10, 0, 0, 1, 2, Route116_EventScript_1F2F7C, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_GIRL_3, 0, 0, 22, 16, 3, 13, 0, 0, 1, 3, Route116_EventScript_1F2F93, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 28, 8, 3, 7, 0, 0, 1, 4, Route116_EventScript_1F2EB7, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_MAN_2, 0, 0, 46, 11, 3, 1, 17, 0, 0, 0, Route116_EventScript_1F2CA2, 947, 0, 0
-	object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 55, 12, 4, 1, 17, 0, 0, 0, Route116_EventScript_290E78, 1001, 0, 0
-	object_event 21, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 38, 9, 3, 10, 17, 0, 0, 0, Route116_EventScript_1F2C70, 894, 0, 0
-	object_event 22, MAP_OBJ_GFX_MANIAC, 0, 0, 74, 13, 3, 1, 17, 0, 0, 0, Route116_EventScript_1F2DB6, 813, 0, 0
-	object_event 23, MAP_OBJ_GFX_WOMAN_3, 0, 0, 33, 8, 3, 7, 0, 0, 1, 1, Route116_EventScript_1F3041, 0, 0, 0
-	object_event 24, MAP_OBJ_GFX_BOY_2, 0, 0, 33, 5, 3, 8, 0, 0, 1, 2, Route116_EventScript_1F3058, 0, 0, 0
-	object_event 25, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 34, 7, 0, 1, 17, 0, 0, 0, Route116_EventScript_290EAC, 1146, 0, 0
-	object_event 26, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 30, 5, 3, 1, 17, 0, 0, 0, Route116_EventScript_2906BB, 21, 0, 0
-	object_event 27, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 36, 13, 3, 18, 17, 0, 1, 5, Route116_EventScript_1F3086, 0, 0, 0
-	object_event 28, MAP_OBJ_GFX_HIKER, 0, 0, 42, 13, 3, 9, 17, 0, 1, 5, Route116_EventScript_1F306F, 0, 0, 0
+Route116_EventObjects: @ 852A4B8
+	object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 18, 2, 3, 12, 0, 0, 0, 25, BerryTreeScript, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 19, 2, 3, 12, 0, 0, 0, 26, BerryTreeScript, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 12, 7, 3, 16, 0, 0, 1, 3, Route116_EventScript_1F2E89, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 21, 6, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 17, 0, 0
+	object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 32, 10, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 18, 0, 0
+	object_event 6, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 13, 17, 3, 24, 0, 0, 1, 2, Route116_EventScript_1F2EA0, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 19, 6, 3, 1, 0, 0, 0, 0, Route116_EventScript_290E85, 1019, 0, 0
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 17, 3, 1, 0, 0, 0, 0, Route116_EventScript_290E92, 1020, 0, 0
+	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 20, 2, 3, 12, 0, 0, 0, 66, BerryTreeScript, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 21, 2, 3, 12, 0, 0, 0, 67, BerryTreeScript, 0, 0, 0
+	object_event 11, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 46, 9, 3, 1, 0, 0, 0, 0, Route116_EventScript_1F2D84, 891, 0, 0
+	object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 28, 11, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 19, 0, 0
+	object_event 13, EVENT_OBJ_GFX_HIKER, 0, 0, 36, 17, 3, 15, 0, 0, 1, 3, Route116_EventScript_1F2F65, 0, 0, 0
+	object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 24, 9, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 20, 0, 0
+	object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 80, 8, 3, 1, 0, 0, 0, 0, Route116_EventScript_290E9F, 1021, 0, 0
+	object_event 16, EVENT_OBJ_GFX_LASS, 0, 0, 26, 6, 3, 10, 0, 0, 1, 2, Route116_EventScript_1F2F7C, 0, 0, 0
+	object_event 17, EVENT_OBJ_GFX_GIRL_3, 0, 0, 22, 16, 3, 13, 0, 0, 1, 3, Route116_EventScript_1F2F93, 0, 0, 0
+	object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 28, 8, 3, 7, 0, 0, 1, 4, Route116_EventScript_1F2EB7, 0, 0, 0
+	object_event 19, EVENT_OBJ_GFX_MAN_2, 0, 0, 46, 11, 3, 1, 17, 0, 0, 0, Route116_EventScript_1F2CA2, 947, 0, 0
+	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 55, 12, 4, 1, 17, 0, 0, 0, Route116_EventScript_290E78, 1001, 0, 0
+	object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 38, 9, 3, 10, 17, 0, 0, 0, Route116_EventScript_1F2C70, 894, 0, 0
+	object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 0, 74, 13, 3, 1, 17, 0, 0, 0, Route116_EventScript_1F2DB6, 813, 0, 0
+	object_event 23, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 33, 8, 3, 7, 0, 0, 1, 1, Route116_EventScript_1F3041, 0, 0, 0
+	object_event 24, EVENT_OBJ_GFX_BOY_2, 0, 0, 33, 5, 3, 8, 0, 0, 1, 2, Route116_EventScript_1F3058, 0, 0, 0
+	object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 34, 7, 0, 1, 17, 0, 0, 0, Route116_EventScript_290EAC, 1146, 0, 0
+	object_event 26, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 30, 5, 3, 1, 17, 0, 0, 0, Route116_EventScript_2906BB, 21, 0, 0
+	object_event 27, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 36, 13, 3, 18, 17, 0, 1, 5, Route116_EventScript_1F3086, 0, 0, 0
+	object_event 28, EVENT_OBJ_GFX_HIKER, 0, 0, 42, 13, 3, 9, 17, 0, 1, 5, Route116_EventScript_1F306F, 0, 0, 0
 
 Route116_MapWarps: @ 852A758
 	warp_def 47, 8, 0, 0, RUSTURF_TUNNEL
@@ -52,5 +52,5 @@ Route116_MapBGEvents: @ 852A790
 	bg_event 70, 13, 3, 7, 0, ITEM_BLACK_GLASSES, 96, 0
 
 Route116_MapEvents:: @ 852A814
-	map_events Route116_MapObjects, Route116_MapWarps, Route116_MapCoordEvents, Route116_MapBGEvents
+	map_events Route116_EventObjects, Route116_MapWarps, Route116_MapCoordEvents, Route116_MapBGEvents
 
diff --git a/data/maps/events/Route116_TunnelersRestHouse.inc b/data/maps/events/Route116_TunnelersRestHouse.inc
index bc159312e..da8f9c1a0 100644
--- a/data/maps/events/Route116_TunnelersRestHouse.inc
+++ b/data/maps/events/Route116_TunnelersRestHouse.inc
@@ -1,12 +1,12 @@
-Route116_TunnelersRestHouse_MapObjects: @ 8533E34
-	object_event 1, MAP_OBJ_GFX_MAN_3, 0, 0, 6, 5, 3, 10, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B85A, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_3, 0, 0, 3, 6, 3, 1, 17, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B86C, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_3, 0, 0, 7, 2, 3, 7, 1, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B863, 0, 0, 0
+Route116_TunnelersRestHouse_EventObjects: @ 8533E34
+	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 0, 6, 5, 3, 10, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B85A, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 0, 3, 6, 3, 1, 17, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B86C, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 0, 7, 2, 3, 7, 1, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B863, 0, 0, 0
 
 Route116_TunnelersRestHouse_MapWarps: @ 8533E7C
 	warp_def 4, 8, 0, 1, ROUTE_116
 	warp_def 5, 8, 0, 1, ROUTE_116
 
 Route116_TunnelersRestHouse_MapEvents:: @ 8533E8C
-	map_events Route116_TunnelersRestHouse_MapObjects, Route116_TunnelersRestHouse_MapWarps, 0x0, 0x0
+	map_events Route116_TunnelersRestHouse_EventObjects, Route116_TunnelersRestHouse_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/Route117.inc b/data/maps/events/Route117.inc
index 5b0e89239..4478507ae 100644
--- a/data/maps/events/Route117.inc
+++ b/data/maps/events/Route117.inc
@@ -1,28 +1,28 @@
-Route117_MapObjects: @ 852A828
-	object_event 1, MAP_OBJ_GFX_WOMAN_1, 0, 0, 13, 13, 3, 8, 0, 0, 0, 0, Route117_EventScript_1F399A, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 25, 5, 3, 40, 34, 0, 0, 0, Route117_EventScript_1F39A3, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 47, 4, 3, 8, 0, 0, 0, 0, Route117_EventScript_291C18, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 33, 3, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_KECLEON_1, 0, 0, 39, 4, 3, 1, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_AZUMARILL, 0, 0, 42, 2, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_PIKACHU, 0, 0, 49, 2, 3, 1, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 38, 16, 3, 28, 8, 0, 1, 4, Route117_EventScript_1F3A94, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_WOMAN_3, 0, 0, 8, 10, 3, 23, 0, 0, 1, 3, Route117_EventScript_1F3A32, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_MAN_5, 0, 0, 33, 11, 3, 16, 0, 0, 1, 4, Route117_EventScript_1F39D0, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 41, 13, 3, 12, 0, 0, 0, 29, BerryTreeScript, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 42, 13, 3, 12, 0, 0, 0, 28, BerryTreeScript, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 43, 13, 3, 12, 0, 0, 0, 27, BerryTreeScript, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 16, 18, 3, 1, 0, 0, 0, 0, Route117_EventScript_290EB9, 1022, 0, 0
-	object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 15, 2, 3, 1, 0, 0, 0, 0, Route117_EventScript_2906BB, 17, 0, 0
-	object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 9, 1, 3, 1, 0, 0, 0, 0, Route117_EventScript_290EC6, 1023, 0, 0
-	object_event 17, MAP_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 0, 26, 13, 3, 33, 34, 0, 1, 5, Route117_EventScript_1F3AF6, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_MANIAC, 0, 0, 17, 12, 3, 7, 17, 0, 1, 4, Route117_EventScript_1F3B58, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_LASS, 0, 0, 43, 6, 3, 8, 0, 0, 1, 1, Route117_EventScript_1F3BD3, 0, 0, 0
-	object_event 20, MAP_OBJ_GFX_LASS, 0, 0, 42, 6, 3, 8, 0, 0, 1, 1, Route117_EventScript_1F3B6F, 0, 0, 0
-	object_event 21, MAP_OBJ_GFX_GIRL_2, 0, 0, 48, 10, 3, 2, 17, 0, 0, 0, Route117_EventScript_1F39AC, 0, 0, 0
-	object_event 22, MAP_OBJ_GFX_LASS, 0, 0, 15, 4, 3, 10, 17, 0, 1, 4, Route117_EventScript_1F3C4E, 0, 0, 0
-	object_event 23, MAP_OBJ_GFX_GIRL_3, 0, 0, 21, 4, 3, 9, 17, 0, 1, 4, Route117_EventScript_1F3C65, 0, 0, 0
-	object_event 24, MAP_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 0, 16, 4, 3, 28, 20, 0, 1, 4, Route117_EventScript_1F3C37, 0, 0, 0
+Route117_EventObjects: @ 852A828
+	object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 13, 13, 3, 8, 0, 0, 0, 0, Route117_EventScript_1F399A, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 25, 5, 3, 40, 34, 0, 0, 0, Route117_EventScript_1F39A3, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 47, 4, 3, 8, 0, 0, 0, 0, Route117_EventScript_291C18, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 33, 3, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 39, 4, 3, 1, 0, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 0, 42, 2, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_PIKACHU, 0, 0, 49, 2, 3, 1, 0, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 38, 16, 3, 28, 8, 0, 1, 4, Route117_EventScript_1F3A94, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 8, 10, 3, 23, 0, 0, 1, 3, Route117_EventScript_1F3A32, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_MAN_5, 0, 0, 33, 11, 3, 16, 0, 0, 1, 4, Route117_EventScript_1F39D0, 0, 0, 0
+	object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 41, 13, 3, 12, 0, 0, 0, 29, BerryTreeScript, 0, 0, 0
+	object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 42, 13, 3, 12, 0, 0, 0, 28, BerryTreeScript, 0, 0, 0
+	object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 43, 13, 3, 12, 0, 0, 0, 27, BerryTreeScript, 0, 0, 0
+	object_event 14, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 16, 18, 3, 1, 0, 0, 0, 0, Route117_EventScript_290EB9, 1022, 0, 0
+	object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 15, 2, 3, 1, 0, 0, 0, 0, Route117_EventScript_2906BB, 17, 0, 0
+	object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 9, 1, 3, 1, 0, 0, 0, 0, Route117_EventScript_290EC6, 1023, 0, 0
+	object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 0, 26, 13, 3, 33, 34, 0, 1, 5, Route117_EventScript_1F3AF6, 0, 0, 0
+	object_event 18, EVENT_OBJ_GFX_MANIAC, 0, 0, 17, 12, 3, 7, 17, 0, 1, 4, Route117_EventScript_1F3B58, 0, 0, 0
+	object_event 19, EVENT_OBJ_GFX_LASS, 0, 0, 43, 6, 3, 8, 0, 0, 1, 1, Route117_EventScript_1F3BD3, 0, 0, 0
+	object_event 20, EVENT_OBJ_GFX_LASS, 0, 0, 42, 6, 3, 8, 0, 0, 1, 1, Route117_EventScript_1F3B6F, 0, 0, 0
+	object_event 21, EVENT_OBJ_GFX_GIRL_2, 0, 0, 48, 10, 3, 2, 17, 0, 0, 0, Route117_EventScript_1F39AC, 0, 0, 0
+	object_event 22, EVENT_OBJ_GFX_LASS, 0, 0, 15, 4, 3, 10, 17, 0, 1, 4, Route117_EventScript_1F3C4E, 0, 0, 0
+	object_event 23, EVENT_OBJ_GFX_GIRL_3, 0, 0, 21, 4, 3, 9, 17, 0, 1, 4, Route117_EventScript_1F3C65, 0, 0, 0
+	object_event 24, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 0, 16, 4, 3, 28, 20, 0, 1, 4, Route117_EventScript_1F3C37, 0, 0, 0
 
 Route117_MapWarps: @ 852AA68
 	warp_def 51, 5, 0, 0, ROUTE_117_POKEMON_DAY_CARE
@@ -34,5 +34,5 @@ Route117_MapBGEvents: @ 852AA70
 	bg_event 3, 18, 3, 7, 0, ITEM_REPEL, 72, 0
 
 Route117_MapEvents:: @ 852AAA0
-	map_events Route117_MapObjects, Route117_MapWarps, 0x0, Route117_MapBGEvents
+	map_events Route117_EventObjects, Route117_MapWarps, 0x0, Route117_MapBGEvents
 
diff --git a/data/maps/events/Route117_PokemonDayCare.inc b/data/maps/events/Route117_PokemonDayCare.inc
index e9625991f..363c2132f 100644
--- a/data/maps/events/Route117_PokemonDayCare.inc
+++ b/data/maps/events/Route117_PokemonDayCare.inc
@@ -1,10 +1,10 @@
-Route117_PokemonDayCare_MapObjects: @ 8533EA0
-	object_event 1, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 0, 2, 2, 3, 8, 0, 0, 0, 0, Route117_PokemonDayCare_EventScript_291D11, 0, 0, 0
+Route117_PokemonDayCare_EventObjects: @ 8533EA0
+	object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 2, 2, 3, 8, 0, 0, 0, 0, Route117_PokemonDayCare_EventScript_291D11, 0, 0, 0
 
 Route117_PokemonDayCare_MapWarps: @ 8533EB8
 	warp_def 2, 8, 0, 0, ROUTE_117
 	warp_def 3, 8, 0, 0, ROUTE_117
 
 Route117_PokemonDayCare_MapEvents:: @ 8533EC8
-	map_events Route117_PokemonDayCare_MapObjects, Route117_PokemonDayCare_MapWarps, 0x0, 0x0
+	map_events Route117_PokemonDayCare_EventObjects, Route117_PokemonDayCare_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/Route118.inc b/data/maps/events/Route118.inc
index 40e1e4b70..73ba40dd2 100644
--- a/data/maps/events/Route118.inc
+++ b/data/maps/events/Route118.inc
@@ -1,25 +1,25 @@
-Route118_MapObjects: @ 852AAB4
-	object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 35, 5, 3, 12, 0, 0, 0, 31, BerryTreeScript, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 36, 5, 3, 12, 0, 0, 0, 32, BerryTreeScript, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 37, 5, 3, 12, 0, 0, 0, 33, BerryTreeScript, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_6, 0, 0, 64, 10, 3, 8, 0, 0, 1, 3, Route118_EventScript_1F4079, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_REPORTER_F, 0, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CE16, 797, 0, 0
-	object_event 6, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CE36, 797, 0, 0
-	object_event 7, MAP_OBJ_GFX_GIRL_2, 0, 0, 12, 10, 3, 2, 17, 0, 0, 0, Route118_EventScript_1F3E73, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_REPORTER_F, 0, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CED6, 901, 0, 0
-	object_event 9, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CEF6, 901, 0, 0
-	object_event 10, MAP_OBJ_GFX_REPORTER_F, 0, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CF16, 904, 0, 0
-	object_event 11, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CF36, 904, 0, 0
-	object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 38, 8, 3, 1, 0, 0, 0, 0, Route118_EventScript_2906BB, 17, 0, 0
-	object_event 13, MAP_OBJ_GFX_FISHERMAN, 0, 0, 28, 8, 3, 9, 0, 0, 0, 0, Route118_EventScript_1F3E14, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_WOMAN_3, 0, 0, 7, 12, 3, 7, 0, 0, 1, 4, Route118_EventScript_1F3F87, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 0, 14, 14, 3, 8, 0, 0, 1, 0, Route118_EventScript_1F4000, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_MAN_6, 0, 0, 56, 7, 3, 16, 0, 0, 1, 3, Route118_EventScript_1F4090, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_FISHERMAN, 0, 0, 39, 15, 3, 1, 0, 0, 1, 2, Route118_EventScript_1F3FE9, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_MAN_6, 0, 0, 17, 11, 3, 15, 17, 0, 1, 3, Route118_EventScript_1F4017, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_STEVEN, 0, 0, 44, 7, 3, 8, 17, 0, 0, 0, 0x0, 966, 0, 0
-	object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 69, 7, 3, 1, 17, 0, 0, 0, Route118_EventScript_290ED3, 1121, 0, 0
-	object_event 21, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 7, 7, 3, 8, 17, 0, 1, 4, Route118_EventScript_1F40A7, 0, 0, 0
+Route118_EventObjects: @ 852AAB4
+	object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 35, 5, 3, 12, 0, 0, 0, 31, BerryTreeScript, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 36, 5, 3, 12, 0, 0, 0, 32, BerryTreeScript, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 37, 5, 3, 12, 0, 0, 0, 33, BerryTreeScript, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 0, 64, 10, 3, 8, 0, 0, 1, 3, Route118_EventScript_1F4079, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CE16, 797, 0, 0
+	object_event 6, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CE36, 797, 0, 0
+	object_event 7, EVENT_OBJ_GFX_GIRL_2, 0, 0, 12, 10, 3, 2, 17, 0, 0, 0, Route118_EventScript_1F3E73, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CED6, 901, 0, 0
+	object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CEF6, 901, 0, 0
+	object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CF16, 904, 0, 0
+	object_event 11, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CF36, 904, 0, 0
+	object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 38, 8, 3, 1, 0, 0, 0, 0, Route118_EventScript_2906BB, 17, 0, 0
+	object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 28, 8, 3, 9, 0, 0, 0, 0, Route118_EventScript_1F3E14, 0, 0, 0
+	object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 7, 12, 3, 7, 0, 0, 1, 4, Route118_EventScript_1F3F87, 0, 0, 0
+	object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 14, 14, 3, 8, 0, 0, 1, 0, Route118_EventScript_1F4000, 0, 0, 0
+	object_event 16, EVENT_OBJ_GFX_MAN_6, 0, 0, 56, 7, 3, 16, 0, 0, 1, 3, Route118_EventScript_1F4090, 0, 0, 0
+	object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 39, 15, 3, 1, 0, 0, 1, 2, Route118_EventScript_1F3FE9, 0, 0, 0
+	object_event 18, EVENT_OBJ_GFX_MAN_6, 0, 0, 17, 11, 3, 15, 17, 0, 1, 3, Route118_EventScript_1F4017, 0, 0, 0
+	object_event 19, EVENT_OBJ_GFX_STEVEN, 0, 0, 44, 7, 3, 8, 17, 0, 0, 0, 0x0, 966, 0, 0
+	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 69, 7, 3, 1, 17, 0, 0, 0, Route118_EventScript_290ED3, 1121, 0, 0
+	object_event 21, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 7, 7, 3, 8, 17, 0, 1, 4, Route118_EventScript_1F40A7, 0, 0, 0
 
 Route118_MapWarps: @ 852ACAC
 	warp_def 42, 6, 0, 0, TERRA_CAVE_ENTRANCE
@@ -42,5 +42,5 @@ Route118_MapBGEvents: @ 852ACEC
 	bg_event 12, 14, 3, 7, 0, ITEM_HEART_SCALE, 66, 0
 
 Route118_MapEvents:: @ 852AD58
-	map_events Route118_MapObjects, Route118_MapWarps, Route118_MapCoordEvents, Route118_MapBGEvents
+	map_events Route118_EventObjects, Route118_MapWarps, Route118_MapCoordEvents, Route118_MapBGEvents
 
diff --git a/data/maps/events/Route119.inc b/data/maps/events/Route119.inc
index e78006b3c..96db2d944 100644
--- a/data/maps/events/Route119.inc
+++ b/data/maps/events/Route119.inc
@@ -1,47 +1,47 @@
-Route119_MapObjects: @ 852AD6C
-	object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 24, 5, 3, 12, 0, 0, 0, 34, BerryTreeScript, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 25, 5, 3, 12, 0, 0, 0, 35, BerryTreeScript, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 26, 5, 3, 12, 0, 0, 0, 36, BerryTreeScript, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BUG_CATCHER, 0, 0, 12, 123, 3, 59, 0, 0, 1, 1, Route119_EventScript_1F47E2, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_MANIAC, 0, 0, 26, 123, 3, 60, 0, 0, 1, 1, Route119_EventScript_1F47B4, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MANIAC, 0, 0, 5, 125, 3, 62, 0, 0, 1, 1, Route119_EventScript_1F479D, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_CAMPER, 0, 0, 7, 74, 3, 18, 0, 0, 1, 3, Route119_EventScript_1F4810, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_MANIAC, 0, 0, 28, 116, 3, 60, 0, 0, 1, 1, Route119_EventScript_1F4786, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_PICNICKER, 0, 0, 35, 83, 4, 8, 0, 0, 1, 2, Route119_EventScript_1F4872, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_BUG_CATCHER, 0, 0, 34, 122, 3, 61, 0, 0, 1, 1, Route119_EventScript_1F47CB, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_BUG_CATCHER, 0, 0, 17, 128, 3, 61, 0, 0, 1, 1, Route119_EventScript_1F47F9, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 28, 14, 3, 57, 0, 0, 1, 1, Route119_EventScript_1F4902, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 19, 49, 3, 58, 0, 0, 1, 3, Route119_EventScript_1F4919, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_MAN_6, 0, 0, 10, 50, 4, 10, 0, 0, 1, 3, Route119_EventScript_1F48D4, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_MAN_6, 0, 0, 8, 63, 3, 8, 0, 0, 1, 5, Route119_EventScript_1F48EB, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_HIPSTER, 0, 0, 25, 32, 3, 7, 0, 0, 0, 0, 0x0, 851, 0, 0
-	object_event 17, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 12, 121, 3, 1, 0, 0, 0, 0, Route119_EventScript_290EE0, 1024, 0, 0
-	object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 96, 3, 1, 0, 0, 0, 0, Route119_EventScript_290EED, 1025, 0, 0
-	object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 29, 53, 3, 1, 0, 0, 0, 0, Route119_EventScript_290EFA, 1026, 0, 0
-	object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 25, 76, 3, 1, 0, 0, 0, 0, Route119_EventScript_290F07, 1027, 0, 0
-	object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 8, 18, 3, 1, 0, 0, 0, 0, Route119_EventScript_290F14, 1028, 0, 0
-	object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 33, 117, 3, 1, 0, 0, 0, 0, Route119_EventScript_290F21, 1029, 0, 0
-	object_event 23, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 33, 4, 10, 0, 0, 0, 0, Route119_EventScript_1F49A3, 890, 0, 0
-	object_event 24, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 34, 4, 10, 0, 0, 0, 0, Route119_EventScript_1F49BA, 890, 0, 0
-	object_event 25, MAP_OBJ_GFX_GIDDY, 0, 0, 17, 33, 4, 7, 0, 0, 0, 0, 0x0, 923, 0, 0
-	object_event 26, MAP_OBJ_GFX_BOY_3, 0, 0, 31, 109, 3, 8, 17, 0, 0, 0, Route119_EventScript_1F49D1, 0, 0, 0
-	object_event 27, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 8, 23, 3, 12, 0, 0, 0, 83, BerryTreeScript, 0, 0, 0
-	object_event 28, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 9, 23, 3, 12, 0, 0, 0, 84, BerryTreeScript, 0, 0, 0
-	object_event 29, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 29, 90, 3, 12, 0, 0, 0, 85, BerryTreeScript, 0, 0, 0
-	object_event 30, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 30, 90, 3, 12, 0, 0, 0, 86, BerryTreeScript, 0, 0, 0
-	object_event 31, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 19, 133, 3, 5, 18, 0, 0, 0, Route119_EventScript_1F476B, 0, 0, 0
-	object_event 32, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 56, 3, 1, 17, 0, 0, 0, Route119_EventScript_290F2E, 1106, 0, 0
-	object_event 33, MAP_OBJ_GFX_BOY_2, 0, 0, 35, 93, 4, 2, 17, 0, 0, 0, Route119_EventScript_1F49DA, 0, 0, 0
-	object_event 34, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 29, 6, 3, 57, 17, 0, 1, 3, Route119_EventScript_1F4930, 0, 0, 0
-	object_event 35, MAP_OBJ_GFX_KECLEON_1, 0, 0, 31, 6, 3, 76, 17, 0, 0, 0, Route119_EventScript_27231C, 989, 0, 0
-	object_event 36, MAP_OBJ_GFX_KECLEON_1, 0, 0, 25, 15, 3, 76, 17, 0, 0, 0, Route119_EventScript_272329, 990, 0, 0
-	object_event 37, MAP_OBJ_GFX_FISHERMAN, 0, 0, 13, 104, 3, 10, 17, 0, 1, 0, Route119_EventScript_1F4947, 0, 0, 0
-	object_event 38, MAP_OBJ_GFX_WOMAN_3, 0, 0, 8, 68, 3, 7, 17, 0, 1, 5, Route119_EventScript_1F498C, 0, 0, 0
-	object_event 39, MAP_OBJ_GFX_MAN_6, 0, 0, 16, 52, 3, 10, 17, 0, 1, 3, Route119_EventScript_1F4975, 0, 0, 0
-	object_event 40, MAP_OBJ_GFX_MAN_6, 0, 0, 32, 15, 3, 9, 17, 0, 1, 4, Route119_EventScript_1F495E, 0, 0, 0
-	object_event 41, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 19, 5, 4, 1, 17, 0, 0, 0, Route119_EventScript_291399, 1134, 0, 0
-	object_event 42, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 24, 42, 3, 1, 17, 0, 0, 0, Route119_EventScript_290F3B, 1147, 0, 0
-	object_event 43, MAP_OBJ_GFX_SCOTT, 0, 0, 28, 25, 3, 8, 0, 0, 0, 0, 0x0, 786, 0, 0
+Route119_EventObjects: @ 852AD6C
+	object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 24, 5, 3, 12, 0, 0, 0, 34, BerryTreeScript, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 25, 5, 3, 12, 0, 0, 0, 35, BerryTreeScript, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 26, 5, 3, 12, 0, 0, 0, 36, BerryTreeScript, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 12, 123, 3, 59, 0, 0, 1, 1, Route119_EventScript_1F47E2, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 0, 26, 123, 3, 60, 0, 0, 1, 1, Route119_EventScript_1F47B4, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_MANIAC, 0, 0, 5, 125, 3, 62, 0, 0, 1, 1, Route119_EventScript_1F479D, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_CAMPER, 0, 0, 7, 74, 3, 18, 0, 0, 1, 3, Route119_EventScript_1F4810, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 0, 28, 116, 3, 60, 0, 0, 1, 1, Route119_EventScript_1F4786, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_PICNICKER, 0, 0, 35, 83, 4, 8, 0, 0, 1, 2, Route119_EventScript_1F4872, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 34, 122, 3, 61, 0, 0, 1, 1, Route119_EventScript_1F47CB, 0, 0, 0
+	object_event 11, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 17, 128, 3, 61, 0, 0, 1, 1, Route119_EventScript_1F47F9, 0, 0, 0
+	object_event 12, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 28, 14, 3, 57, 0, 0, 1, 1, Route119_EventScript_1F4902, 0, 0, 0
+	object_event 13, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 19, 49, 3, 58, 0, 0, 1, 3, Route119_EventScript_1F4919, 0, 0, 0
+	object_event 14, EVENT_OBJ_GFX_MAN_6, 0, 0, 10, 50, 4, 10, 0, 0, 1, 3, Route119_EventScript_1F48D4, 0, 0, 0
+	object_event 15, EVENT_OBJ_GFX_MAN_6, 0, 0, 8, 63, 3, 8, 0, 0, 1, 5, Route119_EventScript_1F48EB, 0, 0, 0
+	object_event 16, EVENT_OBJ_GFX_HIPSTER, 0, 0, 25, 32, 3, 7, 0, 0, 0, 0, 0x0, 851, 0, 0
+	object_event 17, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 12, 121, 3, 1, 0, 0, 0, 0, Route119_EventScript_290EE0, 1024, 0, 0
+	object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 96, 3, 1, 0, 0, 0, 0, Route119_EventScript_290EED, 1025, 0, 0
+	object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 29, 53, 3, 1, 0, 0, 0, 0, Route119_EventScript_290EFA, 1026, 0, 0
+	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 25, 76, 3, 1, 0, 0, 0, 0, Route119_EventScript_290F07, 1027, 0, 0
+	object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 8, 18, 3, 1, 0, 0, 0, 0, Route119_EventScript_290F14, 1028, 0, 0
+	object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 33, 117, 3, 1, 0, 0, 0, 0, Route119_EventScript_290F21, 1029, 0, 0
+	object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 33, 4, 10, 0, 0, 0, 0, Route119_EventScript_1F49A3, 890, 0, 0
+	object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 34, 4, 10, 0, 0, 0, 0, Route119_EventScript_1F49BA, 890, 0, 0
+	object_event 25, EVENT_OBJ_GFX_GIDDY, 0, 0, 17, 33, 4, 7, 0, 0, 0, 0, 0x0, 923, 0, 0
+	object_event 26, EVENT_OBJ_GFX_BOY_3, 0, 0, 31, 109, 3, 8, 17, 0, 0, 0, Route119_EventScript_1F49D1, 0, 0, 0
+	object_event 27, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 8, 23, 3, 12, 0, 0, 0, 83, BerryTreeScript, 0, 0, 0
+	object_event 28, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 9, 23, 3, 12, 0, 0, 0, 84, BerryTreeScript, 0, 0, 0
+	object_event 29, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 29, 90, 3, 12, 0, 0, 0, 85, BerryTreeScript, 0, 0, 0
+	object_event 30, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 30, 90, 3, 12, 0, 0, 0, 86, BerryTreeScript, 0, 0, 0
+	object_event 31, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 19, 133, 3, 5, 18, 0, 0, 0, Route119_EventScript_1F476B, 0, 0, 0
+	object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 56, 3, 1, 17, 0, 0, 0, Route119_EventScript_290F2E, 1106, 0, 0
+	object_event 33, EVENT_OBJ_GFX_BOY_2, 0, 0, 35, 93, 4, 2, 17, 0, 0, 0, Route119_EventScript_1F49DA, 0, 0, 0
+	object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 29, 6, 3, 57, 17, 0, 1, 3, Route119_EventScript_1F4930, 0, 0, 0
+	object_event 35, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 31, 6, 3, 76, 17, 0, 0, 0, Route119_EventScript_27231C, 989, 0, 0
+	object_event 36, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 25, 15, 3, 76, 17, 0, 0, 0, Route119_EventScript_272329, 990, 0, 0
+	object_event 37, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 13, 104, 3, 10, 17, 0, 1, 0, Route119_EventScript_1F4947, 0, 0, 0
+	object_event 38, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 8, 68, 3, 7, 17, 0, 1, 5, Route119_EventScript_1F498C, 0, 0, 0
+	object_event 39, EVENT_OBJ_GFX_MAN_6, 0, 0, 16, 52, 3, 10, 17, 0, 1, 3, Route119_EventScript_1F4975, 0, 0, 0
+	object_event 40, EVENT_OBJ_GFX_MAN_6, 0, 0, 32, 15, 3, 9, 17, 0, 1, 4, Route119_EventScript_1F495E, 0, 0, 0
+	object_event 41, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 19, 5, 4, 1, 17, 0, 0, 0, Route119_EventScript_291399, 1134, 0, 0
+	object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 24, 42, 3, 1, 17, 0, 0, 0, Route119_EventScript_290F3B, 1147, 0, 0
+	object_event 43, EVENT_OBJ_GFX_SCOTT, 0, 0, 28, 25, 3, 8, 0, 0, 0, 0, 0x0, 786, 0, 0
 
 Route119_MapWarps: @ 852B174
 	warp_def 6, 32, 0, 0, ROUTE_119_WEATHER_INSTITUTE_1F
@@ -95,5 +95,5 @@ Route119_MapBGEvents: @ 852B2F4
 	bg_event 28, 9, 0, 0, 0, Route119_EventScript_1F49E3
 
 Route119_MapEvents:: @ 852B3E4
-	map_events Route119_MapObjects, Route119_MapWarps, Route119_MapCoordEvents, Route119_MapBGEvents
+	map_events Route119_EventObjects, Route119_MapWarps, Route119_MapCoordEvents, Route119_MapBGEvents
 
diff --git a/data/maps/events/Route119_House.inc b/data/maps/events/Route119_House.inc
index 7033c505a..38c35b40a 100644
--- a/data/maps/events/Route119_House.inc
+++ b/data/maps/events/Route119_House.inc
@@ -1,16 +1,16 @@
-Route119_House_MapObjects: @ 853ECD0
-	object_event 1, MAP_OBJ_GFX_WOMAN_5, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route119_House_EventScript_270966, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WINGULL, 0, 0, 1, 6, 3, 2, 34, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WINGULL, 0, 0, 0, 4, 3, 2, 19, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WINGULL, 0, 0, 2, 2, 3, 2, 17, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WINGULL, 0, 0, 8, 5, 3, 2, 35, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_WINGULL, 0, 0, 6, 6, 3, 2, 34, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_WINGULL, 0, 0, 5, 3, 3, 2, 49, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0
+Route119_House_EventObjects: @ 853ECD0
+	object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route119_House_EventScript_270966, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 0, 1, 6, 3, 2, 34, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 0, 4, 3, 2, 19, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 0, 2, 2, 3, 2, 17, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_WINGULL, 0, 0, 8, 5, 3, 2, 35, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_WINGULL, 0, 0, 6, 6, 3, 2, 34, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 0, 5, 3, 3, 2, 49, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0
 
 Route119_House_MapWarps: @ 853ED78
 	warp_def 3, 8, 0, 1, ROUTE_119
 	warp_def 4, 8, 0, 1, ROUTE_119
 
 Route119_House_MapEvents:: @ 853ED88
-	map_events Route119_House_MapObjects, Route119_House_MapWarps, 0x0, 0x0
+	map_events Route119_House_EventObjects, Route119_House_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/Route119_WeatherInstitute_1F.inc b/data/maps/events/Route119_WeatherInstitute_1F.inc
index 01a53d75a..6fa459ac6 100644
--- a/data/maps/events/Route119_WeatherInstitute_1F.inc
+++ b/data/maps/events/Route119_WeatherInstitute_1F.inc
@@ -1,9 +1,9 @@
-Route119_WeatherInstitute_1F_MapObjects: @ 853EB20
-	object_event 1, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 15, 3, 3, 9, 0, 0, 1, 3, Route119_WeatherInstitute_1F_EventScript_26FB29, 890, 0, 0
-	object_event 2, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 10, 5, 3, 8, 0, 0, 1, 2, Route119_WeatherInstitute_1F_EventScript_26FB40, 890, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_5, 0, 0, 5, 4, 3, 8, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB0F, 892, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_5, 0, 0, 2, 11, 3, 1, 1, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAC8, 892, 0, 0
-	object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 14, 11, 3, 2, 17, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAA4, 0, 0, 0
+Route119_WeatherInstitute_1F_EventObjects: @ 853EB20
+	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 15, 3, 3, 9, 0, 0, 1, 3, Route119_WeatherInstitute_1F_EventScript_26FB29, 890, 0, 0
+	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 10, 5, 3, 8, 0, 0, 1, 2, Route119_WeatherInstitute_1F_EventScript_26FB40, 890, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 0, 5, 4, 3, 8, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB0F, 892, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 0, 2, 11, 3, 1, 1, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAC8, 892, 0, 0
+	object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 14, 11, 3, 2, 17, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAA4, 0, 0, 0
 
 Route119_WeatherInstitute_1F_MapWarps: @ 853EB98
 	warp_def 9, 12, 0, 0, ROUTE_119
@@ -17,5 +17,5 @@ Route119_WeatherInstitute_1F_MapBGEvents: @ 853EBB0
 	bg_event 0, 3, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB18
 
 Route119_WeatherInstitute_1F_MapEvents:: @ 853EBE0
-	map_events Route119_WeatherInstitute_1F_MapObjects, Route119_WeatherInstitute_1F_MapWarps, 0x0, Route119_WeatherInstitute_1F_MapBGEvents
+	map_events Route119_WeatherInstitute_1F_EventObjects, Route119_WeatherInstitute_1F_MapWarps, 0x0, Route119_WeatherInstitute_1F_MapBGEvents
 
diff --git a/data/maps/events/Route119_WeatherInstitute_2F.inc b/data/maps/events/Route119_WeatherInstitute_2F.inc
index 3a68ca865..0f838709c 100644
--- a/data/maps/events/Route119_WeatherInstitute_2F.inc
+++ b/data/maps/events/Route119_WeatherInstitute_2F.inc
@@ -1,16 +1,16 @@
-Route119_WeatherInstitute_2F_MapObjects: @ 853EBF4
-	object_event 1, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 15, 6, 3, 10, 0, 0, 1, 4, Route119_WeatherInstitute_2F_EventScript_26FF7F, 890, 0, 0
-	object_event 2, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 10, 8, 3, 13, 0, 0, 1, 2, Route119_WeatherInstitute_2F_EventScript_26FF96, 890, 0, 0
-	object_event 3, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 4, 6, 3, 10, 0, 0, 1, 0, Route119_WeatherInstitute_2F_EventScript_26FFAD, 890, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_5, 0, 0, 0, 6, 3, 10, 0, 0, 0, 0, 0x0, 893, 0, 0
-	object_event 5, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 18, 6, 3, 1, 18, 0, 0, 0, Route119_WeatherInstitute_2F_EventScript_27018B, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_5, 0, 0, 1, 7, 3, 10, 0, 0, 0, 0, 0x0, 893, 0, 0
-	object_event 7, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 16, 6, 3, 9, 17, 0, 0, 0, 0x0, 992, 0, 0
-	object_event 8, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 19, 6, 3, 9, 17, 0, 1, 3, Route119_WeatherInstitute_2F_EventScript_26FF68, 890, 0, 0
+Route119_WeatherInstitute_2F_EventObjects: @ 853EBF4
+	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 15, 6, 3, 10, 0, 0, 1, 4, Route119_WeatherInstitute_2F_EventScript_26FF7F, 890, 0, 0
+	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 10, 8, 3, 13, 0, 0, 1, 2, Route119_WeatherInstitute_2F_EventScript_26FF96, 890, 0, 0
+	object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 4, 6, 3, 10, 0, 0, 1, 0, Route119_WeatherInstitute_2F_EventScript_26FFAD, 890, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 0, 0, 6, 3, 10, 0, 0, 0, 0, 0x0, 893, 0, 0
+	object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 18, 6, 3, 1, 18, 0, 0, 0, Route119_WeatherInstitute_2F_EventScript_27018B, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 0, 1, 7, 3, 10, 0, 0, 0, 0, 0x0, 893, 0, 0
+	object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 16, 6, 3, 9, 17, 0, 0, 0, 0x0, 992, 0, 0
+	object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 19, 6, 3, 9, 17, 0, 1, 3, Route119_WeatherInstitute_2F_EventScript_26FF68, 890, 0, 0
 
 Route119_WeatherInstitute_2F_MapWarps: @ 853ECB4
 	warp_def 17, 1, 0, 2, ROUTE_119_WEATHER_INSTITUTE_1F
 
 Route119_WeatherInstitute_2F_MapEvents:: @ 853ECBC
-	map_events Route119_WeatherInstitute_2F_MapObjects, Route119_WeatherInstitute_2F_MapWarps, 0x0, 0x0
+	map_events Route119_WeatherInstitute_2F_EventObjects, Route119_WeatherInstitute_2F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/Route120.inc b/data/maps/events/Route120.inc
index 6206e713f..6f227115c 100644
--- a/data/maps/events/Route120.inc
+++ b/data/maps/events/Route120.inc
@@ -1,48 +1,48 @@
-Route120_MapObjects: @ 852B3F8
-	object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 4, 79, 3, 12, 0, 0, 0, 46, BerryTreeScript, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 5, 79, 3, 12, 0, 0, 0, 45, BerryTreeScript, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 6, 79, 3, 12, 0, 0, 0, 44, BerryTreeScript, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 7, 79, 3, 12, 0, 0, 0, 43, BerryTreeScript, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 34, 24, 3, 12, 0, 0, 0, 37, BerryTreeScript, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 35, 24, 3, 12, 0, 0, 0, 38, BerryTreeScript, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 36, 24, 3, 12, 0, 0, 0, 39, BerryTreeScript, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 9, 92, 5, 12, 0, 0, 0, 40, BerryTreeScript, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 10, 92, 5, 12, 0, 0, 0, 41, BerryTreeScript, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 11, 92, 5, 12, 0, 0, 0, 42, BerryTreeScript, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_MAN_6, 0, 0, 5, 22, 3, 14, 0, 0, 1, 3, Route120_EventScript_1F57D7, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_MAN_6, 0, 0, 32, 14, 3, 10, 0, 0, 1, 3, Route120_EventScript_1F57EE, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_CAMPER, 0, 0, 27, 51, 3, 9, 0, 0, 1, 7, Route120_EventScript_1F5850, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_PICNICKER, 0, 0, 36, 45, 3, 9, 0, 0, 1, 2, Route120_EventScript_1F5867, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_MANIAC, 0, 0, 19, 80, 5, 15, 0, 0, 1, 3, Route120_EventScript_1F587E, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 20, 55, 3, 1, 0, 0, 0, 0, Route120_EventScript_290F48, 1030, 0, 0
-	object_event 17, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 37, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CE76, 798, 0, 0
-	object_event 18, MAP_OBJ_GFX_REPORTER_F, 0, 0, 36, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CE56, 798, 0, 0
-	object_event 19, MAP_OBJ_GFX_REPORTER_F, 0, 0, 36, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CF16, 902, 0, 0
-	object_event 20, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 37, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CF36, 902, 0, 0
-	object_event 21, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 35, 32, 3, 1, 0, 0, 0, 0, Route120_EventScript_2906BB, 17, 0, 0
-	object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 89, 3, 1, 0, 0, 0, 0, Route120_EventScript_290F55, 1031, 0, 0
-	object_event 23, MAP_OBJ_GFX_BEAUTY, 0, 0, 14, 92, 5, 5, 1, 0, 0, 0, Route120_EventScript_1F5527, 0, 0, 0
-	object_event 24, MAP_OBJ_GFX_WOMAN_7, 0, 0, 31, 37, 3, 15, 0, 0, 1, 4, Route120_EventScript_1F58E0, 0, 0, 0
-	object_event 25, MAP_OBJ_GFX_HIKER, 0, 0, 9, 60, 3, 21, 0, 0, 1, 4, Route120_EventScript_1F58F7, 0, 0, 0
-	object_event 26, MAP_OBJ_GFX_WOMAN_7, 0, 0, 16, 6, 3, 23, 0, 0, 1, 4, Route120_EventScript_1F590E, 0, 0, 0
-	object_event 27, MAP_OBJ_GFX_WOMAN_7, 0, 0, 18, 34, 3, 9, 0, 0, 1, 3, Route120_EventScript_1F5925, 0, 0, 0
-	object_event 28, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 22, 13, 3, 1, 17, 0, 0, 0, Route120_EventScript_290F6F, 1108, 0, 0
-	object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 23, 82, 5, 1, 17, 0, 0, 0, Route120_EventScript_290F62, 1107, 0, 0
-	object_event 30, MAP_OBJ_GFX_KECLEON_1, 0, 0, 12, 16, 4, 76, 17, 0, 0, 0, Route120_EventScript_1F57BC, 970, 0, 0
-	object_event 31, MAP_OBJ_GFX_STEVEN, 0, 0, 13, 15, 4, 8, 17, 0, 0, 0, Route120_EventScript_1F5641, 972, 0, 0
-	object_event 32, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 20, 1, 3, 1, 17, 0, 0, 0, Route120_EventScript_2906BB, 20, 0, 0
-	object_event 33, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 15, 1, 3, 1, 17, 0, 0, 0, Route120_EventScript_2906BB, 18, 0, 0
-	object_event 34, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 10, 72, 3, 58, 17, 0, 1, 3, Route120_EventScript_1F593C, 0, 0, 0
-	object_event 35, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 19, 28, 3, 57, 17, 0, 1, 3, Route120_EventScript_1F5953, 0, 0, 0
-	object_event 36, MAP_OBJ_GFX_KECLEON_2, 0, 0, 12, 16, 3, 8, 17, 0, 0, 0, 0x0, 981, 0, 0
-	object_event 37, MAP_OBJ_GFX_KECLEON_1, 0, 0, 20, 11, 3, 76, 17, 0, 0, 0, Route120_EventScript_2722DB, 982, 0, 0
-	object_event 38, MAP_OBJ_GFX_KECLEON_1, 0, 0, 27, 2, 3, 76, 17, 0, 0, 0, Route120_EventScript_2722E8, 985, 0, 0
-	object_event 39, MAP_OBJ_GFX_KECLEON_1, 0, 0, 4, 77, 3, 76, 17, 0, 0, 0, Route120_EventScript_2722F5, 986, 0, 0
-	object_event 40, MAP_OBJ_GFX_KECLEON_1, 0, 0, 7, 51, 3, 76, 17, 0, 0, 0, Route120_EventScript_27230F, 988, 0, 0
-	object_event 41, MAP_OBJ_GFX_KECLEON_1, 0, 0, 19, 48, 3, 76, 17, 0, 0, 0, Route120_EventScript_272302, 987, 0, 0
-	object_event 42, MAP_OBJ_GFX_GIRL_3, 0, 0, 19, 32, 3, 7, 17, 0, 1, 3, Route120_EventScript_1F5981, 0, 0, 0
-	object_event 43, MAP_OBJ_GFX_MAN_4, 0, 0, 14, 34, 3, 10, 17, 0, 1, 3, Route120_EventScript_1F596A, 0, 0, 0
-	object_event 44, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 24, 33, 3, 1, 17, 0, 0, 0, Route120_EventScript_290F7C, 1148, 0, 0
+Route120_EventObjects: @ 852B3F8
+	object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 4, 79, 3, 12, 0, 0, 0, 46, BerryTreeScript, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 5, 79, 3, 12, 0, 0, 0, 45, BerryTreeScript, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 6, 79, 3, 12, 0, 0, 0, 44, BerryTreeScript, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 7, 79, 3, 12, 0, 0, 0, 43, BerryTreeScript, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 34, 24, 3, 12, 0, 0, 0, 37, BerryTreeScript, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 35, 24, 3, 12, 0, 0, 0, 38, BerryTreeScript, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 36, 24, 3, 12, 0, 0, 0, 39, BerryTreeScript, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 9, 92, 5, 12, 0, 0, 0, 40, BerryTreeScript, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 10, 92, 5, 12, 0, 0, 0, 41, BerryTreeScript, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 11, 92, 5, 12, 0, 0, 0, 42, BerryTreeScript, 0, 0, 0
+	object_event 11, EVENT_OBJ_GFX_MAN_6, 0, 0, 5, 22, 3, 14, 0, 0, 1, 3, Route120_EventScript_1F57D7, 0, 0, 0
+	object_event 12, EVENT_OBJ_GFX_MAN_6, 0, 0, 32, 14, 3, 10, 0, 0, 1, 3, Route120_EventScript_1F57EE, 0, 0, 0
+	object_event 13, EVENT_OBJ_GFX_CAMPER, 0, 0, 27, 51, 3, 9, 0, 0, 1, 7, Route120_EventScript_1F5850, 0, 0, 0
+	object_event 14, EVENT_OBJ_GFX_PICNICKER, 0, 0, 36, 45, 3, 9, 0, 0, 1, 2, Route120_EventScript_1F5867, 0, 0, 0
+	object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 0, 19, 80, 5, 15, 0, 0, 1, 3, Route120_EventScript_1F587E, 0, 0, 0
+	object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 20, 55, 3, 1, 0, 0, 0, 0, Route120_EventScript_290F48, 1030, 0, 0
+	object_event 17, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 37, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CE76, 798, 0, 0
+	object_event 18, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 36, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CE56, 798, 0, 0
+	object_event 19, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 36, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CF16, 902, 0, 0
+	object_event 20, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 37, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CF36, 902, 0, 0
+	object_event 21, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 35, 32, 3, 1, 0, 0, 0, 0, Route120_EventScript_2906BB, 17, 0, 0
+	object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 89, 3, 1, 0, 0, 0, 0, Route120_EventScript_290F55, 1031, 0, 0
+	object_event 23, EVENT_OBJ_GFX_BEAUTY, 0, 0, 14, 92, 5, 5, 1, 0, 0, 0, Route120_EventScript_1F5527, 0, 0, 0
+	object_event 24, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 31, 37, 3, 15, 0, 0, 1, 4, Route120_EventScript_1F58E0, 0, 0, 0
+	object_event 25, EVENT_OBJ_GFX_HIKER, 0, 0, 9, 60, 3, 21, 0, 0, 1, 4, Route120_EventScript_1F58F7, 0, 0, 0
+	object_event 26, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 16, 6, 3, 23, 0, 0, 1, 4, Route120_EventScript_1F590E, 0, 0, 0
+	object_event 27, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 18, 34, 3, 9, 0, 0, 1, 3, Route120_EventScript_1F5925, 0, 0, 0
+	object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 22, 13, 3, 1, 17, 0, 0, 0, Route120_EventScript_290F6F, 1108, 0, 0
+	object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 23, 82, 5, 1, 17, 0, 0, 0, Route120_EventScript_290F62, 1107, 0, 0
+	object_event 30, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 12, 16, 4, 76, 17, 0, 0, 0, Route120_EventScript_1F57BC, 970, 0, 0
+	object_event 31, EVENT_OBJ_GFX_STEVEN, 0, 0, 13, 15, 4, 8, 17, 0, 0, 0, Route120_EventScript_1F5641, 972, 0, 0
+	object_event 32, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 20, 1, 3, 1, 17, 0, 0, 0, Route120_EventScript_2906BB, 20, 0, 0
+	object_event 33, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 15, 1, 3, 1, 17, 0, 0, 0, Route120_EventScript_2906BB, 18, 0, 0
+	object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 10, 72, 3, 58, 17, 0, 1, 3, Route120_EventScript_1F593C, 0, 0, 0
+	object_event 35, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 19, 28, 3, 57, 17, 0, 1, 3, Route120_EventScript_1F5953, 0, 0, 0
+	object_event 36, EVENT_OBJ_GFX_KECLEON_2, 0, 0, 12, 16, 3, 8, 17, 0, 0, 0, 0x0, 981, 0, 0
+	object_event 37, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 20, 11, 3, 76, 17, 0, 0, 0, Route120_EventScript_2722DB, 982, 0, 0
+	object_event 38, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 27, 2, 3, 76, 17, 0, 0, 0, Route120_EventScript_2722E8, 985, 0, 0
+	object_event 39, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 4, 77, 3, 76, 17, 0, 0, 0, Route120_EventScript_2722F5, 986, 0, 0
+	object_event 40, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 7, 51, 3, 76, 17, 0, 0, 0, Route120_EventScript_27230F, 988, 0, 0
+	object_event 41, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 19, 48, 3, 76, 17, 0, 0, 0, Route120_EventScript_272302, 987, 0, 0
+	object_event 42, EVENT_OBJ_GFX_GIRL_3, 0, 0, 19, 32, 3, 7, 17, 0, 1, 3, Route120_EventScript_1F5981, 0, 0, 0
+	object_event 43, EVENT_OBJ_GFX_MAN_4, 0, 0, 14, 34, 3, 10, 17, 0, 1, 3, Route120_EventScript_1F596A, 0, 0, 0
+	object_event 44, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 24, 33, 3, 1, 17, 0, 0, 0, Route120_EventScript_290F7C, 1148, 0, 0
 
 Route120_MapWarps: @ 852B818
 	warp_def 7, 55, 0, 0, ANCIENT_TOMB
@@ -86,5 +86,5 @@ Route120_MapBGEvents: @ 852B958
 	bg_event 5, 76, 0, 8, 0, ITEM_HARD_STONE, 0, 0
 
 Route120_MapEvents:: @ 852BA00
-	map_events Route120_MapObjects, Route120_MapWarps, Route120_MapCoordEvents, Route120_MapBGEvents
+	map_events Route120_EventObjects, Route120_MapWarps, Route120_MapCoordEvents, Route120_MapBGEvents
 
diff --git a/data/maps/events/Route121.inc b/data/maps/events/Route121.inc
index b58fe4858..ec6ced043 100644
--- a/data/maps/events/Route121.inc
+++ b/data/maps/events/Route121.inc
@@ -1,33 +1,33 @@
-Route121_MapObjects: @ 852BA14
-	object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 0, 29, 14, 3, 10, 17, 0, 0, 0, Route121_EventScript_1F5DFD, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 14, 2, 3, 12, 0, 0, 0, 47, BerryTreeScript, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 15, 2, 3, 12, 0, 0, 0, 48, BerryTreeScript, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 16, 2, 3, 12, 0, 0, 0, 49, BerryTreeScript, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 17, 2, 3, 12, 0, 0, 0, 50, BerryTreeScript, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 64, 14, 3, 12, 0, 0, 0, 51, BerryTreeScript, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 65, 14, 3, 12, 0, 0, 0, 52, BerryTreeScript, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 66, 14, 3, 12, 0, 0, 0, 53, BerryTreeScript, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 67, 14, 3, 12, 0, 0, 0, 54, BerryTreeScript, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_LASS, 0, 0, 39, 9, 3, 8, 0, 0, 1, 1, Route121_EventScript_1F5F04, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_LASS, 0, 0, 40, 9, 3, 8, 0, 0, 1, 1, Route121_EventScript_1F5F1F, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 30, 8, 3, 7, 0, 0, 0, 0, 0x0, 914, 0, 0
-	object_event 13, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 30, 7, 3, 10, 0, 0, 0, 0, 0x0, 914, 0, 0
-	object_event 14, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 31, 7, 3, 9, 0, 0, 0, 0, 0x0, 914, 0, 0
-	object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 32, 5, 3, 1, 0, 0, 0, 0, Route121_EventScript_2906BB, 17, 0, 0
-	object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 65, 4, 3, 1, 0, 0, 0, 0, Route121_EventScript_2906BB, 18, 0, 0
-	object_event 17, MAP_OBJ_GFX_WOMAN_2, 0, 0, 63, 5, 3, 9, 0, 0, 1, 4, Route121_EventScript_1F5E74, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 55, 8, 3, 9, 0, 0, 1, 3, Route121_EventScript_1F5E8B, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 11, 11, 3, 7, 0, 0, 1, 4, Route121_EventScript_1F5EED, 0, 0, 0
-	object_event 20, MAP_OBJ_GFX_BEAUTY, 0, 0, 22, 5, 3, 17, 0, 0, 1, 4, Route121_EventScript_1F5F3A, 0, 0, 0
-	object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 55, 10, 3, 1, 17, 0, 0, 0, Route121_EventScript_290F89, 1103, 0, 0
-	object_event 22, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 26, 12, 3, 1, 17, 0, 0, 0, Route121_EventScript_2906BB, 19, 0, 0
-	object_event 23, MAP_OBJ_GFX_MANIAC, 0, 0, 11, 6, 3, 26, 65, 0, 1, 3, Route121_EventScript_1F5F9C, 0, 0, 0
-	object_event 24, MAP_OBJ_GFX_MAN_5, 0, 0, 59, 8, 3, 8, 17, 0, 1, 4, Route121_EventScript_1F5FB3, 0, 0, 0
-	object_event 25, MAP_OBJ_GFX_WOMAN_3, 0, 0, 59, 13, 3, 7, 17, 0, 1, 4, Route121_EventScript_1F5FCA, 0, 0, 0
-	object_event 26, MAP_OBJ_GFX_MAN_4, 0, 0, 65, 9, 3, 18, 17, 0, 1, 6, Route121_EventScript_1F5FE1, 0, 0, 0
-	object_event 27, MAP_OBJ_GFX_WOMAN_7, 0, 0, 72, 9, 3, 17, 17, 0, 1, 6, Route121_EventScript_1F5FF8, 0, 0, 0
-	object_event 28, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 60, 10, 3, 1, 17, 0, 0, 0, Route121_EventScript_290F96, 1149, 0, 0
-	object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 38, 13, 3, 1, 17, 0, 0, 0, Route121_EventScript_290FA3, 1150, 0, 0
+Route121_EventObjects: @ 852BA14
+	object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 29, 14, 3, 10, 17, 0, 0, 0, Route121_EventScript_1F5DFD, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 14, 2, 3, 12, 0, 0, 0, 47, BerryTreeScript, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 15, 2, 3, 12, 0, 0, 0, 48, BerryTreeScript, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 16, 2, 3, 12, 0, 0, 0, 49, BerryTreeScript, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 17, 2, 3, 12, 0, 0, 0, 50, BerryTreeScript, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 64, 14, 3, 12, 0, 0, 0, 51, BerryTreeScript, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 65, 14, 3, 12, 0, 0, 0, 52, BerryTreeScript, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 66, 14, 3, 12, 0, 0, 0, 53, BerryTreeScript, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 67, 14, 3, 12, 0, 0, 0, 54, BerryTreeScript, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_LASS, 0, 0, 39, 9, 3, 8, 0, 0, 1, 1, Route121_EventScript_1F5F04, 0, 0, 0
+	object_event 11, EVENT_OBJ_GFX_LASS, 0, 0, 40, 9, 3, 8, 0, 0, 1, 1, Route121_EventScript_1F5F1F, 0, 0, 0
+	object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 30, 8, 3, 7, 0, 0, 0, 0, 0x0, 914, 0, 0
+	object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 30, 7, 3, 10, 0, 0, 0, 0, 0x0, 914, 0, 0
+	object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 31, 7, 3, 9, 0, 0, 0, 0, 0x0, 914, 0, 0
+	object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 32, 5, 3, 1, 0, 0, 0, 0, Route121_EventScript_2906BB, 17, 0, 0
+	object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 65, 4, 3, 1, 0, 0, 0, 0, Route121_EventScript_2906BB, 18, 0, 0
+	object_event 17, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 63, 5, 3, 9, 0, 0, 1, 4, Route121_EventScript_1F5E74, 0, 0, 0
+	object_event 18, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 55, 8, 3, 9, 0, 0, 1, 3, Route121_EventScript_1F5E8B, 0, 0, 0
+	object_event 19, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 11, 11, 3, 7, 0, 0, 1, 4, Route121_EventScript_1F5EED, 0, 0, 0
+	object_event 20, EVENT_OBJ_GFX_BEAUTY, 0, 0, 22, 5, 3, 17, 0, 0, 1, 4, Route121_EventScript_1F5F3A, 0, 0, 0
+	object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 55, 10, 3, 1, 17, 0, 0, 0, Route121_EventScript_290F89, 1103, 0, 0
+	object_event 22, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 26, 12, 3, 1, 17, 0, 0, 0, Route121_EventScript_2906BB, 19, 0, 0
+	object_event 23, EVENT_OBJ_GFX_MANIAC, 0, 0, 11, 6, 3, 26, 65, 0, 1, 3, Route121_EventScript_1F5F9C, 0, 0, 0
+	object_event 24, EVENT_OBJ_GFX_MAN_5, 0, 0, 59, 8, 3, 8, 17, 0, 1, 4, Route121_EventScript_1F5FB3, 0, 0, 0
+	object_event 25, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 59, 13, 3, 7, 17, 0, 1, 4, Route121_EventScript_1F5FCA, 0, 0, 0
+	object_event 26, EVENT_OBJ_GFX_MAN_4, 0, 0, 65, 9, 3, 18, 17, 0, 1, 6, Route121_EventScript_1F5FE1, 0, 0, 0
+	object_event 27, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 72, 9, 3, 17, 17, 0, 1, 6, Route121_EventScript_1F5FF8, 0, 0, 0
+	object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 60, 10, 3, 1, 17, 0, 0, 0, Route121_EventScript_290F96, 1149, 0, 0
+	object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 38, 13, 3, 1, 17, 0, 0, 0, Route121_EventScript_290FA3, 1150, 0, 0
 
 Route121_MapWarps: @ 852BCCC
 	warp_def 37, 5, 0, 2, ROUTE_121_SAFARI_ZONE_ENTRANCE
@@ -51,5 +51,5 @@ Route121_MapBGEvents: @ 852BD14
 	bg_event 68, 8, 3, 7, 0, ITEM_MAX_REVIVE, 100, 0
 
 Route121_MapEvents:: @ 852BD8C
-	map_events Route121_MapObjects, Route121_MapWarps, Route121_MapCoordEvents, Route121_MapBGEvents
+	map_events Route121_EventObjects, Route121_MapWarps, Route121_MapCoordEvents, Route121_MapBGEvents
 
diff --git a/data/maps/events/Route121_SafariZoneEntrance.inc b/data/maps/events/Route121_SafariZoneEntrance.inc
index 258571e17..39bb6123c 100644
--- a/data/maps/events/Route121_SafariZoneEntrance.inc
+++ b/data/maps/events/Route121_SafariZoneEntrance.inc
@@ -1,7 +1,7 @@
-Route121_SafariZoneEntrance_MapObjects: @ 8533EDC
-	object_event 1, MAP_OBJ_GFX_PICNICKER, 0, 0, 17, 9, 3, 9, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBE6, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_CAMPER, 0, 0, 10, 2, 3, 8, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBEF, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_CAMPER, 0, 0, 8, 2, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0
+Route121_SafariZoneEntrance_EventObjects: @ 8533EDC
+	object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 0, 17, 9, 3, 9, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBE6, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 0, 10, 2, 3, 8, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBEF, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 0, 8, 2, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0
 
 Route121_SafariZoneEntrance_MapWarps: @ 8533F24
 	warp_def 2, 5, 0, 0, SAFARI_ZONE_SOUTH
@@ -16,5 +16,5 @@ Route121_SafariZoneEntrance_MapBGEvents: @ 8533F54
 	bg_event 15, 1, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BD21
 
 Route121_SafariZoneEntrance_MapEvents:: @ 8533F60
-	map_events Route121_SafariZoneEntrance_MapObjects, Route121_SafariZoneEntrance_MapWarps, Route121_SafariZoneEntrance_MapCoordEvents, Route121_SafariZoneEntrance_MapBGEvents
+	map_events Route121_SafariZoneEntrance_EventObjects, Route121_SafariZoneEntrance_MapWarps, Route121_SafariZoneEntrance_MapCoordEvents, Route121_SafariZoneEntrance_MapBGEvents
 
diff --git a/data/maps/events/Route123.inc b/data/maps/events/Route123.inc
index cb60786c0..0521a0592 100644
--- a/data/maps/events/Route123.inc
+++ b/data/maps/events/Route123.inc
@@ -1,47 +1,47 @@
-Route123_MapObjects: @ 852BDBC
-	object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 11, 3, 3, 12, 0, 0, 0, 58, BerryTreeScript, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 12, 3, 3, 12, 0, 0, 0, 59, BerryTreeScript, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 14, 3, 3, 12, 0, 0, 0, 60, BerryTreeScript, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 15, 3, 3, 12, 0, 0, 0, 61, BerryTreeScript, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 81, 1, 3, 12, 0, 0, 0, 62, BerryTreeScript, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 82, 1, 3, 12, 0, 0, 0, 63, BerryTreeScript, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 83, 1, 3, 12, 0, 0, 0, 64, BerryTreeScript, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_WOMAN_7, 0, 0, 70, 12, 3, 24, 0, 0, 1, 1, Route123_EventScript_1F61C5, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_MAN_4, 0, 0, 58, 7, 3, 17, 0, 0, 1, 2, Route123_EventScript_1F61DC, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 14, 5, 3, 12, 0, 0, 0, 65, BerryTreeScript, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 15, 5, 3, 12, 0, 0, 0, 72, BerryTreeScript, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 17, 5, 3, 12, 0, 0, 0, 73, BerryTreeScript, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 18, 5, 3, 12, 0, 0, 0, 74, BerryTreeScript, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 17, 3, 3, 12, 0, 0, 0, 79, BerryTreeScript, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 18, 3, 3, 12, 0, 0, 0, 14, BerryTreeScript, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 11, 5, 3, 12, 0, 0, 0, 15, BerryTreeScript, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 12, 5, 3, 12, 0, 0, 0, 30, BerryTreeScript, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 101, 13, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 17, 0, 0
-	object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 129, 14, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 18, 0, 0
-	object_event 20, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 92, 9, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 19, 0, 0
-	object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 31, 8, 3, 1, 0, 0, 0, 0, Route123_EventScript_290FB0, 1032, 0, 0
-	object_event 22, MAP_OBJ_GFX_GIRL_3, 0, 0, 108, 13, 3, 15, 0, 0, 0, 0, Route123_EventScript_1F6151, 0, 0, 0
-	object_event 23, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 109, 13, 3, 12, 0, 0, 0, 87, BerryTreeScript, 0, 0, 0
-	object_event 24, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 110, 13, 3, 12, 0, 0, 0, 88, BerryTreeScript, 0, 0, 0
-	object_event 25, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 111, 13, 3, 12, 0, 0, 0, 89, BerryTreeScript, 0, 0, 0
-	object_event 26, MAP_OBJ_GFX_WOMAN_3, 0, 0, 18, 9, 3, 23, 0, 0, 1, 2, Route123_EventScript_1F61F3, 0, 0, 0
-	object_event 27, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 38, 13, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F62E9, 0, 0, 0
-	object_event 28, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 37, 13, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F62CE, 0, 0, 0
-	object_event 29, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 138, 12, 3, 9, 0, 0, 1, 7, Route123_EventScript_1F620A, 0, 0, 0
-	object_event 30, MAP_OBJ_GFX_LASS, 0, 0, 49, 16, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F626C, 0, 0, 0
-	object_event 31, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 87, 12, 3, 8, 0, 0, 1, 4, Route123_EventScript_1F6304, 0, 0, 0
-	object_event 32, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 27, 18, 3, 1, 17, 0, 0, 0, Route123_EventScript_290FBD, 1104, 0, 0
-	object_event 33, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 75, 9, 3, 1, 17, 0, 0, 0, Route123_EventScript_290FCA, 1109, 0, 0
-	object_event 34, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 138, 14, 3, 57, 17, 0, 1, 1, Route123_EventScript_1F6377, 0, 0, 0
-	object_event 35, MAP_OBJ_GFX_WOMAN_3, 0, 0, 138, 16, 3, 7, 17, 0, 1, 1, Route123_EventScript_1F6360, 0, 0, 0
-	object_event 36, MAP_OBJ_GFX_MANIAC, 0, 0, 87, 17, 3, 7, 17, 0, 1, 4, Route123_EventScript_1F6349, 0, 0, 0
-	object_event 37, MAP_OBJ_GFX_MAN_6, 0, 0, 66, 16, 3, 8, 17, 0, 1, 2, Route123_EventScript_1F63BC, 0, 0, 0
-	object_event 38, MAP_OBJ_GFX_MAN_6, 0, 0, 66, 19, 3, 7, 17, 0, 1, 2, Route123_EventScript_1F6332, 0, 0, 0
-	object_event 39, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 49, 19, 3, 7, 17, 0, 1, 2, Route123_EventScript_1F631B, 0, 0, 0
-	object_event 40, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 43, 15, 3, 1, 17, 0, 0, 0, Route123_EventScript_290FD7, 1152, 0, 0
-	object_event 41, MAP_OBJ_GFX_WOMAN_7, 0, 0, 14, 16, 3, 7, 17, 0, 1, 3, Route123_EventScript_1F638E, 0, 0, 0
-	object_event 42, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 14, 12, 3, 26, 49, 0, 1, 3, Route123_EventScript_1F63A5, 0, 0, 0
-	object_event 43, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 57, 16, 3, 1, 17, 0, 0, 0, Route123_EventScript_290FE4, 1153, 0, 0
+Route123_EventObjects: @ 852BDBC
+	object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 11, 3, 3, 12, 0, 0, 0, 58, BerryTreeScript, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 12, 3, 3, 12, 0, 0, 0, 59, BerryTreeScript, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 14, 3, 3, 12, 0, 0, 0, 60, BerryTreeScript, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 15, 3, 3, 12, 0, 0, 0, 61, BerryTreeScript, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 81, 1, 3, 12, 0, 0, 0, 62, BerryTreeScript, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 82, 1, 3, 12, 0, 0, 0, 63, BerryTreeScript, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 83, 1, 3, 12, 0, 0, 0, 64, BerryTreeScript, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 70, 12, 3, 24, 0, 0, 1, 1, Route123_EventScript_1F61C5, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 0, 58, 7, 3, 17, 0, 0, 1, 2, Route123_EventScript_1F61DC, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 14, 5, 3, 12, 0, 0, 0, 65, BerryTreeScript, 0, 0, 0
+	object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 15, 5, 3, 12, 0, 0, 0, 72, BerryTreeScript, 0, 0, 0
+	object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 17, 5, 3, 12, 0, 0, 0, 73, BerryTreeScript, 0, 0, 0
+	object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 18, 5, 3, 12, 0, 0, 0, 74, BerryTreeScript, 0, 0, 0
+	object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 17, 3, 3, 12, 0, 0, 0, 79, BerryTreeScript, 0, 0, 0
+	object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 18, 3, 3, 12, 0, 0, 0, 14, BerryTreeScript, 0, 0, 0
+	object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 11, 5, 3, 12, 0, 0, 0, 15, BerryTreeScript, 0, 0, 0
+	object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 12, 5, 3, 12, 0, 0, 0, 30, BerryTreeScript, 0, 0, 0
+	object_event 18, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 101, 13, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 17, 0, 0
+	object_event 19, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 129, 14, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 18, 0, 0
+	object_event 20, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 92, 9, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 19, 0, 0
+	object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 31, 8, 3, 1, 0, 0, 0, 0, Route123_EventScript_290FB0, 1032, 0, 0
+	object_event 22, EVENT_OBJ_GFX_GIRL_3, 0, 0, 108, 13, 3, 15, 0, 0, 0, 0, Route123_EventScript_1F6151, 0, 0, 0
+	object_event 23, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 109, 13, 3, 12, 0, 0, 0, 87, BerryTreeScript, 0, 0, 0
+	object_event 24, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 110, 13, 3, 12, 0, 0, 0, 88, BerryTreeScript, 0, 0, 0
+	object_event 25, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 111, 13, 3, 12, 0, 0, 0, 89, BerryTreeScript, 0, 0, 0
+	object_event 26, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 18, 9, 3, 23, 0, 0, 1, 2, Route123_EventScript_1F61F3, 0, 0, 0
+	object_event 27, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 38, 13, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F62E9, 0, 0, 0
+	object_event 28, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 37, 13, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F62CE, 0, 0, 0
+	object_event 29, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 138, 12, 3, 9, 0, 0, 1, 7, Route123_EventScript_1F620A, 0, 0, 0
+	object_event 30, EVENT_OBJ_GFX_LASS, 0, 0, 49, 16, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F626C, 0, 0, 0
+	object_event 31, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 87, 12, 3, 8, 0, 0, 1, 4, Route123_EventScript_1F6304, 0, 0, 0
+	object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 27, 18, 3, 1, 17, 0, 0, 0, Route123_EventScript_290FBD, 1104, 0, 0
+	object_event 33, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 75, 9, 3, 1, 17, 0, 0, 0, Route123_EventScript_290FCA, 1109, 0, 0
+	object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 138, 14, 3, 57, 17, 0, 1, 1, Route123_EventScript_1F6377, 0, 0, 0
+	object_event 35, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 138, 16, 3, 7, 17, 0, 1, 1, Route123_EventScript_1F6360, 0, 0, 0
+	object_event 36, EVENT_OBJ_GFX_MANIAC, 0, 0, 87, 17, 3, 7, 17, 0, 1, 4, Route123_EventScript_1F6349, 0, 0, 0
+	object_event 37, EVENT_OBJ_GFX_MAN_6, 0, 0, 66, 16, 3, 8, 17, 0, 1, 2, Route123_EventScript_1F63BC, 0, 0, 0
+	object_event 38, EVENT_OBJ_GFX_MAN_6, 0, 0, 66, 19, 3, 7, 17, 0, 1, 2, Route123_EventScript_1F6332, 0, 0, 0
+	object_event 39, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 49, 19, 3, 7, 17, 0, 1, 2, Route123_EventScript_1F631B, 0, 0, 0
+	object_event 40, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 43, 15, 3, 1, 17, 0, 0, 0, Route123_EventScript_290FD7, 1152, 0, 0
+	object_event 41, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 14, 16, 3, 7, 17, 0, 1, 3, Route123_EventScript_1F638E, 0, 0, 0
+	object_event 42, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 14, 12, 3, 26, 49, 0, 1, 3, Route123_EventScript_1F63A5, 0, 0, 0
+	object_event 43, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 57, 16, 3, 1, 17, 0, 0, 0, Route123_EventScript_290FE4, 1153, 0, 0
 
 Route123_MapWarps: @ 852C1C4
 	warp_def 22, 6, 0, 0, ROUTE_123_BERRY_MASTERS_HOUSE
@@ -84,5 +84,5 @@ Route123_MapBGEvents: @ 852C32C
 	bg_event 138, 18, 3, 7, 0, ITEM_RARE_CANDY, 110, 0
 
 Route123_MapEvents:: @ 852C3B0
-	map_events Route123_MapObjects, Route123_MapWarps, Route123_MapCoordEvents, Route123_MapBGEvents
+	map_events Route123_EventObjects, Route123_MapWarps, Route123_MapCoordEvents, Route123_MapBGEvents
 
diff --git a/data/maps/events/Route123_BerryMastersHouse.inc b/data/maps/events/Route123_BerryMastersHouse.inc
index cbe15cac1..719dc55c7 100644
--- a/data/maps/events/Route123_BerryMastersHouse.inc
+++ b/data/maps/events/Route123_BerryMastersHouse.inc
@@ -1,11 +1,11 @@
-Route123_BerryMastersHouse_MapObjects: @ 853EACC
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F845, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 0, 7, 4, 3, 8, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F8C0, 0, 0, 0
+Route123_BerryMastersHouse_EventObjects: @ 853EACC
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F845, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 7, 4, 3, 8, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F8C0, 0, 0, 0
 
 Route123_BerryMastersHouse_MapWarps: @ 853EAFC
 	warp_def 3, 7, 0, 0, ROUTE_123
 	warp_def 4, 7, 0, 0, ROUTE_123
 
 Route123_BerryMastersHouse_MapEvents:: @ 853EB0C
-	map_events Route123_BerryMastersHouse_MapObjects, Route123_BerryMastersHouse_MapWarps, 0x0, 0x0
+	map_events Route123_BerryMastersHouse_EventObjects, Route123_BerryMastersHouse_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/Route124.inc b/data/maps/events/Route124.inc
index 6f40347e9..8cd919a63 100644
--- a/data/maps/events/Route124.inc
+++ b/data/maps/events/Route124.inc
@@ -1,16 +1,16 @@
-Route124_MapObjects: @ 852C3C4
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 34, 25, 1, 1, 5, 0, 1, 3, Route124_EventScript_1F6585, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 61, 74, 1, 67, 53, 0, 1, 7, Route124_EventScript_1F659C, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 49, 45, 1, 24, 0, 0, 1, 3, Route124_EventScript_1F65B3, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 7, 23, 1, 18, 134, 0, 1, 5, Route124_EventScript_1F6615, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 58, 58, 1, 28, 7, 0, 1, 2, Route124_EventScript_1F662C, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 28, 12, 3, 1, 17, 0, 0, 0, Route124_EventScript_290FF1, 1092, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 31, 53, 3, 1, 17, 0, 0, 0, Route124_EventScript_290FFE, 1093, 0, 0
-	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 58, 11, 3, 1, 17, 0, 0, 0, Route124_EventScript_29100B, 1066, 0, 0
-	object_event 9, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 18, 44, 1, 8, 17, 0, 1, 1, Route124_EventScript_1F6643, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_TUBER_M_SWIMMING, 0, 0, 17, 44, 1, 8, 17, 0, 1, 1, Route124_EventScript_1F66A7, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 7, 29, 1, 7, 17, 0, 1, 5, Route124_EventScript_1F670B, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 69, 74, 1, 66, 17, 0, 1, 7, Route124_EventScript_1F6722, 0, 0, 0
+Route124_EventObjects: @ 852C3C4
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 34, 25, 1, 1, 5, 0, 1, 3, Route124_EventScript_1F6585, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 61, 74, 1, 67, 53, 0, 1, 7, Route124_EventScript_1F659C, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 49, 45, 1, 24, 0, 0, 1, 3, Route124_EventScript_1F65B3, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 7, 23, 1, 18, 134, 0, 1, 5, Route124_EventScript_1F6615, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 58, 58, 1, 28, 7, 0, 1, 2, Route124_EventScript_1F662C, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 28, 12, 3, 1, 17, 0, 0, 0, Route124_EventScript_290FF1, 1092, 0, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 31, 53, 3, 1, 17, 0, 0, 0, Route124_EventScript_290FFE, 1093, 0, 0
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 58, 11, 3, 1, 17, 0, 0, 0, Route124_EventScript_29100B, 1066, 0, 0
+	object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 18, 44, 1, 8, 17, 0, 1, 1, Route124_EventScript_1F6643, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 0, 17, 44, 1, 8, 17, 0, 1, 1, Route124_EventScript_1F66A7, 0, 0, 0
+	object_event 11, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 7, 29, 1, 7, 17, 0, 1, 5, Route124_EventScript_1F670B, 0, 0, 0
+	object_event 12, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 69, 74, 1, 66, 17, 0, 1, 7, Route124_EventScript_1F6722, 0, 0, 0
 
 Route124_MapWarps: @ 852C4E4
 	warp_def 70, 48, 3, 0, ROUTE_124_DIVING_TREASURE_HUNTERS_HOUSE
@@ -19,5 +19,5 @@ Route124_MapBGEvents: @ 852C4EC
 	bg_event 73, 48, 3, 0, 0, Route124_EventScript_1F657C
 
 Route124_MapEvents:: @ 852C4F8
-	map_events Route124_MapObjects, Route124_MapWarps, 0x0, Route124_MapBGEvents
+	map_events Route124_EventObjects, Route124_MapWarps, 0x0, Route124_MapBGEvents
 
diff --git a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc b/data/maps/events/Route124_DivingTreasureHuntersHouse.inc
index 43c364e8d..1916f36b7 100644
--- a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc
+++ b/data/maps/events/Route124_DivingTreasureHuntersHouse.inc
@@ -1,5 +1,5 @@
-Route124_DivingTreasureHuntersHouse_MapObjects: @ 853ED9C
-	object_event 1, MAP_OBJ_GFX_MAN_6, 0, 0, 5, 4, 0, 9, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270A32, 0, 0, 0
+Route124_DivingTreasureHuntersHouse_EventObjects: @ 853ED9C
+	object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 0, 5, 4, 0, 9, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270A32, 0, 0, 0
 
 Route124_DivingTreasureHuntersHouse_MapWarps: @ 853EDB4
 	warp_def 3, 8, 0, 0, ROUTE_124
@@ -9,4 +9,4 @@ Route124_DivingTreasureHuntersHouse_MapBGEvents: @ 853EDC4
 	bg_event 7, 1, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270F63
 
 Route124_DivingTreasureHuntersHouse_MapEvents:: @ 853EDD0
-	map_events Route124_DivingTreasureHuntersHouse_MapObjects, Route124_DivingTreasureHuntersHouse_MapWarps, 0x0, Route124_DivingTreasureHuntersHouse_MapBGEvents
+	map_events Route124_DivingTreasureHuntersHouse_EventObjects, Route124_DivingTreasureHuntersHouse_MapWarps, 0x0, Route124_DivingTreasureHuntersHouse_MapBGEvents
diff --git a/data/maps/events/Route125.inc b/data/maps/events/Route125.inc
index 1211044f2..30fa1f18f 100644
--- a/data/maps/events/Route125.inc
+++ b/data/maps/events/Route125.inc
@@ -1,14 +1,14 @@
-Route125_MapObjects: @ 852C50C
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 7, 31, 1, 28, 0, 0, 1, 2, Route125_EventScript_1F67A4, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 45, 9, 1, 10, 82, 0, 1, 2, Route125_EventScript_1F67BB, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 38, 24, 1, 28, 6, 0, 1, 3, Route125_EventScript_1F67D2, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 30, 28, 1, 52, 153, 0, 1, 3, Route125_EventScript_1F67E9, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_SAILOR, 0, 0, 21, 30, 3, 13, 0, 0, 1, 2, Route125_EventScript_1F6800, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_LASS, 0, 0, 17, 19, 3, 8, 17, 0, 1, 1, Route125_EventScript_1F6862, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_LASS, 0, 0, 18, 19, 3, 8, 17, 0, 1, 1, Route125_EventScript_1F687D, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_MAN_6, 0, 0, 43, 19, 3, 28, 18, 0, 1, 3, Route125_EventScript_1F6898, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 48, 19, 3, 27, 18, 0, 1, 3, Route125_EventScript_1F68AF, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 46, 17, 3, 1, 17, 0, 0, 0, Route125_EventScript_291018, 1154, 0, 0
+Route125_EventObjects: @ 852C50C
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 7, 31, 1, 28, 0, 0, 1, 2, Route125_EventScript_1F67A4, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 45, 9, 1, 10, 82, 0, 1, 2, Route125_EventScript_1F67BB, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 38, 24, 1, 28, 6, 0, 1, 3, Route125_EventScript_1F67D2, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 30, 28, 1, 52, 153, 0, 1, 3, Route125_EventScript_1F67E9, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 0, 21, 30, 3, 13, 0, 0, 1, 2, Route125_EventScript_1F6800, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_LASS, 0, 0, 17, 19, 3, 8, 17, 0, 1, 1, Route125_EventScript_1F6862, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_LASS, 0, 0, 18, 19, 3, 8, 17, 0, 1, 1, Route125_EventScript_1F687D, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 0, 43, 19, 3, 28, 18, 0, 1, 3, Route125_EventScript_1F6898, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 48, 19, 3, 27, 18, 0, 1, 3, Route125_EventScript_1F68AF, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 46, 17, 3, 1, 17, 0, 0, 0, Route125_EventScript_291018, 1154, 0, 0
 
 Route125_MapWarps: @ 852C5FC
 	warp_def 22, 19, 0, 0, SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM
@@ -20,5 +20,5 @@ Route125_MapBGEvents: @ 852C604
 	bg_event 24, 32, 0, 8, 0, ITEM_PINAP_BERRY, 0, 0
 
 Route125_MapEvents:: @ 852C634
-	map_events Route125_MapObjects, Route125_MapWarps, 0x0, Route125_MapBGEvents
+	map_events Route125_EventObjects, Route125_MapWarps, 0x0, Route125_MapBGEvents
 
diff --git a/data/maps/events/Route126.inc b/data/maps/events/Route126.inc
index e8bfd1a5f..f6d4a71a5 100644
--- a/data/maps/events/Route126.inc
+++ b/data/maps/events/Route126.inc
@@ -1,14 +1,14 @@
-Route126_MapObjects: @ 852C648
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 51, 65, 1, 51, 58, 0, 1, 3, Route126_EventScript_1F68D6, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 56, 22, 1, 28, 9, 0, 1, 3, Route126_EventScript_1F68ED, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 63, 43, 1, 24, 0, 0, 1, 3, Route126_EventScript_1F6904, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 9, 48, 1, 7, 0, 0, 1, 3, Route126_EventScript_1F691B, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 14, 1, 3, 1, 17, 0, 0, 0, Route126_EventScript_291025, 1105, 0, 0
-	object_event 6, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 15, 66, 1, 66, 17, 0, 1, 7, Route126_EventScript_1F6960, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 7, 66, 1, 67, 17, 0, 1, 7, Route126_EventScript_1F6977, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 64, 5, 1, 66, 17, 0, 1, 7, Route126_EventScript_1F6949, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 56, 5, 1, 67, 17, 0, 1, 7, Route126_EventScript_1F6932, 0, 0, 0
+Route126_EventObjects: @ 852C648
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 51, 65, 1, 51, 58, 0, 1, 3, Route126_EventScript_1F68D6, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 56, 22, 1, 28, 9, 0, 1, 3, Route126_EventScript_1F68ED, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 63, 43, 1, 24, 0, 0, 1, 3, Route126_EventScript_1F6904, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 9, 48, 1, 7, 0, 0, 1, 3, Route126_EventScript_1F691B, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 14, 1, 3, 1, 17, 0, 0, 0, Route126_EventScript_291025, 1105, 0, 0
+	object_event 6, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 15, 66, 1, 66, 17, 0, 1, 7, Route126_EventScript_1F6960, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 7, 66, 1, 67, 17, 0, 1, 7, Route126_EventScript_1F6977, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 64, 5, 1, 66, 17, 0, 1, 7, Route126_EventScript_1F6949, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 56, 5, 1, 67, 17, 0, 1, 7, Route126_EventScript_1F6932, 0, 0, 0
 
 Route126_MapEvents:: @ 852C720
-	map_events Route126_MapObjects, 0x0, 0x0, 0x0
+	map_events Route126_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/Route127.inc b/data/maps/events/Route127.inc
index 7a486263e..b72a1d629 100644
--- a/data/maps/events/Route127.inc
+++ b/data/maps/events/Route127.inc
@@ -1,15 +1,15 @@
-Route127_MapObjects: @ 852C734
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 45, 42, 1, 14, 0, 0, 1, 2, Route127_EventScript_1F6A35, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 18, 68, 1, 21, 0, 0, 1, 4, Route127_EventScript_1F6A4C, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 14, 6, 3, 1, 0, 0, 0, 0, Route127_EventScript_291032, 1034, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 64, 39, 3, 1, 0, 0, 0, 0, Route127_EventScript_29103F, 1035, 0, 0
-	object_event 5, MAP_OBJ_GFX_FISHERMAN, 0, 0, 42, 21, 3, 9, 17, 0, 1, 0, Route127_EventScript_1F6A63, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_FISHERMAN, 0, 0, 64, 19, 3, 10, 17, 0, 1, 0, Route127_EventScript_1F6A91, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_FISHERMAN, 0, 0, 54, 14, 3, 7, 17, 0, 1, 0, Route127_EventScript_1F6A7A, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_MAN_6, 0, 0, 15, 23, 3, 9, 17, 0, 1, 2, Route127_EventScript_1F6AA8, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 63, 63, 3, 1, 17, 0, 1, 3, Route127_EventScript_1F6AD6, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_WOMAN_7, 0, 0, 12, 23, 3, 10, 17, 0, 1, 2, Route127_EventScript_1F6ABF, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 13, 20, 3, 1, 0, 0, 0, 0, Route127_EventScript_29104C, 1155, 0, 0
+Route127_EventObjects: @ 852C734
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 45, 42, 1, 14, 0, 0, 1, 2, Route127_EventScript_1F6A35, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 18, 68, 1, 21, 0, 0, 1, 4, Route127_EventScript_1F6A4C, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 14, 6, 3, 1, 0, 0, 0, 0, Route127_EventScript_291032, 1034, 0, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 64, 39, 3, 1, 0, 0, 0, 0, Route127_EventScript_29103F, 1035, 0, 0
+	object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 42, 21, 3, 9, 17, 0, 1, 0, Route127_EventScript_1F6A63, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 64, 19, 3, 10, 17, 0, 1, 0, Route127_EventScript_1F6A91, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 54, 14, 3, 7, 17, 0, 1, 0, Route127_EventScript_1F6A7A, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 0, 15, 23, 3, 9, 17, 0, 1, 2, Route127_EventScript_1F6AA8, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 63, 63, 3, 1, 17, 0, 1, 3, Route127_EventScript_1F6AD6, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 12, 23, 3, 10, 17, 0, 1, 2, Route127_EventScript_1F6ABF, 0, 0, 0
+	object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 13, 20, 3, 1, 0, 0, 0, 0, Route127_EventScript_29104C, 1155, 0, 0
 
 Route127_MapBGEvents: @ 852C83C
 	bg_event 59, 67, 0, 8, 0, ITEM_ENERGY_ROOT, 0, 0
@@ -19,5 +19,5 @@ Route127_MapBGEvents: @ 852C83C
 	bg_event 45, 24, 0, 8, 0, ITEM_GLITTER_MAIL, 0, 0
 
 Route127_MapEvents:: @ 852C878
-	map_events Route127_MapObjects, 0x0, 0x0, Route127_MapBGEvents
+	map_events Route127_EventObjects, 0x0, 0x0, Route127_MapBGEvents
 
diff --git a/data/maps/events/Route128.inc b/data/maps/events/Route128.inc
index b48c8c4a2..e9efddf20 100644
--- a/data/maps/events/Route128.inc
+++ b/data/maps/events/Route128.inc
@@ -1,14 +1,14 @@
-Route128_MapObjects: @ 852C88C
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 35, 33, 1, 48, 85, 0, 1, 3, Route128_EventScript_1F6CBE, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 78, 24, 1, 28, 5, 0, 1, 7, Route128_EventScript_1F6D20, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_STEVEN, 0, 0, 40, 22, 3, 8, 0, 0, 0, 0, 0x0, 834, 0, 0
-	object_event 4, MAP_OBJ_GFX_ARCHIE, 0, 0, 37, 22, 3, 9, 17, 0, 0, 0, 0x0, 944, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAXIE, 0, 0, 38, 21, 3, 7, 17, 0, 0, 0, 0x0, 945, 0, 0
-	object_event 6, MAP_OBJ_GFX_FISHERMAN, 0, 0, 63, 28, 3, 7, 17, 0, 1, 0, Route128_EventScript_1F6DB0, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_MAN_4, 0, 0, 47, 9, 3, 10, 17, 0, 1, 3, Route128_EventScript_1F6D99, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_WOMAN_7, 0, 0, 24, 8, 3, 17, 17, 0, 1, 3, Route128_EventScript_1F6D82, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 101, 29, 1, 25, 49, 0, 1, 4, Route128_EventScript_1F6DDE, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 101, 22, 1, 26, 49, 0, 1, 4, Route128_EventScript_1F6DC7, 0, 0, 0
+Route128_EventObjects: @ 852C88C
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 35, 33, 1, 48, 85, 0, 1, 3, Route128_EventScript_1F6CBE, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 78, 24, 1, 28, 5, 0, 1, 7, Route128_EventScript_1F6D20, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_STEVEN, 0, 0, 40, 22, 3, 8, 0, 0, 0, 0, 0x0, 834, 0, 0
+	object_event 4, EVENT_OBJ_GFX_ARCHIE, 0, 0, 37, 22, 3, 9, 17, 0, 0, 0, 0x0, 944, 0, 0
+	object_event 5, EVENT_OBJ_GFX_MAXIE, 0, 0, 38, 21, 3, 7, 17, 0, 0, 0, 0x0, 945, 0, 0
+	object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 63, 28, 3, 7, 17, 0, 1, 0, Route128_EventScript_1F6DB0, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 0, 47, 9, 3, 10, 17, 0, 1, 3, Route128_EventScript_1F6D99, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 24, 8, 3, 17, 17, 0, 1, 3, Route128_EventScript_1F6D82, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 101, 29, 1, 25, 49, 0, 1, 4, Route128_EventScript_1F6DDE, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 101, 22, 1, 26, 49, 0, 1, 4, Route128_EventScript_1F6DC7, 0, 0, 0
 
 Route128_MapBGEvents: @ 852C97C
 	bg_event 49, 9, 3, 7, 0, ITEM_HEART_SCALE, 92, 0
@@ -16,5 +16,5 @@ Route128_MapBGEvents: @ 852C97C
 	bg_event 31, 33, 3, 7, 0, ITEM_HEART_SCALE, 94, 0
 
 Route128_MapEvents:: @ 852C9A0
-	map_events Route128_MapObjects, 0x0, 0x0, Route128_MapBGEvents
+	map_events Route128_EventObjects, 0x0, 0x0, Route128_MapBGEvents
 
diff --git a/data/maps/events/Route129.inc b/data/maps/events/Route129.inc
index 38ac3513c..297b9eeb2 100644
--- a/data/maps/events/Route129.inc
+++ b/data/maps/events/Route129.inc
@@ -1,10 +1,10 @@
-Route129_MapObjects: @ 852C9B4
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 28, 16, 1, 50, 67, 0, 1, 3, Route129_EventScript_1F72EC, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 10, 14, 1, 52, 37, 0, 1, 2, Route129_EventScript_1F7303, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 13, 22, 1, 64, 17, 0, 1, 5, Route129_EventScript_1F7331, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 35, 9, 1, 24, 17, 0, 1, 2, Route129_EventScript_1F731A, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 13, 27, 1, 65, 17, 0, 1, 5, Route129_EventScript_1F7348, 0, 0, 0
+Route129_EventObjects: @ 852C9B4
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 28, 16, 1, 50, 67, 0, 1, 3, Route129_EventScript_1F72EC, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 10, 14, 1, 52, 37, 0, 1, 2, Route129_EventScript_1F7303, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 13, 22, 1, 64, 17, 0, 1, 5, Route129_EventScript_1F7331, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 35, 9, 1, 24, 17, 0, 1, 2, Route129_EventScript_1F731A, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 13, 27, 1, 65, 17, 0, 1, 5, Route129_EventScript_1F7348, 0, 0, 0
 
 Route129_MapEvents:: @ 852CA2C
-	map_events Route129_MapObjects, 0x0, 0x0, 0x0
+	map_events Route129_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/Route130.inc b/data/maps/events/Route130.inc
index d5bd41cbd..470fa9880 100644
--- a/data/maps/events/Route130.inc
+++ b/data/maps/events/Route130.inc
@@ -1,9 +1,9 @@
-Route130_MapObjects: @ 852CA40
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 70, 21, 1, 51, 99, 0, 1, 3, Route130_EventScript_1F73BF, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 7, 21, 1, 26, 65, 0, 1, 5, Route130_EventScript_1F73D6, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 52, 9, 3, 12, 0, 0, 0, 82, BerryTreeScript, 17, 0, 0
-	object_event 4, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 7, 30, 1, 25, 65, 0, 1, 5, Route130_EventScript_1F73ED, 0, 0, 0
+Route130_EventObjects: @ 852CA40
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 70, 21, 1, 51, 99, 0, 1, 3, Route130_EventScript_1F73BF, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 7, 21, 1, 26, 65, 0, 1, 5, Route130_EventScript_1F73D6, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 52, 9, 3, 12, 0, 0, 0, 82, BerryTreeScript, 17, 0, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 7, 30, 1, 25, 65, 0, 1, 5, Route130_EventScript_1F73ED, 0, 0, 0
 
 Route130_MapEvents:: @ 852CAA0
-	map_events Route130_MapObjects, 0x0, 0x0, 0x0
+	map_events Route130_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/Route131.inc b/data/maps/events/Route131.inc
index 0f37a4c70..b66f47867 100644
--- a/data/maps/events/Route131.inc
+++ b/data/maps/events/Route131.inc
@@ -1,16 +1,16 @@
-Route131_MapObjects: @ 852CAB4
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 41, 32, 1, 29, 117, 0, 1, 3, Route131_EventScript_1F7429, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 18, 19, 1, 22, 112, 0, 1, 4, Route131_EventScript_1F7440, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 10, 22, 1, 20, 6, 0, 1, 4, Route131_EventScript_1F7457, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 31, 25, 1, 47, 83, 0, 1, 3, Route131_EventScript_1F746E, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 9, 16, 1, 8, 17, 0, 1, 1, Route131_EventScript_1F7485, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_TUBER_M_SWIMMING, 0, 0, 8, 16, 1, 8, 17, 0, 1, 1, Route131_EventScript_1F74A0, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 52, 20, 1, 26, 49, 0, 1, 5, Route131_EventScript_1F74D2, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 52, 27, 1, 25, 49, 0, 1, 5, Route131_EventScript_1F74BB, 0, 0, 0
+Route131_EventObjects: @ 852CAB4
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 41, 32, 1, 29, 117, 0, 1, 3, Route131_EventScript_1F7429, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 18, 19, 1, 22, 112, 0, 1, 4, Route131_EventScript_1F7440, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 10, 22, 1, 20, 6, 0, 1, 4, Route131_EventScript_1F7457, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 31, 25, 1, 47, 83, 0, 1, 3, Route131_EventScript_1F746E, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 9, 16, 1, 8, 17, 0, 1, 1, Route131_EventScript_1F7485, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 0, 8, 16, 1, 8, 17, 0, 1, 1, Route131_EventScript_1F74A0, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 52, 20, 1, 26, 49, 0, 1, 5, Route131_EventScript_1F74D2, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 52, 27, 1, 25, 49, 0, 1, 5, Route131_EventScript_1F74BB, 0, 0, 0
 
 Route131_MapWarps: @ 852CB74
 	warp_def 36, 6, 3, 0, SKY_PILLAR_ENTRANCE
 
 Route131_MapEvents:: @ 852CB7C
-	map_events Route131_MapObjects, Route131_MapWarps, 0x0, 0x0
+	map_events Route131_EventObjects, Route131_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/Route132.inc b/data/maps/events/Route132.inc
index 3e1287b7d..825c6fc65 100644
--- a/data/maps/events/Route132.inc
+++ b/data/maps/events/Route132.inc
@@ -1,15 +1,15 @@
-Route132_MapObjects: @ 852CB90
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 40, 13, 1, 46, 51, 0, 1, 2, Route132_EventScript_1F74EA, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 10, 6, 1, 45, 51, 0, 1, 2, Route132_EventScript_1F7501, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 10, 11, 3, 1, 0, 0, 0, 0, Route132_EventScript_291059, 1036, 0, 0
-	object_event 4, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 9, 15, 3, 8, 0, 0, 1, 4, Route132_EventScript_1F752F, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_FISHERMAN, 0, 0, 49, 28, 3, 10, 0, 0, 1, 1, Route132_EventScript_1F7518, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 33, 26, 3, 8, 17, 0, 1, 4, Route132_EventScript_1F7546, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_WOMAN_7, 0, 0, 33, 31, 3, 25, 65, 0, 1, 4, Route132_EventScript_1F755D, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 21, 30, 3, 7, 17, 0, 1, 4, Route132_EventScript_1F758B, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_MAN_4, 0, 0, 21, 25, 3, 26, 65, 0, 1, 4, Route132_EventScript_1F7574, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 20, 27, 3, 1, 17, 0, 0, 0, Route132_EventScript_291066, 1156, 0, 0
+Route132_EventObjects: @ 852CB90
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 40, 13, 1, 46, 51, 0, 1, 2, Route132_EventScript_1F74EA, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 10, 6, 1, 45, 51, 0, 1, 2, Route132_EventScript_1F7501, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 11, 3, 1, 0, 0, 0, 0, Route132_EventScript_291059, 1036, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 9, 15, 3, 8, 0, 0, 1, 4, Route132_EventScript_1F752F, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 49, 28, 3, 10, 0, 0, 1, 1, Route132_EventScript_1F7518, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 33, 26, 3, 8, 17, 0, 1, 4, Route132_EventScript_1F7546, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 33, 31, 3, 25, 65, 0, 1, 4, Route132_EventScript_1F755D, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 21, 30, 3, 7, 17, 0, 1, 4, Route132_EventScript_1F758B, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 0, 21, 25, 3, 26, 65, 0, 1, 4, Route132_EventScript_1F7574, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 20, 27, 3, 1, 17, 0, 0, 0, Route132_EventScript_291066, 1156, 0, 0
 
 Route132_MapEvents:: @ 852CC80
-	map_events Route132_MapObjects, 0x0, 0x0, 0x0
+	map_events Route132_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/Route133.inc b/data/maps/events/Route133.inc
index c6cb4ac3b..6249ca026 100644
--- a/data/maps/events/Route133.inc
+++ b/data/maps/events/Route133.inc
@@ -1,15 +1,15 @@
-Route133_MapObjects: @ 852CC94
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 68, 27, 1, 25, 32, 0, 1, 3, Route133_EventScript_1F75A3, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 13, 3, 1, 8, 0, 0, 1, 3, Route133_EventScript_1F75D1, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 68, 28, 1, 26, 32, 0, 1, 3, Route133_EventScript_1F75BA, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 53, 12, 3, 1, 0, 0, 0, 0, Route133_EventScript_291073, 1037, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 8, 10, 3, 1, 0, 0, 0, 0, Route133_EventScript_291080, 1038, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_6, 0, 0, 7, 14, 3, 18, 17, 0, 1, 2, Route133_EventScript_1F75FF, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_MAN_4, 0, 0, 37, 15, 3, 18, 0, 0, 1, 4, Route133_EventScript_1F75E8, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 56, 11, 3, 8, 17, 0, 1, 3, Route133_EventScript_1F7616, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 56, 15, 3, 16, 17, 0, 1, 3, Route133_EventScript_1F762D, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 48, 28, 3, 1, 17, 0, 0, 0, Route133_EventScript_29108D, 1157, 0, 0
+Route133_EventObjects: @ 852CC94
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 68, 27, 1, 25, 32, 0, 1, 3, Route133_EventScript_1F75A3, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 13, 3, 1, 8, 0, 0, 1, 3, Route133_EventScript_1F75D1, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 68, 28, 1, 26, 32, 0, 1, 3, Route133_EventScript_1F75BA, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 53, 12, 3, 1, 0, 0, 0, 0, Route133_EventScript_291073, 1037, 0, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 8, 10, 3, 1, 0, 0, 0, 0, Route133_EventScript_291080, 1038, 0, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_6, 0, 0, 7, 14, 3, 18, 17, 0, 1, 2, Route133_EventScript_1F75FF, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 0, 37, 15, 3, 18, 0, 0, 1, 4, Route133_EventScript_1F75E8, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 56, 11, 3, 8, 17, 0, 1, 3, Route133_EventScript_1F7616, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 56, 15, 3, 16, 17, 0, 1, 3, Route133_EventScript_1F762D, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 48, 28, 3, 1, 17, 0, 0, 0, Route133_EventScript_29108D, 1157, 0, 0
 
 Route133_MapEvents:: @ 852CD84
-	map_events Route133_MapObjects, 0x0, 0x0, 0x0
+	map_events Route133_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/Route134.inc b/data/maps/events/Route134.inc
index 6905f533f..6beb27ba5 100644
--- a/data/maps/events/Route134.inc
+++ b/data/maps/events/Route134.inc
@@ -1,16 +1,16 @@
-Route134_MapObjects: @ 852CD98
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 49, 9, 1, 49, 83, 0, 1, 2, Route134_EventScript_1F7653, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 58, 7, 1, 1, 0, 0, 1, 3, Route134_EventScript_1F766A, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 41, 23, 3, 10, 0, 0, 1, 2, Route134_EventScript_1F7698, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_6, 0, 0, 24, 23, 3, 26, 48, 0, 1, 6, Route134_EventScript_1F7681, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 49, 16, 3, 27, 6, 0, 1, 5, Route134_EventScript_1F76AF, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_WOMAN_7, 0, 0, 43, 23, 1, 9, 17, 0, 1, 2, Route134_EventScript_1F76F4, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_SAILOR, 0, 0, 24, 30, 3, 25, 48, 0, 1, 6, Route134_EventScript_1F770B, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_GIRL_3, 0, 0, 50, 16, 3, 28, 6, 0, 1, 5, Route134_EventScript_1F76DD, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_SAILOR, 0, 0, 63, 14, 3, 18, 17, 0, 1, 3, Route134_EventScript_1F76C6, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 50, 17, 3, 1, 17, 0, 0, 0, Route134_EventScript_29109A, 1158, 0, 0
-	object_event 11, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 22, 27, 3, 1, 17, 0, 0, 0, Route134_EventScript_2910A7, 1159, 0, 0
+Route134_EventObjects: @ 852CD98
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 49, 9, 1, 49, 83, 0, 1, 2, Route134_EventScript_1F7653, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 58, 7, 1, 1, 0, 0, 1, 3, Route134_EventScript_1F766A, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 41, 23, 3, 10, 0, 0, 1, 2, Route134_EventScript_1F7698, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 0, 24, 23, 3, 26, 48, 0, 1, 6, Route134_EventScript_1F7681, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 49, 16, 3, 27, 6, 0, 1, 5, Route134_EventScript_1F76AF, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 43, 23, 1, 9, 17, 0, 1, 2, Route134_EventScript_1F76F4, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_SAILOR, 0, 0, 24, 30, 3, 25, 48, 0, 1, 6, Route134_EventScript_1F770B, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_GIRL_3, 0, 0, 50, 16, 3, 28, 6, 0, 1, 5, Route134_EventScript_1F76DD, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_SAILOR, 0, 0, 63, 14, 3, 18, 17, 0, 1, 3, Route134_EventScript_1F76C6, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 50, 17, 3, 1, 17, 0, 0, 0, Route134_EventScript_29109A, 1158, 0, 0
+	object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 22, 27, 3, 1, 17, 0, 0, 0, Route134_EventScript_2910A7, 1159, 0, 0
 
 Route134_MapEvents:: @ 852CEA0
-	map_events Route134_MapObjects, 0x0, 0x0, 0x0
+	map_events Route134_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/RustboroCity.inc b/data/maps/events/RustboroCity.inc
index 26a0c1a11..3efb9fac7 100644
--- a/data/maps/events/RustboroCity.inc
+++ b/data/maps/events/RustboroCity.inc
@@ -1,20 +1,20 @@
-RustboroCity_MapObjects: @ 85267E0
-	object_event 1, MAP_OBJ_GFX_WOMAN_7, 0, 0, 22, 34, 3, 3, 16, 0, 0, 0, RustboroCity_EventScript_1E088A, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 0, 19, 13, 3, 1, 17, 0, 0, 0, RustboroCity_EventScript_1E085F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 25, 37, 3, 7, 0, 0, 0, 0, RustboroCity_EventScript_1E08DA, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 21, 46, 3, 3, 16, 0, 0, 0, RustboroCity_EventScript_1E08D1, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BOY_2, 0, 0, 12, 45, 3, 1, 0, 0, 0, 0, RustboroCity_EventScript_1E08B2, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_4, 0, 0, 26, 23, 3, 1, 17, 0, 0, 0, RustboroCity_EventScript_1E0893, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 24, 51, 3, 10, 0, 0, 0, 0, RustboroCity_EventScript_1E0922, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 25, 51, 3, 9, 0, 0, 0, 0, RustboroCity_EventScript_1E0938, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_MAN_2, 0, 0, 30, 10, 3, 10, 17, 0, 0, 0, RustboroCity_EventScript_1E0ADD, 732, 0, 0
-	object_event 10, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 21, 3, 10, 0, 0, 0, 0, 0x0, 731, 0, 0
-	object_event 11, MAP_OBJ_GFX_MAN_7, 0, 0, 13, 34, 3, 2, 17, 0, 0, 0, RustboroCity_EventScript_1E087E, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 36, 51, 3, 1, 0, 0, 0, 0, RustboroCity_EventScript_2910DB, 1041, 0, 0
-	object_event 13, MAP_OBJ_GFX_MAN_5, 0, 0, 19, 27, 3, 8, 16, 0, 0, 0, RustboroCity_EventScript_1E094E, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_HIPSTER, 0, 0, 16, 50, 3, 1, 17, 0, 0, 0, RustboroCity_EventScript_1E0DB8, 814, 0, 0
-	object_event 15, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 11, 15, 0, 1, 17, 0, 0, 0, 0x0, 844, 0, 0
-	object_event 16, MAP_OBJ_GFX_BOY_1, 0, 0, 31, 36, 3, 1, 16, 0, 0, 0, RustboroCity_EventScript_1E1236, 0, 0, 0
+RustboroCity_EventObjects: @ 85267E0
+	object_event 1, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 22, 34, 3, 3, 16, 0, 0, 0, RustboroCity_EventScript_1E088A, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 19, 13, 3, 1, 17, 0, 0, 0, RustboroCity_EventScript_1E085F, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 25, 37, 3, 7, 0, 0, 0, 0, RustboroCity_EventScript_1E08DA, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 21, 46, 3, 3, 16, 0, 0, 0, RustboroCity_EventScript_1E08D1, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_BOY_2, 0, 0, 12, 45, 3, 1, 0, 0, 0, 0, RustboroCity_EventScript_1E08B2, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 0, 26, 23, 3, 1, 17, 0, 0, 0, RustboroCity_EventScript_1E0893, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 24, 51, 3, 10, 0, 0, 0, 0, RustboroCity_EventScript_1E0922, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 25, 51, 3, 9, 0, 0, 0, 0, RustboroCity_EventScript_1E0938, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 0, 30, 10, 3, 10, 17, 0, 0, 0, RustboroCity_EventScript_1E0ADD, 732, 0, 0
+	object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 21, 3, 10, 0, 0, 0, 0, 0x0, 731, 0, 0
+	object_event 11, EVENT_OBJ_GFX_MAN_7, 0, 0, 13, 34, 3, 2, 17, 0, 0, 0, RustboroCity_EventScript_1E087E, 0, 0, 0
+	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 36, 51, 3, 1, 0, 0, 0, 0, RustboroCity_EventScript_2910DB, 1041, 0, 0
+	object_event 13, EVENT_OBJ_GFX_MAN_5, 0, 0, 19, 27, 3, 8, 16, 0, 0, 0, RustboroCity_EventScript_1E094E, 0, 0, 0
+	object_event 14, EVENT_OBJ_GFX_HIPSTER, 0, 0, 16, 50, 3, 1, 17, 0, 0, 0, RustboroCity_EventScript_1E0DB8, 814, 0, 0
+	object_event 15, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 11, 15, 0, 1, 17, 0, 0, 0, 0x0, 844, 0, 0
+	object_event 16, EVENT_OBJ_GFX_BOY_1, 0, 0, 31, 36, 3, 1, 16, 0, 0, 0, RustboroCity_EventScript_1E1236, 0, 0, 0
 
 RustboroCity_MapWarps: @ 8526960
 	warp_def 27, 19, 0, 0, RUSTBORO_CITY_GYM
@@ -66,5 +66,5 @@ RustboroCity_MapBGEvents: @ 8526B10
 	bg_event 12, 38, 3, 0, 0, RustboroCity_EventScript_1E0919
 
 RustboroCity_MapEvents:: @ 8526B88
-	map_events RustboroCity_MapObjects, RustboroCity_MapWarps, RustboroCity_MapCoordEvents, RustboroCity_MapBGEvents
+	map_events RustboroCity_EventObjects, RustboroCity_MapWarps, RustboroCity_MapCoordEvents, RustboroCity_MapBGEvents
 
diff --git a/data/maps/events/RustboroCity_CuttersHouse.inc b/data/maps/events/RustboroCity_CuttersHouse.inc
index 1e779cb1e..bbed60478 100644
--- a/data/maps/events/RustboroCity_CuttersHouse.inc
+++ b/data/maps/events/RustboroCity_CuttersHouse.inc
@@ -1,11 +1,11 @@
-RustboroCity_CuttersHouse_MapObjects: @ 8530A1C
-	object_event 1, MAP_OBJ_GFX_MAN_3, 0, 0, 7, 5, 3, 10, 0, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215BD4, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LASS, 0, 0, 9, 2, 3, 5, 1, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215C0A, 0, 0, 0
+RustboroCity_CuttersHouse_EventObjects: @ 8530A1C
+	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 0, 7, 5, 3, 10, 0, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215BD4, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_LASS, 0, 0, 9, 2, 3, 5, 1, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215C0A, 0, 0, 0
 
 RustboroCity_CuttersHouse_MapWarps: @ 8530A4C
 	warp_def 5, 8, 0, 8, RUSTBORO_CITY
 	warp_def 6, 8, 0, 8, RUSTBORO_CITY
 
 RustboroCity_CuttersHouse_MapEvents:: @ 8530A5C
-	map_events RustboroCity_CuttersHouse_MapObjects, RustboroCity_CuttersHouse_MapWarps, 0x0, 0x0
+	map_events RustboroCity_CuttersHouse_EventObjects, RustboroCity_CuttersHouse_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/RustboroCity_DevonCorp_1F.inc b/data/maps/events/RustboroCity_DevonCorp_1F.inc
index 5a92ba2fc..034c44aa3 100644
--- a/data/maps/events/RustboroCity_DevonCorp_1F.inc
+++ b/data/maps/events/RustboroCity_DevonCorp_1F.inc
@@ -1,7 +1,7 @@
-RustboroCity_DevonCorp_1F_MapObjects: @ 853037C
-	object_event 1, MAP_OBJ_GFX_MAN_7, 0, 0, 2, 6, 3, 2, 17, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211261, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_7, 0, 0, 15, 5, 3, 2, 18, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211293, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_4, 0, 0, 5, 3, 3, 8, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_2112CE, 0, 0, 0
+RustboroCity_DevonCorp_1F_EventObjects: @ 853037C
+	object_event 1, EVENT_OBJ_GFX_MAN_7, 0, 0, 2, 6, 3, 2, 17, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211261, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_7, 0, 0, 15, 5, 3, 2, 18, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211293, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 5, 3, 3, 8, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_2112CE, 0, 0, 0
 
 RustboroCity_DevonCorp_1F_MapWarps: @ 85303C4
 	warp_def 5, 8, 0, 5, RUSTBORO_CITY
@@ -13,5 +13,5 @@ RustboroCity_DevonCorp_1F_MapBGEvents: @ 85303DC
 	bg_event 8, 2, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211309
 
 RustboroCity_DevonCorp_1F_MapEvents:: @ 85303F4
-	map_events RustboroCity_DevonCorp_1F_MapObjects, RustboroCity_DevonCorp_1F_MapWarps, 0x0, RustboroCity_DevonCorp_1F_MapBGEvents
+	map_events RustboroCity_DevonCorp_1F_EventObjects, RustboroCity_DevonCorp_1F_MapWarps, 0x0, RustboroCity_DevonCorp_1F_MapBGEvents
 
diff --git a/data/maps/events/RustboroCity_DevonCorp_2F.inc b/data/maps/events/RustboroCity_DevonCorp_2F.inc
index a84456e44..f19ab8110 100644
--- a/data/maps/events/RustboroCity_DevonCorp_2F.inc
+++ b/data/maps/events/RustboroCity_DevonCorp_2F.inc
@@ -1,15 +1,15 @@
-RustboroCity_DevonCorp_2F_MapObjects: @ 8530408
-	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 5, 3, 7, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_21186F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 1, 5, 3, 10, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211886, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 2, 6, 3, 15, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118B0, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 10, 5, 3, 7, 160, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118DA, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 14, 8, 3, 7, 17, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118F1, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 14, 5, 3, 7, 17, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211BCF, 0, 0, 0
+RustboroCity_DevonCorp_2F_EventObjects: @ 8530408
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 5, 3, 7, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_21186F, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 1, 5, 3, 10, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211886, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 2, 6, 3, 15, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118B0, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 10, 5, 3, 7, 160, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118DA, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 14, 8, 3, 7, 17, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118F1, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 14, 5, 3, 7, 17, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211BCF, 0, 0, 0
 
 RustboroCity_DevonCorp_2F_MapWarps: @ 8530498
 	warp_def 14, 1, 0, 2, RUSTBORO_CITY_DEVON_CORP_1F
 	warp_def 2, 1, 0, 0, RUSTBORO_CITY_DEVON_CORP_3F
 
 RustboroCity_DevonCorp_2F_MapEvents:: @ 85304A8
-	map_events RustboroCity_DevonCorp_2F_MapObjects, RustboroCity_DevonCorp_2F_MapWarps, 0x0, 0x0
+	map_events RustboroCity_DevonCorp_2F_EventObjects, RustboroCity_DevonCorp_2F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/RustboroCity_DevonCorp_3F.inc b/data/maps/events/RustboroCity_DevonCorp_3F.inc
index ec2d22707..8422ef37a 100644
--- a/data/maps/events/RustboroCity_DevonCorp_3F.inc
+++ b/data/maps/events/RustboroCity_DevonCorp_3F.inc
@@ -1,7 +1,7 @@
-RustboroCity_DevonCorp_3F_MapObjects: @ 85304BC
-	object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 17, 5, 3, 9, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_2, 0, 0, 3, 5, 3, 10, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_2125E1, 949, 0, 0
-	object_event 3, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 15, 5, 3, 76, 17, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0, 0, 0
+RustboroCity_DevonCorp_3F_EventObjects: @ 85304BC
+	object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 17, 5, 3, 9, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 0, 3, 5, 3, 10, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_2125E1, 949, 0, 0
+	object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 15, 5, 3, 76, 17, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0, 0, 0
 
 RustboroCity_DevonCorp_3F_MapWarps: @ 8530504
 	warp_def 2, 1, 0, 1, RUSTBORO_CITY_DEVON_CORP_2F
@@ -11,5 +11,5 @@ RustboroCity_DevonCorp_3F_MapBGEvents: @ 853050C
 	bg_event 1, 7, 3, 0, 0, RustboroCity_DevonCorp_3F_EventScript_212600
 
 RustboroCity_DevonCorp_3F_MapEvents:: @ 8530524
-	map_events RustboroCity_DevonCorp_3F_MapObjects, RustboroCity_DevonCorp_3F_MapWarps, 0x0, RustboroCity_DevonCorp_3F_MapBGEvents
+	map_events RustboroCity_DevonCorp_3F_EventObjects, RustboroCity_DevonCorp_3F_MapWarps, 0x0, RustboroCity_DevonCorp_3F_MapBGEvents
 
diff --git a/data/maps/events/RustboroCity_Flat1_1F.inc b/data/maps/events/RustboroCity_Flat1_1F.inc
index 93185e0fd..66786ea5b 100644
--- a/data/maps/events/RustboroCity_Flat1_1F.inc
+++ b/data/maps/events/RustboroCity_Flat1_1F.inc
@@ -1,6 +1,6 @@
-RustboroCity_Flat1_1F_MapObjects: @ 8530890
-	object_event 1, MAP_OBJ_GFX_MAN_4, 0, 0, 9, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150CE, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 0, 12, 4, 3, 9, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150D7, 0, 0, 0
+RustboroCity_Flat1_1F_EventObjects: @ 8530890
+	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 0, 9, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150CE, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 12, 4, 3, 9, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150D7, 0, 0, 0
 
 RustboroCity_Flat1_1F_MapWarps: @ 85308C0
 	warp_def 6, 7, 0, 1, RUSTBORO_CITY
@@ -8,5 +8,5 @@ RustboroCity_Flat1_1F_MapWarps: @ 85308C0
 	warp_def 2, 1, 0, 0, RUSTBORO_CITY_FLAT_1_2F
 
 RustboroCity_Flat1_1F_MapEvents:: @ 85308D8
-	map_events RustboroCity_Flat1_1F_MapObjects, RustboroCity_Flat1_1F_MapWarps, 0x0, 0x0
+	map_events RustboroCity_Flat1_1F_EventObjects, RustboroCity_Flat1_1F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/RustboroCity_Flat1_2F.inc b/data/maps/events/RustboroCity_Flat1_2F.inc
index 0fa012eda..e56741b49 100644
--- a/data/maps/events/RustboroCity_Flat1_2F.inc
+++ b/data/maps/events/RustboroCity_Flat1_2F.inc
@@ -1,16 +1,16 @@
-RustboroCity_Flat1_2F_MapObjects: @ 85308EC
-	object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 4, 6, 3, 5, 19, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_21523D, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 9, 5, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SKITTY_DOLL, 0, 0, 9, 4, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_TREECKO_DOLL, 0, 0, 10, 5, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_TORCHIC_DOLL, 0, 0, 10, 6, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_1, 0, 0, 8, 5, 3, 10, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_21513A, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_MUDKIP_DOLL, 0, 0, 8, 6, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_PIKACHU_DOLL, 0, 0, 9, 7, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0
+RustboroCity_Flat1_2F_EventObjects: @ 85308EC
+	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 4, 6, 3, 5, 19, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_21523D, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 9, 5, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_SKITTY_DOLL, 0, 0, 9, 4, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_TREECKO_DOLL, 0, 0, 10, 5, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_TORCHIC_DOLL, 0, 0, 10, 6, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 0, 8, 5, 3, 10, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_21513A, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_MUDKIP_DOLL, 0, 0, 8, 6, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_PIKACHU_DOLL, 0, 0, 9, 7, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0
 
 RustboroCity_Flat1_2F_MapWarps: @ 85309AC
 	warp_def 2, 1, 0, 2, RUSTBORO_CITY_FLAT_1_1F
 
 RustboroCity_Flat1_2F_MapEvents:: @ 85309B4
-	map_events RustboroCity_Flat1_2F_MapObjects, RustboroCity_Flat1_2F_MapWarps, 0x0, 0x0
+	map_events RustboroCity_Flat1_2F_EventObjects, RustboroCity_Flat1_2F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/RustboroCity_Flat2_1F.inc b/data/maps/events/RustboroCity_Flat2_1F.inc
index 937d1afb9..f31acb8b6 100644
--- a/data/maps/events/RustboroCity_Flat2_1F.inc
+++ b/data/maps/events/RustboroCity_Flat2_1F.inc
@@ -1,6 +1,6 @@
-RustboroCity_Flat2_1F_MapObjects: @ 8530AC4
-	object_event 1, MAP_OBJ_GFX_SKITTY, 0, 0, 11, 4, 3, 9, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F80, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 0, 8, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F77, 0, 0, 0
+RustboroCity_Flat2_1F_EventObjects: @ 8530AC4
+	object_event 1, EVENT_OBJ_GFX_SKITTY, 0, 0, 11, 4, 3, 9, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F80, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 8, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F77, 0, 0, 0
 
 RustboroCity_Flat2_1F_MapWarps: @ 8530AF4
 	warp_def 2, 8, 0, 10, RUSTBORO_CITY
@@ -8,5 +8,5 @@ RustboroCity_Flat2_1F_MapWarps: @ 8530AF4
 	warp_def 3, 1, 0, 0, RUSTBORO_CITY_FLAT_2_2F
 
 RustboroCity_Flat2_1F_MapEvents:: @ 8530B0C
-	map_events RustboroCity_Flat2_1F_MapObjects, RustboroCity_Flat2_1F_MapWarps, 0x0, 0x0
+	map_events RustboroCity_Flat2_1F_EventObjects, RustboroCity_Flat2_1F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/RustboroCity_Flat2_2F.inc b/data/maps/events/RustboroCity_Flat2_2F.inc
index 2ea886e54..3bed978e8 100644
--- a/data/maps/events/RustboroCity_Flat2_2F.inc
+++ b/data/maps/events/RustboroCity_Flat2_2F.inc
@@ -1,11 +1,11 @@
-RustboroCity_Flat2_2F_MapObjects: @ 8530B20
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 11, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FD8, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 7, 3, 3, 5, 2, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FE1, 0, 0, 0
+RustboroCity_Flat2_2F_EventObjects: @ 8530B20
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 11, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FD8, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 7, 3, 3, 5, 2, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FE1, 0, 0, 0
 
 RustboroCity_Flat2_2F_MapWarps: @ 8530B50
 	warp_def 3, 1, 0, 2, RUSTBORO_CITY_FLAT_2_1F
 	warp_def 1, 1, 0, 0, RUSTBORO_CITY_FLAT_2_3F
 
 RustboroCity_Flat2_2F_MapEvents:: @ 8530B60
-	map_events RustboroCity_Flat2_2F_MapObjects, RustboroCity_Flat2_2F_MapWarps, 0x0, 0x0
+	map_events RustboroCity_Flat2_2F_EventObjects, RustboroCity_Flat2_2F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/RustboroCity_Flat2_3F.inc b/data/maps/events/RustboroCity_Flat2_3F.inc
index 44c5bc37a..16f9aa3ea 100644
--- a/data/maps/events/RustboroCity_Flat2_3F.inc
+++ b/data/maps/events/RustboroCity_Flat2_3F.inc
@@ -1,10 +1,10 @@
-RustboroCity_Flat2_3F_MapObjects: @ 8530B74
-	object_event 1, MAP_OBJ_GFX_MAN_7, 0, 0, 7, 3, 3, 5, 2, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216117, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_1, 0, 0, 12, 2, 3, 8, 0, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216120, 0, 0, 0
+RustboroCity_Flat2_3F_EventObjects: @ 8530B74
+	object_event 1, EVENT_OBJ_GFX_MAN_7, 0, 0, 7, 3, 3, 5, 2, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216117, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 12, 2, 3, 8, 0, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216120, 0, 0, 0
 
 RustboroCity_Flat2_3F_MapWarps: @ 8530BA4
 	warp_def 1, 1, 0, 1, RUSTBORO_CITY_FLAT_2_2F
 
 RustboroCity_Flat2_3F_MapEvents:: @ 8530BAC
-	map_events RustboroCity_Flat2_3F_MapObjects, RustboroCity_Flat2_3F_MapWarps, 0x0, 0x0
+	map_events RustboroCity_Flat2_3F_EventObjects, RustboroCity_Flat2_3F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/RustboroCity_Gym.inc b/data/maps/events/RustboroCity_Gym.inc
index dc395c064..d17c42d67 100644
--- a/data/maps/events/RustboroCity_Gym.inc
+++ b/data/maps/events/RustboroCity_Gym.inc
@@ -1,9 +1,9 @@
-RustboroCity_Gym_MapObjects: @ 8530538
-	object_event 1, MAP_OBJ_GFX_ROXANNE, 0, 0, 5, 2, 3, 8, 0, 0, 0, 0, RustboroCity_Gym_EventScript_212F31, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 5, 13, 3, 8, 0, 0, 1, 2, RustboroCity_Gym_EventScript_212FE3, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 3, 9, 3, 9, 0, 0, 1, 3, RustboroCity_Gym_EventScript_212FFA, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_2, 0, 0, 3, 18, 3, 8, 0, 0, 0, 0, RustboroCity_Gym_EventScript_213028, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_HIKER, 0, 0, 1, 6, 3, 8, 17, 0, 1, 3, RustboroCity_Gym_EventScript_213011, 0, 0, 0
+RustboroCity_Gym_EventObjects: @ 8530538
+	object_event 1, EVENT_OBJ_GFX_ROXANNE, 0, 0, 5, 2, 3, 8, 0, 0, 0, 0, RustboroCity_Gym_EventScript_212F31, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 5, 13, 3, 8, 0, 0, 1, 2, RustboroCity_Gym_EventScript_212FE3, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 3, 9, 3, 9, 0, 0, 1, 3, RustboroCity_Gym_EventScript_212FFA, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 0, 3, 18, 3, 8, 0, 0, 0, 0, RustboroCity_Gym_EventScript_213028, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_HIKER, 0, 0, 1, 6, 3, 8, 17, 0, 1, 3, RustboroCity_Gym_EventScript_213011, 0, 0, 0
 
 RustboroCity_Gym_MapWarps: @ 85305B0
 	warp_def 5, 19, 0, 0, RUSTBORO_CITY
@@ -14,5 +14,5 @@ RustboroCity_Gym_MapBGEvents: @ 85305C0
 	bg_event 8, 18, 0, 1, 0, RustboroCity_Gym_EventScript_213057
 
 RustboroCity_Gym_MapEvents:: @ 85305D8
-	map_events RustboroCity_Gym_MapObjects, RustboroCity_Gym_MapWarps, 0x0, RustboroCity_Gym_MapBGEvents
+	map_events RustboroCity_Gym_EventObjects, RustboroCity_Gym_MapWarps, 0x0, RustboroCity_Gym_MapBGEvents
 
diff --git a/data/maps/events/RustboroCity_House1.inc b/data/maps/events/RustboroCity_House1.inc
index eee616f8a..d07456dc9 100644
--- a/data/maps/events/RustboroCity_House1.inc
+++ b/data/maps/events/RustboroCity_House1.inc
@@ -1,11 +1,11 @@
-RustboroCity_House1_MapObjects: @ 85309C8
-	object_event 1, MAP_OBJ_GFX_CAMPER, 0, 0, 6, 4, 3, 9, 0, 0, 0, 0, RustboroCity_House1_EventScript_21593F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIKER, 0, 0, 9, 2, 3, 8, 0, 0, 0, 0, RustboroCity_House1_EventScript_2159DF, 0, 0, 0
+RustboroCity_House1_EventObjects: @ 85309C8
+	object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 0, 6, 4, 3, 9, 0, 0, 0, 0, RustboroCity_House1_EventScript_21593F, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_HIKER, 0, 0, 9, 2, 3, 8, 0, 0, 0, 0, RustboroCity_House1_EventScript_2159DF, 0, 0, 0
 
 RustboroCity_House1_MapWarps: @ 85309F8
 	warp_def 5, 7, 0, 7, RUSTBORO_CITY
 	warp_def 6, 7, 0, 7, RUSTBORO_CITY
 
 RustboroCity_House1_MapEvents:: @ 8530A08
-	map_events RustboroCity_House1_MapObjects, RustboroCity_House1_MapWarps, 0x0, 0x0
+	map_events RustboroCity_House1_EventObjects, RustboroCity_House1_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/RustboroCity_House2.inc b/data/maps/events/RustboroCity_House2.inc
index b4a00970f..5d45c64d0 100644
--- a/data/maps/events/RustboroCity_House2.inc
+++ b/data/maps/events/RustboroCity_House2.inc
@@ -1,11 +1,11 @@
-RustboroCity_House2_MapObjects: @ 8530A70
-	object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EB4, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 4, 5, 3, 7, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EBD, 0, 0, 0
+RustboroCity_House2_EventObjects: @ 8530A70
+	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EB4, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 4, 5, 3, 7, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EBD, 0, 0, 0
 
 RustboroCity_House2_MapWarps: @ 8530AA0
 	warp_def 5, 8, 0, 9, RUSTBORO_CITY
 	warp_def 6, 8, 0, 9, RUSTBORO_CITY
 
 RustboroCity_House2_MapEvents:: @ 8530AB0
-	map_events RustboroCity_House2_MapObjects, RustboroCity_House2_MapWarps, 0x0, 0x0
+	map_events RustboroCity_House2_EventObjects, RustboroCity_House2_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/RustboroCity_House3.inc b/data/maps/events/RustboroCity_House3.inc
index 09cf245e0..61a528cdc 100644
--- a/data/maps/events/RustboroCity_House3.inc
+++ b/data/maps/events/RustboroCity_House3.inc
@@ -1,12 +1,12 @@
-RustboroCity_House3_MapObjects: @ 8530BC0
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 4, 5, 3, 10, 0, 0, 0, 0, RustboroCity_House3_EventScript_216191, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 0, 7, 5, 3, 9, 0, 0, 0, 0, RustboroCity_House3_EventScript_21619A, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_PIKACHU, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, RustboroCity_House3_EventScript_2161A3, 0, 0, 0
+RustboroCity_House3_EventObjects: @ 8530BC0
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 4, 5, 3, 10, 0, 0, 0, 0, RustboroCity_House3_EventScript_216191, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 7, 5, 3, 9, 0, 0, 0, 0, RustboroCity_House3_EventScript_21619A, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_PIKACHU, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, RustboroCity_House3_EventScript_2161A3, 0, 0, 0
 
 RustboroCity_House3_MapWarps: @ 8530C08
 	warp_def 5, 8, 0, 11, RUSTBORO_CITY
 	warp_def 6, 8, 0, 11, RUSTBORO_CITY
 
 RustboroCity_House3_MapEvents:: @ 8530C18
-	map_events RustboroCity_House3_MapObjects, RustboroCity_House3_MapWarps, 0x0, 0x0
+	map_events RustboroCity_House3_EventObjects, RustboroCity_House3_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/RustboroCity_Mart.inc b/data/maps/events/RustboroCity_Mart.inc
index 28b614d47..e177ee10a 100644
--- a/data/maps/events/RustboroCity_Mart.inc
+++ b/data/maps/events/RustboroCity_Mart.inc
@@ -1,13 +1,13 @@
-RustboroCity_Mart_MapObjects: @ 853080C
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F06, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BOY_1, 0, 0, 2, 5, 3, 7, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F7D, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 8, 4, 3, 3, 16, 0, 0, 0, RustboroCity_Mart_EventScript_214F74, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BUG_CATCHER, 0, 0, 8, 2, 3, 7, 17, 0, 0, 0, RustboroCity_Mart_EventScript_214F86, 0, 0, 0
+RustboroCity_Mart_EventObjects: @ 853080C
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F06, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 0, 2, 5, 3, 7, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F7D, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 8, 4, 3, 3, 16, 0, 0, 0, RustboroCity_Mart_EventScript_214F74, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 8, 2, 3, 7, 17, 0, 0, 0, RustboroCity_Mart_EventScript_214F86, 0, 0, 0
 
 RustboroCity_Mart_MapWarps: @ 853086C
 	warp_def 3, 7, 0, 2, RUSTBORO_CITY
 	warp_def 4, 7, 0, 2, RUSTBORO_CITY
 
 RustboroCity_Mart_MapEvents:: @ 853087C
-	map_events RustboroCity_Mart_MapObjects, RustboroCity_Mart_MapWarps, 0x0, 0x0
+	map_events RustboroCity_Mart_EventObjects, RustboroCity_Mart_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/RustboroCity_PokemonCenter_1F.inc b/data/maps/events/RustboroCity_PokemonCenter_1F.inc
index 9c44870ad..56dd4ef83 100644
--- a/data/maps/events/RustboroCity_PokemonCenter_1F.inc
+++ b/data/maps/events/RustboroCity_PokemonCenter_1F.inc
@@ -1,8 +1,8 @@
-RustboroCity_PokemonCenter_1F_MapObjects: @ 85306F4
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D76, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_1, 0, 0, 11, 2, 3, 9, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D84, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_1, 0, 0, 3, 4, 3, 2, 17, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D8D, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 0, 10, 6, 3, 10, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D96, 0, 0, 0
+RustboroCity_PokemonCenter_1F_EventObjects: @ 85306F4
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D76, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 11, 2, 3, 9, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D84, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 3, 4, 3, 2, 17, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D8D, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 10, 6, 3, 10, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D96, 0, 0, 0
 
 RustboroCity_PokemonCenter_1F_MapWarps: @ 8530754
 	warp_def 7, 8, 3, 3, RUSTBORO_CITY
@@ -10,5 +10,5 @@ RustboroCity_PokemonCenter_1F_MapWarps: @ 8530754
 	warp_def 1, 6, 4, 0, RUSTBORO_CITY_POKEMON_CENTER_2F
 
 RustboroCity_PokemonCenter_1F_MapEvents:: @ 853076C
-	map_events RustboroCity_PokemonCenter_1F_MapObjects, RustboroCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
+	map_events RustboroCity_PokemonCenter_1F_EventObjects, RustboroCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/RustboroCity_PokemonCenter_2F.inc b/data/maps/events/RustboroCity_PokemonCenter_2F.inc
index 71defda3d..f9e00e26c 100644
--- a/data/maps/events/RustboroCity_PokemonCenter_2F.inc
+++ b/data/maps/events/RustboroCity_PokemonCenter_2F.inc
@@ -1,8 +1,8 @@
-RustboroCity_PokemonCenter_2F_MapObjects: @ 8530780
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
+RustboroCity_PokemonCenter_2F_EventObjects: @ 8530780
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
 
 RustboroCity_PokemonCenter_2F_MapWarps: @ 85307E0
 	warp_def 1, 6, 4, 2, RUSTBORO_CITY_POKEMON_CENTER_1F
@@ -10,5 +10,5 @@ RustboroCity_PokemonCenter_2F_MapWarps: @ 85307E0
 	warp_def 9, 1, 3, 0, TRADE_CENTER
 
 RustboroCity_PokemonCenter_2F_MapEvents:: @ 85307F8
-	map_events RustboroCity_PokemonCenter_2F_MapObjects, RustboroCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
+	map_events RustboroCity_PokemonCenter_2F_EventObjects, RustboroCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/RustboroCity_PokemonSchool.inc b/data/maps/events/RustboroCity_PokemonSchool.inc
index 3facee89a..ac0160e7b 100644
--- a/data/maps/events/RustboroCity_PokemonSchool.inc
+++ b/data/maps/events/RustboroCity_PokemonSchool.inc
@@ -1,11 +1,11 @@
-RustboroCity_PokemonSchool_MapObjects: @ 85305EC
-	object_event 1, MAP_OBJ_GFX_BOY_5, 0, 0, 8, 6, 3, 10, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F5F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BOY_5, 0, 0, 9, 6, 3, 9, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F68, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_4, 0, 0, 3, 8, 3, 7, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F71, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LASS, 0, 0, 10, 8, 3, 7, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F7A, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 3, 6, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F83, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 5, 3, 3, 8, 17, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F95, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_SCOTT, 0, 0, 0, 10, 0, 7, 17, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_214040, 999, 0, 0
+RustboroCity_PokemonSchool_EventObjects: @ 85305EC
+	object_event 1, EVENT_OBJ_GFX_BOY_5, 0, 0, 8, 6, 3, 10, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F5F, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_5, 0, 0, 9, 6, 3, 9, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F68, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 0, 3, 8, 3, 7, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F71, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_LASS, 0, 0, 10, 8, 3, 7, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F7A, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 3, 6, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F83, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 5, 3, 3, 8, 17, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F95, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 0, 0, 10, 0, 7, 17, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_214040, 999, 0, 0
 
 RustboroCity_PokemonSchool_MapWarps: @ 8530694
 	warp_def 5, 10, 0, 4, RUSTBORO_CITY
@@ -19,5 +19,5 @@ RustboroCity_PokemonSchool_MapBGEvents: @ 85306A4
 	bg_event 3, 5, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F8C
 
 RustboroCity_PokemonSchool_MapEvents:: @ 85306E0
-	map_events RustboroCity_PokemonSchool_MapObjects, RustboroCity_PokemonSchool_MapWarps, 0x0, RustboroCity_PokemonSchool_MapBGEvents
+	map_events RustboroCity_PokemonSchool_EventObjects, RustboroCity_PokemonSchool_MapWarps, 0x0, RustboroCity_PokemonSchool_MapBGEvents
 
diff --git a/data/maps/events/RusturfTunnel.inc b/data/maps/events/RusturfTunnel.inc
index 94846323a..5c2a214b9 100644
--- a/data/maps/events/RusturfTunnel.inc
+++ b/data/maps/events/RusturfTunnel.inc
@@ -1,14 +1,14 @@
-RusturfTunnel_MapObjects: @ 85341C4
-	object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 23, 5, 3, 10, 0, 0, 0, 0, RusturfTunnel_EventScript_22CE76, 807, 0, 0
-	object_event 2, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 24, 5, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 931, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 1, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_291136, 1048, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 30, 2, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_291143, 1049, 0, 0
-	object_event 5, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 4, 3, 10, 0, 0, 0, 0, 0x0, 879, 0, 0
-	object_event 6, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 14, 5, 3, 9, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0C2, 878, 0, 0
-	object_event 7, MAP_OBJ_GFX_WINGULL, 0, 0, 14, 4, 3, 9, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0AF, 880, 0, 0
-	object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 24, 4, 3, 8, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 932, 0, 0
-	object_event 9, MAP_OBJ_GFX_HIKER, 0, 0, 32, 13, 3, 9, 17, 0, 1, 3, RusturfTunnel_EventScript_22D1B1, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_WOMAN_3, 0, 0, 25, 4, 3, 9, 17, 0, 0, 0, RusturfTunnel_EventScript_22CE5F, 983, 0, 0
+RusturfTunnel_EventObjects: @ 85341C4
+	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 23, 5, 3, 10, 0, 0, 0, 0, RusturfTunnel_EventScript_22CE76, 807, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 24, 5, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 931, 0, 0
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 1, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_291136, 1048, 0, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 30, 2, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_291143, 1049, 0, 0
+	object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 4, 3, 10, 0, 0, 0, 0, 0x0, 879, 0, 0
+	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 14, 5, 3, 9, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0C2, 878, 0, 0
+	object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 0, 14, 4, 3, 9, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0AF, 880, 0, 0
+	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 24, 4, 3, 8, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 932, 0, 0
+	object_event 9, EVENT_OBJ_GFX_HIKER, 0, 0, 32, 13, 3, 9, 17, 0, 1, 3, RusturfTunnel_EventScript_22D1B1, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 25, 4, 3, 9, 17, 0, 0, 0, RusturfTunnel_EventScript_22CE5F, 983, 0, 0
 
 RusturfTunnel_MapWarps: @ 85342B4
 	warp_def 4, 10, 3, 0, ROUTE_116
@@ -23,5 +23,5 @@ RusturfTunnel_MapCoordEvents: @ 85342CC
 	coord_event 25, 5, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_22D07D
 
 RusturfTunnel_MapEvents:: @ 853431C
-	map_events RusturfTunnel_MapObjects, RusturfTunnel_MapWarps, RusturfTunnel_MapCoordEvents, 0x0
+	map_events RusturfTunnel_EventObjects, RusturfTunnel_MapWarps, RusturfTunnel_MapCoordEvents, 0x0
 
diff --git a/data/maps/events/SSTidalCorridor.inc b/data/maps/events/SSTidalCorridor.inc
index 5d6d73288..1816412d6 100644
--- a/data/maps/events/SSTidalCorridor.inc
+++ b/data/maps/events/SSTidalCorridor.inc
@@ -1,9 +1,9 @@
-SSTidalCorridor_MapObjects: @ 853A158
-	object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 1, 11, 3, 7, 0, 0, 0, 0, SSTidalCorridor_EventScript_23C119, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SAILOR, 0, 0, 16, 7, 3, 3, 32, 0, 0, 0, SSTidalCorridor_EventScript_23C1A3, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 9, 2, 3, 8, 17, 0, 0, 0, SSTidalCorridor_EventScript_23C0D9, 950, 0, 0
-	object_event 4, MAP_OBJ_GFX_WINGULL, 0, 0, 7, 2, 3, 1, 17, 0, 0, 0, SSTidalCorridor_EventScript_23C0E2, 950, 0, 0
-	object_event 5, MAP_OBJ_GFX_SCOTT, 0, 0, 9, 10, 3, 9, 0, 0, 0, 0, 0x0, 810, 0, 0
+SSTidalCorridor_EventObjects: @ 853A158
+	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 1, 11, 3, 7, 0, 0, 0, 0, SSTidalCorridor_EventScript_23C119, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 0, 16, 7, 3, 3, 32, 0, 0, 0, SSTidalCorridor_EventScript_23C1A3, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 9, 2, 3, 8, 17, 0, 0, 0, SSTidalCorridor_EventScript_23C0D9, 950, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 0, 7, 2, 3, 1, 17, 0, 0, 0, SSTidalCorridor_EventScript_23C0E2, 950, 0, 0
+	object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 0, 9, 10, 3, 9, 0, 0, 0, 0, 0x0, 810, 0, 0
 
 SSTidalCorridor_MapWarps: @ 853A1D0
 	warp_def 4, 9, 3, 0, SS_TIDAL_ROOMS
@@ -31,5 +31,5 @@ SSTidalCorridor_MapBGEvents: @ 853A218
 	bg_event 14, 9, 0, 1, 0, SSTidalCorridor_EventScript_23C110
 
 SSTidalCorridor_MapEvents:: @ 853A2A8
-	map_events SSTidalCorridor_MapObjects, SSTidalCorridor_MapWarps, 0x0, SSTidalCorridor_MapBGEvents
+	map_events SSTidalCorridor_EventObjects, SSTidalCorridor_MapWarps, 0x0, SSTidalCorridor_MapBGEvents
 
diff --git a/data/maps/events/SSTidalLowerDeck.inc b/data/maps/events/SSTidalLowerDeck.inc
index 0ce76cf29..e135eceae 100644
--- a/data/maps/events/SSTidalLowerDeck.inc
+++ b/data/maps/events/SSTidalLowerDeck.inc
@@ -1,6 +1,6 @@
-SSTidalLowerDeck_MapObjects: @ 853A2BC
-	object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 10, 4, 3, 46, 68, 0, 1, 3, SSTidalLowerDeck_EventScript_23C819, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SAILOR, 0, 0, 7, 4, 3, 50, 71, 0, 1, 3, SSTidalLowerDeck_EventScript_23C830, 0, 0, 0
+SSTidalLowerDeck_EventObjects: @ 853A2BC
+	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 10, 4, 3, 46, 68, 0, 1, 3, SSTidalLowerDeck_EventScript_23C819, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 0, 7, 4, 3, 50, 71, 0, 1, 3, SSTidalLowerDeck_EventScript_23C830, 0, 0, 0
 
 SSTidalLowerDeck_MapWarps: @ 853A2EC
 	warp_def 15, 2, 3, 8, SS_TIDAL_CORRIDOR
@@ -9,5 +9,5 @@ SSTidalLowerDeck_MapBGEvents: @ 853A2F4
 	bg_event 0, 2, 0, 7, 0, ITEM_LEFTOVERS, 35, 0
 
 SSTidalLowerDeck_MapEvents:: @ 853A300
-	map_events SSTidalLowerDeck_MapObjects, SSTidalLowerDeck_MapWarps, 0x0, SSTidalLowerDeck_MapBGEvents
+	map_events SSTidalLowerDeck_EventObjects, SSTidalLowerDeck_MapWarps, 0x0, SSTidalLowerDeck_MapBGEvents
 
diff --git a/data/maps/events/SSTidalRooms.inc b/data/maps/events/SSTidalRooms.inc
index 81648162b..14aadda5f 100644
--- a/data/maps/events/SSTidalRooms.inc
+++ b/data/maps/events/SSTidalRooms.inc
@@ -1,12 +1,12 @@
-SSTidalRooms_MapObjects: @ 853A314
-	object_event 1, MAP_OBJ_GFX_MAN_3, 0, 0, 4, 7, 3, 10, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA49, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 34, 11, 3, 9, 0, 0, 1, 3, SSTidalRooms_EventScript_23CA60, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 21, 5, 3, 10, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA77, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_5, 0, 0, 5, 14, 3, 8, 0, 0, 1, 1, SSTidalRooms_EventScript_23CA8E, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_5, 0, 0, 4, 14, 3, 8, 0, 0, 1, 1, SSTidalRooms_EventScript_23CAA9, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_BOY_4, 0, 0, 22, 11, 3, 8, 17, 0, 1, 3, SSTidalRooms_EventScript_23CAC4, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_WOMAN_3, 0, 0, 15, 6, 3, 9, 0, 0, 1, 0, SSTidalRooms_EventScript_23CADB, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_MANIAC, 0, 0, 28, 5, 3, 7, 17, 0, 0, 0, SSTidalRooms_EventScript_23C9F2, 951, 0, 0
+SSTidalRooms_EventObjects: @ 853A314
+	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 0, 4, 7, 3, 10, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA49, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 34, 11, 3, 9, 0, 0, 1, 3, SSTidalRooms_EventScript_23CA60, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 21, 5, 3, 10, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA77, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 0, 5, 14, 3, 8, 0, 0, 1, 1, SSTidalRooms_EventScript_23CA8E, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 4, 14, 3, 8, 0, 0, 1, 1, SSTidalRooms_EventScript_23CAA9, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_BOY_4, 0, 0, 22, 11, 3, 8, 17, 0, 1, 3, SSTidalRooms_EventScript_23CAC4, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 15, 6, 3, 9, 0, 0, 1, 0, SSTidalRooms_EventScript_23CADB, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 0, 28, 5, 3, 7, 17, 0, 0, 0, SSTidalRooms_EventScript_23C9F2, 951, 0, 0
 
 SSTidalRooms_MapWarps: @ 853A3D4
 	warp_def 4, 16, 0, 0, SS_TIDAL_CORRIDOR
@@ -27,5 +27,5 @@ SSTidalRooms_MapBGEvents: @ 853A434
 	bg_event 15, 12, 0, 0, 0, SSTidalRooms_EventScript_23CA33
 
 SSTidalRooms_MapEvents:: @ 853A44C
-	map_events SSTidalRooms_MapObjects, SSTidalRooms_MapWarps, 0x0, SSTidalRooms_MapBGEvents
+	map_events SSTidalRooms_EventObjects, SSTidalRooms_MapWarps, 0x0, SSTidalRooms_MapBGEvents
 
diff --git a/data/maps/events/SafariZone_North.inc b/data/maps/events/SafariZone_North.inc
index e8ace6482..d11d31fe9 100644
--- a/data/maps/events/SafariZone_North.inc
+++ b/data/maps/events/SafariZone_North.inc
@@ -1,14 +1,14 @@
-SafariZone_North_MapObjects: @ 853B160
-	object_event 1, MAP_OBJ_GFX_FISHERMAN, 0, 0, 22, 9, 3, 2, 17, 0, 0, 0, SafariZone_North_EventScript_23D254, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_5, 0, 0, 6, 29, 3, 2, 17, 0, 0, 0, SafariZone_North_EventScript_23D25D, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 25, 10, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 17, 0, 0
-	object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 25, 13, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 18, 0, 0
-	object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 28, 14, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 19, 0, 0
-	object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 23, 6, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 20, 0, 0
-	object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 20, 7, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 21, 0, 0
-	object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 27, 7, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 22, 0, 0
-	object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 6, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2912C9, 1119, 0, 0
+SafariZone_North_EventObjects: @ 853B160
+	object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 22, 9, 3, 2, 17, 0, 0, 0, SafariZone_North_EventScript_23D254, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 0, 6, 29, 3, 2, 17, 0, 0, 0, SafariZone_North_EventScript_23D25D, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 25, 10, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 17, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 25, 13, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 18, 0, 0
+	object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 28, 14, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 19, 0, 0
+	object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 23, 6, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 20, 0, 0
+	object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 20, 7, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 21, 0, 0
+	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 27, 7, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 22, 0, 0
+	object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 6, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2912C9, 1119, 0, 0
 
 SafariZone_North_MapEvents:: @ 853B238
-	map_events SafariZone_North_MapObjects, 0x0, 0x0, 0x0
+	map_events SafariZone_North_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/SafariZone_Northeast.inc b/data/maps/events/SafariZone_Northeast.inc
index 84505d6e6..233b55da0 100644
--- a/data/maps/events/SafariZone_Northeast.inc
+++ b/data/maps/events/SafariZone_Northeast.inc
@@ -1,18 +1,18 @@
-SafariZone_Northeast_MapObjects: @ 853B968
-	object_event 1, MAP_OBJ_GFX_BOY_3, 0, 0, 8, 20, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_23D3C6, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 30, 22, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_23D3D8, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 11, 11, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 21, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_1, 0, 0, 13, 35, 0, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_23D3CF, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 8, 13, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 19, 0, 0
-	object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 9, 7, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 17, 0, 0
-	object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 8, 10, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 20, 0, 0
-	object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 12, 8, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 18, 0, 0
-	object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 8, 17, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2912E3, 1169, 0, 0
+SafariZone_Northeast_EventObjects: @ 853B968
+	object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 0, 8, 20, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_23D3C6, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 30, 22, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_23D3D8, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 11, 11, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 21, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 13, 35, 0, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_23D3CF, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 8, 13, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 19, 0, 0
+	object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 9, 7, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 17, 0, 0
+	object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 8, 10, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 20, 0, 0
+	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 12, 8, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 18, 0, 0
+	object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 8, 17, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2912E3, 1169, 0, 0
 
 SafariZone_Northeast_MapBGEvents: @ 853BA40
 	bg_event 31, 35, 3, 7, 0, ITEM_RARE_CANDY, 106, 0
 	bg_event 21, 5, 3, 7, 0, ITEM_ZINC, 107, 0
 
 SafariZone_Northeast_MapEvents:: @ 853BA58
-	map_events SafariZone_Northeast_MapObjects, 0x0, 0x0, SafariZone_Northeast_MapBGEvents
+	map_events SafariZone_Northeast_EventObjects, 0x0, 0x0, SafariZone_Northeast_MapBGEvents
 
diff --git a/data/maps/events/SafariZone_Northwest.inc b/data/maps/events/SafariZone_Northwest.inc
index 64152d008..41c2fe198 100644
--- a/data/maps/events/SafariZone_Northwest.inc
+++ b/data/maps/events/SafariZone_Northwest.inc
@@ -1,7 +1,7 @@
-SafariZone_Northwest_MapObjects: @ 853B11C
-	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 8, 8, 5, 8, 0, 0, 0, 0, SafariZone_Northwest_EventScript_23D24A, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 33, 7, 3, 1, 17, 0, 0, 0, SafariZone_Northwest_EventScript_2912BC, 1094, 0, 0
+SafariZone_Northwest_EventObjects: @ 853B11C
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 8, 8, 5, 8, 0, 0, 0, 0, SafariZone_Northwest_EventScript_23D24A, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 33, 7, 3, 1, 17, 0, 0, 0, SafariZone_Northwest_EventScript_2912BC, 1094, 0, 0
 
 SafariZone_Northwest_MapEvents:: @ 853B14C
-	map_events SafariZone_Northwest_MapObjects, 0x0, 0x0, 0x0
+	map_events SafariZone_Northwest_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/SafariZone_RestHouse.inc b/data/maps/events/SafariZone_RestHouse.inc
index 863c3113a..1ab278781 100644
--- a/data/maps/events/SafariZone_RestHouse.inc
+++ b/data/maps/events/SafariZone_RestHouse.inc
@@ -1,12 +1,12 @@
-SafariZone_RestHouse_MapObjects: @ 853B8FC
-	object_event 1, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 7, 4, 0, 10, 17, 0, 0, 0, SafariZone_RestHouse_EventScript_242BE7, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 8, 4, 0, 9, 17, 0, 0, 0, SafariZone_RestHouse_EventScript_242BF0, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 0, 2, 5, 3, 10, 17, 0, 0, 0, SafariZone_RestHouse_EventScript_242BF9, 0, 0, 0
+SafariZone_RestHouse_EventObjects: @ 853B8FC
+	object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 7, 4, 0, 10, 17, 0, 0, 0, SafariZone_RestHouse_EventScript_242BE7, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 8, 4, 0, 9, 17, 0, 0, 0, SafariZone_RestHouse_EventScript_242BF0, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 2, 5, 3, 10, 17, 0, 0, 0, SafariZone_RestHouse_EventScript_242BF9, 0, 0, 0
 
 SafariZone_RestHouse_MapWarps: @ 853B944
 	warp_def 3, 8, 0, 0, SAFARI_ZONE_SOUTHWEST
 	warp_def 4, 8, 0, 0, SAFARI_ZONE_SOUTHWEST
 
 SafariZone_RestHouse_MapEvents:: @ 853B954
-	map_events SafariZone_RestHouse_MapObjects, SafariZone_RestHouse_MapWarps, 0x0, 0x0
+	map_events SafariZone_RestHouse_EventObjects, SafariZone_RestHouse_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SafariZone_South.inc b/data/maps/events/SafariZone_South.inc
index 4a0ead84c..c1e293e6f 100644
--- a/data/maps/events/SafariZone_South.inc
+++ b/data/maps/events/SafariZone_South.inc
@@ -1,14 +1,14 @@
-SafariZone_South_MapObjects: @ 853B2A4
-	object_event 1, MAP_OBJ_GFX_CAMPER, 0, 0, 32, 34, 4, 8, 0, 0, 0, 0, SafariZone_South_EventScript_23D2E5, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BOY_1, 0, 0, 26, 28, 3, 2, 17, 0, 0, 0, SafariZone_South_EventScript_23D2CA, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_5, 0, 0, 16, 6, 5, 8, 0, 0, 0, 0, SafariZone_South_EventScript_23D2D3, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 15, 31, 3, 2, 17, 0, 0, 0, SafariZone_South_EventScript_23D2DC, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_CAMPER, 0, 0, 36, 16, 3, 9, 17, 0, 0, 0, SafariZone_South_EventScript_23D390, 717, 0, 0
-	object_event 6, MAP_OBJ_GFX_CAMPER, 0, 0, 36, 17, 3, 9, 17, 0, 0, 0, SafariZone_South_EventScript_23D3A2, 717, 0, 0
+SafariZone_South_EventObjects: @ 853B2A4
+	object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 0, 32, 34, 4, 8, 0, 0, 0, 0, SafariZone_South_EventScript_23D2E5, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 0, 26, 28, 3, 2, 17, 0, 0, 0, SafariZone_South_EventScript_23D2CA, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 0, 16, 6, 5, 8, 0, 0, 0, 0, SafariZone_South_EventScript_23D2D3, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 15, 31, 3, 2, 17, 0, 0, 0, SafariZone_South_EventScript_23D2DC, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 0, 36, 16, 3, 9, 17, 0, 0, 0, SafariZone_South_EventScript_23D390, 717, 0, 0
+	object_event 6, EVENT_OBJ_GFX_CAMPER, 0, 0, 36, 17, 3, 9, 17, 0, 0, 0, SafariZone_South_EventScript_23D3A2, 717, 0, 0
 
 SafariZone_South_MapWarps: @ 853B334
 	warp_def 32, 33, 0, 0, ROUTE_121_SAFARI_ZONE_ENTRANCE
 
 SafariZone_South_MapEvents:: @ 853B33C
-	map_events SafariZone_South_MapObjects, SafariZone_South_MapWarps, 0x0, 0x0
+	map_events SafariZone_South_EventObjects, SafariZone_South_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SafariZone_Southeast.inc b/data/maps/events/SafariZone_Southeast.inc
index 3970e6eb0..61e6b93fe 100644
--- a/data/maps/events/SafariZone_Southeast.inc
+++ b/data/maps/events/SafariZone_Southeast.inc
@@ -1,14 +1,14 @@
-SafariZone_Southeast_MapObjects: @ 853BA6C
-	object_event 1, MAP_OBJ_GFX_BOY_4, 0, 0, 7, 7, 3, 1, 17, 0, 0, 0, SafariZone_Southeast_EventScript_23D3BD, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 0, 20, 30, 3, 2, 17, 0, 0, 0, SafariZone_Southeast_EventScript_23D3B4, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 8, 26, 3, 2, 17, 0, 0, 0, SafariZone_Southeast_EventScript_23D3AB, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 31, 15, 3, 1, 17, 0, 0, 0, SafariZone_Southeast_EventScript_2912F0, 1170, 0, 0
-	object_event 5, MAP_OBJ_GFX_CAMPER, 0, 0, 12, 16, 3, 9, 17, 0, 0, 0, SafariZone_Southeast_EventScript_23D399, 747, 0, 0
+SafariZone_Southeast_EventObjects: @ 853BA6C
+	object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 0, 7, 7, 3, 1, 17, 0, 0, 0, SafariZone_Southeast_EventScript_23D3BD, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 20, 30, 3, 2, 17, 0, 0, 0, SafariZone_Southeast_EventScript_23D3B4, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 8, 26, 3, 2, 17, 0, 0, 0, SafariZone_Southeast_EventScript_23D3AB, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 31, 15, 3, 1, 17, 0, 0, 0, SafariZone_Southeast_EventScript_2912F0, 1170, 0, 0
+	object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 0, 12, 16, 3, 9, 17, 0, 0, 0, SafariZone_Southeast_EventScript_23D399, 747, 0, 0
 
 SafariZone_Southeast_MapBGEvents: @ 853BAE4
 	bg_event 19, 36, 3, 7, 0, ITEM_PP_UP, 108, 0
 	bg_event 32, 33, 0, 7, 0, ITEM_FULL_RESTORE, 105, 0
 
 SafariZone_Southeast_MapEvents:: @ 853BAFC
-	map_events SafariZone_Southeast_MapObjects, 0x0, 0x0, SafariZone_Southeast_MapBGEvents
+	map_events SafariZone_Southeast_EventObjects, 0x0, 0x0, SafariZone_Southeast_MapBGEvents
 
diff --git a/data/maps/events/SafariZone_Southwest.inc b/data/maps/events/SafariZone_Southwest.inc
index 9edb33ddb..eda3552eb 100644
--- a/data/maps/events/SafariZone_Southwest.inc
+++ b/data/maps/events/SafariZone_Southwest.inc
@@ -1,6 +1,6 @@
-SafariZone_Southwest_MapObjects: @ 853B24C
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 22, 9, 3, 8, 0, 0, 0, 0, SafariZone_Southwest_EventScript_23D267, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 37, 3, 1, 17, 0, 0, 0, SafariZone_Southwest_EventScript_2912D6, 1131, 0, 0
+SafariZone_Southwest_EventObjects: @ 853B24C
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 22, 9, 3, 8, 0, 0, 0, 0, SafariZone_Southwest_EventScript_23D267, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 37, 3, 1, 17, 0, 0, 0, SafariZone_Southwest_EventScript_2912D6, 1131, 0, 0
 
 SafariZone_Southwest_MapWarps: @ 853B27C
 	warp_def 29, 7, 3, 0, SAFARI_ZONE_REST_HOUSE
@@ -9,5 +9,5 @@ SafariZone_Southwest_MapBGEvents: @ 853B284
 	bg_event 32, 7, 3, 0, 0, SafariZone_Southwest_EventScript_23D270
 
 SafariZone_Southwest_MapEvents:: @ 853B290
-	map_events SafariZone_Southwest_MapObjects, SafariZone_Southwest_MapWarps, 0x0, SafariZone_Southwest_MapBGEvents
+	map_events SafariZone_Southwest_EventObjects, SafariZone_Southwest_MapWarps, 0x0, SafariZone_Southwest_MapBGEvents
 
diff --git a/data/maps/events/ScorchedSlab.inc b/data/maps/events/ScorchedSlab.inc
index f5c878466..313423b51 100644
--- a/data/maps/events/ScorchedSlab.inc
+++ b/data/maps/events/ScorchedSlab.inc
@@ -1,9 +1,9 @@
-ScorchedSlab_MapObjects: @ 8536F88
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 5, 3, 1, 0, 0, 0, 0, ScorchedSlab_EventScript_2912AF, 1079, 0, 0
+ScorchedSlab_EventObjects: @ 8536F88
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 5, 3, 1, 0, 0, 0, 0, ScorchedSlab_EventScript_2912AF, 1079, 0, 0
 
 ScorchedSlab_MapWarps: @ 8536FA0
 	warp_def 7, 16, 1, 1, ROUTE_120
 
 ScorchedSlab_MapEvents:: @ 8536FA8
-	map_events ScorchedSlab_MapObjects, ScorchedSlab_MapWarps, 0x0, 0x0
+	map_events ScorchedSlab_EventObjects, ScorchedSlab_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SeafloorCavern_Entrance.inc b/data/maps/events/SeafloorCavern_Entrance.inc
index 3a41757e2..1118c0ab3 100644
--- a/data/maps/events/SeafloorCavern_Entrance.inc
+++ b/data/maps/events/SeafloorCavern_Entrance.inc
@@ -1,10 +1,10 @@
-SeafloorCavern_Entrance_MapObjects: @ 85356BC
-	object_event 1, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 10, 2, 3, 7, 17, 0, 0, 0, SeafloorCavern_Entrance_EventScript_234485, 941, 0, 0
+SeafloorCavern_Entrance_EventObjects: @ 85356BC
+	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 10, 2, 3, 7, 17, 0, 0, 0, SeafloorCavern_Entrance_EventScript_234485, 941, 0, 0
 
 SeafloorCavern_Entrance_MapWarps: @ 85356D4
 	warp_def 10, 18, 3, 0, UNDERWATER_4
 	warp_def 10, 1, 3, 0, SEAFLOOR_CAVERN_ROOM_1
 
 SeafloorCavern_Entrance_MapEvents:: @ 85356E4
-	map_events SeafloorCavern_Entrance_MapObjects, SeafloorCavern_Entrance_MapWarps, 0x0, 0x0
+	map_events SeafloorCavern_Entrance_EventObjects, SeafloorCavern_Entrance_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SeafloorCavern_Room1.inc b/data/maps/events/SeafloorCavern_Room1.inc
index 4a219357c..31fbb7d86 100644
--- a/data/maps/events/SeafloorCavern_Room1.inc
+++ b/data/maps/events/SeafloorCavern_Room1.inc
@@ -1,9 +1,9 @@
-SeafloorCavern_Room1_MapObjects: @ 85356F8
-	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, 17, 0, 0
-	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, 18, 0, 0
-	object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 5, 10, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2907A6, 19, 0, 0
-	object_event 4, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 8, 6, 3, 1, 17, 0, 1, 2, SeafloorCavern_Room1_EventScript_2347EC, 946, 0, 0
-	object_event 5, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 15, 10, 3, 16, 17, 0, 1, 3, SeafloorCavern_Room1_EventScript_234803, 946, 0, 0
+SeafloorCavern_Room1_EventObjects: @ 85356F8
+	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, 17, 0, 0
+	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, 18, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 5, 10, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2907A6, 19, 0, 0
+	object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 8, 6, 3, 1, 17, 0, 1, 2, SeafloorCavern_Room1_EventScript_2347EC, 946, 0, 0
+	object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 15, 10, 3, 16, 17, 0, 1, 3, SeafloorCavern_Room1_EventScript_234803, 946, 0, 0
 
 SeafloorCavern_Room1_MapWarps: @ 8535770
 	warp_def 5, 18, 3, 1, SEAFLOOR_CAVERN_ENTRANCE
@@ -11,5 +11,5 @@ SeafloorCavern_Room1_MapWarps: @ 8535770
 	warp_def 6, 2, 3, 0, SEAFLOOR_CAVERN_ROOM_2
 
 SeafloorCavern_Room1_MapEvents:: @ 8535788
-	map_events SeafloorCavern_Room1_MapObjects, SeafloorCavern_Room1_MapWarps, 0x0, 0x0
+	map_events SeafloorCavern_Room1_EventObjects, SeafloorCavern_Room1_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SeafloorCavern_Room2.inc b/data/maps/events/SeafloorCavern_Room2.inc
index cf0c2dfad..608b45e50 100644
--- a/data/maps/events/SeafloorCavern_Room2.inc
+++ b/data/maps/events/SeafloorCavern_Room2.inc
@@ -1,12 +1,12 @@
-SeafloorCavern_Room2_MapObjects: @ 853579C
-	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 3, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 18, 0, 0
-	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 10, 3, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 19, 0, 0
-	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 17, 0, 0
-	object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 21, 0, 0
-	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 7, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 22, 0, 0
-	object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 8, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, 24, 0, 0
-	object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 9, 3, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, 25, 0, 0
-	object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 23, 0, 0
+SeafloorCavern_Room2_EventObjects: @ 853579C
+	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 3, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 18, 0, 0
+	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 10, 3, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 19, 0, 0
+	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 17, 0, 0
+	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 21, 0, 0
+	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 7, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 22, 0, 0
+	object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 8, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, 24, 0, 0
+	object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 9, 3, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, 25, 0, 0
+	object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 23, 0, 0
 
 SeafloorCavern_Room2_MapWarps: @ 853585C
 	warp_def 10, 7, 3, 2, SEAFLOOR_CAVERN_ROOM_1
@@ -15,5 +15,5 @@ SeafloorCavern_Room2_MapWarps: @ 853585C
 	warp_def 11, 1, 3, 0, SEAFLOOR_CAVERN_ROOM_7
 
 SeafloorCavern_Room2_MapEvents:: @ 853587C
-	map_events SeafloorCavern_Room2_MapObjects, SeafloorCavern_Room2_MapWarps, 0x0, 0x0
+	map_events SeafloorCavern_Room2_EventObjects, SeafloorCavern_Room2_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SeafloorCavern_Room3.inc b/data/maps/events/SeafloorCavern_Room3.inc
index 964b45a6d..f7c919131 100644
--- a/data/maps/events/SeafloorCavern_Room3.inc
+++ b/data/maps/events/SeafloorCavern_Room3.inc
@@ -1,13 +1,13 @@
-SeafloorCavern_Room3_MapObjects: @ 8535890
-	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 10, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 18, 0, 0
-	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 11, 10, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 20, 0, 0
-	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 9, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 21, 0, 0
-	object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 22, 0, 0
-	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 11, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 23, 0, 0
-	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 24, 0, 0
-	object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 25, 0, 0
-	object_event 8, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 9, 5, 3, 9, 17, 0, 1, 6, SeafloorCavern_Room3_EventScript_234938, 946, 0, 0
-	object_event 9, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 5, 5, 3, 10, 17, 0, 1, 4, SeafloorCavern_Room3_EventScript_23494F, 946, 0, 0
+SeafloorCavern_Room3_EventObjects: @ 8535890
+	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 10, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 18, 0, 0
+	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 11, 10, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 20, 0, 0
+	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 9, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 21, 0, 0
+	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 22, 0, 0
+	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 11, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 23, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 24, 0, 0
+	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 25, 0, 0
+	object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 9, 5, 3, 9, 17, 0, 1, 6, SeafloorCavern_Room3_EventScript_234938, 946, 0, 0
+	object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 5, 5, 3, 10, 17, 0, 1, 4, SeafloorCavern_Room3_EventScript_23494F, 946, 0, 0
 
 SeafloorCavern_Room3_MapWarps: @ 8535968
 	warp_def 8, 1, 3, 1, SEAFLOOR_CAVERN_ROOM_8
@@ -15,5 +15,5 @@ SeafloorCavern_Room3_MapWarps: @ 8535968
 	warp_def 4, 15, 3, 1, SEAFLOOR_CAVERN_ROOM_6
 
 SeafloorCavern_Room3_MapEvents:: @ 8535980
-	map_events SeafloorCavern_Room3_MapObjects, SeafloorCavern_Room3_MapWarps, 0x0, 0x0
+	map_events SeafloorCavern_Room3_EventObjects, SeafloorCavern_Room3_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SeafloorCavern_Room4.inc b/data/maps/events/SeafloorCavern_Room4.inc
index 79d57dd72..3b7f6f2ee 100644
--- a/data/maps/events/SeafloorCavern_Room4.inc
+++ b/data/maps/events/SeafloorCavern_Room4.inc
@@ -1,6 +1,6 @@
-SeafloorCavern_Room4_MapObjects: @ 8535994
-	object_event 1, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 5, 8, 3, 17, 17, 0, 1, 3, SeafloorCavern_Room4_EventScript_234C9C, 946, 0, 0
-	object_event 2, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 5, 12, 3, 7, 17, 0, 1, 3, SeafloorCavern_Room4_EventScript_234CB3, 946, 0, 0
+SeafloorCavern_Room4_EventObjects: @ 8535994
+	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 5, 8, 3, 17, 17, 0, 1, 3, SeafloorCavern_Room4_EventScript_234C9C, 946, 0, 0
+	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 5, 12, 3, 7, 17, 0, 1, 3, SeafloorCavern_Room4_EventScript_234CB3, 946, 0, 0
 
 SeafloorCavern_Room4_MapWarps: @ 85359C4
 	warp_def 13, 1, 3, 1, SEAFLOOR_CAVERN_ROOM_2
@@ -9,5 +9,5 @@ SeafloorCavern_Room4_MapWarps: @ 85359C4
 	warp_def 10, 15, 3, 1, SEAFLOOR_CAVERN_ENTRANCE
 
 SeafloorCavern_Room4_MapEvents:: @ 85359E4
-	map_events SeafloorCavern_Room4_MapObjects, SeafloorCavern_Room4_MapWarps, 0x0, 0x0
+	map_events SeafloorCavern_Room4_EventObjects, SeafloorCavern_Room4_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SeafloorCavern_Room5.inc b/data/maps/events/SeafloorCavern_Room5.inc
index b88a862ab..4fd74a9c7 100644
--- a/data/maps/events/SeafloorCavern_Room5.inc
+++ b/data/maps/events/SeafloorCavern_Room5.inc
@@ -1,10 +1,10 @@
-SeafloorCavern_Room5_MapObjects: @ 85359F8
-	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 3, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 17, 0, 0
-	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 18, 0, 0
-	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 11, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 19, 0, 0
-	object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 3, 13, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, 21, 0, 0
-	object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 13, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, 22, 0, 0
-	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 20, 0, 0
+SeafloorCavern_Room5_EventObjects: @ 85359F8
+	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 3, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 17, 0, 0
+	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 18, 0, 0
+	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 11, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 19, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 3, 13, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, 21, 0, 0
+	object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 13, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, 22, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 20, 0, 0
 
 SeafloorCavern_Room5_MapWarps: @ 8535A88
 	warp_def 4, 1, 3, 1, SEAFLOOR_CAVERN_ROOM_1
@@ -12,5 +12,5 @@ SeafloorCavern_Room5_MapWarps: @ 8535A88
 	warp_def 7, 17, 3, 2, SEAFLOOR_CAVERN_ROOM_4
 
 SeafloorCavern_Room5_MapEvents:: @ 8535AA0
-	map_events SeafloorCavern_Room5_MapObjects, SeafloorCavern_Room5_MapWarps, 0x0, 0x0
+	map_events SeafloorCavern_Room5_EventObjects, SeafloorCavern_Room5_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SeafloorCavern_Room8.inc b/data/maps/events/SeafloorCavern_Room8.inc
index 7fd65fc08..65a1da014 100644
--- a/data/maps/events/SeafloorCavern_Room8.inc
+++ b/data/maps/events/SeafloorCavern_Room8.inc
@@ -1,21 +1,21 @@
-SeafloorCavern_Room8_MapObjects: @ 8535B04
-	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 17, 0, 0
-	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 18, 0, 0
-	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 19, 0, 0
-	object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 3, 6, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 20, 0, 0
-	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 7, 6, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 21, 0, 0
-	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 22, 0, 0
-	object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 23, 0, 0
-	object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 24, 0, 0
-	object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 3, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 25, 0, 0
-	object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 26, 0, 0
-	object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 27, 0, 0
-	object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 7, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 28, 0, 0
+SeafloorCavern_Room8_EventObjects: @ 8535B04
+	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 17, 0, 0
+	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 18, 0, 0
+	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 19, 0, 0
+	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 3, 6, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 20, 0, 0
+	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 7, 6, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 21, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 22, 0, 0
+	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 23, 0, 0
+	object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 24, 0, 0
+	object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 3, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 25, 0, 0
+	object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 26, 0, 0
+	object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 27, 0, 0
+	object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 7, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 28, 0, 0
 
 SeafloorCavern_Room8_MapWarps: @ 8535C24
 	warp_def 5, 2, 3, 0, SEAFLOOR_CAVERN_ROOM_9
 	warp_def 5, 12, 3, 0, SEAFLOOR_CAVERN_ROOM_3
 
 SeafloorCavern_Room8_MapEvents:: @ 8535C34
-	map_events SeafloorCavern_Room8_MapObjects, SeafloorCavern_Room8_MapWarps, 0x0, 0x0
+	map_events SeafloorCavern_Room8_EventObjects, SeafloorCavern_Room8_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SeafloorCavern_Room9.inc b/data/maps/events/SeafloorCavern_Room9.inc
index bcd27d030..8c203021c 100644
--- a/data/maps/events/SeafloorCavern_Room9.inc
+++ b/data/maps/events/SeafloorCavern_Room9.inc
@@ -1,11 +1,11 @@
-SeafloorCavern_Room9_MapObjects: @ 8535C48
-	object_event 1, MAP_OBJ_GFX_KYOGRE_1, 0, 0, 17, 38, 3, 8, 0, 0, 0, 0, 0x0, 859, 0, 0
-	object_event 2, MAP_OBJ_GFX_ARCHIE, 0, 0, 9, 42, 3, 10, 0, 0, 0, 0, 0x0, 828, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAXIE, 0, 0, 9, 42, 3, 10, 0, 0, 0, 0, 0x0, 829, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 8, 41, 3, 10, 0, 0, 0, 0, 0x0, 831, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 8, 42, 3, 10, 0, 0, 0, 0, 0x0, 831, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 14, 5, 3, 1, 17, 0, 0, 0, SeafloorCavern_Room9_EventScript_291401, 1090, 0, 0
-	object_event 7, MAP_OBJ_GFX_KYOGRE_2, 0, 0, 17, 38, 3, 8, 17, 0, 0, 0, 0x0, 733, 0, 0
+SeafloorCavern_Room9_EventObjects: @ 8535C48
+	object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 0, 17, 38, 3, 8, 0, 0, 0, 0, 0x0, 859, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 0, 9, 42, 3, 10, 0, 0, 0, 0, 0x0, 828, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAXIE, 0, 0, 9, 42, 3, 10, 0, 0, 0, 0, 0x0, 829, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 8, 41, 3, 10, 0, 0, 0, 0, 0x0, 831, 0, 0
+	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 8, 42, 3, 10, 0, 0, 0, 0, 0x0, 831, 0, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 14, 5, 3, 1, 17, 0, 0, 0, SeafloorCavern_Room9_EventScript_291401, 1090, 0, 0
+	object_event 7, EVENT_OBJ_GFX_KYOGRE_2, 0, 0, 17, 38, 3, 8, 17, 0, 0, 0, 0x0, 733, 0, 0
 
 SeafloorCavern_Room9_MapWarps: @ 8535CF0
 	warp_def 5, 4, 3, 0, SEAFLOOR_CAVERN_ROOM_8
@@ -14,5 +14,5 @@ SeafloorCavern_Room9_MapCoordEvents: @ 8535CF8
 	coord_event 17, 42, 3, 0, VAR_0x40A2, 0, 0, SeafloorCavern_Room9_EventScript_234DC9
 
 SeafloorCavern_Room9_MapEvents:: @ 8535D08
-	map_events SeafloorCavern_Room9_MapObjects, SeafloorCavern_Room9_MapWarps, SeafloorCavern_Room9_MapCoordEvents, 0x0
+	map_events SeafloorCavern_Room9_EventObjects, SeafloorCavern_Room9_MapWarps, SeafloorCavern_Room9_MapCoordEvents, 0x0
 
diff --git a/data/maps/events/SecretBase_BlueCave1.inc b/data/maps/events/SecretBase_BlueCave1.inc
index eb92a3851..301779af5 100644
--- a/data/maps/events/SecretBase_BlueCave1.inc
+++ b/data/maps/events/SecretBase_BlueCave1.inc
@@ -1,11 +1,11 @@
-SecretBase_BlueCave1_MapObjects: @ 8537BEC
+SecretBase_BlueCave1_EventObjects: @ 8537BEC
 	object_event 1, 255, 0, 0, 4, 2, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave1_EventScript_275D64, 173, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
 	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
 	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
 	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
@@ -19,5 +19,5 @@ SecretBase_BlueCave1_MapWarps: @ 8537D54
 	warp_def 5, 7, 0, 126, NONE
 
 SecretBase_BlueCave1_MapEvents:: @ 8537D5C
-	map_events SecretBase_BlueCave1_MapObjects, SecretBase_BlueCave1_MapWarps, 0x0, 0x0
+	map_events SecretBase_BlueCave1_EventObjects, SecretBase_BlueCave1_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SecretBase_BlueCave2.inc b/data/maps/events/SecretBase_BlueCave2.inc
index e2db7471f..f919cfae0 100644
--- a/data/maps/events/SecretBase_BlueCave2.inc
+++ b/data/maps/events/SecretBase_BlueCave2.inc
@@ -1,11 +1,11 @@
-SecretBase_BlueCave2_MapObjects: @ 8538504
+SecretBase_BlueCave2_EventObjects: @ 8538504
 	object_event 1, 255, 0, 0, 2, 1, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave2_EventScript_275D64, 173, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
 	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
 	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
 	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
@@ -19,5 +19,5 @@ SecretBase_BlueCave2_MapWarps: @ 853866C
 	warp_def 7, 5, 0, 126, NONE
 
 SecretBase_BlueCave2_MapEvents:: @ 8538674
-	map_events SecretBase_BlueCave2_MapObjects, SecretBase_BlueCave2_MapWarps, 0x0, 0x0
+	map_events SecretBase_BlueCave2_EventObjects, SecretBase_BlueCave2_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SecretBase_BlueCave3.inc b/data/maps/events/SecretBase_BlueCave3.inc
index cc5606ac4..ba2b28eb1 100644
--- a/data/maps/events/SecretBase_BlueCave3.inc
+++ b/data/maps/events/SecretBase_BlueCave3.inc
@@ -1,11 +1,11 @@
-SecretBase_BlueCave3_MapObjects: @ 8538E1C
+SecretBase_BlueCave3_EventObjects: @ 8538E1C
 	object_event 1, 255, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave3_EventScript_275D64, 173, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
 	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
 	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
 	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
@@ -19,5 +19,5 @@ SecretBase_BlueCave3_MapWarps: @ 8538F84
 	warp_def 4, 15, 0, 126, NONE
 
 SecretBase_BlueCave3_MapEvents:: @ 8538F8C
-	map_events SecretBase_BlueCave3_MapObjects, SecretBase_BlueCave3_MapWarps, 0x0, 0x0
+	map_events SecretBase_BlueCave3_EventObjects, SecretBase_BlueCave3_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SecretBase_BlueCave4.inc b/data/maps/events/SecretBase_BlueCave4.inc
index 0efdf765d..cc79f44be 100644
--- a/data/maps/events/SecretBase_BlueCave4.inc
+++ b/data/maps/events/SecretBase_BlueCave4.inc
@@ -1,11 +1,11 @@
-SecretBase_BlueCave4_MapObjects: @ 8539734
+SecretBase_BlueCave4_EventObjects: @ 8539734
 	object_event 1, 255, 0, 0, 5, 13, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave4_EventScript_275D64, 173, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
 	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
 	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
 	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
@@ -19,5 +19,5 @@ SecretBase_BlueCave4_MapWarps: @ 853989C
 	warp_def 4, 15, 0, 126, NONE
 
 SecretBase_BlueCave4_MapEvents:: @ 85398A4
-	map_events SecretBase_BlueCave4_MapObjects, SecretBase_BlueCave4_MapWarps, 0x0, 0x0
+	map_events SecretBase_BlueCave4_EventObjects, SecretBase_BlueCave4_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SecretBase_BrownCave1.inc b/data/maps/events/SecretBase_BrownCave1.inc
index 7755a5a09..e937ac1f4 100644
--- a/data/maps/events/SecretBase_BrownCave1.inc
+++ b/data/maps/events/SecretBase_BrownCave1.inc
@@ -1,11 +1,11 @@
-SecretBase_BrownCave1_MapObjects: @ 8537A68
+SecretBase_BrownCave1_EventObjects: @ 8537A68
 	object_event 1, 255, 0, 0, 5, 2, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave1_EventScript_275D64, 173, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
 	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
 	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
 	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
@@ -19,5 +19,5 @@ SecretBase_BrownCave1_MapWarps: @ 8537BD0
 	warp_def 5, 7, 0, 126, NONE
 
 SecretBase_BrownCave1_MapEvents:: @ 8537BD8
-	map_events SecretBase_BrownCave1_MapObjects, SecretBase_BrownCave1_MapWarps, 0x0, 0x0
+	map_events SecretBase_BrownCave1_EventObjects, SecretBase_BrownCave1_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SecretBase_BrownCave2.inc b/data/maps/events/SecretBase_BrownCave2.inc
index 37a1387bf..d3885cb0d 100644
--- a/data/maps/events/SecretBase_BrownCave2.inc
+++ b/data/maps/events/SecretBase_BrownCave2.inc
@@ -1,11 +1,11 @@
-SecretBase_BrownCave2_MapObjects: @ 8538380
+SecretBase_BrownCave2_EventObjects: @ 8538380
 	object_event 1, 255, 0, 0, 11, 2, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave2_EventScript_275D64, 173, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
 	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
 	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
 	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
@@ -19,5 +19,5 @@ SecretBase_BrownCave2_MapWarps: @ 85384E8
 	warp_def 1, 7, 0, 126, NONE
 
 SecretBase_BrownCave2_MapEvents:: @ 85384F0
-	map_events SecretBase_BrownCave2_MapObjects, SecretBase_BrownCave2_MapWarps, 0x0, 0x0
+	map_events SecretBase_BrownCave2_EventObjects, SecretBase_BrownCave2_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SecretBase_BrownCave3.inc b/data/maps/events/SecretBase_BrownCave3.inc
index 14c9905a2..c0ec35e37 100644
--- a/data/maps/events/SecretBase_BrownCave3.inc
+++ b/data/maps/events/SecretBase_BrownCave3.inc
@@ -1,11 +1,11 @@
-SecretBase_BrownCave3_MapObjects: @ 8538C98
+SecretBase_BrownCave3_EventObjects: @ 8538C98
 	object_event 1, 255, 0, 0, 1, 7, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave3_EventScript_275D64, 173, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
 	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
 	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
 	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
@@ -19,5 +19,5 @@ SecretBase_BrownCave3_MapWarps: @ 8538E00
 	warp_def 11, 9, 0, 126, NONE
 
 SecretBase_BrownCave3_MapEvents:: @ 8538E08
-	map_events SecretBase_BrownCave3_MapObjects, SecretBase_BrownCave3_MapWarps, 0x0, 0x0
+	map_events SecretBase_BrownCave3_EventObjects, SecretBase_BrownCave3_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SecretBase_BrownCave4.inc b/data/maps/events/SecretBase_BrownCave4.inc
index 543cb0072..de9250cbb 100644
--- a/data/maps/events/SecretBase_BrownCave4.inc
+++ b/data/maps/events/SecretBase_BrownCave4.inc
@@ -1,11 +1,11 @@
-SecretBase_BrownCave4_MapObjects: @ 85395B0
+SecretBase_BrownCave4_EventObjects: @ 85395B0
 	object_event 1, 255, 0, 0, 2, 1, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave4_EventScript_275D64, 173, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
 	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
 	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
 	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
@@ -19,5 +19,5 @@ SecretBase_BrownCave4_MapWarps: @ 8539718
 	warp_def 2, 8, 0, 126, NONE
 
 SecretBase_BrownCave4_MapEvents:: @ 8539720
-	map_events SecretBase_BrownCave4_MapObjects, SecretBase_BrownCave4_MapWarps, 0x0, 0x0
+	map_events SecretBase_BrownCave4_EventObjects, SecretBase_BrownCave4_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SecretBase_RedCave1.inc b/data/maps/events/SecretBase_RedCave1.inc
index ebc15ecd7..aa664f45c 100644
--- a/data/maps/events/SecretBase_RedCave1.inc
+++ b/data/maps/events/SecretBase_RedCave1.inc
@@ -1,11 +1,11 @@
-SecretBase_RedCave1_MapObjects: @ 85378E4
+SecretBase_RedCave1_EventObjects: @ 85378E4
 	object_event 1, 255, 0, 0, 7, 4, 3, 8, 0, 0, 0, 0, SecretBase_RedCave1_EventScript_275D64, 173, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
 	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
 	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
 	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
@@ -19,5 +19,5 @@ SecretBase_RedCave1_MapWarps: @ 8537A4C
 	warp_def 5, 7, 0, 126, NONE
 
 SecretBase_RedCave1_MapEvents:: @ 8537A54
-	map_events SecretBase_RedCave1_MapObjects, SecretBase_RedCave1_MapWarps, 0x0, 0x0
+	map_events SecretBase_RedCave1_EventObjects, SecretBase_RedCave1_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SecretBase_RedCave2.inc b/data/maps/events/SecretBase_RedCave2.inc
index ef7958e9a..956e3b03b 100644
--- a/data/maps/events/SecretBase_RedCave2.inc
+++ b/data/maps/events/SecretBase_RedCave2.inc
@@ -1,11 +1,11 @@
-SecretBase_RedCave2_MapObjects: @ 85381FC
+SecretBase_RedCave2_EventObjects: @ 85381FC
 	object_event 1, 255, 0, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_RedCave2_EventScript_275D64, 173, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
 	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
 	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
 	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
@@ -19,5 +19,5 @@ SecretBase_RedCave2_MapWarps: @ 8538364
 	warp_def 3, 14, 0, 126, NONE
 
 SecretBase_RedCave2_MapEvents:: @ 853836C
-	map_events SecretBase_RedCave2_MapObjects, SecretBase_RedCave2_MapWarps, 0x0, 0x0
+	map_events SecretBase_RedCave2_EventObjects, SecretBase_RedCave2_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SecretBase_RedCave3.inc b/data/maps/events/SecretBase_RedCave3.inc
index 65dc43026..dfdbec94c 100644
--- a/data/maps/events/SecretBase_RedCave3.inc
+++ b/data/maps/events/SecretBase_RedCave3.inc
@@ -1,11 +1,11 @@
-SecretBase_RedCave3_MapObjects: @ 8538B14
+SecretBase_RedCave3_EventObjects: @ 8538B14
 	object_event 1, 255, 0, 0, 12, 1, 3, 8, 0, 0, 0, 0, SecretBase_RedCave3_EventScript_275D64, 173, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
 	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
 	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
 	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
@@ -19,5 +19,5 @@ SecretBase_RedCave3_MapWarps: @ 8538C7C
 	warp_def 3, 6, 0, 126, NONE
 
 SecretBase_RedCave3_MapEvents:: @ 8538C84
-	map_events SecretBase_RedCave3_MapObjects, SecretBase_RedCave3_MapWarps, 0x0, 0x0
+	map_events SecretBase_RedCave3_EventObjects, SecretBase_RedCave3_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SecretBase_RedCave4.inc b/data/maps/events/SecretBase_RedCave4.inc
index 274a459cd..b485d0ad9 100644
--- a/data/maps/events/SecretBase_RedCave4.inc
+++ b/data/maps/events/SecretBase_RedCave4.inc
@@ -1,11 +1,11 @@
-SecretBase_RedCave4_MapObjects: @ 853942C
+SecretBase_RedCave4_EventObjects: @ 853942C
 	object_event 1, 255, 0, 0, 5, 8, 3, 8, 0, 0, 0, 0, SecretBase_RedCave4_EventScript_275D64, 173, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
 	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
 	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
 	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
@@ -19,5 +19,5 @@ SecretBase_RedCave4_MapWarps: @ 8539594
 	warp_def 2, 12, 0, 126, NONE
 
 SecretBase_RedCave4_MapEvents:: @ 853959C
-	map_events SecretBase_RedCave4_MapObjects, SecretBase_RedCave4_MapWarps, 0x0, 0x0
+	map_events SecretBase_RedCave4_EventObjects, SecretBase_RedCave4_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SecretBase_Shrub1.inc b/data/maps/events/SecretBase_Shrub1.inc
index e20d76bc2..545426eea 100644
--- a/data/maps/events/SecretBase_Shrub1.inc
+++ b/data/maps/events/SecretBase_Shrub1.inc
@@ -1,11 +1,11 @@
-SecretBase_Shrub1_MapObjects: @ 8538078
+SecretBase_Shrub1_EventObjects: @ 8538078
 	object_event 1, 255, 0, 0, 5, 2, 3, 8, 0, 0, 0, 0, SecretBase_Shrub1_EventScript_275D64, 173, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
 	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
 	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
 	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
@@ -19,5 +19,5 @@ SecretBase_Shrub1_MapWarps: @ 85381E0
 	warp_def 5, 7, 0, 126, NONE
 
 SecretBase_Shrub1_MapEvents:: @ 85381E8
-	map_events SecretBase_Shrub1_MapObjects, SecretBase_Shrub1_MapWarps, 0x0, 0x0
+	map_events SecretBase_Shrub1_EventObjects, SecretBase_Shrub1_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SecretBase_Shrub2.inc b/data/maps/events/SecretBase_Shrub2.inc
index 23d023b31..0adb6b76d 100644
--- a/data/maps/events/SecretBase_Shrub2.inc
+++ b/data/maps/events/SecretBase_Shrub2.inc
@@ -1,11 +1,11 @@
-SecretBase_Shrub2_MapObjects: @ 8538990
+SecretBase_Shrub2_EventObjects: @ 8538990
 	object_event 1, 255, 0, 0, 13, 2, 3, 8, 0, 0, 0, 0, SecretBase_Shrub2_EventScript_275D64, 173, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
 	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
 	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
 	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
@@ -19,5 +19,5 @@ SecretBase_Shrub2_MapWarps: @ 8538AF8
 	warp_def 7, 5, 0, 126, NONE
 
 SecretBase_Shrub2_MapEvents:: @ 8538B00
-	map_events SecretBase_Shrub2_MapObjects, SecretBase_Shrub2_MapWarps, 0x0, 0x0
+	map_events SecretBase_Shrub2_EventObjects, SecretBase_Shrub2_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SecretBase_Shrub3.inc b/data/maps/events/SecretBase_Shrub3.inc
index 5fe624dc3..b8f4d4ed4 100644
--- a/data/maps/events/SecretBase_Shrub3.inc
+++ b/data/maps/events/SecretBase_Shrub3.inc
@@ -1,11 +1,11 @@
-SecretBase_Shrub3_MapObjects: @ 85392A8
+SecretBase_Shrub3_EventObjects: @ 85392A8
 	object_event 1, 255, 0, 0, 5, 7, 3, 8, 0, 0, 0, 0, SecretBase_Shrub3_EventScript_275D64, 173, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
 	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
 	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
 	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
@@ -19,5 +19,5 @@ SecretBase_Shrub3_MapWarps: @ 8539410
 	warp_def 6, 9, 0, 126, NONE
 
 SecretBase_Shrub3_MapEvents:: @ 8539418
-	map_events SecretBase_Shrub3_MapObjects, SecretBase_Shrub3_MapWarps, 0x0, 0x0
+	map_events SecretBase_Shrub3_EventObjects, SecretBase_Shrub3_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SecretBase_Shrub4.inc b/data/maps/events/SecretBase_Shrub4.inc
index ad432f6ff..679b313d5 100644
--- a/data/maps/events/SecretBase_Shrub4.inc
+++ b/data/maps/events/SecretBase_Shrub4.inc
@@ -1,11 +1,11 @@
-SecretBase_Shrub4_MapObjects: @ 8539BC0
+SecretBase_Shrub4_EventObjects: @ 8539BC0
 	object_event 1, 255, 0, 0, 9, 7, 3, 8, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_275D64, 173, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
 	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
 	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
 	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
@@ -19,5 +19,5 @@ SecretBase_Shrub4_MapWarps: @ 8539D28
 	warp_def 11, 8, 0, 126, NONE
 
 SecretBase_Shrub4_MapEvents:: @ 8539D30
-	map_events SecretBase_Shrub4_MapObjects, SecretBase_Shrub4_MapWarps, 0x0, 0x0
+	map_events SecretBase_Shrub4_EventObjects, SecretBase_Shrub4_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SecretBase_Tree1.inc b/data/maps/events/SecretBase_Tree1.inc
index 149d5dea3..402081450 100644
--- a/data/maps/events/SecretBase_Tree1.inc
+++ b/data/maps/events/SecretBase_Tree1.inc
@@ -1,11 +1,11 @@
-SecretBase_Tree1_MapObjects: @ 8537EF4
+SecretBase_Tree1_EventObjects: @ 8537EF4
 	object_event 1, 255, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, SecretBase_Tree1_EventScript_275D64, 173, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
 	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
 	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
 	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
@@ -19,5 +19,5 @@ SecretBase_Tree1_MapWarps: @ 853805C
 	warp_def 5, 7, 0, 126, NONE
 
 SecretBase_Tree1_MapEvents:: @ 8538064
-	map_events SecretBase_Tree1_MapObjects, SecretBase_Tree1_MapWarps, 0x0, 0x0
+	map_events SecretBase_Tree1_EventObjects, SecretBase_Tree1_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SecretBase_Tree2.inc b/data/maps/events/SecretBase_Tree2.inc
index 16037e22f..ddfbf094c 100644
--- a/data/maps/events/SecretBase_Tree2.inc
+++ b/data/maps/events/SecretBase_Tree2.inc
@@ -1,11 +1,11 @@
-SecretBase_Tree2_MapObjects: @ 853880C
+SecretBase_Tree2_EventObjects: @ 853880C
 	object_event 1, 255, 0, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_Tree2_EventScript_275D64, 173, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
 	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
 	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
 	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
@@ -19,5 +19,5 @@ SecretBase_Tree2_MapWarps: @ 8538974
 	warp_def 3, 14, 0, 126, NONE
 
 SecretBase_Tree2_MapEvents:: @ 853897C
-	map_events SecretBase_Tree2_MapObjects, SecretBase_Tree2_MapWarps, 0x0, 0x0
+	map_events SecretBase_Tree2_EventObjects, SecretBase_Tree2_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SecretBase_Tree3.inc b/data/maps/events/SecretBase_Tree3.inc
index 6fbd60683..a13916bc7 100644
--- a/data/maps/events/SecretBase_Tree3.inc
+++ b/data/maps/events/SecretBase_Tree3.inc
@@ -1,11 +1,11 @@
-SecretBase_Tree3_MapObjects: @ 8539124
+SecretBase_Tree3_EventObjects: @ 8539124
 	object_event 1, 255, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, SecretBase_Tree3_EventScript_275D64, 173, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
 	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
 	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
 	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
@@ -19,5 +19,5 @@ SecretBase_Tree3_MapWarps: @ 853928C
 	warp_def 8, 6, 0, 126, NONE
 
 SecretBase_Tree3_MapEvents:: @ 8539294
-	map_events SecretBase_Tree3_MapObjects, SecretBase_Tree3_MapWarps, 0x0, 0x0
+	map_events SecretBase_Tree3_EventObjects, SecretBase_Tree3_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SecretBase_Tree4.inc b/data/maps/events/SecretBase_Tree4.inc
index 4032d668a..4511b236c 100644
--- a/data/maps/events/SecretBase_Tree4.inc
+++ b/data/maps/events/SecretBase_Tree4.inc
@@ -1,11 +1,11 @@
-SecretBase_Tree4_MapObjects: @ 8539A3C
+SecretBase_Tree4_EventObjects: @ 8539A3C
 	object_event 1, 255, 0, 0, 10, 9, 3, 8, 0, 0, 0, 0, SecretBase_Tree4_EventScript_275D64, 173, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
 	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
 	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
 	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
@@ -19,5 +19,5 @@ SecretBase_Tree4_MapWarps: @ 8539BA4
 	warp_def 7, 12, 0, 126, NONE
 
 SecretBase_Tree4_MapEvents:: @ 8539BAC
-	map_events SecretBase_Tree4_MapObjects, SecretBase_Tree4_MapWarps, 0x0, 0x0
+	map_events SecretBase_Tree4_EventObjects, SecretBase_Tree4_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SecretBase_YellowCave1.inc b/data/maps/events/SecretBase_YellowCave1.inc
index 7d604b093..6fc02d447 100644
--- a/data/maps/events/SecretBase_YellowCave1.inc
+++ b/data/maps/events/SecretBase_YellowCave1.inc
@@ -1,11 +1,11 @@
-SecretBase_YellowCave1_MapObjects: @ 8537D70
+SecretBase_YellowCave1_EventObjects: @ 8537D70
 	object_event 1, 255, 0, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave1_EventScript_275D64, 173, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
 	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
 	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
 	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
@@ -19,5 +19,5 @@ SecretBase_YellowCave1_MapWarps: @ 8537ED8
 	warp_def 5, 7, 0, 126, NONE
 
 SecretBase_YellowCave1_MapEvents:: @ 8537EE0
-	map_events SecretBase_YellowCave1_MapObjects, SecretBase_YellowCave1_MapWarps, 0x0, 0x0
+	map_events SecretBase_YellowCave1_EventObjects, SecretBase_YellowCave1_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SecretBase_YellowCave2.inc b/data/maps/events/SecretBase_YellowCave2.inc
index 592595aa8..646176740 100644
--- a/data/maps/events/SecretBase_YellowCave2.inc
+++ b/data/maps/events/SecretBase_YellowCave2.inc
@@ -1,11 +1,11 @@
-SecretBase_YellowCave2_MapObjects: @ 8538688
+SecretBase_YellowCave2_EventObjects: @ 8538688
 	object_event 1, 255, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave2_EventScript_275D64, 173, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
 	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
 	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
 	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
@@ -19,5 +19,5 @@ SecretBase_YellowCave2_MapWarps: @ 85387F0
 	warp_def 12, 7, 0, 126, NONE
 
 SecretBase_YellowCave2_MapEvents:: @ 85387F8
-	map_events SecretBase_YellowCave2_MapObjects, SecretBase_YellowCave2_MapWarps, 0x0, 0x0
+	map_events SecretBase_YellowCave2_EventObjects, SecretBase_YellowCave2_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SecretBase_YellowCave3.inc b/data/maps/events/SecretBase_YellowCave3.inc
index bd1f69b1a..32b71c477 100644
--- a/data/maps/events/SecretBase_YellowCave3.inc
+++ b/data/maps/events/SecretBase_YellowCave3.inc
@@ -1,11 +1,11 @@
-SecretBase_YellowCave3_MapObjects: @ 8538FA0
+SecretBase_YellowCave3_EventObjects: @ 8538FA0
 	object_event 1, 255, 0, 0, 7, 5, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave3_EventScript_275D64, 173, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
 	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
 	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
 	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
@@ -19,5 +19,5 @@ SecretBase_YellowCave3_MapWarps: @ 8539108
 	warp_def 5, 9, 0, 126, NONE
 
 SecretBase_YellowCave3_MapEvents:: @ 8539110
-	map_events SecretBase_YellowCave3_MapObjects, SecretBase_YellowCave3_MapWarps, 0x0, 0x0
+	map_events SecretBase_YellowCave3_EventObjects, SecretBase_YellowCave3_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SecretBase_YellowCave4.inc b/data/maps/events/SecretBase_YellowCave4.inc
index fe52f12bb..187d0dff9 100644
--- a/data/maps/events/SecretBase_YellowCave4.inc
+++ b/data/maps/events/SecretBase_YellowCave4.inc
@@ -1,11 +1,11 @@
-SecretBase_YellowCave4_MapObjects: @ 85398B8
+SecretBase_YellowCave4_EventObjects: @ 85398B8
 	object_event 1, 255, 0, 0, 9, 8, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave4_EventScript_275D64, 173, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
 	object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
 	object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
 	object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
@@ -19,5 +19,5 @@ SecretBase_YellowCave4_MapWarps: @ 8539A20
 	warp_def 6, 12, 0, 126, NONE
 
 SecretBase_YellowCave4_MapEvents:: @ 8539A28
-	map_events SecretBase_YellowCave4_MapObjects, SecretBase_YellowCave4_MapWarps, 0x0, 0x0
+	map_events SecretBase_YellowCave4_EventObjects, SecretBase_YellowCave4_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc b/data/maps/events/ShoalCave_LowTideEntranceRoom.inc
index b19a293ef..dda65b0fe 100644
--- a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc
+++ b/data/maps/events/ShoalCave_LowTideEntranceRoom.inc
@@ -1,6 +1,6 @@
-ShoalCave_LowTideEntranceRoom_MapObjects: @ 853627C
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 30, 3, 3, 1, 17, 0, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_2913C0, 1081, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 18, 15, 3, 9, 17, 0, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_236DD9, 0, 0, 0
+ShoalCave_LowTideEntranceRoom_EventObjects: @ 853627C
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 30, 3, 3, 1, 17, 0, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_2913C0, 1081, 0, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 18, 15, 3, 9, 17, 0, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_236DD9, 0, 0, 0
 
 ShoalCave_LowTideEntranceRoom_MapWarps: @ 85362AC
 	warp_def 20, 30, 3, 0, ROUTE_125
@@ -9,5 +9,5 @@ ShoalCave_LowTideEntranceRoom_MapWarps: @ 85362AC
 	warp_def 27, 2, 3, 7, SHOAL_CAVE_LOW_TIDE_INNER_ROOM
 
 ShoalCave_LowTideEntranceRoom_MapEvents:: @ 85362CC
-	map_events ShoalCave_LowTideEntranceRoom_MapObjects, ShoalCave_LowTideEntranceRoom_MapWarps, 0x0, 0x0
+	map_events ShoalCave_LowTideEntranceRoom_EventObjects, ShoalCave_LowTideEntranceRoom_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/ShoalCave_LowTideIceRoom.inc b/data/maps/events/ShoalCave_LowTideIceRoom.inc
index a02a20864..809fb146c 100644
--- a/data/maps/events/ShoalCave_LowTideIceRoom.inc
+++ b/data/maps/events/ShoalCave_LowTideIceRoom.inc
@@ -1,10 +1,10 @@
-ShoalCave_LowTideIceRoom_MapObjects: @ 8537100
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 12, 8, 3, 1, 17, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913E7, 1112, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 12, 21, 4, 1, 17, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913F4, 1113, 0, 0
+ShoalCave_LowTideIceRoom_EventObjects: @ 8537100
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 12, 8, 3, 1, 17, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913E7, 1112, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 12, 21, 4, 1, 17, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913F4, 1113, 0, 0
 
 ShoalCave_LowTideIceRoom_MapWarps: @ 8537130
 	warp_def 17, 10, 3, 3, SHOAL_CAVE_LOW_TIDE_LOWER_ROOM
 
 ShoalCave_LowTideIceRoom_MapEvents:: @ 8537138
-	map_events ShoalCave_LowTideIceRoom_MapObjects, ShoalCave_LowTideIceRoom_MapWarps, 0x0, 0x0
+	map_events ShoalCave_LowTideIceRoom_EventObjects, ShoalCave_LowTideIceRoom_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/ShoalCave_LowTideInnerRoom.inc b/data/maps/events/ShoalCave_LowTideInnerRoom.inc
index 8fe34709b..4d48e1aab 100644
--- a/data/maps/events/ShoalCave_LowTideInnerRoom.inc
+++ b/data/maps/events/ShoalCave_LowTideInnerRoom.inc
@@ -1,5 +1,5 @@
-ShoalCave_LowTideInnerRoom_MapObjects: @ 85362E0
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 26, 14, 5, 1, 17, 0, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_2913CD, 1082, 0, 0
+ShoalCave_LowTideInnerRoom_EventObjects: @ 85362E0
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 26, 14, 5, 1, 17, 0, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_2913CD, 1082, 0, 0
 
 ShoalCave_LowTideInnerRoom_MapWarps: @ 85362F8
 	warp_def 34, 29, 3, 1, SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM
@@ -20,5 +20,5 @@ ShoalCave_LowTideInnerRoom_MapBGEvents: @ 8536338
 	bg_event 16, 13, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_23705A
 
 ShoalCave_LowTideInnerRoom_MapEvents:: @ 8536380
-	map_events ShoalCave_LowTideInnerRoom_MapObjects, ShoalCave_LowTideInnerRoom_MapWarps, 0x0, ShoalCave_LowTideInnerRoom_MapBGEvents
+	map_events ShoalCave_LowTideInnerRoom_EventObjects, ShoalCave_LowTideInnerRoom_MapWarps, 0x0, ShoalCave_LowTideInnerRoom_MapBGEvents
 
diff --git a/data/maps/events/ShoalCave_LowTideLowerRoom.inc b/data/maps/events/ShoalCave_LowTideLowerRoom.inc
index 384b6570f..d3484961e 100644
--- a/data/maps/events/ShoalCave_LowTideLowerRoom.inc
+++ b/data/maps/events/ShoalCave_LowTideLowerRoom.inc
@@ -1,6 +1,6 @@
-ShoalCave_LowTideLowerRoom_MapObjects: @ 85363DC
-	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 25, 3, 3, 1, 0, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2908BA, 17, 0, 0
-	object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 11, 4, 3, 2, 17, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2371B2, 0, 0, 0
+ShoalCave_LowTideLowerRoom_EventObjects: @ 85363DC
+	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 25, 3, 3, 1, 0, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2908BA, 17, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 11, 4, 3, 2, 17, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2371B2, 0, 0, 0
 
 ShoalCave_LowTideLowerRoom_MapWarps: @ 853640C
 	warp_def 7, 2, 3, 3, SHOAL_CAVE_LOW_TIDE_INNER_ROOM
@@ -12,5 +12,5 @@ ShoalCave_LowTideLowerRoom_MapBGEvents: @ 853642C
 	bg_event 18, 2, 3, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_237176
 
 ShoalCave_LowTideLowerRoom_MapEvents:: @ 8536438
-	map_events ShoalCave_LowTideLowerRoom_MapObjects, ShoalCave_LowTideLowerRoom_MapWarps, 0x0, ShoalCave_LowTideLowerRoom_MapBGEvents
+	map_events ShoalCave_LowTideLowerRoom_EventObjects, ShoalCave_LowTideLowerRoom_MapWarps, 0x0, ShoalCave_LowTideLowerRoom_MapBGEvents
 
diff --git a/data/maps/events/ShoalCave_LowTideStairsRoom.inc b/data/maps/events/ShoalCave_LowTideStairsRoom.inc
index 6592f68d7..556524f05 100644
--- a/data/maps/events/ShoalCave_LowTideStairsRoom.inc
+++ b/data/maps/events/ShoalCave_LowTideStairsRoom.inc
@@ -1,5 +1,5 @@
-ShoalCave_LowTideStairsRoom_MapObjects: @ 8536394
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 13, 12, 3, 1, 17, 0, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_2913DA, 1083, 0, 0
+ShoalCave_LowTideStairsRoom_EventObjects: @ 8536394
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 13, 12, 3, 1, 17, 0, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_2913DA, 1083, 0, 0
 
 ShoalCave_LowTideStairsRoom_MapWarps: @ 85363AC
 	warp_def 3, 12, 3, 1, SHOAL_CAVE_LOW_TIDE_INNER_ROOM
@@ -9,5 +9,5 @@ ShoalCave_LowTideStairsRoom_MapBGEvents: @ 85363BC
 	bg_event 11, 11, 3, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_23711A
 
 ShoalCave_LowTideStairsRoom_MapEvents:: @ 85363C8
-	map_events ShoalCave_LowTideStairsRoom_MapObjects, ShoalCave_LowTideStairsRoom_MapWarps, 0x0, ShoalCave_LowTideStairsRoom_MapBGEvents
+	map_events ShoalCave_LowTideStairsRoom_EventObjects, ShoalCave_LowTideStairsRoom_MapWarps, 0x0, ShoalCave_LowTideStairsRoom_MapBGEvents
 
diff --git a/data/maps/events/SingleBattleColosseum.inc b/data/maps/events/SingleBattleColosseum.inc
index ad8a393d6..382cafe16 100644
--- a/data/maps/events/SingleBattleColosseum.inc
+++ b/data/maps/events/SingleBattleColosseum.inc
@@ -1,5 +1,5 @@
-SingleBattleColosseum_MapObjects: @ 8539D44
-	object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 0, 9, 3, 3, 9, 0, 0, 0, 0, SingleBattleColosseum_EventScript_2774A6, 0, 0, 0
+SingleBattleColosseum_EventObjects: @ 8539D44
+	object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 9, 3, 3, 9, 0, 0, 0, 0, SingleBattleColosseum_EventScript_2774A6, 0, 0, 0
 
 SingleBattleColosseum_MapWarps: @ 8539D5C
 	warp_def 6, 8, 3, 127, NONE
@@ -10,5 +10,5 @@ SingleBattleColosseum_MapCoordEvents: @ 8539D6C
 	coord_event 10, 5, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_0827737E
 
 SingleBattleColosseum_MapEvents:: @ 8539D8C
-	map_events SingleBattleColosseum_MapObjects, SingleBattleColosseum_MapWarps, SingleBattleColosseum_MapCoordEvents, 0x0
+	map_events SingleBattleColosseum_EventObjects, SingleBattleColosseum_MapWarps, SingleBattleColosseum_MapCoordEvents, 0x0
 
diff --git a/data/maps/events/SkyPillar_Outside.inc b/data/maps/events/SkyPillar_Outside.inc
index 70a9c5c21..78991499c 100644
--- a/data/maps/events/SkyPillar_Outside.inc
+++ b/data/maps/events/SkyPillar_Outside.inc
@@ -1,10 +1,10 @@
-SkyPillar_Outside_MapObjects: @ 853701C
-	object_event 1, MAP_OBJ_GFX_WALLACE, 0, 0, 13, 7, 3, 8, 17, 0, 0, 0, SkyPillar_Outside_EventScript_2393F8, 855, 0, 0
+SkyPillar_Outside_EventObjects: @ 853701C
+	object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 0, 13, 7, 3, 8, 17, 0, 0, 0, SkyPillar_Outside_EventScript_2393F8, 855, 0, 0
 
 SkyPillar_Outside_MapWarps: @ 8537034
 	warp_def 17, 13, 3, 1, SKY_PILLAR_ENTRANCE
 	warp_def 14, 5, 0, 0, SKY_PILLAR_1F
 
 SkyPillar_Outside_MapEvents:: @ 8537044
-	map_events SkyPillar_Outside_MapObjects, SkyPillar_Outside_MapWarps, 0x0, 0x0
+	map_events SkyPillar_Outside_EventObjects, SkyPillar_Outside_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SkyPillar_Top.inc b/data/maps/events/SkyPillar_Top.inc
index 8abe8401f..792f350b8 100644
--- a/data/maps/events/SkyPillar_Top.inc
+++ b/data/maps/events/SkyPillar_Top.inc
@@ -1,6 +1,6 @@
-SkyPillar_Top_MapObjects: @ 8537170
-	object_event 1, MAP_OBJ_GFX_RAYQUAZA_2, 0, 0, 14, 7, 3, 8, 17, 0, 0, 0, 0x0, 773, 0, 0
-	object_event 2, MAP_OBJ_GFX_RAYQUAZA_1, 0, 0, 14, 6, 3, 8, 17, 0, 0, 0, SkyPillar_Top_EventScript_239722, 80, 0, 0
+SkyPillar_Top_EventObjects: @ 8537170
+	object_event 1, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 0, 14, 7, 3, 8, 17, 0, 0, 0, 0x0, 773, 0, 0
+	object_event 2, EVENT_OBJ_GFX_RAYQUAZA_1, 0, 0, 14, 6, 3, 8, 17, 0, 0, 0, SkyPillar_Top_EventScript_239722, 80, 0, 0
 
 SkyPillar_Top_MapWarps: @ 85371A0
 	warp_def 16, 14, 3, 1, SKY_PILLAR_5F
@@ -9,5 +9,5 @@ SkyPillar_Top_MapCoordEvents: @ 85371A8
 	coord_event 14, 9, 3, 0, VAR_0x40D7, 0, 0, SkyPillar_Top_EventScript_23979A
 
 SkyPillar_Top_MapEvents:: @ 85371B8
-	map_events SkyPillar_Top_MapObjects, SkyPillar_Top_MapWarps, SkyPillar_Top_MapCoordEvents, 0x0
+	map_events SkyPillar_Top_EventObjects, SkyPillar_Top_MapWarps, SkyPillar_Top_MapCoordEvents, 0x0
 
diff --git a/data/maps/events/SlateportCity.inc b/data/maps/events/SlateportCity.inc
index a187aaf1f..c429ae7f5 100644
--- a/data/maps/events/SlateportCity.inc
+++ b/data/maps/events/SlateportCity.inc
@@ -1,39 +1,39 @@
-SlateportCity_MapObjects: @ 85261CC
-	object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 0, 21, 11, 3, 2, 17, 0, 0, 0, SlateportCity_EventScript_1DCED9, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_1, 0, 0, 34, 29, 3, 5, 1, 0, 0, 0, SlateportCity_EventScript_1DCEF6, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_4, 0, 0, 5, 13, 3, 2, 33, 0, 0, 0, SlateportCity_EventScript_1DCEB8, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 0, 26, 29, 3, 1, 0, 0, 0, 0, SlateportCity_EventScript_1DCF17, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 31, 27, 3, 7, 0, 0, 0, 0, SlateportCity_EventScript_1DD009, 882, 0, 0
-	object_event 6, MAP_OBJ_GFX_COOK, 0, 0, 5, 43, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DCE42, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 0, 20, 37, 3, 1, 17, 0, 0, 0, SlateportCity_EventScript_1DCE63, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_GIRL_1, 0, 0, 8, 42, 3, 2, 17, 0, 0, 0, SlateportCity_EventScript_1DCE84, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 29, 13, 3, 9, 0, 0, 0, 0, SlateportCity_EventScript_1DD353, 835, 0, 0
-	object_event 10, MAP_OBJ_GFX_REPORTER_F, 0, 0, 28, 14, 3, 7, 0, 0, 0, 0, SlateportCity_EventScript_1DD35C, 835, 0, 0
-	object_event 11, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 28, 13, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD1F8, 840, 0, 0
-	object_event 12, MAP_OBJ_GFX_SAILOR, 0, 0, 37, 41, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DCFE5, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_SAILOR, 0, 0, 28, 46, 3, 5, 1, 0, 0, 0, SlateportCity_EventScript_1DCFEE, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_WOMAN_2, 0, 0, 9, 50, 3, 3, 16, 0, 0, 0, SlateportCity_EventScript_1DCFF7, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_MAN_4, 0, 0, 16, 46, 3, 2, 17, 0, 0, 0, SlateportCity_EventScript_1DD000, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_MANIAC, 0, 0, 8, 24, 3, 3, 16, 0, 0, 0, SlateportCity_EventScript_1DCFBB, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_WOMAN_7, 0, 0, 15, 31, 3, 1, 0, 0, 0, 0, SlateportCity_EventScript_1DCFDC, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 30, 27, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD020, 882, 0, 0
-	object_event 19, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 29, 27, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD037, 882, 0, 0
-	object_event 20, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 6, 38, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD198, 0, 0, 0
-	object_event 21, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 5, 51, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DD16A, 0, 0, 0
-	object_event 22, MAP_OBJ_GFX_MAN_6, 0, 0, 34, 51, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DD365, 0, 0, 0
-	object_event 23, MAP_OBJ_GFX_WOMAN_7, 0, 0, 4, 47, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DCDE4, 0, 0, 0
-	object_event 24, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 11, 47, 3, 8, 17, 0, 0, 0, SlateportCity_EventScript_1DD1D8, 948, 0, 0
-	object_event 25, MAP_OBJ_GFX_MAN_3, 0, 0, 5, 47, 3, 8, 17, 0, 0, 0, SlateportCity_EventScript_1DCDBD, 0, 0, 0
-	object_event 26, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 22, 27, 3, 10, 17, 0, 0, 0, SlateportCity_EventScript_1DD04E, 882, 0, 0
-	object_event 27, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 23, 27, 3, 7, 17, 0, 0, 0, SlateportCity_EventScript_1DD065, 882, 0, 0
-	object_event 28, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 24, 27, 3, 10, 17, 0, 0, 0, SlateportCity_EventScript_1DD07C, 882, 0, 0
-	object_event 29, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 21, 26, 3, 10, 17, 0, 0, 0, SlateportCity_EventScript_1DD093, 882, 0, 0
-	object_event 30, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 20, 26, 3, 10, 17, 0, 0, 0, SlateportCity_EventScript_1DD0AA, 882, 0, 0
-	object_event 31, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 26, 27, 3, 7, 17, 0, 0, 0, SlateportCity_EventScript_1DD0C1, 882, 0, 0
-	object_event 32, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 28, 27, 3, 7, 17, 0, 0, 0, SlateportCity_EventScript_1DD14A, 882, 0, 0
-	object_event 33, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 25, 27, 3, 7, 17, 0, 0, 0, SlateportCity_EventScript_1DD153, 882, 0, 0
-	object_event 34, MAP_OBJ_GFX_WOMAN_2, 0, 0, 11, 37, 3, 9, 33, 0, 0, 0, SlateportCity_EventScript_1DD36E, 0, 0, 0
-	object_event 35, MAP_OBJ_GFX_SCOTT, 0, 0, 10, 12, 0, 8, 33, 0, 0, 0, 0x0, 749, 0, 0
+SlateportCity_EventObjects: @ 85261CC
+	object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 21, 11, 3, 2, 17, 0, 0, 0, SlateportCity_EventScript_1DCED9, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 34, 29, 3, 5, 1, 0, 0, 0, SlateportCity_EventScript_1DCEF6, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 0, 5, 13, 3, 2, 33, 0, 0, 0, SlateportCity_EventScript_1DCEB8, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 26, 29, 3, 1, 0, 0, 0, 0, SlateportCity_EventScript_1DCF17, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 31, 27, 3, 7, 0, 0, 0, 0, SlateportCity_EventScript_1DD009, 882, 0, 0
+	object_event 6, EVENT_OBJ_GFX_COOK, 0, 0, 5, 43, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DCE42, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 20, 37, 3, 1, 17, 0, 0, 0, SlateportCity_EventScript_1DCE63, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 0, 8, 42, 3, 2, 17, 0, 0, 0, SlateportCity_EventScript_1DCE84, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 29, 13, 3, 9, 0, 0, 0, 0, SlateportCity_EventScript_1DD353, 835, 0, 0
+	object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 28, 14, 3, 7, 0, 0, 0, 0, SlateportCity_EventScript_1DD35C, 835, 0, 0
+	object_event 11, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 28, 13, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD1F8, 840, 0, 0
+	object_event 12, EVENT_OBJ_GFX_SAILOR, 0, 0, 37, 41, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DCFE5, 0, 0, 0
+	object_event 13, EVENT_OBJ_GFX_SAILOR, 0, 0, 28, 46, 3, 5, 1, 0, 0, 0, SlateportCity_EventScript_1DCFEE, 0, 0, 0
+	object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 9, 50, 3, 3, 16, 0, 0, 0, SlateportCity_EventScript_1DCFF7, 0, 0, 0
+	object_event 15, EVENT_OBJ_GFX_MAN_4, 0, 0, 16, 46, 3, 2, 17, 0, 0, 0, SlateportCity_EventScript_1DD000, 0, 0, 0
+	object_event 16, EVENT_OBJ_GFX_MANIAC, 0, 0, 8, 24, 3, 3, 16, 0, 0, 0, SlateportCity_EventScript_1DCFBB, 0, 0, 0
+	object_event 17, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 15, 31, 3, 1, 0, 0, 0, 0, SlateportCity_EventScript_1DCFDC, 0, 0, 0
+	object_event 18, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 30, 27, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD020, 882, 0, 0
+	object_event 19, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 29, 27, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD037, 882, 0, 0
+	object_event 20, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 6, 38, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD198, 0, 0, 0
+	object_event 21, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 5, 51, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DD16A, 0, 0, 0
+	object_event 22, EVENT_OBJ_GFX_MAN_6, 0, 0, 34, 51, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DD365, 0, 0, 0
+	object_event 23, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 47, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DCDE4, 0, 0, 0
+	object_event 24, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 11, 47, 3, 8, 17, 0, 0, 0, SlateportCity_EventScript_1DD1D8, 948, 0, 0
+	object_event 25, EVENT_OBJ_GFX_MAN_3, 0, 0, 5, 47, 3, 8, 17, 0, 0, 0, SlateportCity_EventScript_1DCDBD, 0, 0, 0
+	object_event 26, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 22, 27, 3, 10, 17, 0, 0, 0, SlateportCity_EventScript_1DD04E, 882, 0, 0
+	object_event 27, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 23, 27, 3, 7, 17, 0, 0, 0, SlateportCity_EventScript_1DD065, 882, 0, 0
+	object_event 28, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 24, 27, 3, 10, 17, 0, 0, 0, SlateportCity_EventScript_1DD07C, 882, 0, 0
+	object_event 29, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 21, 26, 3, 10, 17, 0, 0, 0, SlateportCity_EventScript_1DD093, 882, 0, 0
+	object_event 30, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 20, 26, 3, 10, 17, 0, 0, 0, SlateportCity_EventScript_1DD0AA, 882, 0, 0
+	object_event 31, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 26, 27, 3, 7, 17, 0, 0, 0, SlateportCity_EventScript_1DD0C1, 882, 0, 0
+	object_event 32, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 28, 27, 3, 7, 17, 0, 0, 0, SlateportCity_EventScript_1DD14A, 882, 0, 0
+	object_event 33, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 25, 27, 3, 7, 17, 0, 0, 0, SlateportCity_EventScript_1DD153, 882, 0, 0
+	object_event 34, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 11, 37, 3, 9, 33, 0, 0, 0, SlateportCity_EventScript_1DD36E, 0, 0, 0
+	object_event 35, EVENT_OBJ_GFX_SCOTT, 0, 0, 10, 12, 0, 8, 33, 0, 0, 0, 0x0, 749, 0, 0
 
 SlateportCity_MapWarps: @ 8526514
 	warp_def 19, 19, 0, 0, SLATEPORT_CITY_POKEMON_CENTER_1F
@@ -67,5 +67,5 @@ SlateportCity_MapBGEvents: @ 852657C
 	bg_event 10, 36, 0, 1, 0, SlateportCity_EventScript_1DD643
 
 SlateportCity_MapEvents:: @ 8526618
-	map_events SlateportCity_MapObjects, SlateportCity_MapWarps, SlateportCity_MapCoordEvents, SlateportCity_MapBGEvents
+	map_events SlateportCity_EventObjects, SlateportCity_MapWarps, SlateportCity_MapCoordEvents, SlateportCity_MapBGEvents
 
diff --git a/data/maps/events/SlateportCity_BattleTentBattleRoom.inc b/data/maps/events/SlateportCity_BattleTentBattleRoom.inc
index 8c13a223a..f22969d2a 100644
--- a/data/maps/events/SlateportCity_BattleTentBattleRoom.inc
+++ b/data/maps/events/SlateportCity_BattleTentBattleRoom.inc
@@ -1,8 +1,8 @@
-SlateportCity_BattleTentBattleRoom_MapObjects: @ 852F4DC
-	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 1, 4, 0, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 4, 8, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
+SlateportCity_BattleTentBattleRoom_EventObjects: @ 852F4DC
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 1, 4, 0, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 4, 8, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
 
 SlateportCity_BattleTentBattleRoom_MapEvents:: @ 852F524
-	map_events SlateportCity_BattleTentBattleRoom_MapObjects, 0x0, 0x0, 0x0
+	map_events SlateportCity_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/SlateportCity_BattleTentCorridor.inc b/data/maps/events/SlateportCity_BattleTentCorridor.inc
index acd0f732c..6b45c8e26 100644
--- a/data/maps/events/SlateportCity_BattleTentCorridor.inc
+++ b/data/maps/events/SlateportCity_BattleTentCorridor.inc
@@ -1,6 +1,6 @@
-SlateportCity_BattleTentCorridor_MapObjects: @ 852F4B0
-	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 2, 6, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
+SlateportCity_BattleTentCorridor_EventObjects: @ 852F4B0
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 2, 6, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
 
 SlateportCity_BattleTentCorridor_MapEvents:: @ 852F4C8
-	map_events SlateportCity_BattleTentCorridor_MapObjects, 0x0, 0x0, 0x0
+	map_events SlateportCity_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/SlateportCity_BattleTentLobby.inc b/data/maps/events/SlateportCity_BattleTentLobby.inc
index 7b0f10331..3368d1ba2 100644
--- a/data/maps/events/SlateportCity_BattleTentLobby.inc
+++ b/data/maps/events/SlateportCity_BattleTentLobby.inc
@@ -1,9 +1,9 @@
-SlateportCity_BattleTentLobby_MapObjects: @ 852F408
-	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 5, 3, 8, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_2088AA, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SAILOR, 0, 0, 1, 5, 3, 2, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A3D, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 3, 7, 3, 7, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A7E, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_GIRL_1, 0, 0, 1, 8, 3, 1, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A87, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_3, 0, 0, 11, 8, 3, 9, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A90, 0, 0, 0
+SlateportCity_BattleTentLobby_EventObjects: @ 852F408
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 5, 3, 8, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_2088AA, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 0, 1, 5, 3, 2, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A3D, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 3, 7, 3, 7, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A7E, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_GIRL_1, 0, 0, 1, 8, 3, 1, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A87, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 11, 8, 3, 9, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A90, 0, 0, 0
 
 SlateportCity_BattleTentLobby_MapWarps: @ 852F480
 	warp_def 6, 9, 0, 3, SLATEPORT_CITY
@@ -13,5 +13,5 @@ SlateportCity_BattleTentLobby_MapBGEvents: @ 852F490
 	bg_event 4, 5, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A99
 
 SlateportCity_BattleTentLobby_MapEvents:: @ 852F49C
-	map_events SlateportCity_BattleTentLobby_MapObjects, SlateportCity_BattleTentLobby_MapWarps, 0x0, SlateportCity_BattleTentLobby_MapBGEvents
+	map_events SlateportCity_BattleTentLobby_EventObjects, SlateportCity_BattleTentLobby_MapWarps, 0x0, SlateportCity_BattleTentLobby_MapBGEvents
 
diff --git a/data/maps/events/SlateportCity_Harbor.inc b/data/maps/events/SlateportCity_Harbor.inc
index 307cfd1c2..b7a767f3c 100644
--- a/data/maps/events/SlateportCity_Harbor.inc
+++ b/data/maps/events/SlateportCity_Harbor.inc
@@ -1,12 +1,12 @@
-SlateportCity_Harbor_MapObjects: @ 852FA68
-	object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 0, 8, 10, 3, 8, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CAF1, 905, 0, 0
-	object_event 2, MAP_OBJ_GFX_SAILOR, 0, 0, 4, 12, 3, 9, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC52, 905, 0, 0
-	object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 0, 1, 12, 3, 10, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC99, 905, 0, 0
-	object_event 4, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 13, 3, 1, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CCA2, 841, 0, 0
-	object_event 5, MAP_OBJ_GFX_SS_TIDAL, 0, 0, 8, 9, 1, 10, 0, 0, 0, 0, 0x0, 860, 0, 0
-	object_event 6, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 7, 10, 3, 10, 0, 0, 0, 0, 0x0, 845, 0, 0
-	object_event 7, MAP_OBJ_GFX_ARCHIE, 0, 0, 8, 10, 3, 9, 0, 0, 0, 0, 0x0, 846, 0, 0
-	object_event 8, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 0, 7, 9, 1, 10, 0, 0, 0, 0, 0x0, 848, 0, 0
+SlateportCity_Harbor_EventObjects: @ 852FA68
+	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 0, 8, 10, 3, 8, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CAF1, 905, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 0, 4, 12, 3, 9, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC52, 905, 0, 0
+	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 1, 12, 3, 10, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC99, 905, 0, 0
+	object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 13, 3, 1, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CCA2, 841, 0, 0
+	object_event 5, EVENT_OBJ_GFX_SS_TIDAL, 0, 0, 8, 9, 1, 10, 0, 0, 0, 0, 0x0, 860, 0, 0
+	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 7, 10, 3, 10, 0, 0, 0, 0, 0x0, 845, 0, 0
+	object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 0, 8, 10, 3, 9, 0, 0, 0, 0, 0x0, 846, 0, 0
+	object_event 8, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 0, 7, 9, 1, 10, 0, 0, 0, 0, 0x0, 848, 0, 0
 
 SlateportCity_Harbor_MapWarps: @ 852FB28
 	warp_def 11, 14, 0, 8, SLATEPORT_CITY
@@ -21,5 +21,5 @@ SlateportCity_Harbor_MapCoordEvents: @ 852FB48
 	coord_event 8, 14, 3, 0, VAR_0x40A0, 1, 0, SlateportCity_Harbor_EventScript_20C9DF
 
 SlateportCity_Harbor_MapEvents:: @ 852FB88
-	map_events SlateportCity_Harbor_MapObjects, SlateportCity_Harbor_MapWarps, SlateportCity_Harbor_MapCoordEvents, 0x0
+	map_events SlateportCity_Harbor_EventObjects, SlateportCity_Harbor_MapWarps, SlateportCity_Harbor_MapCoordEvents, 0x0
 
diff --git a/data/maps/events/SlateportCity_House1.inc b/data/maps/events/SlateportCity_House1.inc
index d5151a0a1..96bf5fba9 100644
--- a/data/maps/events/SlateportCity_House1.inc
+++ b/data/maps/events/SlateportCity_House1.inc
@@ -1,10 +1,10 @@
-SlateportCity_House1_MapObjects: @ 852F538
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 7, 5, 3, 8, 0, 0, 0, 0, SlateportCity_House1_EventScript_209AA5, 0, 0, 0
+SlateportCity_House1_EventObjects: @ 852F538
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 7, 5, 3, 8, 0, 0, 0, 0, SlateportCity_House1_EventScript_209AA5, 0, 0, 0
 
 SlateportCity_House1_MapWarps: @ 852F550
 	warp_def 3, 7, 0, 6, SLATEPORT_CITY
 	warp_def 4, 7, 0, 6, SLATEPORT_CITY
 
 SlateportCity_House1_MapEvents:: @ 852F560
-	map_events SlateportCity_House1_MapObjects, SlateportCity_House1_MapWarps, 0x0, 0x0
+	map_events SlateportCity_House1_EventObjects, SlateportCity_House1_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SlateportCity_House2.inc b/data/maps/events/SlateportCity_House2.inc
index f77f34456..4bd43a5d4 100644
--- a/data/maps/events/SlateportCity_House2.inc
+++ b/data/maps/events/SlateportCity_House2.inc
@@ -1,11 +1,11 @@
-SlateportCity_House2_MapObjects: @ 852FB9C
-	object_event 1, MAP_OBJ_GFX_MAN_3, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9AF, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 7, 4, 3, 9, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9B8, 0, 0, 0
+SlateportCity_House2_EventObjects: @ 852FB9C
+	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9AF, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 7, 4, 3, 9, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9B8, 0, 0, 0
 
 SlateportCity_House2_MapWarps: @ 852FBCC
 	warp_def 3, 7, 0, 10, SLATEPORT_CITY
 	warp_def 4, 7, 0, 10, SLATEPORT_CITY
 
 SlateportCity_House2_MapEvents:: @ 852FBDC
-	map_events SlateportCity_House2_MapObjects, SlateportCity_House2_MapWarps, 0x0, 0x0
+	map_events SlateportCity_House2_EventObjects, SlateportCity_House2_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SlateportCity_Mart.inc b/data/maps/events/SlateportCity_Mart.inc
index bab6768de..c952cf34e 100644
--- a/data/maps/events/SlateportCity_Mart.inc
+++ b/data/maps/events/SlateportCity_Mart.inc
@@ -1,12 +1,12 @@
-SlateportCity_Mart_MapObjects: @ 852FCF0
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC49, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 4, 2, 3, 7, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC76, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 5, 5, 3, 1, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC7F, 0, 0, 0
+SlateportCity_Mart_EventObjects: @ 852FCF0
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC49, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 4, 2, 3, 7, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC76, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 5, 5, 3, 1, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC7F, 0, 0, 0
 
 SlateportCity_Mart_MapWarps: @ 852FD38
 	warp_def 3, 7, 0, 1, SLATEPORT_CITY
 	warp_def 4, 7, 0, 1, SLATEPORT_CITY
 
 SlateportCity_Mart_MapEvents:: @ 852FD48
-	map_events SlateportCity_Mart_MapObjects, SlateportCity_Mart_MapWarps, 0x0, 0x0
+	map_events SlateportCity_Mart_EventObjects, SlateportCity_Mart_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc
index 1ae29ed6f..9f97d892d 100644
--- a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc
+++ b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc
@@ -1,18 +1,18 @@
-SlateportCity_OceanicMuseum_1F_MapObjects: @ 852F670
-	object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 0, 7, 7, 3, 10, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 18, 5, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE5F, 883, 0, 0
-	object_event 3, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 12, 2, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE68, 883, 0, 0
-	object_event 4, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 2, 8, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE56, 883, 0, 0
-	object_event 5, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 3, 4, 3, 9, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE4D, 883, 0, 0
-	object_event 6, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 14, 4, 3, 10, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE71, 883, 0, 0
-	object_event 7, MAP_OBJ_GFX_BEAUTY, 0, 0, 12, 7, 3, 9, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 8, 3, 3, 8, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE7A, 883, 0, 0
-	object_event 9, MAP_OBJ_GFX_WOMAN_7, 0, 0, 4, 2, 3, 1, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AED4, 961, 0, 0
-	object_event 10, MAP_OBJ_GFX_MANIAC, 0, 0, 10, 2, 3, 7, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEDD, 961, 0, 0
-	object_event 11, MAP_OBJ_GFX_MAN_3, 0, 0, 17, 7, 3, 10, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEE6, 961, 0, 0
-	object_event 12, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 18, 8, 3, 7, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEEF, 961, 0, 0
-	object_event 13, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 9, 4, 3, 21, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEF8, 965, 0, 0
-	object_event 14, MAP_OBJ_GFX_REPORTER_M, 0, 0, 7, 4, 3, 1, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_28C883, 961, 0, 0
+SlateportCity_OceanicMuseum_1F_EventObjects: @ 852F670
+	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 0, 7, 7, 3, 10, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 18, 5, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE5F, 883, 0, 0
+	object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 12, 2, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE68, 883, 0, 0
+	object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 2, 8, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE56, 883, 0, 0
+	object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 3, 4, 3, 9, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE4D, 883, 0, 0
+	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 14, 4, 3, 10, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE71, 883, 0, 0
+	object_event 7, EVENT_OBJ_GFX_BEAUTY, 0, 0, 12, 7, 3, 9, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 8, 3, 3, 8, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE7A, 883, 0, 0
+	object_event 9, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 2, 3, 1, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AED4, 961, 0, 0
+	object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 0, 10, 2, 3, 7, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEDD, 961, 0, 0
+	object_event 11, EVENT_OBJ_GFX_MAN_3, 0, 0, 17, 7, 3, 10, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEE6, 961, 0, 0
+	object_event 12, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 18, 8, 3, 7, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEEF, 961, 0, 0
+	object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 9, 4, 3, 21, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEF8, 965, 0, 0
+	object_event 14, EVENT_OBJ_GFX_REPORTER_M, 0, 0, 7, 4, 3, 1, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_28C883, 961, 0, 0
 
 SlateportCity_OceanicMuseum_1F_MapWarps: @ 852F7C0
 	warp_def 9, 8, 0, 5, SLATEPORT_CITY
@@ -39,5 +39,5 @@ SlateportCity_OceanicMuseum_1F_MapBGEvents: @ 852F7F8
 	bg_event 17, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AECB
 
 SlateportCity_OceanicMuseum_1F_MapEvents:: @ 852F894
-	map_events SlateportCity_OceanicMuseum_1F_MapObjects, SlateportCity_OceanicMuseum_1F_MapWarps, SlateportCity_OceanicMuseum_1F_MapCoordEvents, SlateportCity_OceanicMuseum_1F_MapBGEvents
+	map_events SlateportCity_OceanicMuseum_1F_EventObjects, SlateportCity_OceanicMuseum_1F_MapWarps, SlateportCity_OceanicMuseum_1F_MapCoordEvents, SlateportCity_OceanicMuseum_1F_MapBGEvents
 
diff --git a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc b/data/maps/events/SlateportCity_OceanicMuseum_2F.inc
index 5c3f7108d..4bad8a43d 100644
--- a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc
+++ b/data/maps/events/SlateportCity_OceanicMuseum_2F.inc
@@ -1,11 +1,11 @@
-SlateportCity_OceanicMuseum_2F_MapObjects: @ 852F8A8
-	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 13, 6, 3, 8, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BB00, 887, 0, 0
-	object_event 2, MAP_OBJ_GFX_ARCHIE, 0, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, 886, 0, 0
-	object_event 3, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, 884, 0, 0
-	object_event 4, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, 885, 0, 0
-	object_event 5, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 12, 7, 3, 10, 17, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD64, 961, 0, 0
-	object_event 6, MAP_OBJ_GFX_WOMAN_2, 0, 0, 9, 6, 3, 1, 17, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD6D, 961, 0, 0
-	object_event 7, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 1, 3, 3, 10, 17, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD76, 961, 0, 0
+SlateportCity_OceanicMuseum_2F_EventObjects: @ 852F8A8
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 13, 6, 3, 8, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BB00, 887, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, 886, 0, 0
+	object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, 884, 0, 0
+	object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, 885, 0, 0
+	object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 12, 7, 3, 10, 17, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD64, 961, 0, 0
+	object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 9, 6, 3, 1, 17, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD6D, 961, 0, 0
+	object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 1, 3, 3, 10, 17, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD76, 961, 0, 0
 
 SlateportCity_OceanicMuseum_2F_MapWarps: @ 852F950
 	warp_def 6, 1, 0, 2, SLATEPORT_CITY_OCEANIC_MUSEUM_1F
@@ -34,5 +34,5 @@ SlateportCity_OceanicMuseum_2F_MapBGEvents: @ 852F958
 	bg_event 4, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD40
 
 SlateportCity_OceanicMuseum_2F_MapEvents:: @ 852FA54
-	map_events SlateportCity_OceanicMuseum_2F_MapObjects, SlateportCity_OceanicMuseum_2F_MapWarps, 0x0, SlateportCity_OceanicMuseum_2F_MapBGEvents
+	map_events SlateportCity_OceanicMuseum_2F_EventObjects, SlateportCity_OceanicMuseum_2F_MapWarps, 0x0, SlateportCity_OceanicMuseum_2F_MapBGEvents
 
diff --git a/data/maps/events/SlateportCity_PokemonCenter_1F.inc b/data/maps/events/SlateportCity_PokemonCenter_1F.inc
index 52f406b71..4a6335695 100644
--- a/data/maps/events/SlateportCity_PokemonCenter_1F.inc
+++ b/data/maps/events/SlateportCity_PokemonCenter_1F.inc
@@ -1,7 +1,7 @@
-SlateportCity_PokemonCenter_1F_MapObjects: @ 852FBF0
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAD3, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SAILOR, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAE1, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 0, 10, 7, 3, 10, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAEA, 0, 0, 0
+SlateportCity_PokemonCenter_1F_EventObjects: @ 852FBF0
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAD3, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAE1, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 10, 7, 3, 10, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAEA, 0, 0, 0
 
 SlateportCity_PokemonCenter_1F_MapWarps: @ 852FC38
 	warp_def 7, 8, 3, 0, SLATEPORT_CITY
@@ -9,5 +9,5 @@ SlateportCity_PokemonCenter_1F_MapWarps: @ 852FC38
 	warp_def 1, 6, 4, 0, SLATEPORT_CITY_POKEMON_CENTER_2F
 
 SlateportCity_PokemonCenter_1F_MapEvents:: @ 852FC50
-	map_events SlateportCity_PokemonCenter_1F_MapObjects, SlateportCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
+	map_events SlateportCity_PokemonCenter_1F_EventObjects, SlateportCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SlateportCity_PokemonCenter_2F.inc b/data/maps/events/SlateportCity_PokemonCenter_2F.inc
index cd9f74d39..43938e550 100644
--- a/data/maps/events/SlateportCity_PokemonCenter_2F.inc
+++ b/data/maps/events/SlateportCity_PokemonCenter_2F.inc
@@ -1,8 +1,8 @@
-SlateportCity_PokemonCenter_2F_MapObjects: @ 852FC64
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
+SlateportCity_PokemonCenter_2F_EventObjects: @ 852FC64
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
 
 SlateportCity_PokemonCenter_2F_MapWarps: @ 852FCC4
 	warp_def 1, 6, 4, 2, SLATEPORT_CITY_POKEMON_CENTER_1F
@@ -10,5 +10,5 @@ SlateportCity_PokemonCenter_2F_MapWarps: @ 852FCC4
 	warp_def 9, 1, 3, 0, TRADE_CENTER
 
 SlateportCity_PokemonCenter_2F_MapEvents:: @ 852FCDC
-	map_events SlateportCity_PokemonCenter_2F_MapObjects, SlateportCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
+	map_events SlateportCity_PokemonCenter_2F_EventObjects, SlateportCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SlateportCity_PokemonFanClub.inc b/data/maps/events/SlateportCity_PokemonFanClub.inc
index ba18519ef..db5a8b97c 100644
--- a/data/maps/events/SlateportCity_PokemonFanClub.inc
+++ b/data/maps/events/SlateportCity_PokemonFanClub.inc
@@ -1,18 +1,18 @@
-SlateportCity_PokemonFanClub_MapObjects: @ 852F574
-	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 11, 4, 0, 8, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1E8, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 1, 5, 0, 3, 16, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1F1, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_REPORTER_F, 0, 0, 11, 5, 0, 7, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_28C943, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 0, 6, 2, 3, 1, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A17E, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 6, 5, 4, 8, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_209E96, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 3, 9, 3, 1, 17, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A20D, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_SKITTY, 0, 0, 8, 3, 3, 1, 17, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1FA, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_AZUMARILL, 0, 0, 10, 8, 3, 1, 17, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A220, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_MAN_5, 0, 0, 11, 8, 0, 9, 16, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_2C7F16, 0, 0, 0
+SlateportCity_PokemonFanClub_EventObjects: @ 852F574
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 11, 4, 0, 8, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1E8, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 1, 5, 0, 3, 16, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1F1, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 11, 5, 0, 7, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_28C943, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 6, 2, 3, 1, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A17E, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 6, 5, 4, 8, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_209E96, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 3, 9, 3, 1, 17, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A20D, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_SKITTY, 0, 0, 8, 3, 3, 1, 17, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1FA, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_AZUMARILL, 0, 0, 10, 8, 3, 1, 17, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A220, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_MAN_5, 0, 0, 11, 8, 0, 9, 16, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_2C7F16, 0, 0, 0
 
 SlateportCity_PokemonFanClub_MapWarps: @ 852F64C
 	warp_def 6, 10, 0, 4, SLATEPORT_CITY
 	warp_def 7, 10, 0, 4, SLATEPORT_CITY
 
 SlateportCity_PokemonFanClub_MapEvents:: @ 852F65C
-	map_events SlateportCity_PokemonFanClub_MapObjects, SlateportCity_PokemonFanClub_MapWarps, 0x0, 0x0
+	map_events SlateportCity_PokemonFanClub_EventObjects, SlateportCity_PokemonFanClub_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SlateportCity_SternsShipyard_1F.inc b/data/maps/events/SlateportCity_SternsShipyard_1F.inc
index 07e93e516..6169dad1b 100644
--- a/data/maps/events/SlateportCity_SternsShipyard_1F.inc
+++ b/data/maps/events/SlateportCity_SternsShipyard_1F.inc
@@ -1,8 +1,8 @@
-SlateportCity_SternsShipyard_1F_MapObjects: @ 852F318
-	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 5, 5, 3, 8, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207F40, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 10, 7, 3, 7, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FED, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 18, 8, 3, 5, 1, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FF6, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 11, 3, 2, 33, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FFF, 869, 0, 0
+SlateportCity_SternsShipyard_1F_EventObjects: @ 852F318
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 5, 5, 3, 8, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207F40, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 10, 7, 3, 7, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FED, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 18, 8, 3, 5, 1, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FF6, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 11, 3, 2, 33, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FFF, 869, 0, 0
 
 SlateportCity_SternsShipyard_1F_MapWarps: @ 852F378
 	warp_def 2, 14, 0, 2, SLATEPORT_CITY
@@ -10,5 +10,5 @@ SlateportCity_SternsShipyard_1F_MapWarps: @ 852F378
 	warp_def 3, 1, 0, 0, SLATEPORT_CITY_STERNS_SHIPYARD_2F
 
 SlateportCity_SternsShipyard_1F_MapEvents:: @ 852F390
-	map_events SlateportCity_SternsShipyard_1F_MapObjects, SlateportCity_SternsShipyard_1F_MapWarps, 0x0, 0x0
+	map_events SlateportCity_SternsShipyard_1F_EventObjects, SlateportCity_SternsShipyard_1F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SlateportCity_SternsShipyard_2F.inc b/data/maps/events/SlateportCity_SternsShipyard_2F.inc
index d43e45568..8224ed8ff 100644
--- a/data/maps/events/SlateportCity_SternsShipyard_2F.inc
+++ b/data/maps/events/SlateportCity_SternsShipyard_2F.inc
@@ -1,11 +1,11 @@
-SlateportCity_SternsShipyard_2F_MapObjects: @ 852F3A4
-	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 10, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 8, 4, 3, 10, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_20863E, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 9, 3, 7, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_208647, 0, 0, 0
+SlateportCity_SternsShipyard_2F_EventObjects: @ 852F3A4
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 10, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 8, 4, 3, 10, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_20863E, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 9, 3, 7, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_208647, 0, 0, 0
 
 SlateportCity_SternsShipyard_2F_MapWarps: @ 852F3EC
 	warp_def 3, 1, 0, 2, SLATEPORT_CITY_STERNS_SHIPYARD_1F
 
 SlateportCity_SternsShipyard_2F_MapEvents:: @ 852F3F4
-	map_events SlateportCity_SternsShipyard_2F_MapObjects, SlateportCity_SternsShipyard_2F_MapWarps, 0x0, 0x0
+	map_events SlateportCity_SternsShipyard_2F_EventObjects, SlateportCity_SternsShipyard_2F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SootopolisCity.inc b/data/maps/events/SootopolisCity.inc
index 6f3bb0111..acb70f285 100644
--- a/data/maps/events/SootopolisCity.inc
+++ b/data/maps/events/SootopolisCity.inc
@@ -1,22 +1,22 @@
-SootopolisCity_MapObjects: @ 8527314
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 31, 18, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_1E5E8D, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 0, 47, 33, 0, 9, 0, 0, 0, 0, SootopolisCity_EventScript_1E5FE2, 854, 0, 0
-	object_event 3, MAP_OBJ_GFX_GIRL_2, 0, 0, 9, 43, 3, 5, 1, 0, 0, 0, SootopolisCity_EventScript_1E5ED8, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 51, 14, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_1E608E, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BOY_1, 0, 0, 43, 26, 3, 1, 0, 0, 0, 0, SootopolisCity_EventScript_1E60E3, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_1, 0, 0, 26, 4, 3, 5, 1, 0, 0, 0, SootopolisCity_EventScript_1E6017, 839, 0, 0
-	object_event 7, MAP_OBJ_GFX_STEVEN, 0, 0, 20, 36, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E6166, 973, 0, 0
-	object_event 8, MAP_OBJ_GFX_WOMAN_7, 0, 0, 49, 34, 3, 3, 17, 0, 0, 0, SootopolisCity_EventScript_1E6038, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_GROUDON_3, 0, 0, 28, 44, 0, 80, 17, 0, 0, 0, 0x0, 998, 0, 0
-	object_event 10, MAP_OBJ_GFX_KYOGRE_3, 0, 0, 34, 44, 1, 79, 17, 0, 0, 0, 0x0, 997, 0, 0
-	object_event 11, MAP_OBJ_GFX_RAYQUAZA_2, 0, 0, 31, 41, 1, 10, 17, 0, 0, 0, 0x0, 996, 0, 0
-	object_event 12, MAP_OBJ_GFX_MANIAC, 0, 0, 17, 44, 3, 10, 17, 0, 0, 0, SootopolisCity_EventScript_1E6411, 854, 0, 0
-	object_event 13, MAP_OBJ_GFX_GIRL_3, 0, 0, 14, 42, 3, 10, 17, 0, 0, 0, SootopolisCity_EventScript_1E63DB, 854, 0, 0
-	object_event 14, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 17, 40, 3, 10, 17, 0, 0, 0, SootopolisCity_EventScript_1E6393, 854, 0, 0
-	object_event 15, MAP_OBJ_GFX_BOY_2, 0, 0, 19, 37, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E635D, 854, 0, 0
-	object_event 16, MAP_OBJ_GFX_MAXIE, 0, 0, 29, 33, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E64F2, 827, 0, 0
-	object_event 17, MAP_OBJ_GFX_ARCHIE, 0, 0, 31, 33, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E651F, 826, 0, 0
-	object_event 18, MAP_OBJ_GFX_WALLACE, 0, 0, 31, 18, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E6446, 816, 0, 0
+SootopolisCity_EventObjects: @ 8527314
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 31, 18, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_1E5E8D, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 47, 33, 0, 9, 0, 0, 0, 0, SootopolisCity_EventScript_1E5FE2, 854, 0, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 0, 9, 43, 3, 5, 1, 0, 0, 0, SootopolisCity_EventScript_1E5ED8, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 51, 14, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_1E608E, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 0, 43, 26, 3, 1, 0, 0, 0, 0, SootopolisCity_EventScript_1E60E3, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 0, 26, 4, 3, 5, 1, 0, 0, 0, SootopolisCity_EventScript_1E6017, 839, 0, 0
+	object_event 7, EVENT_OBJ_GFX_STEVEN, 0, 0, 20, 36, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E6166, 973, 0, 0
+	object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 49, 34, 3, 3, 17, 0, 0, 0, SootopolisCity_EventScript_1E6038, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_GROUDON_3, 0, 0, 28, 44, 0, 80, 17, 0, 0, 0, 0x0, 998, 0, 0
+	object_event 10, EVENT_OBJ_GFX_KYOGRE_3, 0, 0, 34, 44, 1, 79, 17, 0, 0, 0, 0x0, 997, 0, 0
+	object_event 11, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 0, 31, 41, 1, 10, 17, 0, 0, 0, 0x0, 996, 0, 0
+	object_event 12, EVENT_OBJ_GFX_MANIAC, 0, 0, 17, 44, 3, 10, 17, 0, 0, 0, SootopolisCity_EventScript_1E6411, 854, 0, 0
+	object_event 13, EVENT_OBJ_GFX_GIRL_3, 0, 0, 14, 42, 3, 10, 17, 0, 0, 0, SootopolisCity_EventScript_1E63DB, 854, 0, 0
+	object_event 14, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 17, 40, 3, 10, 17, 0, 0, 0, SootopolisCity_EventScript_1E6393, 854, 0, 0
+	object_event 15, EVENT_OBJ_GFX_BOY_2, 0, 0, 19, 37, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E635D, 854, 0, 0
+	object_event 16, EVENT_OBJ_GFX_MAXIE, 0, 0, 29, 33, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E64F2, 827, 0, 0
+	object_event 17, EVENT_OBJ_GFX_ARCHIE, 0, 0, 31, 33, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E651F, 826, 0, 0
+	object_event 18, EVENT_OBJ_GFX_WALLACE, 0, 0, 31, 18, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E6446, 816, 0, 0
 
 SootopolisCity_MapWarps: @ 85274C4
 	warp_def 43, 31, 0, 0, SOOTOPOLIS_CITY_POKEMON_CENTER_1F
@@ -42,5 +42,5 @@ SootopolisCity_MapBGEvents: @ 852752C
 	bg_event 41, 37, 0, 0, 0, SootopolisCity_EventScript_1E6154
 
 SootopolisCity_MapEvents:: @ 8527574
-	map_events SootopolisCity_MapObjects, SootopolisCity_MapWarps, 0x0, SootopolisCity_MapBGEvents
+	map_events SootopolisCity_EventObjects, SootopolisCity_MapWarps, 0x0, SootopolisCity_MapBGEvents
 
diff --git a/data/maps/events/SootopolisCity_Gym_1F.inc b/data/maps/events/SootopolisCity_Gym_1F.inc
index b348cebcf..60e02f3fb 100644
--- a/data/maps/events/SootopolisCity_Gym_1F.inc
+++ b/data/maps/events/SootopolisCity_Gym_1F.inc
@@ -1,6 +1,6 @@
-SootopolisCity_Gym_1F_MapObjects: @ 8532FF4
-	object_event 1, MAP_OBJ_GFX_JUAN, 0, 0, 8, 2, 0, 8, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_224F44, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_2, 0, 0, 7, 24, 3, 8, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_225040, 0, 0, 0
+SootopolisCity_Gym_1F_EventObjects: @ 8532FF4
+	object_event 1, EVENT_OBJ_GFX_JUAN, 0, 0, 8, 2, 0, 8, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_224F44, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 0, 7, 24, 3, 8, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_225040, 0, 0, 0
 
 SootopolisCity_Gym_1F_MapWarps: @ 8533024
 	warp_def 8, 25, 0, 2, SOOTOPOLIS_CITY
@@ -12,5 +12,5 @@ SootopolisCity_Gym_1F_MapBGEvents: @ 853303C
 	bg_event 10, 24, 0, 1, 0, SootopolisCity_Gym_1F_EventScript_22506F
 
 SootopolisCity_Gym_1F_MapEvents:: @ 8533054
-	map_events SootopolisCity_Gym_1F_MapObjects, SootopolisCity_Gym_1F_MapWarps, 0x0, SootopolisCity_Gym_1F_MapBGEvents
+	map_events SootopolisCity_Gym_1F_EventObjects, SootopolisCity_Gym_1F_MapWarps, 0x0, SootopolisCity_Gym_1F_MapBGEvents
 
diff --git a/data/maps/events/SootopolisCity_Gym_B1F.inc b/data/maps/events/SootopolisCity_Gym_B1F.inc
index 9e0dcbadd..1d490490d 100644
--- a/data/maps/events/SootopolisCity_Gym_B1F.inc
+++ b/data/maps/events/SootopolisCity_Gym_B1F.inc
@@ -1,18 +1,18 @@
-SootopolisCity_Gym_B1F_MapObjects: @ 8533068
-	object_event 1, MAP_OBJ_GFX_LASS, 0, 0, 7, 17, 3, 10, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225C8B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BEAUTY, 0, 0, 9, 19, 3, 9, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CD0, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_3, 0, 0, 12, 7, 3, 9, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CB9, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BEAUTY, 0, 0, 11, 9, 0, 7, 0, 0, 1, 5, SootopolisCity_Gym_B1F_EventScript_225CE7, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BEAUTY, 0, 0, 5, 6, 3, 8, 0, 0, 1, 4, SootopolisCity_Gym_B1F_EventScript_225D15, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_WOMAN_2, 0, 0, 7, 8, 3, 10, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225D2C, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_LASS, 0, 0, 4, 8, 3, 10, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225CA2, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_BEAUTY, 0, 0, 9, 7, 3, 8, 0, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_225CFE, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_WOMAN_3, 0, 0, 6, 13, 3, 10, 17, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D5A, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_WOMAN_2, 0, 0, 10, 13, 3, 9, 17, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D43, 0, 0, 0
+SootopolisCity_Gym_B1F_EventObjects: @ 8533068
+	object_event 1, EVENT_OBJ_GFX_LASS, 0, 0, 7, 17, 3, 10, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225C8B, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 0, 9, 19, 3, 9, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CD0, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 12, 7, 3, 9, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CB9, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 0, 11, 9, 0, 7, 0, 0, 1, 5, SootopolisCity_Gym_B1F_EventScript_225CE7, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 0, 5, 6, 3, 8, 0, 0, 1, 4, SootopolisCity_Gym_B1F_EventScript_225D15, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 7, 8, 3, 10, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225D2C, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_LASS, 0, 0, 4, 8, 3, 10, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225CA2, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_BEAUTY, 0, 0, 9, 7, 3, 8, 0, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_225CFE, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 6, 13, 3, 10, 17, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D5A, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 10, 13, 3, 9, 17, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D43, 0, 0, 0
 
 SootopolisCity_Gym_B1F_MapWarps: @ 8533158
 	warp_def 11, 22, 3, 2, SOOTOPOLIS_CITY_GYM_1F
 
 SootopolisCity_Gym_B1F_MapEvents:: @ 8533160
-	map_events SootopolisCity_Gym_B1F_MapObjects, SootopolisCity_Gym_B1F_MapWarps, 0x0, 0x0
+	map_events SootopolisCity_Gym_B1F_EventObjects, SootopolisCity_Gym_B1F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SootopolisCity_House1.inc b/data/maps/events/SootopolisCity_House1.inc
index b7eb626e0..eaaf2d334 100644
--- a/data/maps/events/SootopolisCity_House1.inc
+++ b/data/maps/events/SootopolisCity_House1.inc
@@ -1,11 +1,11 @@
-SootopolisCity_House1_MapObjects: @ 85332F8
-	object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22694D, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_KECLEON_1, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22698E, 0, 0, 0
+SootopolisCity_House1_EventObjects: @ 85332F8
+	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22694D, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22698E, 0, 0, 0
 
 SootopolisCity_House1_MapWarps: @ 8533328
 	warp_def 3, 6, 0, 4, SOOTOPOLIS_CITY
 	warp_def 4, 6, 0, 4, SOOTOPOLIS_CITY
 
 SootopolisCity_House1_MapEvents:: @ 8533338
-	map_events SootopolisCity_House1_MapObjects, SootopolisCity_House1_MapWarps, 0x0, 0x0
+	map_events SootopolisCity_House1_EventObjects, SootopolisCity_House1_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SootopolisCity_House2.inc b/data/maps/events/SootopolisCity_House2.inc
index 98b1b6712..d00a1fa5f 100644
--- a/data/maps/events/SootopolisCity_House2.inc
+++ b/data/maps/events/SootopolisCity_House2.inc
@@ -1,10 +1,10 @@
-SootopolisCity_House2_MapObjects: @ 853334C
-	object_event 1, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 3, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_House2_EventScript_226A77, 0, 0, 0
+SootopolisCity_House2_EventObjects: @ 853334C
+	object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 3, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_House2_EventScript_226A77, 0, 0, 0
 
 SootopolisCity_House2_MapWarps: @ 8533364
 	warp_def 3, 6, 0, 5, SOOTOPOLIS_CITY
 	warp_def 4, 6, 0, 5, SOOTOPOLIS_CITY
 
 SootopolisCity_House2_MapEvents:: @ 8533374
-	map_events SootopolisCity_House2_MapObjects, SootopolisCity_House2_MapWarps, 0x0, 0x0
+	map_events SootopolisCity_House2_EventObjects, SootopolisCity_House2_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SootopolisCity_House3.inc b/data/maps/events/SootopolisCity_House3.inc
index eaf48fd6e..b6407478c 100644
--- a/data/maps/events/SootopolisCity_House3.inc
+++ b/data/maps/events/SootopolisCity_House3.inc
@@ -1,11 +1,11 @@
-SootopolisCity_House3_MapObjects: @ 8533388
-	object_event 1, MAP_OBJ_GFX_WOMAN_5, 0, 0, 2, 4, 3, 8, 0, 0, 0, 0, SootopolisCity_House3_EventScript_226B72, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_2, 0, 0, 6, 4, 3, 2, 17, 0, 0, 0, SootopolisCity_House3_EventScript_226B9B, 0, 0, 0
+SootopolisCity_House3_EventObjects: @ 8533388
+	object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 2, 4, 3, 8, 0, 0, 0, 0, SootopolisCity_House3_EventScript_226B72, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 0, 6, 4, 3, 2, 17, 0, 0, 0, SootopolisCity_House3_EventScript_226B9B, 0, 0, 0
 
 SootopolisCity_House3_MapWarps: @ 85333B8
 	warp_def 3, 6, 0, 6, SOOTOPOLIS_CITY
 	warp_def 4, 6, 0, 6, SOOTOPOLIS_CITY
 
 SootopolisCity_House3_MapEvents:: @ 85333C8
-	map_events SootopolisCity_House3_MapObjects, SootopolisCity_House3_MapWarps, 0x0, 0x0
+	map_events SootopolisCity_House3_EventObjects, SootopolisCity_House3_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SootopolisCity_House4.inc b/data/maps/events/SootopolisCity_House4.inc
index eb41cbafb..223cc4f0d 100644
--- a/data/maps/events/SootopolisCity_House4.inc
+++ b/data/maps/events/SootopolisCity_House4.inc
@@ -1,12 +1,12 @@
-SootopolisCity_House4_MapObjects: @ 85333DC
-	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_House4_EventScript_226D16, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 0, 5, 2, 3, 7, 33, 0, 0, 0, SootopolisCity_House4_EventScript_226D1F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_AZUMARILL, 0, 0, 2, 3, 3, 1, 17, 0, 0, 0, SootopolisCity_House4_EventScript_226D28, 0, 0, 0
+SootopolisCity_House4_EventObjects: @ 85333DC
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_House4_EventScript_226D16, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 5, 2, 3, 7, 33, 0, 0, 0, SootopolisCity_House4_EventScript_226D1F, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_AZUMARILL, 0, 0, 2, 3, 3, 1, 17, 0, 0, 0, SootopolisCity_House4_EventScript_226D28, 0, 0, 0
 
 SootopolisCity_House4_MapWarps: @ 8533424
 	warp_def 3, 6, 0, 7, SOOTOPOLIS_CITY
 	warp_def 4, 6, 0, 7, SOOTOPOLIS_CITY
 
 SootopolisCity_House4_MapEvents:: @ 8533434
-	map_events SootopolisCity_House4_MapObjects, SootopolisCity_House4_MapWarps, 0x0, 0x0
+	map_events SootopolisCity_House4_EventObjects, SootopolisCity_House4_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SootopolisCity_House5.inc b/data/maps/events/SootopolisCity_House5.inc
index 5bffec912..66a804c1a 100644
--- a/data/maps/events/SootopolisCity_House5.inc
+++ b/data/maps/events/SootopolisCity_House5.inc
@@ -1,11 +1,11 @@
-SootopolisCity_House5_MapObjects: @ 8533448
-	object_event 1, MAP_OBJ_GFX_MANIAC, 0, 0, 3, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E94, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 6, 3, 3, 9, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E9D, 0, 0, 0
+SootopolisCity_House5_EventObjects: @ 8533448
+	object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 3, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E94, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 6, 3, 3, 9, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E9D, 0, 0, 0
 
 SootopolisCity_House5_MapWarps: @ 8533478
 	warp_def 3, 6, 0, 8, SOOTOPOLIS_CITY
 	warp_def 4, 6, 0, 8, SOOTOPOLIS_CITY
 
 SootopolisCity_House5_MapEvents:: @ 8533488
-	map_events SootopolisCity_House5_MapObjects, SootopolisCity_House5_MapWarps, 0x0, 0x0
+	map_events SootopolisCity_House5_EventObjects, SootopolisCity_House5_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SootopolisCity_House6.inc b/data/maps/events/SootopolisCity_House6.inc
index 5f0f5d430..2c27b4ef2 100644
--- a/data/maps/events/SootopolisCity_House6.inc
+++ b/data/maps/events/SootopolisCity_House6.inc
@@ -1,10 +1,10 @@
-SootopolisCity_House6_MapObjects: @ 853349C
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 4, 3, 3, 2, 17, 0, 0, 0, SootopolisCity_House6_EventScript_226F5C, 0, 0, 0
+SootopolisCity_House6_EventObjects: @ 853349C
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 4, 3, 3, 2, 17, 0, 0, 0, SootopolisCity_House6_EventScript_226F5C, 0, 0, 0
 
 SootopolisCity_House6_MapWarps: @ 85334B4
 	warp_def 3, 6, 0, 9, SOOTOPOLIS_CITY
 	warp_def 4, 6, 0, 9, SOOTOPOLIS_CITY
 
 SootopolisCity_House6_MapEvents:: @ 85334C4
-	map_events SootopolisCity_House6_MapObjects, SootopolisCity_House6_MapWarps, 0x0, 0x0
+	map_events SootopolisCity_House6_EventObjects, SootopolisCity_House6_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SootopolisCity_House7.inc b/data/maps/events/SootopolisCity_House7.inc
index 3a18508a2..fbbbc5579 100644
--- a/data/maps/events/SootopolisCity_House7.inc
+++ b/data/maps/events/SootopolisCity_House7.inc
@@ -1,11 +1,11 @@
-SootopolisCity_House7_MapObjects: @ 85334D8
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 5, 3, 3, 9, 0, 0, 0, 0, SootopolisCity_House7_EventScript_2270CC, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 1, 4, 3, 2, 17, 0, 0, 0, SootopolisCity_House7_EventScript_2270D5, 0, 0, 0
+SootopolisCity_House7_EventObjects: @ 85334D8
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 5, 3, 3, 9, 0, 0, 0, 0, SootopolisCity_House7_EventScript_2270CC, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 1, 4, 3, 2, 17, 0, 0, 0, SootopolisCity_House7_EventScript_2270D5, 0, 0, 0
 
 SootopolisCity_House7_MapWarps: @ 8533508
 	warp_def 3, 6, 0, 10, SOOTOPOLIS_CITY
 	warp_def 4, 6, 0, 10, SOOTOPOLIS_CITY
 
 SootopolisCity_House7_MapEvents:: @ 8533518
-	map_events SootopolisCity_House7_MapObjects, SootopolisCity_House7_MapWarps, 0x0, 0x0
+	map_events SootopolisCity_House7_EventObjects, SootopolisCity_House7_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc b/data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc
index 0dcb79d1b..ffd6fe203 100644
--- a/data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc
+++ b/data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc
@@ -1,6 +1,6 @@
-SootopolisCity_LotadAndSeedotHouse_MapObjects: @ 853352C
-	object_event 1, MAP_OBJ_GFX_FISHERMAN, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIKER, 0, 0, 5, 4, 3, 9, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_22722B, 0, 0, 0
+SootopolisCity_LotadAndSeedotHouse_EventObjects: @ 853352C
+	object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_HIKER, 0, 0, 5, 4, 3, 9, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_22722B, 0, 0, 0
 
 SootopolisCity_LotadAndSeedotHouse_MapWarps: @ 853355C
 	warp_def 3, 6, 0, 11, SOOTOPOLIS_CITY
@@ -11,5 +11,5 @@ SootopolisCity_LotadAndSeedotHouse_MapBGEvents: @ 853356C
 	bg_event 2, 1, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_22735B
 
 SootopolisCity_LotadAndSeedotHouse_MapEvents:: @ 8533584
-	map_events SootopolisCity_LotadAndSeedotHouse_MapObjects, SootopolisCity_LotadAndSeedotHouse_MapWarps, 0x0, SootopolisCity_LotadAndSeedotHouse_MapBGEvents
+	map_events SootopolisCity_LotadAndSeedotHouse_EventObjects, SootopolisCity_LotadAndSeedotHouse_MapWarps, 0x0, SootopolisCity_LotadAndSeedotHouse_MapBGEvents
 
diff --git a/data/maps/events/SootopolisCity_Mart.inc b/data/maps/events/SootopolisCity_Mart.inc
index de29f556b..30ff85620 100644
--- a/data/maps/events/SootopolisCity_Mart.inc
+++ b/data/maps/events/SootopolisCity_Mart.inc
@@ -1,12 +1,12 @@
-SootopolisCity_Mart_MapObjects: @ 853328C
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_226795, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267C2, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 9, 5, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267EC, 0, 0, 0
+SootopolisCity_Mart_EventObjects: @ 853328C
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_226795, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267C2, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 9, 5, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267EC, 0, 0, 0
 
 SootopolisCity_Mart_MapWarps: @ 85332D4
 	warp_def 3, 7, 0, 1, SOOTOPOLIS_CITY
 	warp_def 4, 7, 0, 1, SOOTOPOLIS_CITY
 
 SootopolisCity_Mart_MapEvents:: @ 85332E4
-	map_events SootopolisCity_Mart_MapObjects, SootopolisCity_Mart_MapWarps, 0x0, 0x0
+	map_events SootopolisCity_Mart_EventObjects, SootopolisCity_Mart_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc b/data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc
index 69865a2aa..f6efd8225 100644
--- a/data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc
+++ b/data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc
@@ -1,5 +1,5 @@
-SootopolisCity_MysteryEventsHouse_1F_MapObjects: @ 8533598
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 6, 4, 0, 10, 0, 0, 0, 0, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24, 0, 0, 0
+SootopolisCity_MysteryEventsHouse_1F_EventObjects: @ 8533598
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 6, 4, 0, 10, 0, 0, 0, 0, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24, 0, 0, 0
 
 SootopolisCity_MysteryEventsHouse_1F_MapWarps: @ 85335B0
 	warp_def 3, 7, 0, 12, SOOTOPOLIS_CITY
@@ -7,5 +7,5 @@ SootopolisCity_MysteryEventsHouse_1F_MapWarps: @ 85335B0
 	warp_def 3, 1, 3, 0, SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F
 
 SootopolisCity_MysteryEventsHouse_1F_MapEvents:: @ 85335C8
-	map_events SootopolisCity_MysteryEventsHouse_1F_MapObjects, SootopolisCity_MysteryEventsHouse_1F_MapWarps, 0x0, 0x0
+	map_events SootopolisCity_MysteryEventsHouse_1F_EventObjects, SootopolisCity_MysteryEventsHouse_1F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc b/data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc
index 2a02e72f2..faec348c2 100644
--- a/data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc
+++ b/data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc
@@ -1,9 +1,9 @@
-SootopolisCity_MysteryEventsHouse_B1F_MapObjects: @ 85335DC
-	object_event 1, MAP_OBJ_GFX_HIPSTER, 0, 0, 6, 5, 0, 9, 17, 0, 0, 0, 0x0, 0, 0, 0
+SootopolisCity_MysteryEventsHouse_B1F_EventObjects: @ 85335DC
+	object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 0, 6, 5, 0, 9, 17, 0, 0, 0, 0x0, 0, 0, 0
 
 SootopolisCity_MysteryEventsHouse_B1F_MapWarps: @ 85335F4
 	warp_def 3, 1, 0, 2, SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F
 
 SootopolisCity_MysteryEventsHouse_B1F_MapEvents:: @ 85335FC
-	map_events SootopolisCity_MysteryEventsHouse_B1F_MapObjects, SootopolisCity_MysteryEventsHouse_B1F_MapWarps, 0x0, 0x0
+	map_events SootopolisCity_MysteryEventsHouse_B1F_EventObjects, SootopolisCity_MysteryEventsHouse_B1F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc b/data/maps/events/SootopolisCity_PokemonCenter_1F.inc
index 669ce88ae..afb2d586b 100644
--- a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc
+++ b/data/maps/events/SootopolisCity_PokemonCenter_1F.inc
@@ -1,8 +1,8 @@
-SootopolisCity_PokemonCenter_1F_MapObjects: @ 8533174
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226500, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 12, 4, 3, 2, 17, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_22650E, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 0, 4, 7, 3, 5, 1, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226538, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_1, 0, 0, 2, 3, 3, 2, 17, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_2C8256, 0, 0, 0
+SootopolisCity_PokemonCenter_1F_EventObjects: @ 8533174
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226500, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 12, 4, 3, 2, 17, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_22650E, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 7, 3, 5, 1, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226538, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 2, 3, 3, 2, 17, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_2C8256, 0, 0, 0
 
 SootopolisCity_PokemonCenter_1F_MapWarps: @ 85331D4
 	warp_def 7, 8, 3, 0, SOOTOPOLIS_CITY
@@ -10,5 +10,5 @@ SootopolisCity_PokemonCenter_1F_MapWarps: @ 85331D4
 	warp_def 1, 6, 4, 0, SOOTOPOLIS_CITY_POKEMON_CENTER_2F
 
 SootopolisCity_PokemonCenter_1F_MapEvents:: @ 85331EC
-	map_events SootopolisCity_PokemonCenter_1F_MapObjects, SootopolisCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
+	map_events SootopolisCity_PokemonCenter_1F_EventObjects, SootopolisCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SootopolisCity_PokemonCenter_2F.inc b/data/maps/events/SootopolisCity_PokemonCenter_2F.inc
index d063a7666..21be152fa 100644
--- a/data/maps/events/SootopolisCity_PokemonCenter_2F.inc
+++ b/data/maps/events/SootopolisCity_PokemonCenter_2F.inc
@@ -1,8 +1,8 @@
-SootopolisCity_PokemonCenter_2F_MapObjects: @ 8533200
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
+SootopolisCity_PokemonCenter_2F_EventObjects: @ 8533200
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
 
 SootopolisCity_PokemonCenter_2F_MapWarps: @ 8533260
 	warp_def 1, 6, 4, 2, SOOTOPOLIS_CITY_POKEMON_CENTER_1F
@@ -10,5 +10,5 @@ SootopolisCity_PokemonCenter_2F_MapWarps: @ 8533260
 	warp_def 9, 1, 3, 0, TRADE_CENTER
 
 SootopolisCity_PokemonCenter_2F_MapEvents:: @ 8533278
-	map_events SootopolisCity_PokemonCenter_2F_MapObjects, SootopolisCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
+	map_events SootopolisCity_PokemonCenter_2F_EventObjects, SootopolisCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/SouthernIsland_Exterior.inc b/data/maps/events/SouthernIsland_Exterior.inc
index 7c6bc4128..11cc35658 100644
--- a/data/maps/events/SouthernIsland_Exterior.inc
+++ b/data/maps/events/SouthernIsland_Exterior.inc
@@ -1,6 +1,6 @@
-SouthernIsland_Exterior_MapObjects: @ 853B83C
-	object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 13, 23, 3, 7, 0, 0, 0, 0, SouthernIsland_Exterior_EventScript_2429D2, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 0, 13, 25, 1, 10, 0, 0, 0, 0, 0x0, 0, 0, 0
+SouthernIsland_Exterior_EventObjects: @ 853B83C
+	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 13, 23, 3, 7, 0, 0, 0, 0, SouthernIsland_Exterior_EventScript_2429D2, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 0, 13, 25, 1, 10, 0, 0, 0, 0, 0x0, 0, 0, 0
 
 SouthernIsland_Exterior_MapWarps: @ 853B86C
 	warp_def 14, 5, 3, 0, SOUTHERN_ISLAND_INTERIOR
@@ -10,5 +10,5 @@ SouthernIsland_Exterior_MapBGEvents: @ 853B87C
 	bg_event 16, 7, 3, 0, 0, SouthernIsland_Exterior_EventScript_242A3C
 
 SouthernIsland_Exterior_MapEvents:: @ 853B888
-	map_events SouthernIsland_Exterior_MapObjects, SouthernIsland_Exterior_MapWarps, 0x0, SouthernIsland_Exterior_MapBGEvents
+	map_events SouthernIsland_Exterior_EventObjects, SouthernIsland_Exterior_MapWarps, 0x0, SouthernIsland_Exterior_MapBGEvents
 
diff --git a/data/maps/events/SouthernIsland_Interior.inc b/data/maps/events/SouthernIsland_Interior.inc
index a304f1832..6a89414b2 100644
--- a/data/maps/events/SouthernIsland_Interior.inc
+++ b/data/maps/events/SouthernIsland_Interior.inc
@@ -1,6 +1,6 @@
-SouthernIsland_Interior_MapObjects: @ 853B89C
-	object_event 1, MAP_OBJ_GFX_HIPSTER, 0, 0, 13, 12, 3, 7, 0, 0, 0, 0, 0x0, 910, 0, 0
-	object_event 2, MAP_OBJ_GFX_TRADER, 0, 0, 13, 2, 0, 8, 0, 0, 0, 0, 0x0, 911, 0, 0
+SouthernIsland_Interior_EventObjects: @ 853B89C
+	object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 0, 13, 12, 3, 7, 0, 0, 0, 0, 0x0, 910, 0, 0
+	object_event 2, EVENT_OBJ_GFX_TRADER, 0, 0, 13, 2, 0, 8, 0, 0, 0, 0, 0x0, 911, 0, 0
 
 SouthernIsland_Interior_MapWarps: @ 853B8CC
 	warp_def 13, 18, 3, 0, SOUTHERN_ISLAND_EXTERIOR
@@ -10,5 +10,5 @@ SouthernIsland_Interior_MapBGEvents: @ 853B8DC
 	bg_event 13, 11, 3, 1, 0, SouthernIsland_Interior_EventScript_242AC4
 
 SouthernIsland_Interior_MapEvents:: @ 853B8E8
-	map_events SouthernIsland_Interior_MapObjects, SouthernIsland_Interior_MapWarps, 0x0, SouthernIsland_Interior_MapBGEvents
+	map_events SouthernIsland_Interior_EventObjects, SouthernIsland_Interior_MapWarps, 0x0, SouthernIsland_Interior_MapBGEvents
 
diff --git a/data/maps/events/TerraCave_End.inc b/data/maps/events/TerraCave_End.inc
index 0e3c0f0bb..88dbdf09a 100644
--- a/data/maps/events/TerraCave_End.inc
+++ b/data/maps/events/TerraCave_End.inc
@@ -1,5 +1,5 @@
-TerraCave_End_MapObjects: @ 8537850
-	object_event 1, MAP_OBJ_GFX_GROUDON_1, 0, 0, 17, 22, 1, 8, 17, 0, 0, 0, 0x0, 783, 0, 0
+TerraCave_End_EventObjects: @ 8537850
+	object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 0, 17, 22, 1, 8, 17, 0, 0, 0, 0x0, 783, 0, 0
 
 TerraCave_End_MapWarps: @ 8537868
 	warp_def 5, 4, 3, 1, TERRA_CAVE_ENTRANCE
@@ -8,5 +8,5 @@ TerraCave_End_MapCoordEvents: @ 8537870
 	coord_event 17, 26, 3, 0, VAR_TEMP_1, 1, 0, TerraCave_End_EventScript_23B0EC
 
 TerraCave_End_MapEvents:: @ 8537880
-	map_events TerraCave_End_MapObjects, TerraCave_End_MapWarps, TerraCave_End_MapCoordEvents, 0x0
+	map_events TerraCave_End_EventObjects, TerraCave_End_MapWarps, TerraCave_End_MapCoordEvents, 0x0
 
diff --git a/data/maps/events/TradeCenter.inc b/data/maps/events/TradeCenter.inc
index dea4f52c3..25dbd3139 100644
--- a/data/maps/events/TradeCenter.inc
+++ b/data/maps/events/TradeCenter.inc
@@ -1,5 +1,5 @@
-TradeCenter_MapObjects: @ 8539DA0
-	object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 0, 9, 6, 3, 9, 0, 0, 0, 0, TradeCenter_EventScript_2774B6, 0, 0, 0
+TradeCenter_EventObjects: @ 8539DA0
+	object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 9, 6, 3, 9, 0, 0, 0, 0, TradeCenter_EventScript_2774B6, 0, 0, 0
 
 TradeCenter_MapWarps: @ 8539DB8
 	warp_def 5, 8, 3, 127, NONE
@@ -10,5 +10,5 @@ TradeCenter_MapCoordEvents: @ 8539DC8
 	coord_event 7, 5, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_082773FF
 
 TradeCenter_MapEvents:: @ 8539DE8
-	map_events TradeCenter_MapObjects, TradeCenter_MapWarps, TradeCenter_MapCoordEvents, 0x0
+	map_events TradeCenter_EventObjects, TradeCenter_MapWarps, TradeCenter_MapCoordEvents, 0x0
 
diff --git a/data/maps/events/TrainerHill_Elevator.inc b/data/maps/events/TrainerHill_Elevator.inc
index 873495876..0a84d3b51 100644
--- a/data/maps/events/TrainerHill_Elevator.inc
+++ b/data/maps/events/TrainerHill_Elevator.inc
@@ -1,10 +1,10 @@
-TrainerHill_Elevator_MapObjects: @ 853DD84
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 0, 6, 3, 8, 17, 0, 0, 0, TrainerHill_Elevator_EventScript_26935F, 0, 0, 0
+TrainerHill_Elevator_EventObjects: @ 853DD84
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 0, 6, 3, 8, 17, 0, 0, 0, TrainerHill_Elevator_EventScript_26935F, 0, 0, 0
 
 TrainerHill_Elevator_MapWarps: @ 853DD9C
 	warp_def 1, 6, 3, 1, TRAINER_HILL_ROOF
 	warp_def 2, 6, 3, 1, TRAINER_HILL_ROOF
 
 TrainerHill_Elevator_MapEvents:: @ 853DDAC
-	map_events TrainerHill_Elevator_MapObjects, TrainerHill_Elevator_MapWarps, 0x0, 0x0
+	map_events TrainerHill_Elevator_EventObjects, TrainerHill_Elevator_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/TrainerHill_Entrance.inc b/data/maps/events/TrainerHill_Entrance.inc
index a5574755b..832ab5838 100644
--- a/data/maps/events/TrainerHill_Entrance.inc
+++ b/data/maps/events/TrainerHill_Entrance.inc
@@ -1,9 +1,9 @@
-TrainerHill_Entrance_MapObjects: @ 853D874
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 11, 6, 3, 9, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_2681FD, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_NURSE, 0, 0, 4, 9, 3, 8, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_2681EF, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 14, 9, 3, 8, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_2683C7, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 0, 5, 14, 3, 2, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_2683AC, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAN_4, 0, 0, 14, 15, 3, 2, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_268391, 0, 0, 0
+TrainerHill_Entrance_EventObjects: @ 853D874
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 11, 6, 3, 9, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_2681FD, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_NURSE, 0, 0, 4, 9, 3, 8, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_2681EF, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 14, 9, 3, 8, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_2683C7, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 5, 14, 3, 2, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_2683AC, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 0, 14, 15, 3, 2, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_268391, 0, 0, 0
 
 TrainerHill_Entrance_MapWarps: @ 853D8EC
 	warp_def 9, 16, 3, 4, ROUTE_111
@@ -17,5 +17,5 @@ TrainerHill_Entrance_MapBGEvents: @ 853D914
 	bg_event 8, 10, 0, 1, 0, TrainerHill_Entrance_EventScript_268388
 
 TrainerHill_Entrance_MapEvents:: @ 853D920
-	map_events TrainerHill_Entrance_MapObjects, TrainerHill_Entrance_MapWarps, TrainerHill_Entrance_MapCoordEvents, TrainerHill_Entrance_MapBGEvents
+	map_events TrainerHill_Entrance_EventObjects, TrainerHill_Entrance_MapWarps, TrainerHill_Entrance_MapCoordEvents, TrainerHill_Entrance_MapBGEvents
 
diff --git a/data/maps/events/TrainerHill_Roof.inc b/data/maps/events/TrainerHill_Roof.inc
index 4f48ef724..1ae00b9a2 100644
--- a/data/maps/events/TrainerHill_Roof.inc
+++ b/data/maps/events/TrainerHill_Roof.inc
@@ -1,10 +1,10 @@
-TrainerHill_Roof_MapObjects: @ 853D9C4
-	object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 12, 7, 3, 8, 17, 0, 0, 0, TrainerHill_Roof_EventScript_268FB2, 0, 0, 0
+TrainerHill_Roof_EventObjects: @ 853D9C4
+	object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 12, 7, 3, 8, 17, 0, 0, 0, TrainerHill_Roof_EventScript_268FB2, 0, 0, 0
 
 TrainerHill_Roof_MapWarps: @ 853D9DC
 	warp_def 9, 5, 3, 1, TRAINER_HILL_4F
 	warp_def 15, 5, 0, 1, TRAINER_HILL_ELEVATOR
 
 TrainerHill_Roof_MapEvents:: @ 853D9EC
-	map_events TrainerHill_Roof_MapObjects, TrainerHill_Roof_MapWarps, 0x0, 0x0
+	map_events TrainerHill_Roof_EventObjects, TrainerHill_Roof_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/Underwater_SeafloorCavern.inc b/data/maps/events/Underwater_SeafloorCavern.inc
index b284db78f..0bf82c217 100644
--- a/data/maps/events/Underwater_SeafloorCavern.inc
+++ b/data/maps/events/Underwater_SeafloorCavern.inc
@@ -1,12 +1,12 @@
-Underwater_SeafloorCavern_MapObjects: @ 8535640
-	object_event 1, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 5, 4, 3, 76, 17, 0, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980, 0, 0
-	object_event 2, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 6, 4, 3, 76, 17, 0, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980, 0, 0
-	object_event 3, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 7, 4, 3, 76, 17, 0, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980, 0, 0
-	object_event 4, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 8, 4, 3, 76, 17, 0, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980, 0, 0
+Underwater_SeafloorCavern_EventObjects: @ 8535640
+	object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 5, 4, 3, 76, 17, 0, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980, 0, 0
+	object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 6, 4, 3, 76, 17, 0, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980, 0, 0
+	object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 7, 4, 3, 76, 17, 0, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980, 0, 0
+	object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 8, 4, 3, 76, 17, 0, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980, 0, 0
 
 Underwater_SeafloorCavern_MapWarps: @ 85356A0
 	warp_def 6, 7, 0, 0, UNDERWATER_4
 
 Underwater_SeafloorCavern_MapEvents:: @ 85356A8
-	map_events Underwater_SeafloorCavern_MapObjects, Underwater_SeafloorCavern_MapWarps, 0x0, 0x0
+	map_events Underwater_SeafloorCavern_EventObjects, Underwater_SeafloorCavern_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/UnionRoom.inc b/data/maps/events/UnionRoom.inc
index be9b40243..c79b11f5d 100644
--- a/data/maps/events/UnionRoom.inc
+++ b/data/maps/events/UnionRoom.inc
@@ -1,18 +1,18 @@
-UnionRoom_MapObjects: @ 853B020
-	object_event 1, MAP_OBJ_GFX_UNION_ROOM_NURSE, 0, 0, 3, 2, 3, 8, 0, 0, 0, 0, UnionRoom_EventScript_23D236, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIDDY, 0, 0, 1, 8, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D204, 706, 0, 0
+UnionRoom_EventObjects: @ 853B020
+	object_event 1, EVENT_OBJ_GFX_UNION_ROOM_NURSE, 0, 0, 3, 2, 3, 8, 0, 0, 0, 0, UnionRoom_EventScript_23D236, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GIDDY, 0, 0, 1, 8, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D204, 706, 0, 0
 	object_event 3, 247, 0, 0, 7, 8, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D22C, 710, 0, 0
 	object_event 4, 246, 0, 0, 1, 4, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D222, 709, 0, 0
-	object_event 5, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 7, 4, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D218, 708, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 13, 4, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D20E, 707, 0, 0
-	object_event 7, MAP_OBJ_GFX_STORYTELLER, 0, 0, 10, 6, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D1FA, 705, 0, 0
-	object_event 8, MAP_OBJ_GFX_TRADER, 0, 0, 13, 8, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D1F0, 704, 0, 0
-	object_event 9, MAP_OBJ_GFX_HIPSTER, 0, 0, 4, 6, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D1E6, 703, 0, 0
+	object_event 5, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 7, 4, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D218, 708, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 13, 4, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D20E, 707, 0, 0
+	object_event 7, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 10, 6, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D1FA, 705, 0, 0
+	object_event 8, EVENT_OBJ_GFX_TRADER, 0, 0, 13, 8, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D1F0, 704, 0, 0
+	object_event 9, EVENT_OBJ_GFX_HIPSTER, 0, 0, 4, 6, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D1E6, 703, 0, 0
 
 UnionRoom_MapWarps: @ 853B0F8
 	warp_def 7, 11, 3, 127, NONE
 	warp_def 8, 11, 3, 127, NONE
 
 UnionRoom_MapEvents:: @ 853B108
-	map_events UnionRoom_MapObjects, UnionRoom_MapWarps, 0x0, 0x0
+	map_events UnionRoom_EventObjects, UnionRoom_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/UnknownMap_25_34.inc b/data/maps/events/UnknownMap_25_34.inc
index 0fcbef3a3..975f08470 100644
--- a/data/maps/events/UnknownMap_25_34.inc
+++ b/data/maps/events/UnknownMap_25_34.inc
@@ -1,3 +1,3 @@
 UnknownMap_25_34_MapEvents:: @ 853A064
-	map_events LinkContestRoom1_MapObjects, 0x0, 0x0, 0x0
+	map_events LinkContestRoom1_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/VerdanturfTown.inc b/data/maps/events/VerdanturfTown.inc
index 7738701b2..c30969657 100644
--- a/data/maps/events/VerdanturfTown.inc
+++ b/data/maps/events/VerdanturfTown.inc
@@ -1,8 +1,8 @@
-VerdanturfTown_MapObjects: @ 8527CDC
-	object_event 1, MAP_OBJ_GFX_MAN_2, 0, 0, 4, 17, 3, 5, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5A8, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 9, 2, 3, 9, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB575, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_1, 0, 0, 7, 11, 3, 3, 16, 0, 0, 0, VerdanturfTown_EventScript_1EB5BA, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_CAMPER, 0, 0, 7, 6, 3, 5, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5B1, 0, 0, 0
+VerdanturfTown_EventObjects: @ 8527CDC
+	object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 17, 3, 5, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5A8, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 9, 2, 3, 9, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB575, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 7, 11, 3, 3, 16, 0, 0, 0, VerdanturfTown_EventScript_1EB5BA, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 0, 7, 6, 3, 5, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5B1, 0, 0, 0
 
 VerdanturfTown_MapWarps: @ 8527D3C
 	warp_def 3, 7, 0, 0, VERDANTURF_TOWN_BATTLE_TENT_LOBBY
@@ -24,5 +24,5 @@ VerdanturfTown_MapBGEvents: @ 8527D74
 	bg_event 7, 3, 0, 0, 0, VerdanturfTown_EventScript_1EB5F4
 
 VerdanturfTown_MapEvents:: @ 8527DD4
-	map_events VerdanturfTown_MapObjects, VerdanturfTown_MapWarps, 0x0, VerdanturfTown_MapBGEvents
+	map_events VerdanturfTown_EventObjects, VerdanturfTown_MapWarps, 0x0, VerdanturfTown_MapBGEvents
 
diff --git a/data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc b/data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc
index 0db3fc920..20597089a 100644
--- a/data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc
+++ b/data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc
@@ -1,8 +1,8 @@
-VerdanturfTown_BattleTentBattleRoom_MapObjects: @ 852E734
-	object_event 1, MAP_OBJ_GFX_TRADER, 0, 0, 2, 8, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 11, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 2, 4, 0, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
+VerdanturfTown_BattleTentBattleRoom_EventObjects: @ 852E734
+	object_event 1, EVENT_OBJ_GFX_TRADER, 0, 0, 2, 8, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 11, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 2, 4, 0, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
 
 VerdanturfTown_BattleTentBattleRoom_MapEvents:: @ 852E77C
-	map_events VerdanturfTown_BattleTentBattleRoom_MapObjects, 0x0, 0x0, 0x0
+	map_events VerdanturfTown_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/VerdanturfTown_BattleTentCorridor.inc b/data/maps/events/VerdanturfTown_BattleTentCorridor.inc
index 7ec4cee10..539cf8b11 100644
--- a/data/maps/events/VerdanturfTown_BattleTentCorridor.inc
+++ b/data/maps/events/VerdanturfTown_BattleTentCorridor.inc
@@ -1,6 +1,6 @@
-VerdanturfTown_BattleTentCorridor_MapObjects: @ 852E708
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 2, 6, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
+VerdanturfTown_BattleTentCorridor_EventObjects: @ 852E708
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 2, 6, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
 
 VerdanturfTown_BattleTentCorridor_MapEvents:: @ 852E720
-	map_events VerdanturfTown_BattleTentCorridor_MapObjects, 0x0, 0x0, 0x0
+	map_events VerdanturfTown_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0
 
diff --git a/data/maps/events/VerdanturfTown_BattleTentLobby.inc b/data/maps/events/VerdanturfTown_BattleTentLobby.inc
index d6b5818da..3f5ea9c68 100644
--- a/data/maps/events/VerdanturfTown_BattleTentLobby.inc
+++ b/data/maps/events/VerdanturfTown_BattleTentLobby.inc
@@ -1,10 +1,10 @@
-VerdanturfTown_BattleTentLobby_MapObjects: @ 852E648
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 6, 5, 3, 8, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201873, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_1, 0, 0, 0, 5, 3, 2, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201A7B, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_3, 0, 0, 9, 7, 3, 2, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201ABC, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BOY_2, 0, 0, 1, 8, 3, 10, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AC5, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_SCOTT, 0, 0, 12, 6, 3, 9, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AD0, 766, 0, 0
-	object_event 6, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 2, 8, 3, 9, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AF7, 0, 0, 0
+VerdanturfTown_BattleTentLobby_EventObjects: @ 852E648
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 6, 5, 3, 8, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201873, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 0, 0, 5, 3, 2, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201A7B, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 0, 9, 7, 3, 2, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201ABC, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 0, 1, 8, 3, 10, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AC5, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 0, 12, 6, 3, 9, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AD0, 766, 0, 0
+	object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 2, 8, 3, 9, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AF7, 0, 0, 0
 
 VerdanturfTown_BattleTentLobby_MapWarps: @ 852E6D8
 	warp_def 6, 9, 0, 0, VERDANTURF_TOWN
@@ -14,5 +14,5 @@ VerdanturfTown_BattleTentLobby_MapBGEvents: @ 852E6E8
 	bg_event 4, 5, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201B02
 
 VerdanturfTown_BattleTentLobby_MapEvents:: @ 852E6F4
-	map_events VerdanturfTown_BattleTentLobby_MapObjects, VerdanturfTown_BattleTentLobby_MapWarps, 0x0, VerdanturfTown_BattleTentLobby_MapBGEvents
+	map_events VerdanturfTown_BattleTentLobby_EventObjects, VerdanturfTown_BattleTentLobby_MapWarps, 0x0, VerdanturfTown_BattleTentLobby_MapBGEvents
 
diff --git a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc b/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc
index 2441d8d41..03cf2de7a 100644
--- a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc
+++ b/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc
@@ -1,11 +1,11 @@
-VerdanturfTown_FriendshipRatersHouse_MapObjects: @ 852E9C8
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 3, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_203031, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_PIKACHU, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_2030DA, 0, 0, 0
+VerdanturfTown_FriendshipRatersHouse_EventObjects: @ 852E9C8
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 3, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_203031, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_PIKACHU, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_2030DA, 0, 0, 0
 
 VerdanturfTown_FriendshipRatersHouse_MapWarps: @ 852E9F8
 	warp_def 3, 7, 0, 5, VERDANTURF_TOWN
 	warp_def 4, 7, 0, 5, VERDANTURF_TOWN
 
 VerdanturfTown_FriendshipRatersHouse_MapEvents:: @ 852EA08
-	map_events VerdanturfTown_FriendshipRatersHouse_MapObjects, VerdanturfTown_FriendshipRatersHouse_MapWarps, 0x0, 0x0
+	map_events VerdanturfTown_FriendshipRatersHouse_EventObjects, VerdanturfTown_FriendshipRatersHouse_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/VerdanturfTown_House.inc b/data/maps/events/VerdanturfTown_House.inc
index 803f9f666..0f37fe20b 100644
--- a/data/maps/events/VerdanturfTown_House.inc
+++ b/data/maps/events/VerdanturfTown_House.inc
@@ -1,11 +1,11 @@
-VerdanturfTown_House_MapObjects: @ 852EA1C
-	object_event 1, MAP_OBJ_GFX_WOMAN_7, 0, 0, 4, 5, 3, 7, 0, 0, 0, 0, VerdanturfTown_House_EventScript_20335F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_House_EventScript_203368, 0, 0, 0
+VerdanturfTown_House_EventObjects: @ 852EA1C
+	object_event 1, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 5, 3, 7, 0, 0, 0, 0, VerdanturfTown_House_EventScript_20335F, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_House_EventScript_203368, 0, 0, 0
 
 VerdanturfTown_House_MapWarps: @ 852EA4C
 	warp_def 3, 8, 0, 6, VERDANTURF_TOWN
 	warp_def 4, 8, 0, 6, VERDANTURF_TOWN
 
 VerdanturfTown_House_MapEvents:: @ 852EA5C
-	map_events VerdanturfTown_House_MapObjects, VerdanturfTown_House_MapWarps, 0x0, 0x0
+	map_events VerdanturfTown_House_EventObjects, VerdanturfTown_House_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/VerdanturfTown_Mart.inc b/data/maps/events/VerdanturfTown_Mart.inc
index 6d6ca6a5d..551126235 100644
--- a/data/maps/events/VerdanturfTown_Mart.inc
+++ b/data/maps/events/VerdanturfTown_Mart.inc
@@ -1,13 +1,13 @@
-VerdanturfTown_Mart_MapObjects: @ 852E790
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_202587, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BOY_2, 0, 0, 5, 4, 3, 10, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025BA, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 8, 5, 3, 9, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025C3, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LASS, 0, 0, 3, 2, 3, 9, 17, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025CC, 0, 0, 0
+VerdanturfTown_Mart_EventObjects: @ 852E790
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_202587, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 0, 5, 4, 3, 10, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025BA, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 8, 5, 3, 9, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025C3, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_LASS, 0, 0, 3, 2, 3, 9, 17, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025CC, 0, 0, 0
 
 VerdanturfTown_Mart_MapWarps: @ 852E7F0
 	warp_def 3, 7, 0, 1, VERDANTURF_TOWN
 	warp_def 4, 7, 0, 1, VERDANTURF_TOWN
 
 VerdanturfTown_Mart_MapEvents:: @ 852E800
-	map_events VerdanturfTown_Mart_MapObjects, VerdanturfTown_Mart_MapWarps, 0x0, 0x0
+	map_events VerdanturfTown_Mart_EventObjects, VerdanturfTown_Mart_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc b/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc
index 9534ca9c7..d17513fd5 100644
--- a/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc
+++ b/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc
@@ -1,8 +1,8 @@
-VerdanturfTown_PokemonCenter_1F_MapObjects: @ 852E814
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_20273A, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 4, 5, 3, 5, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202748, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 2, 3, 7, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202751, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 10, 6, 3, 9, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6, 0, 0, 0
+VerdanturfTown_PokemonCenter_1F_EventObjects: @ 852E814
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_20273A, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 4, 5, 3, 5, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202748, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 2, 3, 7, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202751, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 10, 6, 3, 9, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6, 0, 0, 0
 
 VerdanturfTown_PokemonCenter_1F_MapWarps: @ 852E874
 	warp_def 7, 8, 3, 2, VERDANTURF_TOWN
@@ -10,5 +10,5 @@ VerdanturfTown_PokemonCenter_1F_MapWarps: @ 852E874
 	warp_def 1, 6, 4, 0, VERDANTURF_TOWN_POKEMON_CENTER_2F
 
 VerdanturfTown_PokemonCenter_1F_MapEvents:: @ 852E88C
-	map_events VerdanturfTown_PokemonCenter_1F_MapObjects, VerdanturfTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
+	map_events VerdanturfTown_PokemonCenter_1F_EventObjects, VerdanturfTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc b/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc
index 2649066d8..4fcbd0e08 100644
--- a/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc
+++ b/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc
@@ -1,8 +1,8 @@
-VerdanturfTown_PokemonCenter_2F_MapObjects: @ 852E8A0
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
+VerdanturfTown_PokemonCenter_2F_EventObjects: @ 852E8A0
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
 
 VerdanturfTown_PokemonCenter_2F_MapWarps: @ 852E900
 	warp_def 1, 6, 4, 2, VERDANTURF_TOWN_POKEMON_CENTER_1F
@@ -10,5 +10,5 @@ VerdanturfTown_PokemonCenter_2F_MapWarps: @ 852E900
 	warp_def 9, 1, 3, 0, TRADE_CENTER
 
 VerdanturfTown_PokemonCenter_2F_MapEvents:: @ 852E918
-	map_events VerdanturfTown_PokemonCenter_2F_MapObjects, VerdanturfTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
+	map_events VerdanturfTown_PokemonCenter_2F_EventObjects, VerdanturfTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/VerdanturfTown_WandasHouse.inc b/data/maps/events/VerdanturfTown_WandasHouse.inc
index 2089da649..070092679 100644
--- a/data/maps/events/VerdanturfTown_WandasHouse.inc
+++ b/data/maps/events/VerdanturfTown_WandasHouse.inc
@@ -1,14 +1,14 @@
-VerdanturfTown_WandasHouse_MapObjects: @ 852E92C
-	object_event 1, MAP_OBJ_GFX_WALLY, 0, 0, 14, 5, 3, 2, 17, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028BF, 806, 0, 0
-	object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 5, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_202913, 808, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_3, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028E1, 809, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_2, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20294E, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_3, 0, 0, 5, 5, 3, 9, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20291C, 984, 0, 0
+VerdanturfTown_WandasHouse_EventObjects: @ 852E92C
+	object_event 1, EVENT_OBJ_GFX_WALLY, 0, 0, 14, 5, 3, 2, 17, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028BF, 806, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 5, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_202913, 808, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028E1, 809, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20294E, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 5, 5, 3, 9, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20291C, 984, 0, 0
 
 VerdanturfTown_WandasHouse_MapWarps: @ 852E9A4
 	warp_def 7, 7, 0, 3, VERDANTURF_TOWN
 	warp_def 8, 7, 0, 3, VERDANTURF_TOWN
 
 VerdanturfTown_WandasHouse_MapEvents:: @ 852E9B4
-	map_events VerdanturfTown_WandasHouse_MapObjects, VerdanturfTown_WandasHouse_MapWarps, 0x0, 0x0
+	map_events VerdanturfTown_WandasHouse_EventObjects, VerdanturfTown_WandasHouse_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/VictoryRoad_1F.inc b/data/maps/events/VictoryRoad_1F.inc
index db3554ed4..511782688 100644
--- a/data/maps/events/VictoryRoad_1F.inc
+++ b/data/maps/events/VictoryRoad_1F.inc
@@ -1,13 +1,13 @@
-VictoryRoad_1F_MapObjects: @ 8535E04
-	object_event 1, MAP_OBJ_GFX_MAN_4, 0, 0, 33, 22, 3, 8, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E73, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 0, 6, 15, 4, 9, 0, 0, 1, 4, VictoryRoad_1F_EventScript_235EA1, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 27, 34, 3, 18, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E8A, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WALLY, 0, 0, 12, 25, 4, 8, 17, 0, 0, 0, VictoryRoad_1F_EventScript_235E2C, 858, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 40, 26, 3, 1, 17, 0, 0, 0, VictoryRoad_1F_EventScript_291483, 1084, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 37, 39, 4, 1, 17, 0, 0, 0, VictoryRoad_1F_EventScript_291490, 1085, 0, 0
-	object_event 7, MAP_OBJ_GFX_WALLY, 0, 0, 31, 9, 3, 1, 17, 0, 0, 0, VictoryRoad_1F_EventScript_235E35, 751, 0, 0
-	object_event 8, MAP_OBJ_GFX_WOMAN_7, 0, 0, 29, 17, 3, 10, 17, 0, 1, 2, VictoryRoad_1F_EventScript_235ECF, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_MAN_4, 0, 0, 32, 17, 3, 9, 17, 0, 1, 2, VictoryRoad_1F_EventScript_235EB8, 0, 0, 0
+VictoryRoad_1F_EventObjects: @ 8535E04
+	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 0, 33, 22, 3, 8, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E73, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 6, 15, 4, 9, 0, 0, 1, 4, VictoryRoad_1F_EventScript_235EA1, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 27, 34, 3, 18, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E8A, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WALLY, 0, 0, 12, 25, 4, 8, 17, 0, 0, 0, VictoryRoad_1F_EventScript_235E2C, 858, 0, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 40, 26, 3, 1, 17, 0, 0, 0, VictoryRoad_1F_EventScript_291483, 1084, 0, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 37, 39, 4, 1, 17, 0, 0, 0, VictoryRoad_1F_EventScript_291490, 1085, 0, 0
+	object_event 7, EVENT_OBJ_GFX_WALLY, 0, 0, 31, 9, 3, 1, 17, 0, 0, 0, VictoryRoad_1F_EventScript_235E35, 751, 0, 0
+	object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 29, 17, 3, 10, 17, 0, 1, 2, VictoryRoad_1F_EventScript_235ECF, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 0, 32, 17, 3, 9, 17, 0, 1, 2, VictoryRoad_1F_EventScript_235EB8, 0, 0, 0
 
 VictoryRoad_1F_MapWarps: @ 8535EDC
 	warp_def 15, 40, 3, 2, EVER_GRANDE_CITY
@@ -24,5 +24,5 @@ VictoryRoad_1F_MapBGEvents: @ 8535F24
 	bg_event 30, 39, 4, 7, 0, ITEM_ULTRA_BALL, 81, 0
 
 VictoryRoad_1F_MapEvents:: @ 8535F30
-	map_events VictoryRoad_1F_MapObjects, VictoryRoad_1F_MapWarps, VictoryRoad_1F_MapCoordEvents, VictoryRoad_1F_MapBGEvents
+	map_events VictoryRoad_1F_EventObjects, VictoryRoad_1F_MapWarps, VictoryRoad_1F_MapCoordEvents, VictoryRoad_1F_MapBGEvents
 
diff --git a/data/maps/events/VictoryRoad_B1F.inc b/data/maps/events/VictoryRoad_B1F.inc
index 6c57f0662..b251959ae 100644
--- a/data/maps/events/VictoryRoad_B1F.inc
+++ b/data/maps/events/VictoryRoad_B1F.inc
@@ -1,25 +1,25 @@
-VictoryRoad_B1F_MapObjects: @ 8535F44
-	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 20, 5, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 19, 0, 0
-	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 21, 4, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 20, 0, 0
-	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 7, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 17, 0, 0
-	object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 9, 10, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 18, 0, 0
-	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 20, 26, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 23, 0, 0
-	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 21, 25, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 22, 0, 0
-	object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 35, 6, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 30, 0, 0
-	object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 19, 5, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 25, 0, 0
-	object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 20, 4, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 26, 0, 0
-	object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 18, 12, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 27, 0, 0
-	object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 20, 25, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 28, 0, 0
-	object_event 12, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 21, 26, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 29, 0, 0
-	object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 34, 4, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 31, 0, 0
-	object_event 14, MAP_OBJ_GFX_MAN_4, 0, 0, 37, 12, 3, 9, 0, 0, 1, 3, VictoryRoad_B1F_EventScript_2364E5, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_WOMAN_7, 0, 0, 26, 16, 3, 7, 0, 0, 1, 4, VictoryRoad_B1F_EventScript_2364FC, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_WOMAN_7, 0, 0, 5, 21, 3, 9, 0, 0, 1, 2, VictoryRoad_B1F_EventScript_236513, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 34, 3, 3, 1, 17, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 21, 0, 0
-	object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 42, 8, 4, 1, 17, 0, 0, 0, VictoryRoad_B1F_EventScript_29149D, 1086, 0, 0
-	object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 32, 3, 3, 1, 17, 0, 0, 0, VictoryRoad_B1F_EventScript_2914AA, 1087, 0, 0
-	object_event 20, MAP_OBJ_GFX_MAN_4, 0, 0, 14, 16, 3, 8, 17, 0, 1, 4, VictoryRoad_B1F_EventScript_23652A, 0, 0, 0
-	object_event 21, MAP_OBJ_GFX_WOMAN_7, 0, 0, 14, 20, 3, 16, 17, 0, 1, 3, VictoryRoad_B1F_EventScript_236541, 0, 0, 0
+VictoryRoad_B1F_EventObjects: @ 8535F44
+	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 20, 5, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 19, 0, 0
+	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 21, 4, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 20, 0, 0
+	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 7, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 17, 0, 0
+	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 9, 10, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 18, 0, 0
+	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 20, 26, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 23, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 21, 25, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 22, 0, 0
+	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 35, 6, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 30, 0, 0
+	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 19, 5, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 25, 0, 0
+	object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 20, 4, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 26, 0, 0
+	object_event 10, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 18, 12, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 27, 0, 0
+	object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 20, 25, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 28, 0, 0
+	object_event 12, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 21, 26, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 29, 0, 0
+	object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 34, 4, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 31, 0, 0
+	object_event 14, EVENT_OBJ_GFX_MAN_4, 0, 0, 37, 12, 3, 9, 0, 0, 1, 3, VictoryRoad_B1F_EventScript_2364E5, 0, 0, 0
+	object_event 15, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 26, 16, 3, 7, 0, 0, 1, 4, VictoryRoad_B1F_EventScript_2364FC, 0, 0, 0
+	object_event 16, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 5, 21, 3, 9, 0, 0, 1, 2, VictoryRoad_B1F_EventScript_236513, 0, 0, 0
+	object_event 17, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 34, 3, 3, 1, 17, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 21, 0, 0
+	object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 42, 8, 4, 1, 17, 0, 0, 0, VictoryRoad_B1F_EventScript_29149D, 1086, 0, 0
+	object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 32, 3, 3, 1, 17, 0, 0, 0, VictoryRoad_B1F_EventScript_2914AA, 1087, 0, 0
+	object_event 20, EVENT_OBJ_GFX_MAN_4, 0, 0, 14, 16, 3, 8, 17, 0, 1, 4, VictoryRoad_B1F_EventScript_23652A, 0, 0, 0
+	object_event 21, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 14, 20, 3, 16, 17, 0, 1, 3, VictoryRoad_B1F_EventScript_236541, 0, 0, 0
 
 VictoryRoad_B1F_MapWarps: @ 853613C
 	warp_def 30, 25, 3, 0, VICTORY_ROAD_B2F
@@ -31,5 +31,5 @@ VictoryRoad_B1F_MapWarps: @ 853613C
 	warp_def 5, 26, 3, 3, VICTORY_ROAD_B2F
 
 VictoryRoad_B1F_MapEvents:: @ 8536174
-	map_events VictoryRoad_B1F_MapObjects, VictoryRoad_B1F_MapWarps, 0x0, 0x0
+	map_events VictoryRoad_B1F_EventObjects, VictoryRoad_B1F_MapWarps, 0x0, 0x0
 
diff --git a/data/maps/events/VictoryRoad_B2F.inc b/data/maps/events/VictoryRoad_B2F.inc
index 09fdb466f..5e702c0c3 100644
--- a/data/maps/events/VictoryRoad_B2F.inc
+++ b/data/maps/events/VictoryRoad_B2F.inc
@@ -1,11 +1,11 @@
-VictoryRoad_B2F_MapObjects: @ 8536188
-	object_event 1, MAP_OBJ_GFX_MAN_4, 0, 0, 15, 6, 3, 8, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_2368D5, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_4, 0, 0, 43, 14, 3, 7, 17, 0, 1, 4, VictoryRoad_B2F_EventScript_2368EC, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 0, 2, 17, 3, 8, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_236903, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_7, 0, 0, 35, 22, 3, 9, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_23691A, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 13, 8, 3, 1, 17, 0, 0, 0, VictoryRoad_B2F_EventScript_2914B7, 1088, 0, 0
-	object_event 6, MAP_OBJ_GFX_WOMAN_7, 0, 0, 25, 18, 4, 8, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_236948, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_MAN_4, 0, 0, 25, 21, 4, 7, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_236931, 0, 0, 0
+VictoryRoad_B2F_EventObjects: @ 8536188
+	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 0, 15, 6, 3, 8, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_2368D5, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 0, 43, 14, 3, 7, 17, 0, 1, 4, VictoryRoad_B2F_EventScript_2368EC, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 2, 17, 3, 8, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_236903, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 35, 22, 3, 9, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_23691A, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 13, 8, 3, 1, 17, 0, 0, 0, VictoryRoad_B2F_EventScript_2914B7, 1088, 0, 0
+	object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 25, 18, 4, 8, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_236948, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 0, 25, 21, 4, 7, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_236931, 0, 0, 0
 
 VictoryRoad_B2F_MapWarps: @ 8536230
 	warp_def 30, 25, 3, 0, VICTORY_ROAD_B1F
@@ -18,5 +18,5 @@ VictoryRoad_B2F_MapBGEvents: @ 8536250
 	bg_event 37, 1, 3, 7, 0, ITEM_MAX_REPEL, 83, 0
 
 VictoryRoad_B2F_MapEvents:: @ 8536268
-	map_events VictoryRoad_B2F_MapObjects, VictoryRoad_B2F_MapWarps, 0x0, VictoryRoad_B2F_MapBGEvents
+	map_events VictoryRoad_B2F_EventObjects, VictoryRoad_B2F_MapWarps, 0x0, VictoryRoad_B2F_MapBGEvents
 
diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc
index 2828036e0..1fda1133f 100644
--- a/data/scripts/berry_tree.inc
+++ b/data/scripts/berry_tree.inc
@@ -1,5 +1,5 @@
 BerryTreeScript:: @ 82742F9
-	special FieldObjectInteractionGetBerryTreeData
+	special EventObjectInteractionGetBerryTreeData
 	switch VAR_0x8004
 	case 255, Route102_EventScript_27434F
 	case 0, Route102_EventScript_274359
@@ -54,7 +54,7 @@ Route102_EventScript_2743AF:: @ 82743AF
 
 Route102_EventScript_2743B1:: @ 82743B1
 	lockall
-	special FieldObjectInteractionGetBerryCountString
+	special EventObjectInteractionGetBerryCountString
 	message Route102_Text_274560
 	waitmessage
 	waitbuttonpress
@@ -62,7 +62,7 @@ Route102_EventScript_2743B1:: @ 82743B1
 
 Route102_EventScript_2743C1:: @ 82743C1
 	lockall
-	special FieldObjectInteractionGetBerryName
+	special EventObjectInteractionGetBerryName
 	message Route102_Text_274579
 	waitmessage
 	waitbuttonpress
@@ -70,7 +70,7 @@ Route102_EventScript_2743C1:: @ 82743C1
 
 Route102_EventScript_2743D1:: @ 82743D1
 	lockall
-	special FieldObjectInteractionGetBerryName
+	special EventObjectInteractionGetBerryName
 	message Route102_Text_27458A
 	waitmessage
 	waitbuttonpress
@@ -79,7 +79,7 @@ Route102_EventScript_2743D1:: @ 82743D1
 Route102_EventScript_2743E1:: @ 82743E1
 	call Route102_EventScript_2743F6
 	lockall
-	special FieldObjectInteractionGetBerryName
+	special EventObjectInteractionGetBerryName
 	message Route102_Text_2745AB
 	waitmessage
 	waitbuttonpress
@@ -105,7 +105,7 @@ Route102_EventScript_274421:: @ 8274421
 	buffernumberstring 1, VAR_0x8006
 	lock
 	faceplayer
-	special FieldObjectInteractionGetBerryCountString
+	special EventObjectInteractionGetBerryCountString
 	msgbox Route102_Text_2745EE, 5
 	compare VAR_RESULT, 1
 	goto_eq Route102_EventScript_274448
@@ -113,11 +113,11 @@ Route102_EventScript_274421:: @ 8274421
 	goto_eq Route102_EventScript_274479
 
 Route102_EventScript_274448:: @ 8274448
-	special FieldObjectInteractionPickBerryTree
+	special EventObjectInteractionPickBerryTree
 	compare VAR_0x8004, 0
 	goto_eq Route102_EventScript_274470
 	special sub_80EED34
-	special FieldObjectInteractionRemoveBerryTree
+	special EventObjectInteractionRemoveBerryTree
 	message Route102_Text_27461B
 	playfanfare MUS_ME_KINOMI
 	waitmessage
@@ -145,7 +145,7 @@ Route102_EventScript_274479:: @ 8274479
 
 Route102_EventScript_274482:: @ 8274482
 	lockall
-	special FieldObjectInteractionGetBerryTreeData
+	special EventObjectInteractionGetBerryTreeData
 	call Route102_EventScript_2744DD
 	releaseall
 	end
@@ -154,7 +154,7 @@ Route102_EventScript_27448D:: @ 827448D
 	checkitem ITEM_WAILMER_PAIL, 1
 	compare VAR_RESULT, 0
 	goto_eq Route102_EventScript_2744BE
-	special FieldObjectInteractionGetBerryName
+	special EventObjectInteractionGetBerryName
 	msgbox Route102_Text_2746E4, 5
 	compare VAR_RESULT, 1
 	goto_eq Route102_EventScript_2744C4
@@ -166,14 +166,14 @@ Route102_EventScript_2744BE:: @ 82744BE
 	end
 
 Route102_EventScript_2744C0:: @ 82744C0
-	special FieldObjectInteractionGetBerryTreeData
+	special EventObjectInteractionGetBerryTreeData
 	lockall
 
 Route102_EventScript_2744C4:: @ 82744C4
-	special FieldObjectInteractionGetBerryName
+	special EventObjectInteractionGetBerryName
 	message Route102_Text_274710
 	waitmessage
-	special FieldObjectInteractionWaterBerryTree
+	special EventObjectInteractionWaterBerryTree
 	special sub_80FAFF8
 	waitstate
 	message Route102_Text_274723
@@ -183,10 +183,10 @@ Route102_EventScript_2744C4:: @ 82744C4
 	end
 
 Route102_EventScript_2744DD:: @ 82744DD
-	special FieldObjectInteractionPlantBerryTree
+	special EventObjectInteractionPlantBerryTree
 	incrementgamestat 3
 	special sub_80EED10
-	special FieldObjectInteractionGetBerryCountString
+	special EventObjectInteractionGetBerryCountString
 	message Route102_Text_274535
 	waitmessage
 	waitbuttonpress
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 9a34d2e61..523aa67ca 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -342,8 +342,8 @@ OldaleTown_PokemonCenter_2F_EventScript_276DE0:: @ 8276DE0
 	end
 
 OldaleTown_PokemonCenter_2F_Movement_276E10: @ 8276E10
-	step_up
-	step_up
+	walk_up
+	walk_up
 	step_end
 
 OldaleTown_PokemonCenter_2F_EventScript_276E13:: @ 8276E13
@@ -736,52 +736,52 @@ OldaleTown_PokemonCenter_2F_EventScript_27733F:: @ 827733F
 	end
 
 OldaleTown_PokemonCenter_2F_Movement_277349: @ 8277349
-	step_00
+	face_down
 	step_end
 
 OldaleTown_PokemonCenter_2F_Movement_27734B: @ 827734B
-	step_03
+	face_right
 	step_end
 
 MossdeepCity_GameCorner_1F_Movement_27734D: @ 827734D
 OldaleTown_PokemonCenter_2F_Movement_27734D: @ 827734D
-	step_02
+	face_left
 	step_end
 
 OldaleTown_PokemonCenter_2F_Movement_27734F: @ 827734F
-	step_down
-	step_down
+	walk_down
+	walk_down
 	step_end
 
 Movement_277352: @ 8277352
-	step_right
-	step_up
-	step_up
+	walk_right
+	walk_up
+	walk_up
 	step_end
 
 OldaleTown_PokemonCenter_2F_Movement_277356: @ 8277356
-	step_left
-	step_up
-	step_up
+	walk_left
+	walk_up
+	walk_up
 	step_end
 
 OldaleTown_PokemonCenter_2F_Movement_27735A: @ 827735A
-	step_up
+	walk_up
 	step_end
 
 OldaleTown_PokemonCenter_2F_Movement_27735C: @ 827735C
-	step_02
+	face_left
 	step_end
 
 OldaleTown_PokemonCenter_2F_Movement_27735E: @ 827735E
-	step_03
+	face_right
 	step_end
 
 MossdeepCity_GameCorner_1F_Movement_277360: @ 8277360
-	step_left
-	step_up
-	step_up
-	step_up
+	walk_left
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 gUnknown_08277365:: @ 8277365
diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc
index a6a0ebcc2..6a13f39ba 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -1248,186 +1248,186 @@ LinkContestRoom1_EventScript_27ACDF:: @ 827ACDF
 	return
 
 LinkContestRoom1_Movement_27AD09: @ 827AD09
-	step_down
+	walk_down
 	step_end
 
 LinkContestRoom1_Movement_27AD0B: @ 827AD0B
-	step_40
-	step_up
-	step_41
+	lock_facing_direction
+	walk_up
+	unlock_facing_direction
 	step_end
 
 LinkContestRoom1_Movement_27AD0F: @ 827AD0F
-	step_28
+	walk_in_place_fastest_right
 	step_end
 
 LinkContestRoom1_Movement_27AD11: @ 827AD11
-	step_58
+	emote_heart
 	step_end
 
 LinkContestRoom1_Movement_27AD13: @ 827AD13
-	step_25
+	walk_in_place_fastest_down
 	step_end
 
 LinkContestRoom1_Movement_27AD15: @ 827AD15
-	step_left
-	step_left
-	step_25
+	walk_left
+	walk_left
+	walk_in_place_fastest_down
 	step_end
 
 LinkContestRoom1_Movement_27AD19: @ 827AD19
-	step_right
-	step_right
-	step_25
+	walk_right
+	walk_right
+	walk_in_place_fastest_down
 	step_end
 
 LinkContestRoom1_Movement_27AD1D: @ 827AD1D
-	step_up
-	step_25
+	walk_up
+	walk_in_place_fastest_down
 	step_end
 
 LinkContestRoom1_Movement_27AD20: @ 827AD20
-	step_14
-	step_14
+	delay_16
+	delay_16
 	step_end
 
 LinkContestRoom1_Movement_27AD23: @ 827AD23
-	step_28
+	walk_in_place_fastest_right
 	step_end
 
 LinkContestRoom1_Movement_27AD25: @ 827AD25
-	step_27
+	walk_in_place_fastest_left
 	step_end
 
 LinkContestRoom1_Movement_27AD27: @ 827AD27
-	step_25
+	walk_in_place_fastest_down
 	step_end
 
 LinkContestRoom1_Movement_27AD29: @ 827AD29
-	step_left
-	step_left
-	step_up
+	walk_left
+	walk_left
+	walk_up
 	step_end
 
 LinkContestRoom1_Movement_27AD2D: @ 827AD2D
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
 	step_end
 
 LinkContestRoom1_Movement_27AD33: @ 827AD33
-	step_02
-	step_14
-	step_4e
+	face_left
+	delay_16
+	face_original_direction
 	step_end
 
 LinkContestRoom1_Movement_27AD37: @ 827AD37
-	step_01
-	step_14
-	step_4e
+	face_up
+	delay_16
+	face_original_direction
 	step_end
 
 LinkContestRoom1_Movement_27AD3B: @ 827AD3B
-	step_03
-	step_14
-	step_4e
+	face_right
+	delay_16
+	face_original_direction
 	step_end
 
 LinkContestRoom1_Movement_27AD3F: @ 827AD3F
-	step_00
-	step_14
-	step_4e
+	face_down
+	delay_16
+	face_original_direction
 	step_end
 
 LinkContestRoom1_Movement_27AD43: @ 827AD43
-	step_01
+	face_up
 	step_end
 
 LinkContestRoom1_Movement_27AD45: @ 827AD45
-	step_01
-	step_14
-	step_28
+	face_up
+	delay_16
+	walk_in_place_fastest_right
 	step_end
 
 LinkContestRoom1_Movement_27AD49: @ 827AD49
-	step_27
-	step_14
-	step_14
-	step_25
+	walk_in_place_fastest_left
+	delay_16
+	delay_16
+	walk_in_place_fastest_down
 	step_end
 
 LinkContestRoom1_Movement_27AD4E: @ 827AD4E
-	step_14
-	step_14
-	step_25
+	delay_16
+	delay_16
+	walk_in_place_fastest_down
 	step_end
 
 LinkContestRoom1_Movement_27AD52: @ 827AD52
-	step_up
-	step_right
-	step_right
-	step_right
-	step_26
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
 	step_end
 
 LinkContestRoom1_Movement_27AD58: @ 827AD58
-	step_17
-	step_17
-	step_17
-	step_15
-	step_26
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_down
+	walk_in_place_fastest_up
 	step_end
 
 LinkContestRoom1_Movement_27AD5E: @ 827AD5E
-	step_up
-	step_right
-	step_26
+	walk_up
+	walk_right
+	walk_in_place_fastest_up
 	step_end
 
 LinkContestRoom1_Movement_27AD62: @ 827AD62
-	step_17
-	step_15
-	step_26
+	walk_fast_left
+	walk_fast_down
+	walk_in_place_fastest_up
 	step_end
 
 LinkContestRoom1_Movement_27AD66: @ 827AD66
-	step_up
-	step_left
-	step_26
+	walk_up
+	walk_left
+	walk_in_place_fastest_up
 	step_end
 
 LinkContestRoom1_Movement_27AD6A: @ 827AD6A
-	step_18
-	step_15
-	step_26
+	walk_fast_right
+	walk_fast_down
+	walk_in_place_fastest_up
 	step_end
 
 LinkContestRoom1_Movement_27AD6E: @ 827AD6E
-	step_up
-	step_left
-	step_left
-	step_left
-	step_26
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_up
 	step_end
 
 LinkContestRoom1_Movement_27AD74: @ 827AD74
-	step_18
-	step_18
-	step_18
-	step_15
-	step_26
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_in_place_fastest_up
 	step_end
 
 LinkContestRoom1_Movement_27AD7A: @ 827AD7A
-	step_right
-	step_right
-	step_up
+	walk_right
+	walk_right
+	walk_up
 	step_end
 
 LinkContestRoom1_Movement_27AD7E: @ 827AD7E
-	step_up
+	walk_up
 	step_end
 
 LinkContestRoom1_EventScript_27AD80:: @ 827AD80
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc
index 07ed1b82d..d9b8a89ac 100644
--- a/data/scripts/day_care.inc
+++ b/data/scripts/day_care.inc
@@ -240,25 +240,25 @@ Route117_PokemonDayCare_EventScript_291F3D:: @ 8291F3D
 	end
 
 Route117_PokemonDayCare_Movement_291F47: @ 8291F47
-	step_14
-	step_14
-	step_02
-	step_14
-	step_14
-	step_03
-	step_14
-	step_14
-	step_01
-	slow_step_up
-	step_54
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_00
-	step_55
-	slow_step_down
+	delay_16
+	delay_16
+	face_left
+	delay_16
+	delay_16
+	face_right
+	delay_16
+	delay_16
+	face_up
+	walk_slow_up
+	set_invisible
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	face_down
+	set_visible
+	walk_slow_down
 	step_end
 
 Route117_PokemonDayCare_EventScript_291F5B:: @ 8291F5B
diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc
index 44631cc20..df25056ea 100644
--- a/data/scripts/field_move_scripts.inc
+++ b/data/scripts/field_move_scripts.inc
@@ -43,7 +43,7 @@ Route103_EventScript_290710:: @ 8290710
 	end
 
 Route103_Movement_29071F: @ 829071F
-	step_5b
+	cut_tree
 	step_end
 
 Route103_EventScript_290721:: @ 8290721
@@ -128,7 +128,7 @@ Route111_EventScript_290829:: @ 8290829
 	end
 
 Route111_Movement_29082B: @ 829082B
-	step_5a
+	rock_smash_break
 	step_end
 
 Route111_EventScript_29082D:: @ 829082D
diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc
index 269ef2530..5a03a0e98 100644
--- a/data/scripts/gabby_and_ty.inc
+++ b/data/scripts/gabby_and_ty.inc
@@ -213,7 +213,7 @@ Route120_EventScript_28CF36:: @ 828CF36
 
 Route111_EventScript_28CF56:: @ 828CF56
 	special GabbyAndTyBeforeInterview
-	special GabbyAndTySetScriptVarsToFieldObjectLocalIds
+	special GabbyAndTySetScriptVarsToEventObjectLocalIds
 	compare VAR_FACING, 2
 	call_if 1, Route111_EventScript_28CF94
 	compare VAR_FACING, 1
@@ -247,7 +247,7 @@ Route111_EventScript_28CFC3:: @ 828CFC3
 Route118_EventScript_28CFC3:: @ 828CFC3
 Route120_EventScript_28CFC3:: @ 828CFC3
 	special GabbyAndTyBeforeInterview
-	special GabbyAndTySetScriptVarsToFieldObjectLocalIds
+	special GabbyAndTySetScriptVarsToEventObjectLocalIds
 	compare VAR_FACING, 2
 	call_if 1, Route111_EventScript_28CF94
 	compare VAR_FACING, 1
@@ -270,15 +270,15 @@ Route120_EventScript_28CFC3:: @ 828CFC3
 	end
 
 Route111_Movement_28D04D: @ 828D04D
-	step_1d
+	walk_in_place_down
 	step_end
 
 Route111_Movement_28D04F: @ 828D04F
-	step_1e
+	walk_in_place_up
 	step_end
 
 Route111_Movement_28D051: @ 828D051
-	step_1f
+	walk_in_place_left
 	step_end
 
 Route111_EventScript_28D053:: @ 828D053
diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc
index ccf8997d7..fd3868512 100644
--- a/data/scripts/maps/AquaHideout_B2F.inc
+++ b/data/scripts/maps/AquaHideout_B2F.inc
@@ -53,17 +53,17 @@ AquaHideout_B2F_EventScript_233E25:: @ 8233E25
 	end
 
 AquaHideout_B2F_Movement_233E80: @ 8233E80
-	step_left
-	step_left
-	step_left
-	step_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
 	step_end
 
 AquaHideout_B2F_Movement_233E85: @ 8233E85
-	step_right
-	step_right
-	step_right
-	step_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 AquaHideout_B2F_EventScript_233E8A:: @ 8233E8A
diff --git a/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc
index 2f952936f..27ea23b59 100644
--- a/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc
+++ b/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc
@@ -457,75 +457,75 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9:: @ 8257BA9
 	return
 
 BattleFrontier_BattleArenaBattleRoom_Movement_257BE2: @ 8257BE2
-	step_right
-	step_right
+	walk_right
+	walk_right
 
 BattleFrontier_BattleArenaBattleRoom_Movement_257BE4: @ 8257BE4
-	step_right
+	walk_right
 
 BattleFrontier_BattleArenaBattleRoom_Movement_257BE5: @ 8257BE5
-	step_right
+	walk_right
 	step_end
 
 BattleFrontier_BattleArenaBattleRoom_Movement_257BE7: @ 8257BE7
-	step_left
-	step_left
-	step_28
+	walk_left
+	walk_left
+	walk_in_place_fastest_right
 	step_end
 
 BattleFrontier_BattleArenaBattleRoom_Movement_257BEB: @ 8257BEB
-	step_26
+	walk_in_place_fastest_up
 	step_end
 
 BattleFrontier_BattleArenaBattleRoom_Movement_257BED: @ 8257BED
-	step_28
+	walk_in_place_fastest_right
 	step_end
 
 BattleFrontier_BattleArenaBattleRoom_Movement_257BEF: @ 8257BEF
-	step_left
-	step_left
+	walk_left
+	walk_left
 
 BattleFrontier_BattleArenaBattleRoom_Movement_257BF1: @ 8257BF1
-	step_left
+	walk_left
 
 BattleFrontier_BattleArenaBattleRoom_Movement_257BF2: @ 8257BF2
-	step_left
+	walk_left
 	step_end
 
 BattleFrontier_BattleArenaBattleRoom_Movement_257BF4: @ 8257BF4
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
 	step_end
 
 BattleFrontier_BattleArenaBattleRoom_Movement_257BFA: @ 8257BFA
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 BattleFrontier_BattleArenaBattleRoom_Movement_257C02: @ 8257C02
-	step_51
-	step_46
+	disable_jump_landing_ground_effect
+	jump_in_place_down
 	step_end
 
 BattleFrontier_BattleArenaBattleRoom_Movement_257C05: @ 8257C05
-	step_51
-	step_47
+	disable_jump_landing_ground_effect
+	jump_in_place_up
 	step_end
 
 BattleFrontier_BattleArenaBattleRoom_Movement_257C08: @ 8257C08
-	step_25
+	walk_in_place_fastest_down
 	step_end
 
 BattleFrontier_BattleArenaBattleRoom_Movement_257C0A: @ 8257C0A
-	step_28
+	walk_in_place_fastest_right
 	step_end
 
 BattleFrontier_BattleArenaBattleRoom_MapScript2_257C0C: @ 8257C0C
@@ -541,20 +541,20 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257C16:: @ 8257C16
 	end
 
 BattleFrontier_BattleArenaBattleRoom_Movement_257C30: @ 8257C30
-	step_down
-	step_27
-	step_14
-	step_14
-	step_14
-	step_14
-	step_up
-	step_up
-	step_27
+	walk_down
+	walk_in_place_fastest_left
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_up
+	walk_up
+	walk_in_place_fastest_left
 	step_end
 
 BattleFrontier_BattleArenaBattleRoom_Movement_257C3A: @ 8257C3A
-	step_down
-	step_27
+	walk_down
+	walk_in_place_fastest_left
 	step_end
 
 BattleFrontier_BattleArenaBattleRoom_Text_257C3D: @ 8257C3D
diff --git a/data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc b/data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc
index cecd5b44c..83b602fc4 100644
--- a/data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc
+++ b/data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc
@@ -25,63 +25,63 @@ BattleFrontier_BattleArenaCorridor_EventScript_2573C9:: @ 82573C9
 	end
 
 BattleFrontier_BattleArenaCorridor_Movement_257417: @ 8257417
-	step_up
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_right
-	step_right
-	step_right
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 BattleFrontier_BattleArenaCorridor_Movement_25742C: @ 825742C
-	step_right
-	step_54
+	walk_right
+	set_invisible
 	step_end
 
 BattleFrontier_BattleArenaCorridor_Movement_25742F: @ 825742F
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 BattleFrontier_BattleArenaCorridor_Movement_257444: @ 8257444
-	step_27
+	walk_in_place_fastest_left
 	step_end
 
 BattleFrontier_BattleArenaCorridor_Movement_257446: @ 8257446
-	step_up
-	step_25
+	walk_up
+	walk_in_place_fastest_down
 	step_end
 
 BattleFrontier_BattleArenaCorridor_Text_257449: @ 8257449
diff --git a/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc b/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc
index 68ac57fcd..7a0695445 100644
--- a/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc
+++ b/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc
@@ -271,39 +271,39 @@ BattleFrontier_BattleArenaLobby_EventScript_256005:: @ 8256005
 	return
 
 BattleFrontier_BattleArenaLobby_Movement_256034: @ 8256034
-	step_up
-	step_up
-	step_up
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
+	walk_up
+	walk_up
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
 	step_end
 
 BattleFrontier_BattleArenaLobby_Movement_25603E: @ 825603E
-	step_up
-	step_54
+	walk_up
+	set_invisible
 	step_end
 
 BattleFrontier_BattleArenaLobby_Movement_256041: @ 8256041
-	step_up
-	step_up
-	step_up
-	step_up
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_26
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_up
 	step_end
 
 BattleFrontier_BattleArenaLobby_Movement_25604C: @ 825604C
-	step_up
-	step_up
-	step_54
+	walk_up
+	walk_up
+	set_invisible
 	step_end
 
 BattleFrontier_BattleArenaLobby_EventScript_256050:: @ 8256050
@@ -320,26 +320,26 @@ BattleFrontier_BattleArenaLobby_EventScript_256050:: @ 8256050
 	return
 
 BattleFrontier_BattleArenaLobby_Movement_25607F: @ 825607F
-	step_up
-	step_up
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
 	step_end
 
 BattleFrontier_BattleArenaLobby_Movement_256088: @ 8256088
-	step_up
-	step_up
-	step_up
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_26
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
 	step_end
 
 BattleFrontier_BattleArenaLobby_EventScript_256092:: @ 8256092
diff --git a/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc
index 52981a07d..c46358aed 100644
--- a/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc
+++ b/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc
@@ -669,214 +669,214 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C652:: @ 824C652
 
 BattleFrontier_BattleArenaBattleRoom_Movement_24C773: @ 824C773
 BattleFrontier_BattleDomeBattleRoom_Movement_24C773: @ 824C773
-	step_54
+	set_invisible
 	step_end
 
 BattleFrontier_BattleDomeBattleRoom_Movement_24C775: @ 824C775
-	step_55
-	step_14
-	step_up
-	step_up
-	step_up
-	step_right
+	set_visible
+	delay_16
+	walk_up
+	walk_up
+	walk_up
+	walk_right
 
 BattleFrontier_BattleDomeBattleRoom_Movement_24C77B: @ 824C77B
-	step_right
+	walk_right
 	step_end
 
 BattleFrontier_BattleDomeBattleRoom_Movement_24C77D: @ 824C77D
-	step_up
+	walk_up
 	step_end
 
 BattleFrontier_BattleDomeBattleRoom_Movement_24C77F: @ 824C77F
-	step_55
-	step_14
-	step_up
-	step_up
-	step_up
-	step_right
-	step_right
+	set_visible
+	delay_16
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_right
 	step_end
 
 BattleFrontier_BattleDomeBattleRoom_Movement_24C787: @ 824C787
-	step_right
+	walk_right
 	step_end
 
 BattleFrontier_BattleDomeBattleRoom_Movement_24C789: @ 824C789
-	step_left
+	walk_left
 	step_end
 
 BattleFrontier_BattleDomeBattleRoom_Movement_24C78B: @ 824C78B
-	step_01
-	step_54
+	face_up
+	set_invisible
 	step_end
 
 BattleFrontier_BattleDomeBattleRoom_Movement_24C78E: @ 824C78E
-	step_55
-	step_up
-	step_up
-	step_up
-	step_02
-	step_13
-	step_12
-	step_00
-	step_13
-	step_12
-	step_03
-	step_13
-	step_12
-	step_01
-	step_13
-	step_12
-	step_02
-	step_14
-	step_16
-	step_16
-	step_02
-	step_13
-	step_12
-	step_00
-	step_13
-	step_12
-	step_03
-	step_13
-	step_12
-	step_01
-	step_13
-	step_12
-	step_02
-	fast_step_left
-	step_41
-	step_01
-	step_40
-	fast_step_left
-	fast_step_left
-	step_41
-	step_03
-	step_40
-	fast_step_left
-	step_41
-	step_00
-	step_11
-	step_02
-	step_13
-	step_12
-	step_01
-	step_13
-	step_12
-	step_03
-	step_13
-	step_12
-	step_00
-	step_13
-	step_12
-	step_02
-	step_12
-	step_01
-	step_12
-	step_03
-	step_12
-	step_00
-	step_12
-	step_02
-	step_11
-	step_01
-	step_11
-	step_03
-	step_11
-	step_00
-	step_11
-	step_02
-	step_40
-	step_right
-	slow_step_right
-	step_right
-	slow_step_right
-	step_41
-	step_01
-	step_14
-	step_47
-	step_47
-	step_14
-	step_right
-	step_right
-	step_right
-	step_47
-	step_14
-	step_right
-	step_down
-	step_down
-	step_02
-	step_11
-	step_01
-	step_11
-	step_03
-	step_11
-	step_00
-	step_11
-	step_02
-	step_12
-	step_left
-	step_left
+	set_visible
+	walk_up
+	walk_up
+	walk_up
+	face_left
+	delay_8
+	delay_4
+	face_down
+	delay_8
+	delay_4
+	face_right
+	delay_8
+	delay_4
+	face_up
+	delay_8
+	delay_4
+	face_left
+	delay_16
+	walk_fast_up
+	walk_fast_up
+	face_left
+	delay_8
+	delay_4
+	face_down
+	delay_8
+	delay_4
+	face_right
+	delay_8
+	delay_4
+	face_up
+	delay_8
+	delay_4
+	face_left
+	jump_2_left
+	unlock_facing_direction
+	face_up
+	lock_facing_direction
+	jump_2_left
+	jump_2_left
+	unlock_facing_direction
+	face_right
+	lock_facing_direction
+	jump_2_left
+	unlock_facing_direction
+	face_down
+	delay_2
+	face_left
+	delay_8
+	delay_4
+	face_up
+	delay_8
+	delay_4
+	face_right
+	delay_8
+	delay_4
+	face_down
+	delay_8
+	delay_4
+	face_left
+	delay_4
+	face_up
+	delay_4
+	face_right
+	delay_4
+	face_down
+	delay_4
+	face_left
+	delay_2
+	face_up
+	delay_2
+	face_right
+	delay_2
+	face_down
+	delay_2
+	face_left
+	lock_facing_direction
+	walk_right
+	walk_slow_right
+	walk_right
+	walk_slow_right
+	unlock_facing_direction
+	face_up
+	delay_16
+	jump_in_place_up
+	jump_in_place_up
+	delay_16
+	walk_right
+	walk_right
+	walk_right
+	jump_in_place_up
+	delay_16
+	walk_right
+	walk_down
+	walk_down
+	face_left
+	delay_2
+	face_up
+	delay_2
+	face_right
+	delay_2
+	face_down
+	delay_2
+	face_left
+	delay_4
+	walk_left
+	walk_left
 	step_end
 
 BattleFrontier_BattleDomeBattleRoom_Movement_24C7F9: @ 824C7F9
-	step_14
-	step_14
-	step_left
-	step_left
-	step_28
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_right
-	step_right
-	step_25
+	delay_16
+	delay_16
+	walk_left
+	walk_left
+	walk_in_place_fastest_right
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_right
+	walk_right
+	walk_in_place_fastest_down
 	step_end
 
 BattleFrontier_BattleDomeBattleRoom_Movement_24C829: @ 824C829
-	step_left
+	walk_left
 	step_end
 
 BattleFrontier_BattleDomeBattleRoom_Movement_24C82B: @ 824C82B
-	step_left
-	step_left
+	walk_left
+	walk_left
 	step_end
 
 BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E:: @ 824C82E
@@ -978,50 +978,50 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C938:: @ 824C938
 	return
 
 BattleFrontier_BattleDomeBattleRoom_Movement_24C94B: @ 824C94B
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_13
-	step_51
-	step_46
-	step_12
-	step_46
-	step_50
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_8
+	disable_jump_landing_ground_effect
+	jump_in_place_down
+	delay_4
+	jump_in_place_down
+	enable_jump_landing_ground_effect
 	step_end
 
 BattleFrontier_BattleDomeBattleRoom_Movement_24C95E: @ 824C95E
-	step_down
-	step_down
-	step_right
-	step_right
-	step_25
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_in_place_fastest_down
 	step_end
 
 BattleFrontier_BattleDomeBattleRoom_Movement_24C964: @ 824C964
-	step_right
-	step_right
-	step_right
-	step_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 BattleFrontier_BattleDomeBattleRoom_Movement_24C969: @ 824C969
-	step_27
+	walk_in_place_fastest_left
 	step_end
 
 BattleFrontier_BattleDomeBattleRoom_Movement_24C96B: @ 824C96B
-	step_left
-	step_left
-	step_left
-	step_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
 	step_end
 
 BattleFrontier_BattleDomeBattleRoom_Text_24C970: @ 824C970
diff --git a/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc b/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc
index ad6204fd5..6a97382d4 100644
--- a/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc
+++ b/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc
@@ -46,107 +46,107 @@ BattleFrontier_BattleDomeCorridor_EventScript_24B18F:: @ 824B18F
 	end
 
 BattleFrontier_BattleDomeCorridor_Movement_24B1A1: @ 824B1A1
-	step_up
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_26
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_up
 	step_end
 
 BattleFrontier_BattleDomeCorridor_Movement_24B1AE: @ 824B1AE
-	step_up
-	step_up
-	step_54
+	walk_up
+	walk_up
+	set_invisible
 	step_end
 
 BattleFrontier_BattleDomeCorridor_Movement_24B1B2: @ 824B1B2
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
 	step_end
 
 BattleFrontier_BattleDomeCorridor_Movement_24B1BE: @ 824B1BE
-	step_up
-	step_54
+	walk_up
+	set_invisible
 	step_end
 
 BattleFrontier_BattleDomeCorridor_Movement_24B1C1: @ 824B1C1
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_26
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
 	step_end
 
 BattleFrontier_BattleDomeCorridor_Movement_24B1D2: @ 824B1D2
-	step_up
-	step_up
-	step_54
+	walk_up
+	walk_up
+	set_invisible
 	step_end
 
 BattleFrontier_BattleDomeCorridor_Movement_24B1D6: @ 824B1D6
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
 	step_end
 
 BattleFrontier_BattleDomeCorridor_Movement_24B1E6: @ 824B1E6
-	step_up
-	step_54
+	walk_up
+	set_invisible
 	step_end
 
 BattleFrontier_BattleDomeCorridor_Movement_24B1E9: @ 824B1E9
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_up
-	step_54
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	set_invisible
 	step_end
diff --git a/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc b/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc
index 35bf3f5a6..b08d0ca89 100644
--- a/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc
+++ b/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc
@@ -390,22 +390,22 @@ BattleFrontier_BattleDomeLobby_EventScript_249D3F:: @ 8249D3F
 	return
 
 BattleFrontier_BattleDomeLobby_Movement_249D45: @ 8249D45
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 BattleFrontier_BattleDomeLobby_Movement_249D4B: @ 8249D4B
-	step_up
-	step_54
+	walk_up
+	set_invisible
 	step_end
 
 BattleFrontier_BattleDomeLobby_Movement_249D4E: @ 8249D4E
-	step_up
-	step_up
-	step_54
+	walk_up
+	walk_up
+	set_invisible
 	step_end
 
 BattleFrontier_BattleDomeLobby_EventScript_249D52:: @ 8249D52
diff --git a/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc
index f3693e179..d19b4b999 100644
--- a/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc
+++ b/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc
@@ -280,24 +280,24 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B646:: @ 824B646
 	return
 
 BattleFrontier_BattleDomePreBattleRoom_Movement_24B64F: @ 824B64F
-	step_right
-	step_02
+	walk_right
+	face_left
 	step_end
 
 BattleFrontier_BattleDomePreBattleRoom_Movement_24B652: @ 824B652
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 BattleFrontier_BattleDomePreBattleRoom_Movement_24B657: @ 824B657
-	step_up
+	walk_up
 	step_end
 
 BattleFrontier_BattleDomePreBattleRoom_Movement_24B659: @ 824B659
-	step_up
-	step_54
+	walk_up
+	set_invisible
 	step_end
 
 BattleFrontier_BattleDomePreBattleRoom_Text_24B65C: @ 824B65C
diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc
index bd76e111d..cdfd6edd6 100644
--- a/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc
+++ b/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc
@@ -261,32 +261,32 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105:: @ 825B105
 	end
 
 BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B: @ 825B17B
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_03
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	face_right
 	step_end
 
 BattleFrontier_BattleFactoryBattleRoom_Movement_25B182: @ 825B182
-	step_right
+	walk_right
 	step_end
 
 BattleFrontier_BattleFactoryBattleRoom_Movement_25B184: @ 825B184
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_02
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	face_left
 	step_end
 
 BattleFrontier_BattleFactoryBattleRoom_Movement_25B18B: @ 825B18B
-	step_up
-	step_up
-	step_up
-	step_02
+	walk_up
+	walk_up
+	walk_up
+	face_left
 	step_end
 
 BattleFrontier_BattleFactoryBattleRoom_EventScript_25B190:: @ 825B190
diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc b/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc
index 640e96b4d..4f2dea343 100644
--- a/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc
+++ b/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc
@@ -261,17 +261,17 @@ BattleFrontier_BattleFactoryLobby_EventScript_25879D:: @ 825879D
 	end
 
 BattleFrontier_BattleFactoryLobby_Movement_2587A7: @ 82587A7
-	step_up
-	step_up
-	step_up
-	step_54
+	walk_up
+	walk_up
+	walk_up
+	set_invisible
 	step_end
 
 BattleFrontier_BattleFactoryLobby_Movement_2587AC: @ 82587AC
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 BattleFrontier_BattleFactoryLobby_EventScript_2587B1:: @ 82587B1
diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc
index 93a5f2caf..875a3a220 100644
--- a/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc
+++ b/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc
@@ -457,65 +457,65 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A18B:: @ 825A18B
 	return
 
 BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A19A: @ 825A19A
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A0: @ 825A1A0
-	step_up
-	step_left
-	step_left
-	step_up
-	step_up
+	walk_up
+	walk_left
+	walk_left
+	walk_up
+	walk_up
 	step_end
 
 BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A6: @ 825A1A6
-	step_up
-	step_right
-	step_right
-	step_up
-	step_up
+	walk_up
+	walk_right
+	walk_right
+	walk_up
+	walk_up
 	step_end
 
 BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1AC: @ 825A1AC
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_00
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	face_down
 	step_end
 
 BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1B3: @ 825A1B3
-	step_left
-	step_left
-	step_up
-	step_up
-	step_54
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	set_invisible
 	step_end
 
 BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1B9: @ 825A1B9
-	step_right
-	step_right
-	step_up
-	step_up
-	step_54
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	set_invisible
 	step_end
 
 BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1BF: @ 825A1BF
-	step_left
-	step_left
-	step_left
+	walk_left
+	walk_left
+	walk_left
 	step_end
 
 BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1C3: @ 825A1C3
-	step_right
-	step_right
-	step_right
-	step_00
+	walk_right
+	walk_right
+	walk_right
+	face_down
 	step_end
 
 BattleFrontier_BattleFactoryPreBattleRoom_Text_25A1C8: @ 825A1C8
diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc
index 5aff5ad81..07ccbe79d 100644
--- a/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc
+++ b/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc
@@ -394,68 +394,68 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE89:: @ 824FE89
 	return
 
 BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90: @ 824FE90
-	step_54
+	set_invisible
 	step_end
 
 BattleFrontier_BattlePalaceBattleRoom_Movement_24FE92: @ 824FE92
-	step_55
-	step_up
-	step_up
-	step_up
-	step_up
+	set_visible
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 
 BattleFrontier_BattlePalaceBattleRoom_Movement_24FE97: @ 824FE97
-	step_03
+	face_right
 	step_end
 
 BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99: @ 824FE99
-	step_01
+	face_up
 	step_end
 
 BattleFrontier_BattlePalaceBattleRoom_Movement_24FE9B: @ 824FE9B
-	step_55
-	step_up
-	step_up
-	step_up
-	step_up
+	set_visible
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA1: @ 824FEA1
-	step_down
-	step_down
-	step_down
-	step_down
-	step_02
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	face_left
 	step_end
 
 BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA7: @ 824FEA7
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC: @ 824FEAC
-	step_00
+	face_down
 	step_end
 
 BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAE: @ 824FEAE
-	step_55
-	slow_step_down
-	slow_step_down
-	step_02
+	set_visible
+	walk_slow_down
+	walk_slow_down
+	face_left
 	step_end
 
 BattleFrontier_BattlePalaceBattleRoom_Movement_24FEB3: @ 824FEB3
-	step_55
-	slow_step_down
+	set_visible
+	walk_slow_down
 	step_end
 
 BattleFrontier_BattlePalaceBattleRoom_Movement_24FEB6: @ 824FEB6
-	slow_step_down
-	slow_step_down
-	slow_step_down
-	step_02
+	walk_slow_down
+	walk_slow_down
+	walk_slow_down
+	face_left
 	step_end
 
 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FEBB:: @ 824FEBB
@@ -472,42 +472,42 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FED5:: @ 824FED5
 	end
 
 BattleFrontier_BattlePalaceBattleRoom_Movement_24FEDF: @ 824FEDF
-	step_14
-	step_14
-	step_55
-	step_down
-	step_right
-	step_down
-	step_27
+	delay_16
+	delay_16
+	set_visible
+	walk_down
+	walk_right
+	walk_down
+	walk_in_place_fastest_left
 	step_end
 
 BattleFrontier_BattlePalaceBattleRoom_Movement_24FEE7: @ 824FEE7
-	step_55
-	step_15
-	step_18
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_27
-	step_14
+	set_visible
+	walk_fast_down
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_in_place_fastest_left
+	delay_16
 	step_end
 
 BattleFrontier_BattlePalaceBattleRoom_Movement_24FEF2: @ 824FEF2
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_55
-	slow_step_down
-	slow_step_down
-	slow_step_down
-	slow_step_down
-	step_02
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	set_visible
+	walk_slow_down
+	walk_slow_down
+	walk_slow_down
+	walk_slow_down
+	face_left
 	step_end
 
 BattleFrontier_BattlePalaceBattleRoom_Text_24FF00: @ 824FF00
diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc b/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc
index 91fb31ad3..89697ff33 100644
--- a/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc
+++ b/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc
@@ -80,54 +80,54 @@ BattleFrontier_BattlePalaceCorridor_EventScript_24F5AF:: @ 824F5AF
 	return
 
 BattleFrontier_BattlePalaceCorridor_Movement_24F5B8: @ 824F5B8
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 BattleFrontier_BattlePalaceCorridor_Movement_24F5BD: @ 824F5BD
-	step_up
-	step_up
-	step_left
-	step_left
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_left
+	walk_left
+	walk_up
+	walk_up
 	step_end
 
 BattleFrontier_BattlePalaceCorridor_Movement_24F5C4: @ 824F5C4
-	step_up
-	step_up
-	step_up
-	step_left
-	step_left
-	step_up
+	walk_up
+	walk_up
+	walk_up
+	walk_left
+	walk_left
+	walk_up
 	step_end
 
 BattleFrontier_BattlePalaceCorridor_Movement_24F5CB: @ 824F5CB
-	step_up
-	step_right
-	step_right
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 BattleFrontier_BattlePalaceCorridor_Movement_24F5D2: @ 824F5D2
-	step_up
-	step_up
-	step_right
-	step_right
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	walk_up
+	walk_up
 	step_end
 
 BattleFrontier_BattlePalaceCorridor_Movement_24F5D9: @ 824F5D9
-	step_up
+	walk_up
 
 BattleFrontier_BattlePalaceCorridor_Movement_24F5DA: @ 824F5DA
-	step_up
-	step_54
+	walk_up
+	set_invisible
 	step_end
 
 BattleFrontier_BattlePalaceCorridor_Text_24F5DD: @ 824F5DD
diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc b/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc
index 067e18fa2..a5cb11081 100644
--- a/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc
+++ b/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc
@@ -345,18 +345,18 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DC41:: @ 824DC41
 	return
 
 BattleFrontier_BattlePalaceLobby_Movement_24DC47: @ 824DC47
-	step_up
+	walk_up
 	step_end
 
 BattleFrontier_BattlePalaceLobby_Movement_24DC49: @ 824DC49
-	step_up
-	step_54
+	walk_up
+	set_invisible
 	step_end
 
 BattleFrontier_BattlePalaceLobby_Movement_24DC4C: @ 824DC4C
-	step_up
-	step_up
-	step_54
+	walk_up
+	walk_up
+	set_invisible
 	step_end
 
 BattleFrontier_BattlePalaceLobby_EventScript_24DC50:: @ 824DC50
diff --git a/data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc b/data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc
index 5293b6cfa..4171da314 100644
--- a/data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc
+++ b/data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc
@@ -46,21 +46,21 @@ BattleFrontier_BattlePikeCorridor_EventScript_25C801:: @ 825C801
 	end
 
 BattleFrontier_BattlePikeCorridor_Movement_25C80B: @ 825C80B
-	step_up
-	step_up
+	walk_up
+	walk_up
 	step_end
 
 BattleFrontier_BattlePikeCorridor_Movement_25C80E: @ 825C80E
-	step_up
-	step_up
-	step_54
+	walk_up
+	walk_up
+	set_invisible
 	step_end
 
 BattleFrontier_BattlePikeCorridor_Movement_25C812: @ 825C812
-	step_up
-	step_up
-	step_left
-	step_00
+	walk_up
+	walk_up
+	walk_left
+	face_down
 	step_end
 
 BattleFrontier_BattlePikeCorridor_Text_25C817: @ 825C817
diff --git a/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc b/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc
index 0cee28347..74bdb1d78 100644
--- a/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc
+++ b/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc
@@ -268,12 +268,12 @@ BattleFrontier_BattlePikeLobby_EventScript_25BA94:: @ 825BA94
 	return
 
 BattleFrontier_BattlePikeLobby_Movement_25BAA6: @ 825BAA6
-	step_up
+	walk_up
 
 BattleFrontier_BattlePikeLobby_Movement_25BAA7: @ 825BAA7
-	step_up
-	step_up
-	step_54
+	walk_up
+	walk_up
+	set_invisible
 	step_end
 
 BattleFrontier_BattlePikeLobby_EventScript_25BAAB:: @ 825BAAB
diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc
index 3461f8275..fd5fd81e0 100644
--- a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc
+++ b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc
@@ -112,7 +112,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2BF:: @ 825D2BF
 BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB:: @ 825D2FB
 	msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E311, 4
 	closemessage
-	special SpawnScriptFieldObject
+	special SpawnScriptEventObject
 	applymovement 127, BattleFrontier_BattlePikeRandomRoom1_Movement_25D9B0
 	applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E2
 	waitmovement 0
@@ -440,141 +440,141 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B:: @ 825D77B
 	return
 
 BattleFrontier_BattlePikeRandomRoom1_Movement_25D795: @ 825D795
-	step_down
-	step_down
+	walk_down
+	walk_down
 	step_end
 
 BattleFrontier_BattlePikeRandomRoom1_Movement_25D798: @ 825D798
-	step_up
-	step_up
-	step_up
-	step_54
-	step_up
+	walk_up
+	walk_up
+	walk_up
+	set_invisible
+	walk_up
 	step_end
 
 BattleFrontier_BattlePikeRandomRoom1_Movement_25D79E: @ 825D79E
-	step_up
-	step_54
-	step_up
+	walk_up
+	set_invisible
+	walk_up
 	step_end
 
 BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A2: @ 825D7A2
-	step_down
+	walk_down
 	step_end
 
 BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A4: @ 825D7A4
-	step_down
-	step_02
-	step_14
-	step_14
-	step_00
+	walk_down
+	face_left
+	delay_16
+	delay_16
+	face_down
 	step_end
 
 BattleFrontier_BattlePikeRandomRoom1_Movement_25D7AA: @ 825D7AA
-	step_15
-	step_18
-	step_18
-	step_15
-	step_17
-	step_00
+	walk_fast_down
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_left
+	face_down
 	step_end
 
 BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B1: @ 825D7B1
-	step_01
+	face_up
 	step_end
 
 BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B3: @ 825D7B3
-	step_left
+	walk_left
 
 BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B4: @ 825D7B4
-	step_03
+	face_right
 	step_end
 
 BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B6: @ 825D7B6
-	step_down
-	step_down
-	step_right
-	step_00
+	walk_down
+	walk_down
+	walk_right
+	face_down
 	step_end
 
 BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BB: @ 825D7BB
-	step_02
+	face_left
 	step_end
 
 BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD: @ 825D7BD
-	step_03
+	face_right
 	step_end
 
 BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BF: @ 825D7BF
-	step_01
+	face_up
 	step_end
 
 BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C1: @ 825D7C1
-	step_right
+	walk_right
 	step_end
 
 BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C3: @ 825D7C3
-	step_left
+	walk_left
 	step_end
 
 BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C5: @ 825D7C5
-	step_down
-	step_down
+	walk_down
+	walk_down
 	step_end
 
 BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C8: @ 825D7C8
-	step_03
+	face_right
 	step_end
 
 BattleFrontier_BattlePikeRandomRoom1_Movement_25D7CA: @ 825D7CA
-	step_02
+	face_left
 	step_end
 
 BattleFrontier_BattlePikeRandomRoom1_Movement_25D7CC: @ 825D7CC
-	step_up
-	step_up
-	step_up
-	step_right
-	step_up
-	step_54
-	step_up
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_up
+	set_invisible
+	walk_up
 	step_end
 
 BattleFrontier_BattlePikeRandomRoom1_Movement_25D7D4: @ 825D7D4
-	step_up
-	step_up
-	step_up
-	step_left
-	step_up
-	step_54
-	step_up
+	walk_up
+	walk_up
+	walk_up
+	walk_left
+	walk_up
+	set_invisible
+	walk_up
 	step_end
 
 BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC: @ 825D7DC
-	step_up
-	step_up
+	walk_up
+	walk_up
 	step_end
 
 BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DF: @ 825D7DF
-	step_down
-	step_down
+	walk_down
+	walk_down
 	step_end
 
 BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E2: @ 825D7E2
-	step_up
-	step_up
-	step_up
-	step_54
+	walk_up
+	walk_up
+	walk_up
+	set_invisible
 	step_end
 
 BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E7: @ 825D7E7
-	step_55
-	step_down
+	set_visible
+	walk_down
 	step_end
 
 BattleFrontier_BattlePikeRandomRoom1_Movement_25D7EA: @ 825D7EA
-	step_left
-	step_03
+	walk_left
+	face_right
 	step_end
 
 BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED:: @ 825D7ED
@@ -689,13 +689,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D96D:: @ 825D96D
 	return
 
 BattleFrontier_BattlePikeRandomRoom1_Movement_25D9B0: @ 825D9B0
-	step_up
-	step_up
+	walk_up
+	walk_up
 	step_end
 
 BattleFrontier_BattlePikeRandomRoom1_Movement_25D9B3: @ 825D9B3
-	step_down
-	step_down
+	walk_down
+	walk_down
 	step_end
 
 BattleFrontier_BattlePikeRandomRoom1_Text_25D9B6: @ 825D9B6
diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc
index 14f543284..39045c317 100644
--- a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc
+++ b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc
@@ -24,8 +24,8 @@ BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3A7:: @ 825E3A7
 	end
 
 BattleFrontier_BattlePikeRandomRoom2_Movement_25E3DB: @ 825E3DB
-	step_down
-	step_down
+	walk_down
+	walk_down
 	step_end
 
 BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E3DE: @ 825E3DE
diff --git a/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc b/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc
index 6952412f2..6bef7ba12 100644
--- a/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc
+++ b/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc
@@ -267,22 +267,22 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBC2:: @ 825CBC2
 	end
 
 BattleFrontier_BattlePikeThreePathRoom_Movement_25CBCE: @ 825CBCE
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
 	step_end
 
 BattleFrontier_BattlePikeThreePathRoom_Movement_25CBD5: @ 825CBD5
-	step_up
-	step_up
-	step_up
-	step_up
-	step_right
-	step_right
-	step_00
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	face_down
 	step_end
 
 BattleFrontier_BattlePikeThreePathRoom_Text_25CBDD: @ 825CBDD
diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc b/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc
index 2862722ce..e92c8d97f 100644
--- a/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc
+++ b/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc
@@ -462,34 +462,34 @@ BattleFrontier_BattlePyramidLobby_EventScript_250D9C:: @ 8250D9C
 	return
 
 BattleFrontier_BattlePyramidLobby_Movement_250DC4: @ 8250DC4
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_00
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	face_down
 	step_end
 
 BattleFrontier_BattlePyramidLobby_Movement_250DCD: @ 8250DCD
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 BattleFrontier_BattlePyramidLobby_Movement_250DD5: @ 8250DD5
-	step_right
-	step_02
+	walk_right
+	face_left
 	step_end
 
 BattleFrontier_BattlePyramidLobby_Movement_250DD8: @ 8250DD8
-	step_up
-	step_up
+	walk_up
+	walk_up
 	step_end
 
 BattleFrontier_BattlePyramidLobby_EventScript_250DDB:: @ 8250DDB
diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc b/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc
index d071639f8..9d83ab4e0 100644
--- a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc
+++ b/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc
@@ -138,7 +138,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255256:: @ 8255256
 	special sub_81A1780
 	compare VAR_RESULT, 0
 	goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_2552D0
-	special SpawnScriptFieldObject
+	special SpawnScriptEventObject
 	applymovement 127, BattleFrontier_BattlePyramidTop_Movement_25540C
 	waitmovement 0
 	msgbox BattleFrontier_BattlePyramidTop_Text_255669, 4
@@ -185,7 +185,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255335:: @ 8255335
 	special sub_81A1780
 	compare VAR_RESULT, 0
 	goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_255388
-	special SpawnScriptFieldObject
+	special SpawnScriptEventObject
 	applymovement 127, BattleFrontier_BattlePyramidTop_Movement_25540C
 	waitmovement 0
 	msgbox BattleFrontier_BattlePyramidTop_Text_255951, 4
@@ -235,32 +235,32 @@ BattleFrontier_BattlePyramidTop_EventScript_2553ED:: @ 82553ED
 	return
 
 BattleFrontier_BattlePyramidTop_Movement_2553FD: @ 82553FD
-	step_right
-	step_27
+	walk_right
+	walk_in_place_fastest_left
 	step_end
 
 BattleFrontier_BattlePyramidTop_Movement_255400: @ 8255400
-	step_left
-	step_26
+	walk_left
+	walk_in_place_fastest_up
 	step_end
 
 BattleFrontier_BattlePyramidTop_Movement_255403: @ 8255403
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_25
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_down
 	step_end
 
 BattleFrontier_BattlePyramidTop_Movement_25540A: @ 825540A
-	step_15
+	walk_fast_down
 	step_end
 
 BattleFrontier_BattlePyramidTop_Movement_25540C: @ 825540C
-	slow_step_up
-	slow_step_up
-	step_14
+	walk_slow_up
+	walk_slow_up
+	delay_16
 	step_end
 
 BattleFrontier_BattlePyramidTop_Text_255410: @ 8255410
diff --git a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc
index 63306af2a..087752d8f 100644
--- a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc
+++ b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc
@@ -394,92 +394,92 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_242170:: @ 8242170
 	return
 
 BattleFrontier_BattleTowerBattleRoom_Movement_242179: @ 8242179
-	step_up
-	step_up
-	step_up
-	step_03
+	walk_up
+	walk_up
+	walk_up
+	face_right
 	step_end
 
 BattleFrontier_BattleTowerBattleRoom_Movement_24217E: @ 824217E
-	step_00
+	face_down
 	step_end
 
 BattleFrontier_BattleTowerBattleRoom_Movement_242180: @ 8242180
-	step_03
+	face_right
 	step_end
 
 BattleFrontier_BattleTowerBattleRoom_Movement_242182: @ 8242182
-	step_down
-	step_down
-	step_down
-	step_down
-	step_02
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	face_left
 	step_end
 
 BattleFrontier_BattleTowerBattleRoom_Movement_242188: @ 8242188
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 BattleFrontier_BattleTowerBattleRoom_Movement_24218D: @ 824218D
-	step_right
-	step_right
-	step_right
-	step_up
+	walk_right
+	walk_right
+	walk_right
+	walk_up
 	step_end
 
 BattleFrontier_BattleTowerBattleRoom_Movement_242192: @ 8242192
-	step_down
-	step_left
-	step_left
-	step_left
-	step_03
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	face_right
 	step_end
 
 BattleFrontier_BattleTowerBattleRoom_Movement_242198: @ 8242198
-	step_54
+	set_invisible
 	step_end
 
 BattleFrontier_BattleTowerBattleRoom_Movement_24219A: @ 824219A
-	step_55
-	step_14
-	step_up
-	step_left
-	step_left
-	step_13
+	set_visible
+	delay_16
+	walk_up
+	walk_left
+	walk_left
+	delay_8
 	step_end
 
 BattleFrontier_BattleTowerBattleRoom_Movement_2421A1: @ 82421A1
-	step_right
-	step_right
-	step_down
-	step_54
+	walk_right
+	walk_right
+	walk_down
+	set_invisible
 	step_end
 
 BattleFrontier_BattleTowerBattleRoom_Movement_2421A6: @ 82421A6
-	step_14
-	step_14
-	step_14
-	step_14
+	delay_16
+	delay_16
+	delay_16
+	delay_16
 	step_end
 
 BattleFrontier_BattleTowerBattleRoom_Movement_2421AB: @ 82421AB
-	step_03
-	step_14
-	step_14
-	step_14
-	step_14
-	step_20
+	face_right
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_in_place_right
 	step_end
 
 BattleFrontier_BattleTowerBattleRoom_Movement_2421B2: @ 82421B2
-	slow_step_down
-	slow_step_down
-	slow_step_down
-	slow_step_down
-	step_02
+	walk_slow_down
+	walk_slow_down
+	walk_slow_down
+	walk_slow_down
+	face_left
 	step_end
 
 BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8:: @ 82421B8
diff --git a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc
index f22b0de26..81c2dd563 100644
--- a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc
+++ b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc
@@ -415,72 +415,72 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249514:: @ 8249514
 	return
 
 BattleFrontier_BattleTowerBattleRoom2_Movement_249518: @ 8249518
-	step_up
-	step_up
-	step_up
-	step_up
-	step_03
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	face_right
 	step_end
 
 BattleFrontier_BattleTowerBattleRoom2_Movement_24951E: @ 824951E
-	step_left
-	step_up
-	step_up
-	step_up
-	step_03
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	face_right
 	step_end
 
 BattleFrontier_BattleTowerBattleRoom2_Movement_249524: @ 8249524
-	step_02
+	face_left
 	step_end
 
 BattleFrontier_BattleTowerBattleRoom2_Movement_249526: @ 8249526
-	step_28
+	walk_in_place_fastest_right
 	step_end
 
 BattleFrontier_BattleTowerBattleRoom2_Movement_249528: @ 8249528
-	step_down
-	step_down
-	step_down
-	step_down
-	step_02
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	face_left
 	step_end
 
 BattleFrontier_BattleTowerBattleRoom2_Movement_24952E: @ 824952E
-	step_right
-	step_down
-	step_down
-	step_down
-	step_02
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	face_left
 	step_end
 
 BattleFrontier_BattleTowerBattleRoom2_Movement_249534: @ 8249534
-	step_up
-	step_up
-	step_up
-	step_54
+	walk_up
+	walk_up
+	walk_up
+	set_invisible
 	step_end
 
 BattleFrontier_BattleTowerBattleRoom2_Movement_249539: @ 8249539
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 BattleFrontier_BattleTowerBattleRoom2_Movement_24953E: @ 824953E
-	step_right
-	step_right
+	walk_right
+	walk_right
 	step_end
 
 BattleFrontier_BattleTowerBattleRoom2_Movement_249541: @ 8249541
-	step_left
-	step_left
-	step_28
+	walk_left
+	walk_left
+	walk_in_place_fastest_right
 	step_end
 
 BattleFrontier_BattleTowerBattleRoom2_Movement_249545: @ 8249545
-	step_1f
+	walk_in_place_left
 	step_end
 
 BattleFrontier_BattleTowerBattleRoom2_Text_249547: @ 8249547
diff --git a/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc b/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc
index a1dfa2abc..ef1102175 100644
--- a/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc
+++ b/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc
@@ -40,20 +40,20 @@ BattleFrontier_BattleTowerCorridor_EventScript_241B27:: @ 8241B27
 	end
 
 BattleFrontier_BattleTowerCorridor_Movement_241B36: @ 8241B36
-	step_right
+	walk_right
 
 BattleFrontier_BattleTowerCorridor_Movement_241B37: @ 8241B37
-	step_right
-	step_right
+	walk_right
+	walk_right
 
 BattleFrontier_BattleTowerCorridor_Movement_241B39: @ 8241B39
-	step_right
+	walk_right
 
 BattleFrontier_BattleTowerCorridor_Movement_241B3A: @ 8241B3A
-	step_right
-	step_right
-	step_right
-	step_up
-	step_54
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	set_invisible
 	step_end
 
diff --git a/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc b/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc
index af2c67eac..39157609e 100644
--- a/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc
+++ b/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc
@@ -113,60 +113,60 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248EB2:: @ 8248EB2
 	return
 
 BattleFrontier_BattleTowerCorridor2_Movement_248EBC: @ 8248EBC
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 BattleFrontier_BattleTowerCorridor2_Movement_248EC4: @ 8248EC4
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
 	step_end
 
 BattleFrontier_BattleTowerCorridor2_Movement_248ECC: @ 8248ECC
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_28
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_in_place_fastest_right
 	step_end
 
 BattleFrontier_BattleTowerCorridor2_Movement_248ED5: @ 8248ED5
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_27
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_in_place_fastest_left
 	step_end
 
 BattleFrontier_BattleTowerCorridor2_Movement_248EDE: @ 8248EDE
-	step_14
-	step_up
-	step_up
-	step_54
+	delay_16
+	walk_up
+	walk_up
+	set_invisible
 	step_end
 
 BattleFrontier_BattleTowerCorridor2_Movement_248EE3: @ 8248EE3
-	step_up
-	step_54
+	walk_up
+	set_invisible
 	step_end
 
 BattleFrontier_BattleTowerCorridor2_Movement_248EE6: @ 8248EE6
-	step_down
+	walk_down
 	step_end
 
diff --git a/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc b/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc
index 095e75394..433d8e181 100644
--- a/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc
+++ b/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc
@@ -57,27 +57,27 @@ BattleFrontier_BattleTowerElevator_EventScript_241A7C:: @ 8241A7C
 	return
 
 BattleFrontier_BattleTowerElevator_Movement_241A86: @ 8241A86
-	step_up
-	step_right
-	step_00
+	walk_up
+	walk_right
+	face_down
 	step_end
 
 BattleFrontier_BattleTowerElevator_Movement_241A8A: @ 8241A8A
-	step_up
-	step_up
-	step_00
+	walk_up
+	walk_up
+	face_down
 	step_end
 
 BattleFrontier_BattleTowerElevator_Movement_241A8E: @ 8241A8E
-	step_down
-	step_down
-	step_54
+	walk_down
+	walk_down
+	set_invisible
 	step_end
 
 BattleFrontier_BattleTowerElevator_Movement_241A92: @ 8241A92
-	step_right
-	step_down
-	step_down
+	walk_right
+	walk_down
+	walk_down
 	step_end
 
 BattleFrontier_BattleTowerElevator_MapScript2_241A96: @ 8241A96
diff --git a/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc b/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc
index 9f2099b32..d899b1cbe 100644
--- a/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc
+++ b/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc
@@ -781,29 +781,29 @@ BattleFrontier_BattleTowerLobby_EventScript_23F15B:: @ 823F15B
 	return
 
 BattleFrontier_BattleTowerLobby_Movement_23F195: @ 823F195
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 BattleFrontier_BattleTowerLobby_Movement_23F199: @ 823F199
-	step_up
-	step_54
+	walk_up
+	set_invisible
 	step_end
 
 BattleFrontier_BattleTowerLobby_Movement_23F19C: @ 823F19C
-	step_up
-	step_up
-	step_54
+	walk_up
+	walk_up
+	set_invisible
 	step_end
 
 BattleFrontier_BattleTowerLobby_Movement_23F1A0: @ 823F1A0
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_54
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	set_invisible
 	step_end
 
 BattleFrontier_BattleTowerLobby_EventScript_23F1A7:: @ 823F1A7
diff --git a/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc
index e6c99541d..c1d3534d3 100644
--- a/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc
+++ b/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc
@@ -74,12 +74,12 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E41:: @ 8243E41
 	end
 
 BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E75: @ 8243E75
-	step_down
+	walk_down
 	step_end
 
 BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E77: @ 8243E77
-	step_left
-	step_25
+	walk_left
+	walk_in_place_fastest_down
 	step_end
 
 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A:: @ 8243E7A
@@ -136,26 +136,26 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F08: @ 8243F08
 	return
 
 BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1A: @ 8243F1A
-	step_up
-	step_up
-	step_54
+	walk_up
+	walk_up
+	set_invisible
 	step_end
 
 BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1E: @ 8243F1E
-	step_right
-	step_up
-	step_54
+	walk_right
+	walk_up
+	set_invisible
 	step_end
 
 BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F22: @ 8243F22
-	step_left
-	step_up
-	step_54
+	walk_left
+	walk_up
+	set_invisible
 	step_end
 
 BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F26: @ 8243F26
-	step_up
-	step_54
+	walk_up
+	set_invisible
 	step_end
 
 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29:: @ 8243F29
@@ -223,24 +223,24 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FDF:: @ 8243FDF
 	return
 
 BattleFrontier_BattleTowerMultiBattleRoom_Movement_243FEA: @ 8243FEA
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
 	step_end
 
 BattleFrontier_BattleTowerMultiBattleRoom_Movement_243FF2: @ 8243FF2
-	step_17
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
 	step_end
 
 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB:: @ 8243FFB
diff --git a/data/scripts/maps/BattleFrontier_OutsideEast.inc b/data/scripts/maps/BattleFrontier_OutsideEast.inc
index bf0d3ff16..dff56322a 100644
--- a/data/scripts/maps/BattleFrontier_OutsideEast.inc
+++ b/data/scripts/maps/BattleFrontier_OutsideEast.inc
@@ -151,21 +151,21 @@ BattleFrontier_OutsideEast_EventScript_242D60:: @ 8242D60
 	end
 
 BattleFrontier_OutsideEast_Movement_242D69: @ 8242D69
-	step_03
-	step_13
-	step_00
-	step_13
-	step_02
-	step_13
-	step_00
-	step_13
-	step_03
-	step_13
-	step_00
-	step_13
-	step_02
-	step_13
-	step_00
+	face_right
+	delay_8
+	face_down
+	delay_8
+	face_left
+	delay_8
+	face_down
+	delay_8
+	face_right
+	delay_8
+	face_down
+	delay_8
+	face_left
+	delay_8
+	face_down
 	step_end
 
 BattleFrontier_OutsideEast_EventScript_242D79:: @ 8242D79
diff --git a/data/scripts/maps/BattleFrontier_OutsideWest.inc b/data/scripts/maps/BattleFrontier_OutsideWest.inc
index f5886bfff..fa2ff7e36 100644
--- a/data/scripts/maps/BattleFrontier_OutsideWest.inc
+++ b/data/scripts/maps/BattleFrontier_OutsideWest.inc
@@ -202,23 +202,23 @@ BattleFrontier_OutsideWest_EventScript_23D61E:: @ 823D61E
 	return
 
 BattleFrontier_OutsideWest_Movement_23D629: @ 823D629
-	step_25
-	step_25
+	walk_in_place_fastest_down
+	walk_in_place_fastest_down
 	step_end
 
 BattleFrontier_OutsideWest_Movement_23D62C: @ 823D62C
-	step_26
-	step_26
+	walk_in_place_fastest_up
+	walk_in_place_fastest_up
 	step_end
 
 BattleFrontier_OutsideWest_Movement_23D62F: @ 823D62F
-	step_28
-	step_28
+	walk_in_place_fastest_right
+	walk_in_place_fastest_right
 	step_end
 
 BattleFrontier_OutsideWest_Movement_23D632: @ 823D632
-	step_27
-	step_27
+	walk_in_place_fastest_left
+	walk_in_place_fastest_left
 	step_end
 
 BattleFrontier_OutsideWest_EventScript_23D635:: @ 823D635
diff --git a/data/scripts/maps/BattleFrontier_ReceptionGate.inc b/data/scripts/maps/BattleFrontier_ReceptionGate.inc
index eca861f85..ec38c3e9d 100644
--- a/data/scripts/maps/BattleFrontier_ReceptionGate.inc
+++ b/data/scripts/maps/BattleFrontier_ReceptionGate.inc
@@ -63,59 +63,59 @@ BattleFrontier_ReceptionGate_EventScript_266229:: @ 8266229
 	end
 
 BattleFrontier_ReceptionGate_Movement_2662D2: @ 82662D2
-	step_up
-	step_up
-	step_left
-	step_left
+	walk_up
+	walk_up
+	walk_left
+	walk_left
 	step_end
 
 BattleFrontier_ReceptionGate_Movement_2662D7: @ 82662D7
-	step_14
-	step_14
-	step_14
-	step_13
-	step_28
+	delay_16
+	delay_16
+	delay_16
+	delay_8
+	walk_in_place_fastest_right
 	step_end
 
 BattleFrontier_ReceptionGate_Movement_2662DD: @ 82662DD
-	step_down
-	step_down
+	walk_down
+	walk_down
 	step_end
 
 BattleFrontier_ReceptionGate_Movement_2662E0: @ 82662E0
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
 	step_end
 
 BattleFrontier_ReceptionGate_Movement_2662E8: @ 82662E8
-	step_right
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 BattleFrontier_ReceptionGate_Movement_2662F0: @ 82662F0
-	step_14
-	step_14
-	step_14
-	step_13
-	step_28
+	delay_16
+	delay_16
+	delay_16
+	delay_8
+	walk_in_place_fastest_right
 	step_end
 
 BattleFrontier_ReceptionGate_Movement_2662F6: @ 82662F6
-	step_14
-	step_14
-	step_14
-	step_13
-	step_27
+	delay_16
+	delay_16
+	delay_16
+	delay_8
+	walk_in_place_fastest_left
 	step_end
 
 BattleFrontier_ReceptionGate_EventScript_2662FC:: @ 82662FC
diff --git a/data/scripts/maps/BirthIsland_Exterior.inc b/data/scripts/maps/BirthIsland_Exterior.inc
index 6fd637461..b2427e95d 100644
--- a/data/scripts/maps/BirthIsland_Exterior.inc
+++ b/data/scripts/maps/BirthIsland_Exterior.inc
@@ -114,12 +114,12 @@ BirthIsland_Exterior_EventScript_268049:: @ 8268049
 	end
 
 BirthIsland_Exterior_Movement_268054: @ 8268054
-	slow_step_down
-	slow_step_down
-	slow_step_down
-	slow_step_down
-	slow_step_down
-	slow_step_down
-	slow_step_down
+	walk_slow_down
+	walk_slow_down
+	walk_slow_down
+	walk_slow_down
+	walk_slow_down
+	walk_slow_down
+	walk_slow_down
 	step_end
 
diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc
index f78d4ea15..1edc1407d 100644
--- a/data/scripts/maps/DewfordTown.inc
+++ b/data/scripts/maps/DewfordTown.inc
@@ -197,401 +197,401 @@ DewfordTown_EventScript_1E9799:: @ 81E9799
 	return
 
 DewfordTown_Movement_1E97A2: @ 81E97A2
-	step_up
-	step_up
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_up
-	step_up
-	step_left
-	step_left
-	step_17
-	step_17
-	step_17
-	step_17
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_17
-	step_17
-	step_17
-	step_17
-	step_16
-	step_16
-	step_16
-	step_16
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_16
-	step_16
-	step_16
-	step_16
-	step_17
-	step_17
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_17
-	step_17
-	step_16
-	step_16
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_16
-	step_16
-	step_16
-	step_16
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_up
+	walk_up
+	walk_left
+	walk_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_left
+	walk_fast_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 DewfordTown_Movement_1E9865: @ 81E9865
-	step_right
-	step_18
-	step_18
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_18
-	step_18
-	step_16
-	step_16
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
+	walk_right
+	walk_fast_right
+	walk_fast_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
 	step_end
 
 DewfordTown_Movement_1E9911: @ 81E9911
-	step_right
-	step_up
+	walk_right
+	walk_up
 	step_end
 
 DewfordTown_Movement_1E9914: @ 81E9914
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 DewfordTown_Movement_1E9918: @ 81E9918
-	step_up
-	step_up
-	step_up
-	step_25
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_down
 	step_end
 
 DewfordTown_Movement_1E991D: @ 81E991D
-	step_up
+	walk_up
 	step_end
 
 DewfordTown_Movement_1E991F: @ 81E991F
-	step_up
-	step_up
+	walk_up
+	walk_up
 	step_end
 
 DewfordTown_EventScript_1E9922:: @ 81E9922
diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc
index 4d4c3732d..37122a640 100644
--- a/data/scripts/maps/DewfordTown_Hall.inc
+++ b/data/scripts/maps/DewfordTown_Hall.inc
@@ -241,11 +241,11 @@ DewfordTown_Hall_EventScript_1FD7C0:: @ 81FD7C0
 	return
 
 DewfordTown_Hall_Movement_1FD7D6: @ 81FD7D6
-	step_1f
+	walk_in_place_left
 	step_end
 
 DewfordTown_Hall_Movement_1FD7D8: @ 81FD7D8
-	step_20
+	walk_in_place_right
 	step_end
 
 DewfordTown_Hall_EventScript_1FD7DA:: @ 81FD7DA
diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc
index 71410a43f..bed242a2b 100644
--- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc
+++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc
@@ -33,8 +33,8 @@ EverGrandeCity_ChampionsRoom_EventScript_228A1E:: @ 8228A1E
     end
 
 EverGrandeCity_ChampionsRoom_Movement_228A42: @ 8228A42
-	step_up
-	step_up
+	walk_up
+	walk_up
 	step_end
 
 EverGrandeCity_ChampionsRoom_EventScript_228A45:: @ 8228A45
@@ -163,66 +163,66 @@ EverGrandeCity_ChampionsRoom_EventScript_228C12:: @ 8228C12
 	return
 
 EverGrandeCity_ChampionsRoom_Movement_228C1D: @ 8228C1D
-	step_up
-	step_up
+	walk_up
+	walk_up
 	step_end
 
 EverGrandeCity_ChampionsRoom_Movement_228C20: @ 8228C20
-	step_up
-	step_14
-	step_up
-	step_13
-	step_54
+	walk_up
+	delay_16
+	walk_up
+	delay_8
+	set_invisible
 	step_end
 
 EverGrandeCity_ChampionsRoom_Movement_228C26: @ 8228C26
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_left
-	step_up
-	step_28
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_left
+	walk_up
+	walk_in_place_fastest_right
 	step_end
 
 EverGrandeCity_ChampionsRoom_Movement_228C2F: @ 8228C2F
-	step_26
-	step_14
-	step_28
-	step_14
-	step_26
-	step_13
-	step_28
-	step_14
+	walk_in_place_fastest_up
+	delay_16
+	walk_in_place_fastest_right
+	delay_16
+	walk_in_place_fastest_up
+	delay_8
+	walk_in_place_fastest_right
+	delay_16
 	step_end
 
 EverGrandeCity_ChampionsRoom_Movement_228C38: @ 8228C38
-	step_right
-	step_up
+	walk_right
+	walk_up
 	step_end
 
 EverGrandeCity_ChampionsRoom_Movement_228C3B: @ 8228C3B
-	step_up
-	step_up
-	step_25
+	walk_up
+	walk_up
+	walk_in_place_fastest_down
 	step_end
 
 EverGrandeCity_ChampionsRoom_Movement_228C3F: @ 8228C3F
-	step_up
-	step_13
-	step_54
+	walk_up
+	delay_8
+	set_invisible
 	step_end
 
 EverGrandeCity_ChampionsRoom_Movement_228C43: @ 8228C43
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_right
-	step_up
-	step_27
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_up
+	walk_in_place_fastest_left
 	step_end
 
 EverGrandeCity_ChampionsRoom_Text_228C4C: @ 8228C4C
diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc
index de29dca0f..60f0dd1ad 100644
--- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc
+++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc
@@ -67,20 +67,20 @@ EverGrandeCity_HallOfFame_EventScript_2298F5:: @ 82298F5
 	end
 
 EverGrandeCity_HallOfFame_Movement_229901: @ 8229901
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 EverGrandeCity_HallOfFame_Movement_229908: @ 8229908
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 EverGrandeCity_HallOfFame_Text_22990E: @ 822990E
diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc
index a9e27ec73..ed6e6a497 100644
--- a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc
+++ b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc
@@ -61,21 +61,21 @@ EverGrandeCity_PokemonCenter_1F_EventScript_229AC1:: @ 8229AC1
 	return
 
 EverGrandeCity_PokemonCenter_1F_Movement_229ACC: @ 8229ACC
-	step_left
-	step_down
-	step_down
-	step_left
-	step_down
-	step_down
+	walk_left
+	walk_down
+	walk_down
+	walk_left
+	walk_down
+	walk_down
 	step_end
 
 EverGrandeCity_PokemonCenter_1F_Movement_229AD3: @ 8229AD3
-	step_down
-	step_down
-	step_left
-	step_left
-	step_down
-	step_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_down
+	walk_down
 	step_end
 
 EverGrandeCity_PokemonCenter_1F_Text_229ADA: @ 8229ADA
diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc
index 4fd73b3bf..f1a6ce17f 100644
--- a/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc
+++ b/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc
@@ -103,25 +103,25 @@ EverGrandeCity_PokemonLeague_1F_EventScript_2296BB:: @ 82296BB
 	end
 
 EverGrandeCity_PokemonLeague_1F_Movement_2296DA: @ 82296DA
-	step_down
-	step_left
-	step_26
+	walk_down
+	walk_left
+	walk_in_place_fastest_up
 	step_end
 
 EverGrandeCity_PokemonLeague_1F_Movement_2296DE: @ 82296DE
-	step_down
-	step_right
-	step_26
+	walk_down
+	walk_right
+	walk_in_place_fastest_up
 	step_end
 
 EverGrandeCity_PokemonLeague_1F_Movement_2296E2: @ 82296E2
-	step_left
-	step_25
+	walk_left
+	walk_in_place_fastest_down
 	step_end
 
 EverGrandeCity_PokemonLeague_1F_Movement_2296E5: @ 82296E5
-	step_right
-	step_25
+	walk_right
+	walk_in_place_fastest_down
 	step_end
 
 EverGrandeCity_PokemonLeague_1F_Text_2296E8: @ 82296E8
diff --git a/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc b/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc
index f6750009d..48703897e 100644
--- a/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc
+++ b/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc
@@ -203,56 +203,56 @@ FallarborTown_BattleTentBattleRoom_EventScript_200B73:: @ 8200B73
 	end
 
 FallarborTown_BattleTentBattleRoom_Movement_200B8D: @ 8200B8D
-	step_up
-	step_up
-	step_up
-	step_28
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_right
 	step_end
 
 FallarborTown_BattleTentBattleRoom_Movement_200B92: @ 8200B92
-	step_28
+	walk_in_place_fastest_right
 	step_end
 
 FallarborTown_BattleTentBattleRoom_Movement_200B94: @ 8200B94
-	step_27
+	walk_in_place_fastest_left
 	step_end
 
 FallarborTown_BattleTentBattleRoom_Movement_200B96: @ 8200B96
-	step_down
-	step_down
-	step_down
-	step_down
-	step_27
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_in_place_fastest_left
 	step_end
 
 FallarborTown_BattleTentBattleRoom_Movement_200B9C: @ 8200B9C
-	step_left
+	walk_left
 	step_end
 
 FallarborTown_BattleTentBattleRoom_Movement_200B9E: @ 8200B9E
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 FallarborTown_BattleTentBattleRoom_Movement_200BA3: @ 8200BA3
-	step_51
-	step_46
+	disable_jump_landing_ground_effect
+	jump_in_place_down
 	step_end
 
 FallarborTown_BattleTentBattleRoom_Movement_200BA6: @ 8200BA6
-	step_down
-	step_down
-	step_down
-	step_28
+	walk_down
+	walk_down
+	walk_down
+	walk_in_place_fastest_right
 	step_end
 
 FallarborTown_BattleTentBattleRoom_Movement_200BAB: @ 8200BAB
-	step_up
-	step_up
-	step_up
-	step_25
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_down
 	step_end
 
 FallarborTown_BattleTentBattleRoom_MapScript2_200BB0: @ 8200BB0
diff --git a/data/scripts/maps/FallarborTown_BattleTentCorridor.inc b/data/scripts/maps/FallarborTown_BattleTentCorridor.inc
index 1325b0332..f1d3024c0 100644
--- a/data/scripts/maps/FallarborTown_BattleTentCorridor.inc
+++ b/data/scripts/maps/FallarborTown_BattleTentCorridor.inc
@@ -26,18 +26,18 @@ FallarborTown_BattleTentCorridor_EventScript_2006B7:: @ 82006B7
 	end
 
 FallarborTown_BattleTentCorridor_Movement_2006FB: @ 82006FB
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 FallarborTown_BattleTentCorridor_Movement_200700: @ 8200700
-	step_up
+	walk_up
 
 FallarborTown_BattleTentCorridor_Movement_200701: @ 8200701
-	step_up
-	step_54
+	walk_up
+	set_invisible
 	step_end
 
 FallarborTown_BattleTentCorridor_Text_200704: @ 8200704
diff --git a/data/scripts/maps/FallarborTown_BattleTentLobby.inc b/data/scripts/maps/FallarborTown_BattleTentLobby.inc
index 327221120..1bde88e7d 100644
--- a/data/scripts/maps/FallarborTown_BattleTentLobby.inc
+++ b/data/scripts/maps/FallarborTown_BattleTentLobby.inc
@@ -257,26 +257,26 @@ FallarborTown_BattleTentLobby_EventScript_2001CF:: @ 82001CF
 	return
 
 FallarborTown_BattleTentLobby_Movement_2001FE: @ 82001FE
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 FallarborTown_BattleTentLobby_Movement_200202: @ 8200202
-	step_up
-	step_54
+	walk_up
+	set_invisible
 	step_end
 
 FallarborTown_BattleTentLobby_Movement_200205: @ 8200205
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 FallarborTown_BattleTentLobby_Movement_200209: @ 8200209
-	step_up
-	step_up
-	step_54
+	walk_up
+	walk_up
+	set_invisible
 	step_end
 
 FallarborTown_BattleTentLobby_EventScript_20020D:: @ 820020D
diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc
index 1cc3999f7..15f5d2b9e 100644
--- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc
+++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc
@@ -54,31 +54,31 @@ FallarborTown_PokemonCenter_1F_EventScript_200C48:: @ 8200C48
 	end
 
 FallarborTown_PokemonCenter_1F_Movement_200C53: @ 8200C53
-	step_right
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_13
+	walk_right
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	delay_8
 	step_end
 
 FallarborTown_PokemonCenter_1F_Movement_200C60: @ 8200C60
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_13
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	delay_8
 	step_end
 
 FallarborTown_PokemonCenter_1F_Text_200C6B: @ 8200C6B
diff --git a/data/scripts/maps/FarawayIsland_Interior.inc b/data/scripts/maps/FarawayIsland_Interior.inc
index 42b18983f..e7d67431d 100644
--- a/data/scripts/maps/FarawayIsland_Interior.inc
+++ b/data/scripts/maps/FarawayIsland_Interior.inc
@@ -72,51 +72,51 @@ FarawayIsland_Interior_EventScript_267DA2:: @ 8267DA2
 	end
 
 FarawayIsland_Interior_Movement_267DCE: @ 8267DCE
-	step_up
-	step_up
-	step_up
-	step_25
-	step_54
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_down
+	set_invisible
 	step_end
 
 FarawayIsland_Interior_Movement_267DD4: @ 8267DD4
-	step_55
+	set_visible
 	step_end
 
 FarawayIsland_Interior_Movement_267DD6: @ 8267DD6
-	step_40
-	step_16
-	step_16
-	step_41
-	step_1d
-	step_1d
+	lock_facing_direction
+	walk_fast_up
+	walk_fast_up
+	unlock_facing_direction
+	walk_in_place_down
+	walk_in_place_down
 	step_end
 
 FarawayIsland_Interior_Movement_267DDD: @ 8267DDD
-	step_40
-	step_16
-	step_16
-	step_41
-	step_1e
-	step_1e
+	lock_facing_direction
+	walk_fast_up
+	walk_fast_up
+	unlock_facing_direction
+	walk_in_place_up
+	walk_in_place_up
 	step_end
 
 FarawayIsland_Interior_Movement_267DE4: @ 8267DE4
-	step_40
-	step_16
-	step_16
-	step_41
-	step_20
-	step_20
+	lock_facing_direction
+	walk_fast_up
+	walk_fast_up
+	unlock_facing_direction
+	walk_in_place_right
+	walk_in_place_right
 	step_end
 
 FarawayIsland_Interior_Movement_267DEB: @ 8267DEB
-	step_40
-	step_16
-	step_16
-	step_41
-	step_1f
-	step_1f
+	lock_facing_direction
+	walk_fast_up
+	walk_fast_up
+	unlock_facing_direction
+	walk_in_place_left
+	walk_in_place_left
 	step_end
 
 FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2
diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc
index 0b4b71c2b..4a28a180b 100644
--- a/data/scripts/maps/FortreeCity.inc
+++ b/data/scripts/maps/FortreeCity.inc
@@ -87,7 +87,7 @@ FortreeCity_EventScript_1E2645:: @ 81E2645
 	end
 
 FortreeCity_Movement_1E2674: @ 81E2674
-	step_right
+	walk_right
 	step_end
 
 FortreeCity_Text_1E2676: @ 81E2676
diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc
index 521e99021..27ead9ec2 100644
--- a/data/scripts/maps/FortreeCity_House4.inc
+++ b/data/scripts/maps/FortreeCity_House4.inc
@@ -49,11 +49,11 @@ FortreeCity_House4_EventScript_217D06:: @ 8217D06
 	end
 
 FortreeCity_House4_Movement_217D1A: @ 8217D1A
-	step_15
-	step_15
-	step_18
-	step_25
-	step_13
+	walk_fast_down
+	walk_fast_down
+	walk_fast_right
+	walk_in_place_fastest_down
+	delay_8
 	step_end
 
 FortreeCity_House4_EventScript_217D20:: @ 8217D20
diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc
index 9d61bc1a5..b057a0548 100644
--- a/data/scripts/maps/GraniteCave_StevensRoom.inc
+++ b/data/scripts/maps/GraniteCave_StevensRoom.inc
@@ -58,30 +58,30 @@ GraniteCave_StevensRoom_EventScript_22DD3C:: @ 822DD3C
 	return
 
 GraniteCave_StevensRoom_Movement_22DD45: @ 822DD45
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_13
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	delay_8
 	step_end
 
 GraniteCave_StevensRoom_Movement_22DD4C: @ 822DD4C
-	step_14
-	step_14
-	step_14
-	step_26
+	delay_16
+	delay_16
+	delay_16
+	walk_in_place_fastest_up
 	step_end
 
 GraniteCave_StevensRoom_Movement_22DD51: @ 822DD51
-	step_left
-	step_up
-	step_up
-	step_up
-	step_right
-	step_up
-	step_up
-	step_13
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_up
+	walk_up
+	delay_8
 	step_end
 
 GraniteCave_StevensRoom_Text_22DD5A: @ 822DD5A
diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc
index 0631a5d33..5670d9b6e 100644
--- a/data/scripts/maps/LavaridgeTown.inc
+++ b/data/scripts/maps/LavaridgeTown.inc
@@ -162,57 +162,57 @@ LavaridgeTown_EventScript_1EA6C9:: @ 81EA6C9
 	return
 
 LavaridgeTown_Movement_1EA6D4: @ 81EA6D4
-	step_18
-	step_18
-	step_18
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
 	step_end
 
 LavaridgeTown_Movement_1EA6DF: @ 81EA6DF
-	step_14
-	step_13
-	step_28
+	delay_16
+	delay_8
+	walk_in_place_fastest_right
 	step_end
 
 LavaridgeTown_Movement_1EA6E3: @ 81EA6E3
-	step_15
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
+	walk_fast_down
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
 	step_end
 
 LavaridgeTown_Movement_1EA6ED: @ 81EA6ED
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
 	step_end
 
 LavaridgeTown_Movement_1EA6F4: @ 81EA6F4
-	step_left
-	step_left
-	step_up
+	walk_left
+	walk_left
+	walk_up
 	step_end
 
 LavaridgeTown_Movement_1EA6F8: @ 81EA6F8
-	step_down
+	walk_down
 	step_end
 
 LavaridgeTown_EventScript_1EA6FA:: @ 81EA6FA
-	specialvar VAR_RESULT, player_get_direction_lower_nybble
+	specialvar VAR_RESULT, GetPlayerFacingDirection
 	compare VAR_RESULT, 1
 	goto_eq LavaridgeTown_EventScript_1EA70B
 	end
diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc
index 1c4d21970..1f65b88fd 100644
--- a/data/scripts/maps/LilycoveCity_ContestLobby.inc
+++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc
@@ -160,45 +160,45 @@ LilycoveCity_ContestLobby_EventScript_21A403:: @ 821A403
 	return
 
 LilycoveCity_ContestLobby_Movement_21A407: @ 821A407
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 LilycoveCity_ContestLobby_Movement_21A40F: @ 821A40F
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
 	step_end
 
 LilycoveCity_ContestLobby_Movement_21A418: @ 821A418
-	step_27
+	walk_in_place_fastest_left
 	step_end
 
 LilycoveCity_ContestLobby_Movement_21A41A: @ 821A41A
-	step_down
-	step_down
-	step_down
+	walk_down
+	walk_down
+	walk_down
 	step_end
 
 LilycoveCity_ContestLobby_Movement_21A41E: @ 821A41E
-	step_14
-	step_14
-	step_14
-	step_14
-	step_16
-	step_16
-	step_16
-	step_28
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_in_place_fastest_right
 	step_end
 
 LilycoveCity_ContestLobby_EventScript_21A427:: @ 821A427
@@ -275,46 +275,46 @@ LilycoveCity_ContestLobby_EventScript_21A4E4:: @ 821A4E4
 	return
 
 LilycoveCity_ContestLobby_Movement_21A533: @ 821A533
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
 	step_end
 
 LilycoveCity_ContestLobby_Movement_21A53C: @ 821A53C
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
 	step_end
 
 LilycoveCity_ContestLobby_Movement_21A545: @ 821A545
-	step_28
+	walk_in_place_fastest_right
 	step_end
 
 LilycoveCity_ContestLobby_Movement_21A547: @ 821A547
-	step_down
-	step_down
-	step_down
+	walk_down
+	walk_down
+	walk_down
 	step_end
 
 LilycoveCity_ContestLobby_Movement_21A54B: @ 821A54B
-	step_14
-	step_14
-	step_14
-	step_14
-	step_16
-	step_16
-	step_16
-	step_27
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_in_place_fastest_left
 	step_end
 
 LilycoveCity_ContestLobby_EventScript_21A554:: @ 821A554
@@ -433,47 +433,47 @@ LilycoveCity_ContestLobby_EventScript_21A670:: @ 821A670
 	return
 
 LilycoveCity_ContestLobby_Movement_21A6E8: @ 821A6E8
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_13
-	step_54
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	delay_8
+	set_invisible
 	step_end
 
 LilycoveCity_ContestLobby_Movement_21A6F2: @ 821A6F2
-	step_27
-	step_left
+	walk_in_place_fastest_left
+	walk_left
 	step_end
 
 LilycoveCity_ContestLobby_Movement_21A6F5: @ 821A6F5
-	step_left
-	step_left
-	step_25
+	walk_left
+	walk_left
+	walk_in_place_fastest_down
 	step_end
 
 LilycoveCity_ContestLobby_Movement_21A6F9: @ 821A6F9
-	step_down
-	step_down
-	step_26
+	walk_down
+	walk_down
+	walk_in_place_fastest_up
 	step_end
 
 LilycoveCity_ContestLobby_Movement_21A6FD: @ 821A6FD
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_13
-	step_54
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	delay_8
+	set_invisible
 	step_end
 
 LilycoveCity_ContestLobby_Movement_21A706: @ 821A706
-	step_28
+	walk_in_place_fastest_right
 	step_end
 
 LilycoveCity_ContestLobby_EventScript_21A708:: @ 821A708
@@ -959,48 +959,48 @@ LilycoveCity_ContestLobby_EventScript_21AC49:: @ 821AC49
 	return
 
 LilycoveCity_ContestLobby_Movement_21ACD0: @ 821ACD0
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_up
-	step_up
-	step_13
-	step_54
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	delay_8
+	set_invisible
 	step_end
 
 LilycoveCity_ContestLobby_Movement_21ACDB: @ 821ACDB
-	step_right
+	walk_right
 	step_end
 
 LilycoveCity_ContestLobby_Movement_21ACDD: @ 821ACDD
-	step_right
-	step_right
-	step_25
+	walk_right
+	walk_right
+	walk_in_place_fastest_down
 	step_end
 
 LilycoveCity_ContestLobby_Movement_21ACE1: @ 821ACE1
-	step_down
-	step_down
-	step_26
+	walk_down
+	walk_down
+	walk_in_place_fastest_up
 	step_end
 
 LilycoveCity_ContestLobby_Movement_21ACE5: @ 821ACE5
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_up
-	step_up
-	step_13
-	step_54
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	delay_8
+	set_invisible
 	step_end
 
 LilycoveCity_ContestLobby_Movement_21ACEF: @ 821ACEF
-	step_27
+	walk_in_place_fastest_left
 	step_end
 
 LilycoveCity_ContestLobby_EventScript_21ACF1:: @ 821ACF1
diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc
index 5f2b79a5d..3468299a9 100644
--- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc
+++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc
@@ -59,20 +59,20 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_218211:: @ 8218211
 	end
 
 LilycoveCity_CoveLilyMotel_1F_Movement_218259: @ 8218259
-	step_03
-	step_40
-	step_left
-	step_41
+	face_right
+	lock_facing_direction
+	walk_left
+	unlock_facing_direction
 	step_end
 
 LilycoveCity_CoveLilyMotel_1F_Movement_21825E: @ 821825E
-	step_up
+	walk_up
 	step_end
 
 LilycoveCity_CoveLilyMotel_1F_Movement_218260: @ 8218260
-	step_00
-	step_down
-	step_01
+	face_down
+	walk_down
+	face_up
 	step_end
 
 LilycoveCity_CoveLilyMotel_1F_Text_218264: @ 8218264
diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc
index f57ca14b5..6357326c1 100644
--- a/data/scripts/maps/LilycoveCity_Harbor.inc
+++ b/data/scripts/maps/LilycoveCity_Harbor.inc
@@ -454,16 +454,16 @@ LilycoveCity_Harbor_EventScript_21E626:: @ 821E626
 	end
 
 LilycoveCity_Harbor_Movement_21E630: @ 821E630
-	step_right
-	step_26
+	walk_right
+	walk_in_place_fastest_up
 	step_end
 
 LilycoveCity_Harbor_Movement_21E633: @ 821E633
-	step_up
+	walk_up
 	step_end
 
 LilycoveCity_Harbor_Movement_21E635: @ 821E635
-	step_up
+	walk_up
 	step_end
 
 LilycoveCity_Harbor_EventScript_21E637:: @ 821E637
@@ -491,16 +491,16 @@ LilycoveCity_Harbor_EventScript_21E661:: @ 821E661
 	return
 
 LilycoveCity_Harbor_Movement_21E66C: @ 821E66C
-	step_28
-	step_40
-	step_left
-	step_41
+	walk_in_place_fastest_right
+	lock_facing_direction
+	walk_left
+	unlock_facing_direction
 	step_end
 
 LilycoveCity_Harbor_Movement_21E671: @ 821E671
-	step_40
-	step_down
-	step_41
+	lock_facing_direction
+	walk_down
+	unlock_facing_direction
 	step_end
 
 LilycoveCity_Harbor_EventScript_21E675:: @ 821E675
@@ -538,43 +538,43 @@ LilycoveCity_Harbor_EventScript_21E6BA:: @ 821E6BA
 	return
 
 LilycoveCity_Harbor_Movement_21E6D3: @ 821E6D3
-	step_26
-	step_13
-	step_54
+	walk_in_place_fastest_up
+	delay_8
+	set_invisible
 	step_end
 
 LilycoveCity_Harbor_Movement_21E6D7: @ 821E6D7
-	step_14
-	step_up
-	step_14
-	step_54
+	delay_16
+	walk_up
+	delay_16
+	set_invisible
 	step_end
 
 LilycoveCity_Harbor_Movement_21E6DC: @ 821E6DC
-	step_14
-	step_14
-	step_14
-	step_right
-	step_26
-	step_14
-	step_54
+	delay_16
+	delay_16
+	delay_16
+	walk_right
+	walk_in_place_fastest_up
+	delay_16
+	set_invisible
 	step_end
 
 LilycoveCity_Harbor_Movement_21E6E4: @ 821E6E4
-	step_14
-	step_right
-	step_26
-	step_14
-	step_54
+	delay_16
+	walk_right
+	walk_in_place_fastest_up
+	delay_16
+	set_invisible
 	step_end
 
 LilycoveCity_Harbor_Movement_21E6EA: @ 821E6EA
-	step_14
-	step_14
-	step_14
-	step_up
-	step_14
-	step_54
+	delay_16
+	delay_16
+	delay_16
+	walk_up
+	delay_16
+	set_invisible
 	step_end
 
 LilycoveCity_Harbor_Text_21E6F1: @ 821E6F1
diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc
index 8103a623c..507997416 100644
--- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc
+++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc
@@ -70,22 +70,22 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218D84:: @ 8218D84
 	end
 
 LilycoveCity_LilycoveMuseum_1F_Movement_218D99: @ 8218D99
-	step_up
+	walk_up
 	step_end
 
 LilycoveCity_LilycoveMuseum_1F_Movement_218D9B: @ 8218D9B
-	step_left
-	step_up
+	walk_left
+	walk_up
 	step_end
 
 LilycoveCity_LilycoveMuseum_1F_Movement_218D9E: @ 8218D9E
-	step_right
-	step_up
+	walk_right
+	walk_up
 	step_end
 
 LilycoveCity_LilycoveMuseum_1F_Movement_218DA1: @ 8218DA1
-	step_up
-	step_up
+	walk_up
+	walk_up
 	step_end
 
 LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4:: @ 8218DA4
diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc
index 97dba4704..6b4f0f3da 100644
--- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc
+++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc
@@ -86,12 +86,12 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_219808:: @ 8219808
 	end
 
 LilycoveCity_LilycoveMuseum_2F_Movement_219861: @ 8219861
-	step_27
+	walk_in_place_fastest_left
 	step_end
 
 LilycoveCity_LilycoveMuseum_2F_Movement_219863: @ 8219863
-	step_01
-	step_14
+	face_up
+	delay_16
 	step_end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_219866:: @ 8219866
diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc
index cdcef8e9a..74146fc7e 100644
--- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc
+++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc
@@ -29,35 +29,35 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A:: @ 821C79A
 	end
 
 LilycoveCity_PokemonTrainerFanClub_Movement_21C7F5: @ 821C7F5
-	step_13
-	step_25
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
+	delay_8
+	walk_in_place_fastest_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
 	step_end
 
 LilycoveCity_PokemonTrainerFanClub_Movement_21C7FD: @ 821C7FD
-	step_17
-	step_17
-	step_15
-	step_15
-	step_17
-	step_15
+	walk_fast_left
+	walk_fast_left
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_down
 	step_end
 
 LilycoveCity_PokemonTrainerFanClub_Movement_21C804: @ 821C804
-	step_down
-	step_28
+	walk_down
+	walk_in_place_fastest_right
 	step_end
 
 LilycoveCity_PokemonTrainerFanClub_Movement_21C807: @ 821C807
-	step_49
-	step_16
-	step_16
-	step_18
-	step_25
+	jump_in_place_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_in_place_fastest_down
 	step_end
 
 LilycoveCity_PokemonTrainerFanClub_MapScript1_21C80D: @ 821C80D
diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc
index 0fcdc46d5..67b1f9381 100644
--- a/data/scripts/maps/LittlerootTown.inc
+++ b/data/scripts/maps/LittlerootTown.inc
@@ -146,42 +146,42 @@ LittlerootTown_EventScript_1E7F17:: @ 81E7F17
 	return
 
 LittlerootTown_Movement_1E7F98: @ 81E7F98
-	step_down
+	walk_down
 	step_end
 
 LittlerootTown_Movement_1E7F9A: @ 81E7F9A
-	step_down
-	step_27
+	walk_down
+	walk_in_place_fastest_left
 	step_end
 
 LittlerootTown_Movement_1E7F9D: @ 81E7F9D
-	step_14
-	step_13
-	step_up
+	delay_16
+	delay_8
+	walk_up
 	step_end
 
 LittlerootTown_Movement_1E7FA1: @ 81E7FA1
-	step_up
-	step_54
+	walk_up
+	set_invisible
 	step_end
 
 LittlerootTown_Movement_1E7FA4: @ 81E7FA4
-	step_14
-	step_13
-	step_right
-	step_26
+	delay_16
+	delay_8
+	walk_right
+	walk_in_place_fastest_up
 	step_end
 
 LittlerootTown_Movement_1E7FA9: @ 81E7FA9
-	step_up
-	step_up
+	walk_up
+	walk_up
 	step_end
 
 LittlerootTown_Movement_1E7FAC: @ 81E7FAC
-	step_45
-	step_14
-	step_14
-	step_14
+	jump_right
+	delay_16
+	delay_16
+	delay_16
 	step_end
 
 LittlerootTown_EventScript_1E7FB1:: @ 81E7FB1
@@ -287,41 +287,41 @@ LittlerootTown_EventScript_1E80AD:: @ 81E80AD
 	return
 
 LittlerootTown_Movement_1E80D1: @ 81E80D1
-	step_03
-	step_13
-	step_51
-	step_49
-	step_13
-	step_18
-	step_18
-	step_18
-	step_18
-	step_16
-	step_16
-	step_17
-	step_00
+	face_right
+	delay_8
+	disable_jump_landing_ground_effect
+	jump_in_place_right
+	delay_8
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_left
+	face_down
 	step_end
 
 LittlerootTown_Movement_1E80DF: @ 81E80DF
-	step_down
+	walk_down
 	step_end
 
 LittlerootTown_Movement_1E80E1: @ 81E80E1
-	step_right
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_25
+	walk_right
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_in_place_fastest_down
 	step_end
 
 LittlerootTown_Movement_1E80EB: @ 81E80EB
-	step_40
-	step_down
-	step_41
+	lock_facing_direction
+	walk_down
+	unlock_facing_direction
 	step_end
 
 LittlerootTown_EventScript_1E80EF:: @ 81E80EF
@@ -335,27 +335,27 @@ LittlerootTown_EventScript_1E80EF:: @ 81E80EF
 	end
 
 LittlerootTown_Movement_1E810B: @ 81E810B
-	step_03
-	step_13
-	step_51
-	step_49
-	step_13
-	step_18
-	step_18
-	step_18
-	step_16
-	step_16
-	step_18
-	step_00
+	face_right
+	delay_8
+	disable_jump_landing_ground_effect
+	jump_in_place_right
+	delay_8
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	face_down
 	step_end
 
 LittlerootTown_Movement_1E8118: @ 81E8118
-	step_left
-	step_down
-	step_left
-	step_left
-	step_left
-	step_25
+	walk_left
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_down
 	step_end
 
 LittlerootTown_EventScript_1E811F:: @ 81E811F
@@ -739,153 +739,153 @@ LittlerootTown_EventScript_1E85AB:: @ 81E85AB
 	return
 
 LittlerootTown_Movement_1E85D1: @ 81E85D1
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 LittlerootTown_Movement_1E85D8: @ 81E85D8
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 LittlerootTown_Movement_1E85DF: @ 81E85DF
-	step_right
-	step_right
-	step_right
-	step_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 LittlerootTown_Movement_1E85E4: @ 81E85E4
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 LittlerootTown_Movement_1E85EA: @ 81E85EA
-	step_right
-	step_right
+	walk_right
+	walk_right
 	step_end
 
 LittlerootTown_Movement_1E85ED: @ 81E85ED
-	step_right
-	step_right
-	step_right
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 LittlerootTown_Movement_1E85F1: @ 81E85F1
-	step_left
-	step_left
-	step_left
+	walk_left
+	walk_left
+	walk_left
 	step_end
 
 LittlerootTown_Movement_1E85F5: @ 81E85F5
-	step_left
-	step_left
+	walk_left
+	walk_left
 	step_end
 
 LittlerootTown_Movement_1E85F8: @ 81E85F8
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
 	step_end
 
 LittlerootTown_Movement_1E85FE: @ 81E85FE
-	step_left
-	step_left
-	step_left
-	step_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
 	step_end
 
 LittlerootTown_Movement_1E8603: @ 81E8603
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
 	step_end
 
 LittlerootTown_Movement_1E8609: @ 81E8609
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
 	step_end
 
 LittlerootTown_Movement_1E860F: @ 81E860F
-	step_left
-	step_left
-	step_left
-	step_left
-	step_26
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_up
 	step_end
 
 LittlerootTown_Movement_1E8615: @ 81E8615
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_26
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_up
 	step_end
 
 LittlerootTown_Movement_1E861C: @ 81E861C
-	step_left
-	step_left
-	step_26
+	walk_left
+	walk_left
+	walk_in_place_fastest_up
 	step_end
 
 LittlerootTown_Movement_1E8620: @ 81E8620
-	step_left
-	step_left
-	step_left
-	step_26
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_up
 	step_end
 
 LittlerootTown_Movement_1E8625: @ 81E8625
-	step_right
-	step_right
-	step_right
-	step_26
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
 	step_end
 
 LittlerootTown_Movement_1E862A: @ 81E862A
-	step_right
-	step_right
-	step_26
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
 	step_end
 
 LittlerootTown_Movement_1E862E: @ 81E862E
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_26
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
 	step_end
 
 LittlerootTown_Movement_1E8635: @ 81E8635
-	step_right
-	step_right
-	step_right
-	step_right
-	step_26
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
 	step_end
 
 LittlerootTown_Movement_1E863B: @ 81E863B
-	step_up
+	walk_up
 	step_end
 
 LittlerootTown_EventScript_1E863D:: @ 81E863D
diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc
index 0f3fa1a0e..53825a84c 100644
--- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc
+++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc
@@ -71,7 +71,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F7814:: @ 81F7814
 	end
 
 LittlerootTown_BrendansHouse_1F_Movement_1F783A: @ 81F783A
-	step_up
+	walk_up
 	step_end
 
 LittlerootTown_BrendansHouse_1F_EventScript_1F783C:: @ 81F783C
@@ -106,12 +106,12 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F785E:: @ 81F785E
 	end
 
 LittlerootTown_BrendansHouse_1F_Movement_1F789C: @ 81F789C
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 LittlerootTown_BrendansHouse_1F_EventScript_1F78A3:: @ 81F78A3
@@ -202,29 +202,29 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F79A2:: @ 81F79A2
 	return
 
 LittlerootTown_BrendansHouse_1F_Movement_1F79AD: @ 81F79AD
-	step_27
-	step_left
-	step_26
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_in_place_fastest_left
+	walk_left
+	walk_in_place_fastest_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_1F79B5: @ 81F79B5
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_1F79B9: @ 81F79B9
-	step_28
-	step_right
-	step_26
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_in_place_fastest_right
+	walk_right
+	walk_in_place_fastest_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 LittlerootTown_BrendansHouse_1F_EventScript_1F79C1:: @ 81F79C1
@@ -246,52 +246,52 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F79E5:: @ 81F79E5
 	return
 
 LittlerootTown_BrendansHouse_1F_Movement_1F79F7: @ 81F79F7
-	step_14
-	step_13
-	step_28
+	delay_16
+	delay_8
+	walk_in_place_fastest_right
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_1F79FB: @ 81F79FB
-	step_14
-	step_13
-	step_28
-	step_14
-	step_14
-	step_26
+	delay_16
+	delay_8
+	walk_in_place_fastest_right
+	delay_16
+	delay_16
+	walk_in_place_fastest_up
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_1F7A02: @ 81F7A02
-	step_14
-	step_13
-	step_27
+	delay_16
+	delay_8
+	walk_in_place_fastest_left
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_1F7A06: @ 81F7A06
-	step_28
-	step_right
-	step_26
-	step_up
-	step_up
+	walk_in_place_fastest_right
+	walk_right
+	walk_in_place_fastest_up
+	walk_up
+	walk_up
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_1F7A0C: @ 81F7A0C
-	step_28
-	step_right
-	step_26
-	step_up
-	step_up
-	step_27
-	step_left
-	step_26
-	step_up
+	walk_in_place_fastest_right
+	walk_right
+	walk_in_place_fastest_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_left
+	walk_left
+	walk_in_place_fastest_up
+	walk_up
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_1F7A16: @ 81F7A16
-	step_27
-	step_left
-	step_26
-	step_up
-	step_up
+	walk_in_place_fastest_left
+	walk_left
+	walk_in_place_fastest_up
+	walk_up
+	walk_up
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Text_1F7A1C: @ 81F7A1C
diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc
index a5223d38a..429c933fc 100644
--- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc
+++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc
@@ -139,110 +139,110 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8594:: @ 81F8594
 	return
 
 LittlerootTown_BrendansHouse_2F_Movement_1F85BC: @ 81F85BC
-	step_down
-	step_down
-	step_27
+	walk_down
+	walk_down
+	walk_in_place_fastest_left
 	step_end
 
 LittlerootTown_BrendansHouse_2F_Movement_1F85C0: @ 81F85C0
-	step_left
-	step_left
-	step_down
-	step_down
-	step_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_left
 	step_end
 
 LittlerootTown_BrendansHouse_2F_Movement_1F85C6: @ 81F85C6
-	step_up
-	step_up
-	step_up
-	step_left
-	step_left
-	step_left
-	step_left
-	step_26
+	walk_up
+	walk_up
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_up
 	step_end
 
 LittlerootTown_BrendansHouse_2F_Movement_1F85CF: @ 81F85CF
-	step_14
-	step_26
-	step_14
-	step_14
-	step_14
-	step_14
-	step_27
+	delay_16
+	walk_in_place_fastest_up
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_in_place_fastest_left
 	step_end
 
 LittlerootTown_BrendansHouse_2F_Movement_1F85D7: @ 81F85D7
-	step_left
-	step_left
-	step_left
+	walk_left
+	walk_left
+	walk_left
 	step_end
 
 LittlerootTown_BrendansHouse_2F_Movement_1F85DB: @ 81F85DB
-	step_up
-	step_left
-	step_left
-	step_left
-	step_left
-	step_26
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_up
 	step_end
 
 LittlerootTown_BrendansHouse_2F_Movement_1F85E2: @ 81F85E2
-	step_14
-	step_26
-	step_14
-	step_14
-	step_27
+	delay_16
+	walk_in_place_fastest_up
+	delay_16
+	delay_16
+	walk_in_place_fastest_left
 	step_end
 
 LittlerootTown_BrendansHouse_2F_Movement_1F85E8: @ 81F85E8
-	step_left
-	step_left
-	step_down
-	step_27
+	walk_left
+	walk_left
+	walk_down
+	walk_in_place_fastest_left
 	step_end
 
 LittlerootTown_BrendansHouse_2F_Movement_1F85ED: @ 81F85ED
-	step_up
-	step_up
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_26
+	walk_up
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_up
 	step_end
 
 LittlerootTown_BrendansHouse_2F_Movement_1F85F6: @ 81F85F6
-	step_13
-	step_14
-	step_26
-	step_14
-	step_14
-	step_27
+	delay_8
+	delay_16
+	walk_in_place_fastest_up
+	delay_16
+	delay_16
+	walk_in_place_fastest_left
 	step_end
 
 LittlerootTown_BrendansHouse_2F_Movement_1F85FD: @ 81F85FD
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_25
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_down
 	step_end
 
 LittlerootTown_BrendansHouse_2F_Movement_1F8604: @ 81F8604
-	step_up
-	step_left
-	step_left
-	step_26
+	walk_up
+	walk_left
+	walk_left
+	walk_in_place_fastest_up
 	step_end
 
 LittlerootTown_BrendansHouse_2F_Movement_1F8609: @ 81F8609
-	step_14
-	step_14
-	step_27
+	delay_16
+	delay_16
+	walk_in_place_fastest_left
 	step_end
 
 gUnknown_081F860D:: @ 81F860D
diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc
index e0229b9ea..9fc2fe53e 100644
--- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc
+++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc
@@ -71,7 +71,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8964:: @ 81F8964
 	end
 
 LittlerootTown_MaysHouse_1F_Movement_1F898A: @ 81F898A
-	step_up
+	walk_up
 	step_end
 
 LittlerootTown_MaysHouse_1F_EventScript_1F898C:: @ 81F898C
@@ -106,12 +106,12 @@ LittlerootTown_MaysHouse_1F_EventScript_1F89AE:: @ 81F89AE
 	end
 
 LittlerootTown_MaysHouse_1F_Movement_1F89EC: @ 81F89EC
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
 	step_end
 
 LittlerootTown_BrendansHouse_1F_EventScript_1F89F3:: @ 81F89F3
@@ -241,29 +241,29 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8B4B:: @ 81F8B4B
 	return
 
 LittlerootTown_MaysHouse_1F_Movement_1F8B56: @ 81F8B56
-	step_27
-	step_left
-	step_26
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_in_place_fastest_left
+	walk_left
+	walk_in_place_fastest_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 LittlerootTown_MaysHouse_1F_Movement_1F8B5E: @ 81F8B5E
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 LittlerootTown_MaysHouse_1F_Movement_1F8B62: @ 81F8B62
-	step_28
-	step_right
-	step_26
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_in_place_fastest_right
+	walk_right
+	walk_in_place_fastest_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 LittlerootTown_MaysHouse_1F_EventScript_1F8B6A:: @ 81F8B6A
@@ -285,52 +285,52 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8B8E:: @ 81F8B8E
 	return
 
 LittlerootTown_MaysHouse_1F_Movement_1F8BA0: @ 81F8BA0
-	step_14
-	step_13
-	step_28
+	delay_16
+	delay_8
+	walk_in_place_fastest_right
 	step_end
 
 LittlerootTown_MaysHouse_1F_Movement_1F8BA4: @ 81F8BA4
-	step_14
-	step_13
-	step_28
-	step_14
-	step_14
-	step_26
+	delay_16
+	delay_8
+	walk_in_place_fastest_right
+	delay_16
+	delay_16
+	walk_in_place_fastest_up
 	step_end
 
 LittlerootTown_MaysHouse_1F_Movement_1F8BAB: @ 81F8BAB
-	step_14
-	step_13
-	step_27
+	delay_16
+	delay_8
+	walk_in_place_fastest_left
 	step_end
 
 LittlerootTown_MaysHouse_1F_Movement_1F8BAF: @ 81F8BAF
-	step_28
-	step_right
-	step_26
-	step_up
-	step_up
+	walk_in_place_fastest_right
+	walk_right
+	walk_in_place_fastest_up
+	walk_up
+	walk_up
 	step_end
 
 LittlerootTown_MaysHouse_1F_Movement_1F8BB5: @ 81F8BB5
-	step_28
-	step_right
-	step_26
-	step_up
-	step_up
-	step_27
-	step_left
-	step_26
-	step_up
+	walk_in_place_fastest_right
+	walk_right
+	walk_in_place_fastest_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_left
+	walk_left
+	walk_in_place_fastest_up
+	walk_up
 	step_end
 
 LittlerootTown_MaysHouse_1F_Movement_1F8BBF: @ 81F8BBF
-	step_27
-	step_left
-	step_26
-	step_up
-	step_up
+	walk_in_place_fastest_left
+	walk_left
+	walk_in_place_fastest_up
+	walk_up
+	walk_up
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Text_1F8BC5: @ 81F8BC5
diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
index f300b5849..5501f5ad5 100644
--- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
+++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
@@ -140,111 +140,111 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9440:: @ 81F9440
 	return
 
 LittlerootTown_MaysHouse_2F_Movement_1F946F: @ 81F946F
-	step_down
-	step_down
-	step_28
+	walk_down
+	walk_down
+	walk_in_place_fastest_right
 	step_end
 
 LittlerootTown_MaysHouse_2F_Movement_1F9473: @ 81F9473
-	step_right
-	step_right
-	step_down
-	step_down
-	step_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_right
 	step_end
 
 LittlerootTown_MaysHouse_2F_Movement_1F9479: @ 81F9479
-	step_up
-	step_up
-	step_up
-	step_28
-	step_right
-	step_right
-	step_right
-	step_right
-	step_26
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
 	step_end
 
 LittlerootTown_MaysHouse_2F_Movement_1F9483: @ 81F9483
-	step_14
-	step_26
-	step_14
-	step_14
-	step_14
-	step_14
-	step_28
+	delay_16
+	walk_in_place_fastest_up
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_in_place_fastest_right
 	step_end
 
 LittlerootTown_MaysHouse_2F_Movement_1F948B: @ 81F948B
-	step_right
-	step_right
-	step_right
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 LittlerootTown_MaysHouse_2F_Movement_1F948F: @ 81F948F
-	step_up
-	step_28
-	step_right
-	step_right
-	step_right
-	step_right
-	step_26
+	walk_up
+	walk_in_place_fastest_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
 	step_end
 
 LittlerootTown_MaysHouse_2F_Movement_1F9497: @ 81F9497
-	step_14
-	step_26
-	step_14
-	step_14
-	step_28
+	delay_16
+	walk_in_place_fastest_up
+	delay_16
+	delay_16
+	walk_in_place_fastest_right
 	step_end
 
 LittlerootTown_MaysHouse_2F_Movement_1F949D: @ 81F949D
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_25
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_down
 	step_end
 
 LittlerootTown_MaysHouse_2F_Movement_1F94A4: @ 81F94A4
-	step_up
-	step_right
-	step_right
-	step_26
+	walk_up
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
 	step_end
 
 LittlerootTown_MaysHouse_2F_Movement_1F94A9: @ 81F94A9
-	step_14
-	step_14
-	step_28
+	delay_16
+	delay_16
+	walk_in_place_fastest_right
 	step_end
 
 LittlerootTown_MaysHouse_2F_Movement_1F94AD: @ 81F94AD
-	step_right
-	step_right
-	step_down
-	step_28
+	walk_right
+	walk_right
+	walk_down
+	walk_in_place_fastest_right
 	step_end
 
 LittlerootTown_MaysHouse_2F_Movement_1F94B2: @ 81F94B2
-	step_up
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_26
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
 	step_end
 
 LittlerootTown_MaysHouse_2F_Movement_1F94BB: @ 81F94BB
-	step_14
-	step_26
-	step_14
-	step_14
-	step_28
+	delay_16
+	walk_in_place_fastest_up
+	delay_16
+	delay_16
+	walk_in_place_fastest_right
 	step_end
 
 LittlerootTown_BrendansHouse_2F_EventScript_1F94C1:: @ 81F94C1
diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc
index c7d968d78..75b83b6a1 100644
--- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc
+++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc
@@ -142,13 +142,13 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E67:: @ 81F9E67
 	end
 
 LittlerootTown_ProfessorBirchsLab_Movement_1F9E78: @ 81F9E78
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80
@@ -211,35 +211,35 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9F3C:: @ 81F9F3C
 	return
 
 LittlerootTown_ProfessorBirchsLab_Movement_1F9F46: @ 81F9F46
-	step_left
-	step_25
-	step_14
-	step_14
-	step_right
-	step_25
-	step_14
-	step_14
-	step_right
-	step_down
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_26
+	walk_left
+	walk_in_place_fastest_down
+	delay_16
+	delay_16
+	walk_right
+	walk_in_place_fastest_down
+	delay_16
+	delay_16
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
 	step_end
 
 LittlerootTown_ProfessorBirchsLab_Movement_1F9F58: @ 81F9F58
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_up
-	step_left
-	step_25
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_left
+	walk_in_place_fastest_down
 	step_end
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1F9F62:: @ 81F9F62
@@ -252,13 +252,13 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9F62:: @ 81F9F62
 	end
 
 LittlerootTown_ProfessorBirchsLab_Movement_1F9F7C: @ 81F9F7C
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84:: @ 81F9F84
@@ -591,8 +591,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA3D7:: @ 81FA3D7
 	return
 
 LittlerootTown_ProfessorBirchsLab_Movement_1FA3E0: @ 81FA3E0
-	step_down
-	step_27
+	walk_down
+	walk_in_place_fastest_left
 	step_end
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3:: @ 81FA3E3
diff --git a/data/scripts/maps/MagmaHideout_4F.inc b/data/scripts/maps/MagmaHideout_4F.inc
index cb0580580..0cc0fea56 100644
--- a/data/scripts/maps/MagmaHideout_4F.inc
+++ b/data/scripts/maps/MagmaHideout_4F.inc
@@ -77,35 +77,35 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560
 	end
 
 MagmaHideout_4F_Movement_23A672: @ 823A672
-	step_14
-	step_14
-	slow_step_down
-	step_14
-	step_14
-	step_14
-	slow_step_down
-	step_14
-	step_14
-	step_14
+	delay_16
+	delay_16
+	walk_slow_down
+	delay_16
+	delay_16
+	delay_16
+	walk_slow_down
+	delay_16
+	delay_16
+	delay_16
 	step_end
 
 MagmaHideout_4F_Movement_23A67D: @ 823A67D
-	step_32
-	step_32
+	slide_up
+	slide_up
 	step_end
 
 MagmaHideout_4F_Movement_23A680: @ 823A680
-	step_02
-	step_14
-	step_03
-	step_14
-	step_02
-	step_14
-	step_03
-	step_14
-	step_01
-	step_14
-	step_14
+	face_left
+	delay_16
+	face_right
+	delay_16
+	face_left
+	delay_16
+	face_right
+	delay_16
+	face_up
+	delay_16
+	delay_16
 	step_end
 
 MagmaHideout_4F_EventScript_23A68C:: @ 823A68C
diff --git a/data/scripts/maps/MarineCave_End.inc b/data/scripts/maps/MarineCave_End.inc
index c8e7c6fad..9c821e14f 100644
--- a/data/scripts/maps/MarineCave_End.inc
+++ b/data/scripts/maps/MarineCave_End.inc
@@ -66,13 +66,13 @@ MarineCave_End_EventScript_23B092:: @ 823B092
 	end
 
 MarineCave_End_Movement_23B09D: @ 823B09D
-	step_5e
-	step_62
-	step_14
-	step_14
-	step_63
-	step_14
-	step_14
-	step_63
+	init_affine_anim
+	walk_down_start_affine
+	delay_16
+	delay_16
+	walk_down_affine
+	delay_16
+	delay_16
+	walk_down_affine
 	step_end
 
diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc
index 40578a907..abb527d7f 100644
--- a/data/scripts/maps/MauvilleCity.inc
+++ b/data/scripts/maps/MauvilleCity.inc
@@ -234,191 +234,191 @@ MauvilleCity_EventScript_1DF690:: @ 81DF690
 	end
 
 MauvilleCity_Movement_1DF6A8: @ 81DF6A8
-	step_left
-	step_left
-	step_down
-	step_down
-	step_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_left
 	step_end
 
 MauvilleCity_Movement_1DF6AE: @ 81DF6AE
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
 	step_end
 
 MauvilleCity_Movement_1DF6B4: @ 81DF6B4
-	step_14
-	step_14
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_13
+	delay_16
+	delay_16
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	delay_8
 	step_end
 
 MauvilleCity_Movement_1DF6C0: @ 81DF6C0
-	step_14
-	step_14
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_13
+	delay_16
+	delay_16
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	delay_8
 	step_end
 
 MauvilleCity_Movement_1DF6CC: @ 81DF6CC
-	step_14
-	step_13
-	step_27
+	delay_16
+	delay_8
+	walk_in_place_fastest_left
 	step_end
 
 MauvilleCity_Movement_1DF6D0: @ 81DF6D0
-	step_14
-	step_14
-	step_14
-	step_27
+	delay_16
+	delay_16
+	delay_16
+	walk_in_place_fastest_left
 	step_end
 
 MauvilleCity_Movement_1DF6D5: @ 81DF6D5
-	step_14
-	step_27
+	delay_16
+	walk_in_place_fastest_left
 	step_end
 
 MauvilleCity_Movement_1DF6D8: @ 81DF6D8
-	step_14
-	step_14
-	step_27
+	delay_16
+	delay_16
+	walk_in_place_fastest_left
 	step_end
 
 MauvilleCity_Movement_1DF6DC: @ 81DF6DC
-	step_14
-	step_25
+	delay_16
+	walk_in_place_fastest_down
 	step_end
 
 MauvilleCity_Movement_1DF6DF: @ 81DF6DF
-	step_14
-	step_27
+	delay_16
+	walk_in_place_fastest_left
 	step_end
 
 MauvilleCity_Movement_1DF6E2: @ 81DF6E2
-	step_left
-	step_left
-	step_left
-	step_down
-	step_down
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
 	step_end
 
 MauvilleCity_Movement_1DF6E8: @ 81DF6E8
-	step_left
-	step_down
-	step_down
-	step_left
-	step_left
+	walk_left
+	walk_down
+	walk_down
+	walk_left
+	walk_left
 	step_end
 
 MauvilleCity_Movement_1DF6EE: @ 81DF6EE
-	step_14
-	step_13
-	step_12
-	step_25
+	delay_16
+	delay_8
+	delay_4
+	walk_in_place_fastest_down
 	step_end
 
 MauvilleCity_Movement_1DF6F3: @ 81DF6F3
-	step_right
-	step_right
-	step_26
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
 	step_end
 
 MauvilleCity_Movement_1DF6F7: @ 81DF6F7
-	step_right
-	step_up
+	walk_right
+	walk_up
 	step_end
 
 MauvilleCity_Movement_1DF6FA: @ 81DF6FA
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
 	step_end
 
 MauvilleCity_Movement_1DF703: @ 81DF703
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
 	step_end
 
 MauvilleCity_Movement_1DF70D: @ 81DF70D
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_left
-	step_left
-	step_left
-	step_left
-	step_26
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_up
 	step_end
 
 MauvilleCity_Movement_1DF719: @ 81DF719
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
 	step_end
 
 MauvilleCity_Movement_1DF725: @ 81DF725
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
 	step_end
 
 MauvilleCity_Movement_1DF72F: @ 81DF72F
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
 	step_end
 
 MauvilleCity_EventScript_1DF73A:: @ 81DF73A
diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc
index 03b7928aa..fb76a5fc7 100644
--- a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc
+++ b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc
@@ -10,7 +10,7 @@ MauvilleCity_PokemonCenter_1F_MapScript1_210E66: @ 8210E66
 	end
 
 MauvilleCity_PokemonCenter_1F_EventScript_210E74:: @ 8210E74
-	special ScrSpecial_SetMauvilleOldManMapObjGfx
+	special ScrSpecial_SetMauvilleOldManEventObjGfx
 	end
 
 MauvilleCity_PokemonCenter_1F_EventScript_210E78:: @ 8210E78
diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/scripts/maps/MeteorFalls_1F_1R.inc
index 50b218f04..b786dc961 100644
--- a/data/scripts/maps/MeteorFalls_1F_1R.inc
+++ b/data/scripts/maps/MeteorFalls_1F_1R.inc
@@ -92,130 +92,130 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F
 	end
 
 MeteorFalls_1F_1R_Movement_22BEC0: @ 822BEC0
-	step_right
-	step_right
-	step_26
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
 	step_end
 
 MeteorFalls_1F_1R_Movement_22BEC4: @ 822BEC4
-	step_16
-	step_16
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
 	step_end
 
 MeteorFalls_1F_1R_Movement_22BECE: @ 822BECE
-	step_16
-	step_16
-	step_16
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
 	step_end
 
 MeteorFalls_1F_1R_Movement_22BED9: @ 822BED9
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 MeteorFalls_1F_1R_Movement_22BEE0: @ 822BEE0
-	step_14
-	step_14
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
+	delay_16
+	delay_16
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 MeteorFalls_1F_1R_Movement_22BEE8: @ 822BEE8
-	step_14
-	step_14
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
+	delay_16
+	delay_16
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 MeteorFalls_1F_1R_Movement_22BEF0: @ 822BEF0
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 MeteorFalls_1F_1R_Movement_22BEF8: @ 822BEF8
-	step_right
-	step_right
-	step_up
-	step_up
-	step_27
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_in_place_fastest_left
 	step_end
 
 MeteorFalls_1F_1R_Movement_22BEFE: @ 822BEFE
-	step_up
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 MeteorFalls_1F_1R_Movement_22BF08: @ 822BF08
-	step_right
-	step_right
-	step_right
-	step_26
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
 	step_end
 
 MeteorFalls_1F_1R_Movement_22BF0D: @ 822BF0D
-	step_up
-	step_up
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 MeteorFalls_1F_1R_Movement_22BF18: @ 822BF18
-	step_right
-	step_right
-	step_right
-	step_26
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
 	step_end
 
 MeteorFalls_1F_1R_Movement_22BF1D: @ 822BF1D
-	step_25
-	step_12
-	step_28
-	step_40
-	step_left
-	step_41
-	step_03
+	walk_in_place_fastest_down
+	delay_4
+	walk_in_place_fastest_right
+	lock_facing_direction
+	walk_left
+	unlock_facing_direction
+	face_right
 	step_end
 
 MeteorFalls_1F_1R_EventScript_22BF25:: @ 822BF25
diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc
index 4e8531a4e..8cce8efeb 100644
--- a/data/scripts/maps/MossdeepCity.inc
+++ b/data/scripts/maps/MossdeepCity.inc
@@ -103,116 +103,116 @@ MossdeepCity_EventScript_1E4B41:: @ 81E4B41
 	end
 
 MossdeepCity_Movement_1E4BAD: @ 81E4BAD
-	step_14
-	step_03
-	step_14
-	step_14
-	step_14
-	step_14
-	step_02
-	step_14
-	step_14
+	delay_16
+	face_right
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	face_left
+	delay_16
+	delay_16
 	step_end
 
 MossdeepCity_Movement_1E4BB7: @ 81E4BB7
-	step_03
-	step_14
-	step_14
-	step_14
+	face_right
+	delay_16
+	delay_16
+	delay_16
 	step_end
 
 MossdeepCity_Movement_1E4BBC: @ 81E4BBC
-	step_down
-	step_right
-	step_right
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
+	walk_down
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 MossdeepCity_Movement_1E4BCA: @ 81E4BCA
-	step_14
-	step_13
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
+	delay_16
+	delay_8
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 MossdeepCity_Movement_1E4BDD: @ 81E4BDD
-	step_14
-	step_13
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
+	delay_16
+	delay_8
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 MossdeepCity_Movement_1E4BEF: @ 81E4BEF
-	step_14
-	step_13
-	step_down
-	step_right
-	step_right
-	step_right
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
+	delay_16
+	delay_8
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 MossdeepCity_Movement_1E4C00: @ 81E4C00
-	step_14
-	step_13
-	step_right
-	step_right
-	step_right
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
+	delay_16
+	delay_8
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 MossdeepCity_EventScript_1E4C10:: @ 81E4C10
@@ -281,34 +281,34 @@ MossdeepCity_EventScript_1E4CC2:: @ 81E4CC2
 	return
 
 MossdeepCity_Movement_1E4CD4: @ 81E4CD4
-	step_14
-	step_14
-	step_27
+	delay_16
+	delay_16
+	walk_in_place_fastest_left
 	step_end
 
 MossdeepCity_Movement_1E4CD8: @ 81E4CD8
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
 	step_end
 
 MossdeepCity_Movement_1E4CE2: @ 81E4CE2
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
 	step_end
 
 MossdeepCity_Text_1E4CED: @ 81E4CED
diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc
index 972d5f4e8..bb6bfd9de 100644
--- a/data/scripts/maps/MossdeepCity_Gym.inc
+++ b/data/scripts/maps/MossdeepCity_Gym.inc
@@ -285,8 +285,8 @@ MossdeepCity_Gym_EventScript_220C26:: @ 8220C26
 	end
 
 MossdeepCity_Gym_Movement_220C30: @ 8220C30
-	step_14
-	step_14
+	delay_16
+	delay_16
 	step_end
 
 MossdeepCity_Gym_EventScript_220C33:: @ 8220C33
diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc
index 7707690fb..c61f74d99 100644
--- a/data/scripts/maps/MossdeepCity_House2.inc
+++ b/data/scripts/maps/MossdeepCity_House2.inc
@@ -38,19 +38,19 @@ MossdeepCity_House2_EventScript_22212F:: @ 822212F
 	return
 
 MossdeepCity_House2_Movement_22213A: @ 822213A
-	step_18
-	step_15
-	step_15
-	step_17
-	step_15
-	step_13
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_down
+	delay_8
 	step_end
 
 MossdeepCity_House2_Movement_222141: @ 8222141
-	step_15
-	step_15
-	step_15
-	step_13
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	delay_8
 	step_end
 
 MossdeepCity_House2_Text_222146: @ 8222146
diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc
index 8fc55295f..2edf6d251 100644
--- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc
+++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc
@@ -271,22 +271,22 @@ MossdeepCity_SpaceCenter_1F_EventScript_223289:: @ 8223289
 	end
 
 MossdeepCity_SpaceCenter_1F_Movement_22329A: @ 822329A
-	step_40
-	step_left
-	step_41
+	lock_facing_direction
+	walk_left
+	unlock_facing_direction
 	step_end
 
 MossdeepCity_SpaceCenter_1F_Movement_22329E: @ 822329E
-	step_40
-	step_right
-	step_41
+	lock_facing_direction
+	walk_right
+	unlock_facing_direction
 	step_end
 
 MossdeepCity_SpaceCenter_1F_Movement_2232A2: @ 82232A2
-	step_02
-	step_40
-	step_right
-	step_41
+	face_left
+	lock_facing_direction
+	walk_right
+	unlock_facing_direction
 	step_end
 
 MossdeepCity_SpaceCenter_1F_Text_2232A7: @ 82232A7
diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc
index cee99c4d5..52d01db6c 100644
--- a/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc
+++ b/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc
@@ -49,7 +49,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_223DBF:: @ 8223DBF
 	end
 
 MossdeepCity_SpaceCenter_2F_Movement_223E07: @ 8223E07
-	step_up
+	walk_up
 	step_end
 
 MossdeepCity_SpaceCenter_2F_EventScript_223E09:: @ 8223E09
@@ -77,21 +77,21 @@ MossdeepCity_SpaceCenter_2F_EventScript_223E09:: @ 8223E09
 	end
 
 MossdeepCity_SpaceCenter_2F_Movement_223E81: @ 8223E81
-	step_40
-	step_left
-	step_41
+	lock_facing_direction
+	walk_left
+	unlock_facing_direction
 	step_end
 
 MossdeepCity_SpaceCenter_2F_Movement_223E85: @ 8223E85
-	step_40
-	step_down
-	step_41
+	lock_facing_direction
+	walk_down
+	unlock_facing_direction
 	step_end
 
 MossdeepCity_SpaceCenter_2F_Movement_223E89: @ 8223E89
-	step_40
-	step_right
-	step_41
+	lock_facing_direction
+	walk_right
+	unlock_facing_direction
 	step_end
 
 MossdeepCity_SpaceCenter_2F_EventScript_223E8D:: @ 8223E8D
@@ -211,27 +211,27 @@ MossdeepCity_SpaceCenter_2F_EventScript_223FBA:: @ 8223FBA
 	end
 
 MossdeepCity_SpaceCenter_2F_Movement_223FC6: @ 8223FC6
-	step_40
-	step_16
-	step_16
-	step_41
-	step_14
-	step_14
-	slow_step_down
-	slow_step_down
+	lock_facing_direction
+	walk_fast_up
+	walk_fast_up
+	unlock_facing_direction
+	delay_16
+	delay_16
+	walk_slow_down
+	walk_slow_down
 	step_end
 
 MossdeepCity_SpaceCenter_2F_Movement_223FCF: @ 8223FCF
-	step_02
-	step_40
-	step_18
-	step_18
-	step_41
-	step_14
-	step_14
-	slow_step_left
-	slow_step_left
-	step_00
+	face_left
+	lock_facing_direction
+	walk_fast_right
+	walk_fast_right
+	unlock_facing_direction
+	delay_16
+	delay_16
+	walk_slow_left
+	walk_slow_left
+	face_down
 	step_end
 
 MossdeepCity_SpaceCenter_2F_EventScript_223FDA:: @ 8223FDA
diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc
index fb2665e8b..14d0cd5c7 100644
--- a/data/scripts/maps/MossdeepCity_StevensHouse.inc
+++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc
@@ -54,21 +54,21 @@ MossdeepCity_StevensHouse_EventScript_2227CA:: @ 82227CA
 	end
 
 MossdeepCity_StevensHouse_Movement_222833: @ 8222833
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_25
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_down
 	step_end
 
 MossdeepCity_StevensHouse_Movement_22283B: @ 822283B
-	step_up
-	step_right
-	step_right
-	step_right
-	step_26
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
 	step_end
 
 MossdeepCity_StevensHouse_EventScript_222841:: @ 8222841
diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc
index b4825579c..28135bb1e 100644
--- a/data/scripts/maps/MtChimney.inc
+++ b/data/scripts/maps/MtChimney.inc
@@ -153,249 +153,249 @@ MtChimney_EventScript_22EF76:: @ 822EF76
 	end
 
 MtChimney_Movement_22EF83: @ 822EF83
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_right
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_right
 	step_end
 
 MtChimney_Movement_22EF8B: @ 822EF8B
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
 	step_end
 
 MtChimney_Movement_22EF94: @ 822EF94
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_right
-	step_right
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_right
 	step_end
 
 MtChimney_Movement_22EF9C: @ 822EF9C
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
 	step_end
 
 MtChimney_Movement_22EFA6: @ 822EFA6
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
 	step_end
 
 MtChimney_Movement_22EFB8: @ 822EFB8
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_down
 	step_end
 
 MtChimney_Movement_22EFC1: @ 822EFC1
-	step_right
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
 	step_end
 
 MtChimney_Movement_22EFD0: @ 822EFD0
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
 	step_end
 
 MtChimney_Movement_22EFE9: @ 822EFE9
-	step_14
-	step_14
-	step_14
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_down
+	delay_16
+	delay_16
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_down
 	step_end
 
 MtChimney_Movement_22EFF4: @ 822EFF4
-	step_14
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
+	delay_16
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
 	step_end
 
 MtChimney_Movement_22F004: @ 822F004
-	step_14
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
+	delay_16
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
 	step_end
 
 MtChimney_Movement_22F015: @ 822F015
-	step_14
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_25
+	delay_16
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_down
 	step_end
 
 MtChimney_Movement_22F01D: @ 822F01D
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
 	step_end
 
 MtChimney_Movement_22F02B: @ 822F02B
-	step_down
+	walk_down
 	step_end
 
 MtChimney_Movement_22F02D: @ 822F02D
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
 	step_end
 
 MtChimney_Movement_22F035: @ 822F035
-	step_14
-	step_14
-	step_27
-	step_14
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
+	delay_16
+	delay_16
+	walk_in_place_fastest_left
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
 	step_end
 
 MtChimney_Movement_22F03F: @ 822F03F
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_27
-	step_14
-	step_down
-	step_down
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_in_place_fastest_left
+	delay_16
+	walk_down
+	walk_down
 	step_end
 
 MtChimney_Movement_22F04A: @ 822F04A
-	step_40
-	step_17
-	step_41
-	step_03
+	lock_facing_direction
+	walk_fast_left
+	unlock_facing_direction
+	face_right
 	step_end
 
 MtChimney_Movement_22F04F: @ 822F04F
-	step_left
-	step_28
-	step_14
+	walk_left
+	walk_in_place_fastest_right
+	delay_16
 	step_end
 
 MtChimney_EventScript_22F053:: @ 822F053
diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc
index 1dd9c2725..b6c2118db 100644
--- a/data/scripts/maps/MtChimney_CableCarStation.inc
+++ b/data/scripts/maps/MtChimney_CableCarStation.inc
@@ -59,31 +59,31 @@ MtChimney_CableCarStation_EventScript_22AC9B:: @ 822AC9B
 	end
 
 MtChimney_CableCarStation_Movement_22ACA5: @ 822ACA5
-	step_up
-	step_up
-	step_left
-	step_28
+	walk_up
+	walk_up
+	walk_left
+	walk_in_place_fastest_right
 	step_end
 
 MtChimney_CableCarStation_Movement_22ACAA: @ 822ACAA
-	step_14
-	step_right
-	step_down
-	step_down
+	delay_16
+	walk_right
+	walk_down
+	walk_down
 	step_end
 
 MtChimney_CableCarStation_Movement_22ACAF: @ 822ACAF
-	step_up
-	step_up
-	step_up
-	step_14
+	walk_up
+	walk_up
+	walk_up
+	delay_16
 	step_end
 
 MtChimney_CableCarStation_Movement_22ACB4: @ 822ACB4
-	step_down
-	step_down
-	step_down
-	step_14
+	walk_down
+	walk_down
+	walk_down
+	delay_16
 	step_end
 
 MtChimney_CableCarStation_Text_22ACB9: @ 822ACB9
diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc
index fed63f0e0..fe39e9d48 100644
--- a/data/scripts/maps/MtPyre_Summit.inc
+++ b/data/scripts/maps/MtPyre_Summit.inc
@@ -103,29 +103,29 @@ MtPyre_Summit_EventScript_232117:: @ 8232117
 	return
 
 MtPyre_Summit_Movement_23212C: @ 823212C
-	step_down
-	step_down
-	step_27
+	walk_down
+	walk_down
+	walk_in_place_fastest_left
 	step_end
 
 MtPyre_Summit_Movement_232130: @ 8232130
-	step_down
+	walk_down
 	step_end
 
 MtPyre_Summit_Movement_232132: @ 8232132
-	step_down
-	step_down
-	step_28
+	walk_down
+	walk_down
+	walk_in_place_fastest_right
 	step_end
 
 MtPyre_Summit_Movement_232136: @ 8232136
-	step_left
-	step_25
+	walk_left
+	walk_in_place_fastest_down
 	step_end
 
 MtPyre_Summit_Movement_232139: @ 8232139
-	step_right
-	step_25
+	walk_right
+	walk_in_place_fastest_down
 	step_end
 
 MtPyre_Summit_EventScript_23213C:: @ 823213C
@@ -316,112 +316,112 @@ MtPyre_Summit_EventScript_232392:: @ 8232392
 	return
 
 MtPyre_Summit_Movement_2323AE: @ 82323AE
-	step_14
-	step_14
-	step_28
+	delay_16
+	delay_16
+	walk_in_place_fastest_right
 	step_end
 
 MtPyre_Summit_Movement_2323B2: @ 82323B2
-	step_14
-	step_14
-	step_27
+	delay_16
+	delay_16
+	walk_in_place_fastest_left
 	step_end
 
 MtPyre_Summit_Movement_2323B6: @ 82323B6
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
 	step_end
 
 MtPyre_Summit_Movement_2323BD: @ 82323BD
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
 	step_end
 
 MtPyre_Summit_Movement_2323C4: @ 82323C4
-	step_14
-	step_13
-	step_left
-	step_28
-	step_14
-	step_25
+	delay_16
+	delay_8
+	walk_left
+	walk_in_place_fastest_right
+	delay_16
+	walk_in_place_fastest_down
 	step_end
 
 MtPyre_Summit_Movement_2323CB: @ 82323CB
-	step_14
-	step_13
-	step_right
-	step_27
-	step_14
-	step_25
+	delay_16
+	delay_8
+	walk_right
+	walk_in_place_fastest_left
+	delay_16
+	walk_in_place_fastest_down
 	step_end
 
 MtPyre_Summit_Movement_2323D2: @ 82323D2
-	step_14
-	step_13
-	step_27
-	step_14
-	step_25
+	delay_16
+	delay_8
+	walk_in_place_fastest_left
+	delay_16
+	walk_in_place_fastest_down
 	step_end
 
 MtPyre_Summit_Movement_2323D8: @ 82323D8
-	step_up
-	step_up
-	step_up
-	step_left
+	walk_up
+	walk_up
+	walk_up
+	walk_left
 	step_end
 
 MtPyre_Summit_Movement_2323DD: @ 82323DD
-	step_up
-	step_up
-	step_up
-	step_28
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_right
 	step_end
 
 MtPyre_Summit_Movement_2323E2: @ 82323E2
-	step_up
-	step_up
-	step_up
-	step_28
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_right
 	step_end
 
 MtPyre_Summit_Movement_2323E7: @ 82323E7
-	step_14
-	step_26
+	delay_16
+	walk_in_place_fastest_up
 	step_end
 
 MtPyre_Summit_Movement_2323EA: @ 82323EA
-	step_14
-	step_25
+	delay_16
+	walk_in_place_fastest_down
 	step_end
 
 MtPyre_Summit_Movement_2323ED: @ 82323ED
-	step_down
-	step_right
-	step_down
-	step_down
-	step_27
+	walk_down
+	walk_right
+	walk_down
+	walk_down
+	walk_in_place_fastest_left
 	step_end
 
 MtPyre_Summit_Movement_2323F3: @ 82323F3
-	step_down
-	step_down
-	step_down
-	step_27
+	walk_down
+	walk_down
+	walk_down
+	walk_in_place_fastest_left
 	step_end
 
 MtPyre_Summit_Movement_2323F8: @ 82323F8
-	step_down
-	step_down
-	step_down
-	step_27
+	walk_down
+	walk_down
+	walk_down
+	walk_in_place_fastest_left
 	step_end
 
 MtPyre_Summit_EventScript_2323FD:: @ 82323FD
diff --git a/data/scripts/maps/NavelRock_Top.inc b/data/scripts/maps/NavelRock_Top.inc
index 6193a092e..67ddbc373 100644
--- a/data/scripts/maps/NavelRock_Top.inc
+++ b/data/scripts/maps/NavelRock_Top.inc
@@ -38,7 +38,7 @@ NavelRock_Top_EventScript_26915B:: @ 826915B
 NavelRock_Top_EventScript_26916F:: @ 826916F
 	lockall
 	setvar VAR_TEMP_1, 1
-	special SpawnScriptFieldObject
+	special SpawnScriptEventObject
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 35
 	special sub_813B80C
@@ -59,7 +59,7 @@ NavelRock_Top_EventScript_26916F:: @ 826916F
 	applymovement 127, NavelRock_Top_Movement_269234
 	applymovement 1, NavelRock_Top_Movement_26923A
 	waitmovement 0
-	special RemoveScriptFieldObject
+	special RemoveScriptEventObject
 	setvar VAR_0x8004, 250
 	setvar VAR_0x8005, 70
 	setvar VAR_0x8006, 0
@@ -92,36 +92,36 @@ NavelRock_Top_EventScript_269225:: @ 8269225
 	end
 
 NavelRock_Top_Movement_269230: @ 8269230
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 NavelRock_Top_Movement_269234: @ 8269234
-	step_14
-	step_14
-	step_down
-	step_down
-	step_down
+	delay_16
+	delay_16
+	walk_down
+	walk_down
+	walk_down
 	step_end
 
 NavelRock_Top_Movement_26923A: @ 826923A
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_1d
-	step_14
-	step_14
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_in_place_down
+	delay_16
+	delay_16
 	step_end
 
 NavelRock_Top_Movement_269243: @ 8269243
-	step_14
-	step_14
-	step_1d
-	step_1d
-	step_1d
-	step_1d
+	delay_16
+	delay_16
+	walk_in_place_down
+	walk_in_place_down
+	walk_in_place_down
+	walk_in_place_down
 	step_end
 
diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc
index 3c075cad0..32bca3703 100644
--- a/data/scripts/maps/OldaleTown.inc
+++ b/data/scripts/maps/OldaleTown.inc
@@ -96,100 +96,100 @@ OldaleTown_EventScript_1E8FC3:: @ 81E8FC3
 	end
 
 OldaleTown_Movement_1E8FCE: @ 81E8FCE
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_25
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_down
 	step_end
 
 OldaleTown_Movement_1E8FD7: @ 81E8FD7
-	step_left
-	step_up
-	step_up
-	step_right
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_25
+	walk_left
+	walk_up
+	walk_up
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_down
 	step_end
 
 OldaleTown_Movement_1E8FE2: @ 81E8FE2
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_25
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_down
 	step_end
 
 OldaleTown_Movement_1E8FEB: @ 81E8FEB
-	step_up
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_13
-	step_25
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	delay_8
+	walk_in_place_fastest_down
 	step_end
 
 OldaleTown_Movement_1E8FF9: @ 81E8FF9
-	step_right
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 OldaleTown_Movement_1E9001: @ 81E9001
-	step_14
-	step_14
-	step_14
-	step_14
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 OldaleTown_Movement_1E900B: @ 81E900B
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 OldaleTown_Movement_1E9013: @ 81E9013
-	step_left
-	step_up
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_left
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 OldaleTown_EventScript_1E901F:: @ 81E901F
@@ -305,49 +305,49 @@ OldaleTown_EventScript_1E915E:: @ 81E915E
 	return
 
 OldaleTown_Movement_1E9170: @ 81E9170
-	step_left
-	step_left
+	walk_left
+	walk_left
 	step_end
 
 OldaleTown_Movement_1E9173: @ 81E9173
-	step_left
+	walk_left
 	step_end
 
 OldaleTown_Movement_1E9175: @ 81E9175
-	step_02
+	face_left
 	step_end
 
 OldaleTown_Movement_1E9177: @ 81E9177
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
 	step_end
 
 OldaleTown_Movement_1E917E: @ 81E917E
-	step_13
-	step_12
-	step_25
+	delay_8
+	delay_4
+	walk_in_place_fastest_down
 	step_end
 
 OldaleTown_Movement_1E9182: @ 81E9182
-	step_13
-	step_right
+	delay_8
+	walk_right
 	step_end
 
 OldaleTown_Movement_1E9185: @ 81E9185
-	step_16
-	step_27
-	step_40
-	step_right
-	step_41
+	walk_fast_up
+	walk_in_place_fastest_left
+	lock_facing_direction
+	walk_right
+	unlock_facing_direction
 	step_end
 
 OldaleTown_Movement_1E918B: @ 81E918B
-	step_down
-	step_left
+	walk_down
+	walk_left
 	step_end
 
 OldaleTown_Text_1E918E: @ 81E918E
diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc
index c297d61a7..891b5a25a 100644
--- a/data/scripts/maps/PetalburgCity.inc
+++ b/data/scripts/maps/PetalburgCity.inc
@@ -94,127 +94,127 @@ PetalburgCity_EventScript_1DC3FD:: @ 81DC3FD
 	end
 
 PetalburgCity_Movement_1DC406: @ 81DC406
-	step_13
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
+	delay_8
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 PetalburgCity_Movement_1DC418: @ 81DC418
-	step_up
-	step_up
+	walk_up
+	walk_up
 	step_end
 
 PetalburgCity_Movement_1DC41B: @ 81DC41B
-	step_13
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
+	delay_8
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 PetalburgCity_Movement_1DC42D: @ 81DC42D
-	step_up
-	step_54
+	walk_up
+	set_invisible
 	step_end
 
 PetalburgCity_Movement_1DC430: @ 81DC430
-	step_13
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_up
-	step_28
+	delay_8
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_in_place_fastest_right
 	step_end
 
 PetalburgCity_Movement_1DC451: @ 81DC451
-	step_13
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_up
-	step_right
-	step_14
-	step_26
-	step_14
-	step_14
-	step_28
+	delay_8
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_right
+	delay_16
+	walk_in_place_fastest_up
+	delay_16
+	delay_16
+	walk_in_place_fastest_right
 	step_end
 
 PetalburgCity_EventScript_1DC476:: @ 81DC476
@@ -347,159 +347,159 @@ PetalburgCity_EventScript_1DC5FF:: @ 81DC5FF
 	return
 
 PetalburgCity_Movement_1DC611:: @ 81DC611
-	step_14
-	step_14
-	step_14
+	delay_16
+	delay_16
+	delay_16
 	step_end
 
 PetalburgCity_Movement_1DC615: @ 81DC615
-	step_right
-	step_right
-	step_right
-	step_26
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
 	step_end
 
 PetalburgCity_Movement_1DC61A: @ 81DC61A
-	step_right
-	step_right
+	walk_right
+	walk_right
 	step_end
 
 PetalburgCity_Movement_1DC61D: @ 81DC61D
-	step_right
-	step_right
-	step_right
-	step_25
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_down
 	step_end
 
 PetalburgCity_Movement_1DC622: @ 81DC622
-	step_down
-	step_right
-	step_right
-	step_right
-	step_25
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_down
 	step_end
 
 PetalburgCity_Movement_1DC628: @ 81DC628
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_right
-	step_26
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_right
+	walk_in_place_fastest_up
 	step_end
 
 PetalburgCity_Movement_1DC633: @ 81DC633
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_up
-	step_right
-	step_26
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_right
+	walk_in_place_fastest_up
 	step_end
 
 PetalburgCity_Movement_1DC641: @ 81DC641
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_right
-	step_26
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_right
+	walk_in_place_fastest_up
 	step_end
 
 PetalburgCity_Movement_1DC64C: @ 81DC64C
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_up
-	step_right
-	step_26
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_right
+	walk_in_place_fastest_up
 	step_end
 
 PetalburgCity_Movement_1DC658: @ 81DC658
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
 	step_end
 
 PetalburgCity_Movement_1DC665: @ 81DC665
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
 	step_end
 
 PetalburgCity_Movement_1DC66F: @ 81DC66F
-	step_14
-	step_14
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_up
+	delay_16
+	delay_16
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
 	step_end
 
 PetalburgCity_Movement_1DC67C: @ 81DC67C
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
 	step_end
 
 PetalburgCity_Movement_1DC686: @ 81DC686
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_up
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
 	step_end
 
 PetalburgCity_EventScript_1DC691:: @ 81DC691
@@ -597,111 +597,111 @@ PetalburgCity_EventScript_1DC7C4:: @ 81DC7C4
 	return
 
 PetalburgCity_Movement_1DC7D6: @ 81DC7D6
-	step_left
-	step_left
-	step_left
-	step_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
 	step_end
 
 PetalburgCity_Movement_1DC7DB: @ 81DC7DB
-	step_left
-	step_left
-	step_left
-	step_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
 	step_end
 
 PetalburgCity_Movement_1DC7E0: @ 81DC7E0
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
 	step_end
 
 PetalburgCity_Movement_1DC7EE: @ 81DC7EE
-	step_14
-	step_25
-	step_14
-	step_14
-	step_13
-	step_27
+	delay_16
+	walk_in_place_fastest_down
+	delay_16
+	delay_16
+	delay_8
+	walk_in_place_fastest_left
 	step_end
 
 PetalburgCity_Movement_1DC7F5: @ 81DC7F5
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
 	step_end
 
 PetalburgCity_Movement_1DC802: @ 81DC802
-	step_14
-	step_25
-	step_14
-	step_13
-	step_27
+	delay_16
+	walk_in_place_fastest_down
+	delay_16
+	delay_8
+	walk_in_place_fastest_left
 	step_end
 
 PetalburgCity_Movement_1DC808: @ 81DC808
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
 	step_end
 
 PetalburgCity_Movement_1DC815: @ 81DC815
-	step_14
-	step_25
-	step_14
-	step_13
-	step_27
+	delay_16
+	walk_in_place_fastest_down
+	delay_16
+	delay_8
+	walk_in_place_fastest_left
 	step_end
 
 PetalburgCity_Movement_1DC81B: @ 81DC81B
-	step_up
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
 	step_end
 
 PetalburgCity_Movement_1DC828: @ 81DC828
-	step_14
-	step_26
-	step_14
-	step_13
-	step_27
+	delay_16
+	walk_in_place_fastest_up
+	delay_16
+	delay_8
+	walk_in_place_fastest_left
 	step_end
 
 PetalburgCity_EventScript_1DC82E:: @ 81DC82E
diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc
index 2751e345e..663165611 100644
--- a/data/scripts/maps/PetalburgCity_Gym.inc
+++ b/data/scripts/maps/PetalburgCity_Gym.inc
@@ -106,10 +106,10 @@ PetalburgCity_Gym_EventScript_2049A4:: @ 82049A4
 	end
 
 PetalburgCity_Gym_Movement_2049EC: @ 82049EC
-	step_down
-	step_down
-	step_down
-	step_14
+	walk_down
+	walk_down
+	walk_down
+	delay_16
 	step_end
 
 PetalburgCity_Gym_EventScript_2049F1:: @ 82049F1
@@ -565,218 +565,218 @@ PetalburgCity_Gym_EventScript_20506C:: @ 820506C
 	return
 
 PetalburgCity_Gym_Movement_20507E: @ 820507E
-	step_down
-	step_down
-	step_left
-	step_left
-	step_down
-	step_down
-	step_26
-	step_13
-	step_1d
-	step_54
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_in_place_fastest_up
+	delay_8
+	walk_in_place_down
+	set_invisible
 	step_end
 
 PetalburgCity_Gym_Movement_205089: @ 8205089
-	step_down
-	step_down
-	step_left
-	step_left
-	step_down
-	step_down
-	step_26
-	step_13
-	step_1d
-	step_54
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_in_place_fastest_up
+	delay_8
+	walk_in_place_down
+	set_invisible
 	step_end
 
 PetalburgCity_Gym_Movement_205094: @ 8205094
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
-	step_down
-	step_26
-	step_13
-	step_1d
-	step_54
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_in_place_fastest_up
+	delay_8
+	walk_in_place_down
+	set_invisible
 	step_end
 
 PetalburgCity_Gym_Movement_2050A1: @ 82050A1
-	step_14
-	step_down
-	step_down
-	step_left
-	step_left
-	step_down
-	step_down
+	delay_16
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_down
+	walk_down
 	step_end
 
 PetalburgCity_Gym_Movement_2050A9: @ 82050A9
-	step_14
-	step_down
-	step_down
-	step_left
-	step_down
-	step_down
-	step_down
+	delay_16
+	walk_down
+	walk_down
+	walk_left
+	walk_down
+	walk_down
+	walk_down
 	step_end
 
 PetalburgCity_Gym_Movement_2050B1: @ 82050B1
-	step_14
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_down
-	step_down
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
 	step_end
 
 PetalburgCity_Gym_Movement_2050BB: @ 82050BB
-	step_up
-	step_13
-	step_28
-	step_13
-	step_27
-	step_14
-	step_26
+	walk_up
+	delay_8
+	walk_in_place_fastest_right
+	delay_8
+	walk_in_place_fastest_left
+	delay_16
+	walk_in_place_fastest_up
 	step_end
 
 PetalburgCity_Gym_Movement_2050C3: @ 82050C3
-	step_right
-	step_right
-	step_up
-	step_up
-	step_up
-	step_28
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_right
 	step_end
 
 PetalburgCity_Gym_Movement_2050CA: @ 82050CA
-	step_right
-	step_right
-	step_up
-	step_up
-	step_up
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 PetalburgCity_Gym_Movement_2050D0: @ 82050D0
-	step_right
-	step_right
-	step_up
-	step_up
-	step_right
-	step_right
-	step_up
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	walk_up
 	step_end
 
 PetalburgCity_Gym_Movement_2050D8: @ 82050D8
-	step_26
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_13
-	step_25
+	walk_in_place_fastest_up
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_8
+	walk_in_place_fastest_down
 	step_end
 
 PetalburgCity_Gym_Movement_2050E1: @ 82050E1
-	step_14
-	step_up
-	step_14
-	step_13
-	step_up
-	step_right
-	step_up
-	step_up
-	step_27
+	delay_16
+	walk_up
+	delay_16
+	delay_8
+	walk_up
+	walk_right
+	walk_up
+	walk_up
+	walk_in_place_fastest_left
 	step_end
 
 PetalburgCity_Gym_Movement_2050EB: @ 82050EB
-	step_14
-	step_up
-	step_14
-	step_13
-	step_up
-	step_up
+	delay_16
+	walk_up
+	delay_16
+	delay_8
+	walk_up
+	walk_up
 	step_end
 
 PetalburgCity_Gym_Movement_2050F2: @ 82050F2
-	step_down
-	step_down
-	step_down
-	step_down
-	step_26
-	step_14
-	step_1d
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_in_place_fastest_up
+	delay_16
+	walk_in_place_down
 	step_end
 
 PetalburgCity_Gym_Movement_2050FA: @ 82050FA
-	step_down
-	step_down
-	step_right
-	step_down
-	step_26
-	step_14
-	step_1d
+	walk_down
+	walk_down
+	walk_right
+	walk_down
+	walk_in_place_fastest_up
+	delay_16
+	walk_in_place_down
 	step_end
 
 PetalburgCity_Gym_Movement_205102: @ 8205102
-	step_down
-	step_down
-	step_down
-	step_26
-	step_14
-	step_1d
+	walk_down
+	walk_down
+	walk_down
+	walk_in_place_fastest_up
+	delay_16
+	walk_in_place_down
 	step_end
 
 PetalburgCity_Gym_Movement_205109: @ 8205109
-	step_14
-	step_14
-	step_14
-	step_down
-	step_down
-	step_down
-	step_13
+	delay_16
+	delay_16
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	delay_8
 	step_end
 
 PetalburgCity_Gym_Movement_205111: @ 8205111
-	step_14
-	step_14
-	step_right
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_13
+	delay_16
+	delay_16
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	delay_8
 	step_end
 
 PetalburgCity_Gym_Movement_20511B: @ 820511B
-	step_14
-	step_14
-	step_down
-	step_down
-	step_down
-	step_down
-	step_13
+	delay_16
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	delay_8
 	step_end
 
 PetalburgCity_Gym_Movement_205123: @ 8205123
-	step_25
-	step_14
-	step_14
-	step_down
-	step_down
-	step_down
-	step_right
-	step_down
-	step_13
+	walk_in_place_fastest_down
+	delay_16
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_down
+	delay_8
 	step_end
 
 PetalburgCity_Gym_EventScript_20512D:: @ 820512D
diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc
index 907f07623..7c9a1ae49 100644
--- a/data/scripts/maps/PetalburgWoods.inc
+++ b/data/scripts/maps/PetalburgWoods.inc
@@ -114,128 +114,128 @@ PetalburgWoods_EventScript_22E1A7:: @ 822E1A7
 	end
 
 PetalburgWoods_Movement_22E1B1: @ 822E1B1
-	step_01
-	step_14
-	step_12
-	step_03
-	step_14
-	step_13
-	step_02
-	step_14
-	step_13
-	step_00
-	step_14
-	step_03
-	step_14
-	step_13
-	step_01
-	step_14
+	face_up
+	delay_16
+	delay_4
+	face_right
+	delay_16
+	delay_8
+	face_left
+	delay_16
+	delay_8
+	face_down
+	delay_16
+	face_right
+	delay_16
+	delay_8
+	face_up
+	delay_16
 	step_end
 
 PetalburgWoods_Movement_22E1C2: @ 822E1C2
-	step_18
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
 	step_end
 
 PetalburgWoods_Movement_22E1CB: @ 822E1CB
-	step_14
-	step_3e
-	step_down
-	step_down
+	delay_16
+	face_player
+	walk_down
+	walk_down
 	step_end
 
 PetalburgWoods_Movement_22E1D0: @ 822E1D0
-	step_14
-	step_3e
-	step_down
-	step_down
-	step_down
-	step_28
+	delay_16
+	face_player
+	walk_down
+	walk_down
+	walk_down
+	walk_in_place_fastest_right
 	step_end
 
 PetalburgWoods_Movement_22E1D7: @ 822E1D7
-	step_17
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
 	step_end
 
 PetalburgWoods_Movement_22E1E0: @ 822E1E0
-	step_14
-	step_14
-	step_26
+	delay_16
+	delay_16
+	walk_in_place_fastest_up
 	step_end
 
 PetalburgWoods_Movement_22E1E4: @ 822E1E4
-	step_18
-	step_15
-	step_15
-	step_17
-	step_26
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_in_place_fastest_up
 	step_end
 
 PetalburgWoods_Movement_22E1EA: @ 822E1EA
-	step_15
-	step_18
-	step_26
+	walk_fast_down
+	walk_fast_right
+	walk_in_place_fastest_up
 	step_end
 
 PetalburgWoods_Movement_22E1EE: @ 822E1EE
-	step_25
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_01
+	walk_in_place_fastest_down
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	face_up
 	step_end
 
 PetalburgWoods_Movement_22E1F6: @ 822E1F6
-	step_15
-	step_15
+	walk_fast_down
+	walk_fast_down
 	step_end
 
 PetalburgWoods_Movement_22E1F9: @ 822E1F9
-	step_40
-	step_up
-	step_41
+	lock_facing_direction
+	walk_up
+	unlock_facing_direction
 	step_end
 
 PetalburgWoods_Movement_22E1FD: @ 822E1FD
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_14
-	step_14
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	delay_16
+	delay_16
 	step_end
 
 PetalburgWoods_Movement_22E205: @ 822E205
-	step_15
-	step_15
-	step_15
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
 	step_end
 
 PetalburgWoods_Movement_22E209: @ 822E209
-	step_down
-	step_down
-	step_14
-	step_14
+	walk_down
+	walk_down
+	delay_16
+	delay_16
 	step_end
 
 PetalburgWoods_Movement_22E20E: @ 822E20E
-	step_down
+	walk_down
 	step_end
 
 PetalburgWoods_EventScript_22E210:: @ 822E210
diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc
index 4d4334aca..c2807d50b 100644
--- a/data/scripts/maps/Route101.inc
+++ b/data/scripts/maps/Route101.inc
@@ -69,138 +69,138 @@ Route101_EventScript_1EBD7A:: @ 81EBD7A
 	end
 
 Route101_Movement_1EBD90: @ 81EBD90
-	step_up
+	walk_up
 	step_end
 
 Route101_Movement_1EBD92: @ 81EBD92
-	step_right
+	walk_right
 	step_end
 
 Route101_Movement_1EBD94: @ 81EBD94
-	step_down
+	walk_down
 	step_end
 
 Route101_Movement_1EBD96: @ 81EBD96
-	step_16
-	step_16
-	step_16
-	step_18
-	step_18
-	step_18
-	step_15
-	step_15
-	step_17
-	step_17
-	step_17
-	step_16
-	step_16
-	step_18
-	step_18
-	step_18
-	step_15
-	step_15
-	step_17
-	step_17
-	step_17
-	step_16
-	step_16
-	step_18
-	step_18
-	step_18
-	step_15
-	step_15
-	step_17
-	step_17
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_left
 	step_end
 
 Route101_Movement_1EBDB5: @ 81EBDB5
-	step_16
-	step_18
-	step_18
-	step_18
-	step_18
-	step_16
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
 	step_end
 
 Route101_Movement_1EBDBC: @ 81EBDBC
 	step_end
 
 Route101_Movement_1EBDBD: @ 81EBDBD
-	step_23
-	step_23
-	step_23
-	step_23
+	walk_in_place_fast_left
+	walk_in_place_fast_left
+	walk_in_place_fast_left
+	walk_in_place_fast_left
 	step_end
 
 Route101_Movement_1EBDC2: @ 81EBDC2
-	step_16
-	step_16
-	step_16
-	step_16
-	step_27
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_in_place_fastest_left
 	step_end
 
 Route101_Movement_1EBDC8: @ 81EBDC8
-	step_16
-	step_16
-	step_18
-	step_18
-	step_18
-	step_15
-	step_15
-	step_17
-	step_17
-	step_17
-	step_16
-	step_16
-	step_18
-	step_18
-	step_18
-	step_15
-	step_15
-	step_17
-	step_17
-	step_17
-	step_16
-	step_16
-	step_18
-	step_18
-	step_18
-	step_15
-	step_15
-	step_17
-	step_17
-	step_17
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
 	step_end
 
 Route101_Movement_1EBDE7: @ 81EBDE7
-	step_18
-	step_18
-	step_18
-	step_18
-	step_16
-	step_16
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
 	step_end
 
 Route101_Movement_1EBDEE: @ 81EBDEE
 	step_end
 
 Route101_Movement_1EBDEF: @ 81EBDEF
-	step_24
-	step_24
-	step_24
-	step_24
+	walk_in_place_fast_right
+	walk_in_place_fast_right
+	walk_in_place_fast_right
+	walk_in_place_fast_right
 	step_end
 
 Route101_Movement_1EBDF4: @ 81EBDF4
-	step_up
-	step_up
+	walk_up
+	walk_up
 	step_end
 
 Route101_Movement_1EBDF7: @ 81EBDF7
-	step_up
-	step_left
-	step_up
+	walk_up
+	walk_left
+	walk_up
 	step_end
 
 Route101_EventScript_1EBDFB:: @ 81EBDFB
@@ -256,7 +256,7 @@ Route101_EventScript_1EBE89:: @ 81EBE89
 	return
 
 Route101_Movement_1EBE8D: @ 81EBE8D
-	step_right
+	walk_right
 	step_end
 
 Route101_Text_1EBE8F: @ 81EBE8F
diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc
index d71ec729c..8bf597902 100644
--- a/data/scripts/maps/Route103.inc
+++ b/data/scripts/maps/Route103.inc
@@ -152,42 +152,42 @@ Route103_EventScript_1EC5A2:: @ 81EC5A2
 	end
 
 Route103_Movement_1EC5BE: @ 81EC5BE
-	step_left
-	step_down
+	walk_left
+	walk_down
 	step_end
 
 Route103_Movement_1EC5C1: @ 81EC5C1
-	fast_step_down
-	step_14
-	step_down
-	step_down
-	step_down
-	step_down
+	jump_2_down
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	walk_down
 	step_end
 
 Route103_Movement_1EC5C8: @ 81EC5C8
-	step_14
-	step_12
-	step_27
-	step_14
-	step_25
+	delay_16
+	delay_4
+	walk_in_place_fastest_left
+	delay_16
+	walk_in_place_fastest_down
 	step_end
 
 Route103_Movement_1EC5CE: @ 81EC5CE
-	step_down
+	walk_down
 	step_end
 
 Route103_Movement_1EC5D0: @ 81EC5D0
-	fast_step_down
-	step_14
-	step_down
-	step_down
-	step_down
+	jump_2_down
+	delay_16
+	walk_down
+	walk_down
+	walk_down
 	step_end
 
 Route103_Movement_1EC5D6: @ 81EC5D6
-	step_14
-	step_25
+	delay_16
+	walk_in_place_fastest_down
 	step_end
 
 Route103_EventScript_1EC5D9:: @ 81EC5D9
diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc
index 314b47e1d..a432f0d94 100644
--- a/data/scripts/maps/Route104.inc
+++ b/data/scripts/maps/Route104.inc
@@ -130,17 +130,17 @@ Route104_EventScript_1ECD4B:: @ 81ECD4B
 	end
 
 Route104_Movement_1ECDC8: @ 81ECDC8
-	slow_step_left
+	walk_slow_left
 	step_end
 
 Route104_Movement_1ECDCA: @ 81ECDCA
-	step_down
-	step_03
+	walk_down
+	face_right
 	step_end
 
 Route104_Movement_1ECDCD: @ 81ECDCD
-	step_12
-	step_27
+	delay_4
+	walk_in_place_fastest_left
 	step_end
 
 Route104_EventScript_1ECDD0:: @ 81ECDD0
@@ -262,13 +262,13 @@ Route104_EventScript_1ECF73:: @ 81ECF73
 	end
 
 Route104_Movement_1ECF86: @ 81ECF86
-	step_40
-	step_down
-	step_41
+	lock_facing_direction
+	walk_down
+	unlock_facing_direction
 	step_end
 
 Route104_Movement_1ECF8A: @ 81ECF8A
-	step_down
+	walk_down
 	step_end
 
 Route104_EventScript_1ECF8C:: @ 81ECF8C
@@ -448,426 +448,426 @@ Route104_EventScript_1ED1BE:: @ 81ED1BE
 	end
 
 Route104_Movement_1ED1C8: @ 81ED1C8
-	step_down
-	step_down
-	step_down
-	step_down
-	step_15
-	step_15
-	step_15
-	step_15
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_15
-	step_15
-	step_15
-	step_15
-	step_18
-	step_18
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_18
-	step_18
-	step_15
-	step_15
-	step_15
-	step_15
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_right
+	walk_fast_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
 	step_end
 
 Route104_Movement_1ED22A: @ 81ED22A
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_15
-	step_15
-	step_15
-	step_15
-	step_18
-	step_18
-	step_18
-	step_18
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_18
-	step_18
-	step_18
-	step_18
-	step_right
-	step_right
-	step_down
-	step_down
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_down
-	step_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_down
+	walk_down
 	step_end
 
 Route104_Movement_1ED28C: @ 81ED28C
-	step_down
-	step_down
-	step_down
-	step_down
-	step_15
-	step_15
-	step_15
-	step_15
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_15
-	step_15
-	step_15
-	step_15
-	step_18
-	step_18
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_18
-	step_18
-	step_15
-	step_15
-	step_15
-	step_15
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_15
-	step_15
-	step_15
-	step_15
-	step_18
-	step_18
-	step_18
-	step_18
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_18
-	step_18
-	step_18
-	step_18
-	step_right
-	step_right
-	step_down
-	step_down
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_down
-	step_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_right
+	walk_fast_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_down
+	walk_down
 	step_end
 
 Route104_Movement_1ED34F: @ 81ED34F
-	step_left
-	step_down
-	step_down
+	walk_left
+	walk_down
+	walk_down
 	step_end
 
 Route104_Movement_1ED353: @ 81ED353
-	step_down
+	walk_down
 	step_end
 
 Route104_Movement_1ED355: @ 81ED355
-	step_down
-	step_left
-	step_28
+	walk_down
+	walk_left
+	walk_in_place_fastest_right
 	step_end
 
 Route104_Movement_1ED359: @ 81ED359
-	step_down
-	step_down
+	walk_down
+	walk_down
 	step_end
 
 Route104_Movement_1ED35C: @ 81ED35C
-	step_down
-	step_27
+	walk_down
+	walk_in_place_fastest_left
 	step_end
 
 Route104_EventScript_1ED35F:: @ 81ED35F
diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc
index 123f78db1..b1ac87e30 100644
--- a/data/scripts/maps/Route109.inc
+++ b/data/scripts/maps/Route109.inc
@@ -63,210 +63,210 @@ Route109_EventScript_1EE7D5:: @ 81EE7D5
 	end
 
 Route109_Movement_1EE84F: @ 81EE84F
-	step_25
-	step_down
-	step_down
-	step_15
-	step_15
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_15
-	step_15
-	step_17
-	step_17
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_left
-	step_left
-	step_25
+	walk_in_place_fastest_down
+	walk_down
+	walk_down
+	walk_fast_down
+	walk_fast_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_down
 	step_end
 
 Route109_Movement_1EE8FD: @ 81EE8FD
-	step_down
-	step_down
+	walk_down
+	walk_down
 	step_end
 
 Route109_Movement_1EE900: @ 81EE900
-	step_down
-	step_down
-	step_left
-	step_28
+	walk_down
+	walk_down
+	walk_left
+	walk_in_place_fastest_right
 	step_end
 
 Route109_Movement_1EE905: @ 81EE905
-	step_right
-	step_down
+	walk_right
+	walk_down
 	step_end
 
 Route109_Movement_1EE908: @ 81EE908
-	step_left
-	step_down
+	walk_left
+	walk_down
 	step_end
 
 Route109_Movement_1EE90B: @ 81EE90B
-	step_down
+	walk_down
 	step_end
 
 Route109_Movement_1EE90D: @ 81EE90D
-	step_down
-	step_27
+	walk_down
+	walk_in_place_fastest_left
 	step_end
 
 Route109_EventScript_1EE910:: @ 81EE910
diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc
index 9d00303c9..40d6a2e69 100644
--- a/data/scripts/maps/Route110.inc
+++ b/data/scripts/maps/Route110.inc
@@ -557,50 +557,50 @@ Route110_EventScript_1EF9A0:: @ 81EF9A0
 	return
 
 Route110_Movement_1EF9A8: @ 81EF9A8
-	step_down
-	step_left
-	step_25
+	walk_down
+	walk_left
+	walk_in_place_fastest_down
 	step_end
 
 Route110_Movement_1EF9AC: @ 81EF9AC
-	step_down
+	walk_down
 	step_end
 
 Route110_Movement_1EF9AE: @ 81EF9AE
-	step_down
-	step_right
-	step_25
+	walk_down
+	walk_right
+	walk_in_place_fastest_down
 	step_end
 
 Route110_Movement_1EF9B2: @ 81EF9B2
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
 	step_end
 
 Route110_Movement_1EF9BA: @ 81EF9BA
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_15
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_down
 	step_end
 
 Route110_Movement_1EF9C3: @ 81EF9C3
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
 	step_end
 
 Route110_EventScript_1EF9CB:: @ 81EF9CB
@@ -717,66 +717,66 @@ Route110_EventScript_1EFB25:: @ 81EFB25
 	return
 
 Route110_Movement_1EFB30: @ 81EFB30
-	step_down
-	step_down
-	step_down
+	walk_down
+	walk_down
+	walk_down
 	step_end
 
 Route110_Movement_1EFB34: @ 81EFB34
-	step_down
-	step_left
-	step_left
-	step_down
+	walk_down
+	walk_left
+	walk_left
+	walk_down
 	step_end
 
 Route110_Movement_1EFB39: @ 81EFB39
-	step_down
-	step_left
-	step_down
+	walk_down
+	walk_left
+	walk_down
 	step_end
 
 Route110_Movement_1EFB3D: @ 81EFB3D
-	step_down
-	step_down
+	walk_down
+	walk_down
 	step_end
 
 Route110_Movement_1EFB40: @ 81EFB40
-	step_down
-	step_right
-	step_down
+	walk_down
+	walk_right
+	walk_down
 	step_end
 
 Route110_Movement_1EFB44: @ 81EFB44
-	step_up
-	step_up
-	step_right
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_right
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 Route110_Movement_1EFB4B: @ 81EFB4B
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 Route110_Movement_1EFB51: @ 81EFB51
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 Route110_Movement_1EFB57: @ 81EFB57
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 Route110_Text_1EFB5D: @ 81EFB5D
diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc
index 5087d304c..9579df56c 100644
--- a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc
+++ b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc
@@ -27,7 +27,7 @@ Route110_SeasideCyclingRoadEntrance1_EventScript_26EA9F:: @ 826EA9F
 	end
 
 Route110_SeasideCyclingRoadEntrance1_Movement_26EAB4: @ 826EAB4
-	step_left
+	walk_left
 	step_end
 
 Route110_SeasideCyclingRoadEntrance1_EventScript_26EAB6:: @ 826EAB6
diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc
index 97e7452ec..499969d6e 100644
--- a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc
+++ b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc
@@ -45,7 +45,7 @@ Route110_SeasideCyclingRoadEntrance2_EventScript_26EBFC:: @ 826EBFC
 	end
 
 Route110_SeasideCyclingRoadEntrance2_Movement_26EC11: @ 826EC11
-	step_left
+	walk_left
 	step_end
 
 Route110_SeasideCyclingRoadEntrance2_EventScript_26EC13:: @ 826EC13
diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc
index b8db4697b..a2997a49b 100644
--- a/data/scripts/maps/Route110_TrickHouseEnd.inc
+++ b/data/scripts/maps/Route110_TrickHouseEnd.inc
@@ -253,11 +253,11 @@ Route110_TrickHouseEnd_EventScript_26B041:: @ 826B041
 	end
 
 Route110_TrickHouseEnd_Movement_26B089: @ 826B089
-	step_down
+	walk_down
 	step_end
 
 Route110_TrickHouseEnd_Movement_26B08B: @ 826B08B
-	step_48
+	jump_in_place_left
 	step_end
 
 Route110_TrickHouseEnd_Text_26B08D: @ 826B08D
diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc
index 4bf7eb10a..5e03fa165 100644
--- a/data/scripts/maps/Route110_TrickHouseEntrance.inc
+++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc
@@ -304,26 +304,26 @@ Route110_TrickHouseEntrance_EventScript_269E2D:: @ 8269E2D
 
 Route110_TrickHouseEnd_Movement_269E36: @ 8269E36
 Route110_TrickHouseEntrance_Movement_269E36: @ 8269E36
-	step_01
-	step_12
-	step_02
-	step_12
-	step_00
-	step_12
-	step_03
-	step_12
+	face_up
+	delay_4
+	face_left
+	delay_4
+	face_down
+	delay_4
+	face_right
+	delay_4
 	step_end
 
 Route110_TrickHouseEnd_Movement_269E3F: @ 8269E3F
 Route110_TrickHouseEntrance_Movement_269E3F: @ 8269E3F
-	step_01
-	step_52
-	step_32
-	step_32
-	step_32
-	step_32
-	step_32
-	step_32
+	face_up
+	disable_anim
+	slide_up
+	slide_up
+	slide_up
+	slide_up
+	slide_up
+	slide_up
 	step_end
 
 Route110_TrickHouseEntrance_EventScript_269E48:: @ 8269E48
@@ -529,7 +529,7 @@ Route110_TrickHouseEntrance_EventScript_26A126:: @ 826A126
 	end
 
 Route110_TrickHouseEntrance_Movement_26A1A7: @ 826A1A7
-	step_54
+	set_invisible
 	step_end
 
 Route110_TrickHouseEntrance_EventScript_26A1A9:: @ 826A1A9
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc
index cd14f0060..3bdf93b12 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc
+++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc
@@ -855,113 +855,113 @@ Route110_TrickHousePuzzle5_EventScript_26D5FF:: @ 826D5FF
 	return
 
 Route110_TrickHousePuzzle5_Movement_26D60A: @ 826D60A
-	step_left
+	walk_left
 	step_end
 
 Route110_TrickHousePuzzle5_Movement_26D60C: @ 826D60C
-	step_left
-	step_left
+	walk_left
+	walk_left
 	step_end
 
 Route110_TrickHousePuzzle5_Movement_26D60F: @ 826D60F
-	step_left
-	step_left
-	step_left
+	walk_left
+	walk_left
+	walk_left
 	step_end
 
 Route110_TrickHousePuzzle5_Movement_26D613: @ 826D613
-	step_left
-	step_left
-	step_left
-	step_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
 	step_end
 
 
 Movement_26D618: @ 826D618
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
 	step_end
 
 Route110_TrickHousePuzzle5_Movement_26D61E: @ 826D61E
-	step_right
+	walk_right
 	step_end
 
 Route110_TrickHousePuzzle5_Movement_26D620: @ 826D620
-	step_right
-	step_right
+	walk_right
+	walk_right
 	step_end
 
 Route110_TrickHousePuzzle5_Movement_26D623: @ 826D623
-	step_right
-	step_right
-	step_right
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 Route110_TrickHousePuzzle5_Movement_26D627: @ 826D627
-	step_right
-	step_right
-	step_right
-	step_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 Route110_TrickHousePuzzle5_Movement_26D62C: @ 826D62C
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 Route110_TrickHouseEntrance_Movement_26D632: @ 826D632
 Route110_TrickHousePuzzle5_Movement_26D632: @ 826D632
-	step_02
-	step_11
-	step_03
-	step_11
-	step_02
-	step_11
-	step_03
-	step_11
-	step_02
-	step_11
-	step_03
-	step_11
-	step_02
-	step_11
-	step_03
-	step_11
-	step_02
-	step_11
-	step_03
-	step_11
-	step_02
-	step_11
-	step_03
-	step_11
-	step_02
-	step_11
-	step_03
-	step_11
-	step_02
-	step_11
-	step_03
-	step_11
-	step_02
-	step_11
-	step_03
-	step_11
-	step_02
-	step_11
-	step_03
-	step_11
-	step_02
-	step_11
-	step_03
-	step_11
-	step_00
+	face_left
+	delay_2
+	face_right
+	delay_2
+	face_left
+	delay_2
+	face_right
+	delay_2
+	face_left
+	delay_2
+	face_right
+	delay_2
+	face_left
+	delay_2
+	face_right
+	delay_2
+	face_left
+	delay_2
+	face_right
+	delay_2
+	face_left
+	delay_2
+	face_right
+	delay_2
+	face_left
+	delay_2
+	face_right
+	delay_2
+	face_left
+	delay_2
+	face_right
+	delay_2
+	face_left
+	delay_2
+	face_right
+	delay_2
+	face_left
+	delay_2
+	face_right
+	delay_2
+	face_left
+	delay_2
+	face_right
+	delay_2
+	face_down
 	step_end
 
 Route110_TrickHousePuzzle5_Text_26D660: @ 826D660
diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc
index 37d77d095..094a52895 100644
--- a/data/scripts/maps/Route111.inc
+++ b/data/scripts/maps/Route111.inc
@@ -150,13 +150,13 @@ Route111_EventScript_1F0EA7:: @ 81F0EA7
 	end
 
 Route111_Movement_1F0EB1:: @ 81F0EB1
-	step_94
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
+	store_lock_anim
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
 	step_end
 
 Route111_EventScript_1F0EB9:: @ 81F0EB9
@@ -247,19 +247,19 @@ Route111_EventScript_1F0F9D:: @ 81F0F9D
 	return
 
 Route111_Movement_1F0FA8: @ 81F0FA8
-	step_up
+	walk_up
 	step_end
 
 Route111_Movement_1F0FAA: @ 81F0FAA
-	step_down
+	walk_down
 	step_end
 
 Route111_Movement_1F0FAC: @ 81F0FAC
-	step_left
+	walk_left
 	step_end
 
 Route111_Movement_1F0FAE: @ 81F0FAE
-	step_right
+	walk_right
 	step_end
 
 Route111_EventScript_1F0FB0:: @ 81F0FB0
@@ -366,18 +366,18 @@ Route111_EventScript_1F1143:: @ 81F1143
 	return
 
 Route111_Movement_1F114A: @ 81F114A
-	step_26
-	step_up
+	walk_in_place_fastest_up
+	walk_up
 	step_end
 
 Route111_Movement_1F114D: @ 81F114D
-	step_down
+	walk_down
 	step_end
 
 Route111_Movement_1F114F: @ 81F114F
-	step_14
-	step_14
-	step_14
+	delay_16
+	delay_16
+	delay_16
 	step_end
 
 Route111_EventScript_1F1153:: @ 81F1153
diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc
index 72c003d99..94e442a48 100644
--- a/data/scripts/maps/Route112_CableCarStation.inc
+++ b/data/scripts/maps/Route112_CableCarStation.inc
@@ -60,31 +60,31 @@ Route112_CableCarStation_EventScript_22AB67:: @ 822AB67
 	end
 
 Route112_CableCarStation_Movement_22AB71: @ 822AB71
-	step_up
-	step_up
-	step_right
-	step_27
+	walk_up
+	walk_up
+	walk_right
+	walk_in_place_fastest_left
 	step_end
 
 Route112_CableCarStation_Movement_22AB76: @ 822AB76
-	step_14
-	step_left
-	step_down
-	step_down
+	delay_16
+	walk_left
+	walk_down
+	walk_down
 	step_end
 
 Route112_CableCarStation_Movement_22AB7B: @ 822AB7B
-	step_up
-	step_up
-	step_up
-	step_14
+	walk_up
+	walk_up
+	walk_up
+	delay_16
 	step_end
 
 Route112_CableCarStation_Movement_22AB80: @ 822AB80
-	step_down
-	step_down
-	step_down
-	step_14
+	walk_down
+	walk_down
+	walk_down
+	delay_16
 	step_end
 
 Route112_CableCarStation_Text_22AB85: @ 822AB85
diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc
index a8d73397c..68a32c3b5 100644
--- a/data/scripts/maps/Route116.inc
+++ b/data/scripts/maps/Route116.inc
@@ -102,27 +102,27 @@ Route116_EventScript_1F2D39:: @ 81F2D39
 	end
 
 Route116_Movement_1F2D43: @ 81F2D43
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
 	step_end
 
 Route116_Movement_1F2D4C: @ 81F2D4C
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
 	step_end
 
 Route116_EventScript_1F2D57:: @ 81F2D57
@@ -223,28 +223,28 @@ Route116_EventScript_1F2E69:: @ 81F2E69
 	return
 
 Route116_Movement_1F2E74: @ 81F2E74
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
 	step_end
 
 Route116_Movement_1F2E7E: @ 81F2E7E
-	step_up
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
 	step_end
 
 Route116_EventScript_1F2E89:: @ 81F2E89
diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc
index 27a2539e1..818111b81 100644
--- a/data/scripts/maps/Route118.inc
+++ b/data/scripts/maps/Route118.inc
@@ -132,58 +132,58 @@ Route118_EventScript_1F3F4C:: @ 81F3F4C
 	return
 
 Route118_Movement_1F3F5E: @ 81F3F5E
-	step_14
-	step_28
+	delay_16
+	walk_in_place_fastest_right
 	step_end
 
 Route118_Movement_1F3F61: @ 81F3F61
-	step_left
+	walk_left
 	step_end
 
 Route118_Movement_1F3F63: @ 81F3F63
-	step_right
+	walk_right
 	step_end
 
 Route118_Movement_1F3F65: @ 81F3F65
-	fast_step_down
-	step_14
-	step_down
+	jump_2_down
+	delay_16
+	walk_down
 	step_end
 
 Route118_Movement_1F3F69: @ 81F3F69
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 Route118_Movement_1F3F74: @ 81F3F74
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 Route118_Movement_1F3F7E: @ 81F3F7E
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 Route118_EventScript_1F3F87:: @ 81F3F87
diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc
index 41e0fbbfe..a4b6a5fb1 100644
--- a/data/scripts/maps/Route119.inc
+++ b/data/scripts/maps/Route119.inc
@@ -230,98 +230,98 @@ Route119_EventScript_1F470F:: @ 81F470F
 	return
 
 Route119_Movement_1F471E: @ 81F471E
-	step_14
-	step_28
-	step_13
-	step_26
+	delay_16
+	walk_in_place_fastest_right
+	delay_8
+	walk_in_place_fastest_up
 	step_end
 
 Route119_Movement_1F4723: @ 81F4723
-	step_14
-	step_27
-	step_13
-	step_26
+	delay_16
+	walk_in_place_fastest_left
+	delay_8
+	walk_in_place_fastest_up
 	step_end
 
 Route119_Movement_1F4728: @ 81F4728
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_16
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
 	step_end
 
 Route119_Movement_1F4732: @ 81F4732
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_16
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
 	step_end
 
 Route119_Movement_1F473D: @ 81F473D
-	step_18
-	step_16
-	step_16
-	step_16
-	step_18
-	step_16
-	step_16
-	step_16
-	step_16
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
 	step_end
 
 Route119_Movement_1F4747: @ 81F4747
-	step_17
-	step_16
-	step_16
-	step_16
-	step_18
-	step_18
-	step_16
-	step_16
-	step_16
-	step_16
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
 	step_end
 
 Route119_Movement_1F4752: @ 81F4752
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_down
 	step_end
 
 Route119_Movement_1F475A: @ 81F475A
-	step_up
-	step_right
-	step_right
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 Route119_Movement_1F4763: @ 81F4763
-	step_up
-	step_right
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 Route119_EventScript_1F476B:: @ 81F476B
diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc
index 0bd6c12f2..b2341bf3d 100644
--- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc
+++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc
@@ -175,38 +175,38 @@ Route119_WeatherInstitute_2F_EventScript_270166:: @ 8270166
 	end
 
 Route119_WeatherInstitute_2F_Movement_270170: @ 8270170
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
 	step_end
 
 Route119_WeatherInstitute_2F_Movement_27017C: @ 827017C
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_2a
-	step_25
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	ride_water_current_up
+	walk_in_place_fastest_down
 	step_end
 
 Route119_WeatherInstitute_2F_Movement_270184: @ 8270184
-	step_31
-	step_27
+	slide_down
+	walk_in_place_fastest_left
 	step_end
 
 Route119_WeatherInstitute_2F_Movement_270187: @ 8270187
-	step_right
-	step_right
-	step_right
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 Route119_WeatherInstitute_2F_EventScript_27018B:: @ 827018B
diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc
index 461823e47..7d6876aeb 100644
--- a/data/scripts/maps/Route120.inc
+++ b/data/scripts/maps/Route120.inc
@@ -274,8 +274,8 @@ Route120_EventScript_1F57AE:: @ 81F57AE
 	return
 
 Route120_Movement_1F57B9: @ 81F57B9
-	step_down
-	step_left
+	walk_down
+	walk_left
 	step_end
 
 Route120_EventScript_1F57BC:: @ 81F57BC
diff --git a/data/scripts/maps/Route121.inc b/data/scripts/maps/Route121.inc
index d579401b8..f133ffe56 100644
--- a/data/scripts/maps/Route121.inc
+++ b/data/scripts/maps/Route121.inc
@@ -33,36 +33,36 @@ Route121_EventScript_1F5E18:: @ 81F5E18
 	end
 
 Route121_Movement_1F5E59: @ 81F5E59
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
 	step_end
 
 Route121_Movement_1F5E62: @ 81F5E62
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
 	step_end
 
 Route121_Movement_1F5E6B: @ 81F5E6B
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
 	step_end
 
 Route121_EventScript_1F5E74:: @ 81F5E74
diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc
index 1369b5721..0e9cf9636 100644
--- a/data/scripts/maps/Route121_SafariZoneEntrance.inc
+++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc
@@ -15,14 +15,14 @@ Route121_SafariZoneEntrance_EventScript_22BBCB:: @ 822BBCB
 	end
 
 Route121_SafariZoneEntrance_Movement_22BBDD: @ 822BBDD
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 Route121_SafariZoneEntrance_EventScript_22BBE6:: @ 822BBE6
@@ -122,18 +122,18 @@ Route121_SafariZoneEntrance_EventScript_22BD06:: @ 822BD06
 	end
 
 Route121_SafariZoneEntrance_Movement_22BD16: @ 822BD16
-	step_right
+	walk_right
 	step_end
 
 Route121_SafariZoneEntrance_Movement_22BD18: @ 822BD18
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
-	step_14
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	delay_16
 	step_end
 
 Route121_SafariZoneEntrance_EventScript_22BD21:: @ 822BD21
diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc
index f62f78404..8e2742ff5 100644
--- a/data/scripts/maps/Route128.inc
+++ b/data/scripts/maps/Route128.inc
@@ -80,99 +80,99 @@ Route128_EventScript_1F6B57:: @ 81F6B57
 	end
 
 Route128_Movement_1F6C76: @ 81F6C76
-	step_17
+	walk_fast_left
 	step_end
 
 Route128_Movement_1F6C78: @ 81F6C78
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 Route128_Movement_1F6C85: @ 81F6C85
-	step_up
+	walk_up
 	step_end
 
 Route128_Movement_1F6C87: @ 81F6C87
-	step_17
+	walk_fast_left
 	step_end
 
 Route128_Movement_1F6C89: @ 81F6C89
-	step_15
-	step_27
-	step_14
-	step_28
-	step_14
-	step_14
-	step_25
+	walk_fast_down
+	walk_in_place_fastest_left
+	delay_16
+	walk_in_place_fastest_right
+	delay_16
+	delay_16
+	walk_in_place_fastest_down
 	step_end
 
 Route128_Movement_1F6C91: @ 81F6C91
-	step_40
-	slow_step_up
-	step_14
-	step_41
+	lock_facing_direction
+	walk_slow_up
+	delay_16
+	unlock_facing_direction
 	step_end
 
 Route128_Movement_1F6C96: @ 81F6C96
-	step_17
-	step_17
-	step_17
-	step_28
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_in_place_fastest_right
 	step_end
 
 Route128_Movement_1F6C9B: @ 81F6C9B
-	step_14
-	step_14
-	step_16
-	step_17
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
+	delay_16
+	delay_16
+	walk_fast_up
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
 	step_end
 
 Route128_Movement_1F6CA8: @ 81F6CA8
-	step_left
-	step_left
-	step_13
-	step_12
+	walk_left
+	walk_left
+	delay_8
+	delay_4
 	step_end
 
 Route128_Movement_1F6CAD: @ 81F6CAD
-	step_left
-	step_25
+	walk_left
+	walk_in_place_fastest_down
 	step_end
 
 Route128_Movement_1F6CB0: @ 81F6CB0
-	step_17
-	step_17
-	step_17
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
 	step_end
 
 Route128_Movement_1F6CBB: @ 81F6CBB
-	step_right
-	step_25
+	walk_right
+	walk_in_place_fastest_down
 	step_end
 
 Route128_EventScript_1F6CBE:: @ 81F6CBE
diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc
index f8426a7eb..5e323211a 100644
--- a/data/scripts/maps/RustboroCity.inc
+++ b/data/scripts/maps/RustboroCity.inc
@@ -105,30 +105,30 @@ RustboroCity_EventScript_1E07BD:: @ 81E07BD
 	end
 
 RustboroCity_Movement_1E084E: @ 81E084E
-	step_1d
+	walk_in_place_down
 	step_end
 
 RustboroCity_Movement_1E0850: @ 81E0850
-	step_down
+	walk_down
 	step_end
 
 RustboroCity_Movement_1E0852: @ 81E0852
-	step_down
-	step_14
+	walk_down
+	delay_16
 	step_end
 
 RustboroCity_Movement_1E0855: @ 81E0855
-	step_14
-	step_left
-	step_down
-	step_down
-	step_right
-	step_26
-	step_14
+	delay_16
+	walk_left
+	walk_down
+	walk_down
+	walk_right
+	walk_in_place_fastest_up
+	delay_16
 	step_end
 
 RustboroCity_Movement_1E085D: @ 81E085D
-	step_up
+	walk_up
 	step_end
 
 RustboroCity_EventScript_1E085F:: @ 81E085F
@@ -352,100 +352,100 @@ RustboroCity_EventScript_1E0A79:: @ 81E0A79
 	return
 
 RustboroCity_Movement_1E0A8E: @ 81E0A8E
-	step_30
-	step_30
-	step_18
-	step_18
-	step_18
-	step_18
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
+	walk_fastest_right
+	walk_fastest_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
 	step_end
 
 RustboroCity_Movement_1E0AA0: @ 81E0AA0
-	step_30
-	step_30
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
+	walk_fastest_right
+	walk_fastest_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
 	step_end
 
 RustboroCity_Movement_1E0AB1: @ 81E0AB1
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_26
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
 	step_end
 
 RustboroCity_Movement_1E0AB9: @ 81E0AB9
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 RustboroCity_Movement_1E0AC1: @ 81E0AC1
-	step_down
-	step_right
-	step_right
+	walk_down
+	walk_right
+	walk_right
 	step_end
 
 RustboroCity_Movement_1E0AC5: @ 81E0AC5
-	step_down
-	step_down
-	step_right
-	step_right
+	walk_down
+	walk_down
+	walk_right
+	walk_right
 	step_end
 
 RustboroCity_Movement_1E0ACA: @ 81E0ACA
-	step_down
-	step_down
-	step_right
-	step_right
+	walk_down
+	walk_down
+	walk_right
+	walk_right
 	step_end
 
 RustboroCity_Movement_1E0ACF: @ 81E0ACF
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
 	step_end
 
 RustboroCity_Movement_1E0AD5: @ 81E0AD5
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_25
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_down
 	step_end
 
 RustboroCity_EventScript_1E0ADD:: @ 81E0ADD
@@ -554,7 +554,7 @@ RustboroCity_EventScript_1E0BF3:: @ 81E0BF3
 	return
 
 RustboroCity_Movement_1E0C29: @ 81E0C29
-	step_down
+	walk_down
 	step_end
 
 RustboroCity_EventScript_1E0C2B:: @ 81E0C2B
@@ -972,59 +972,59 @@ RustboroCity_EventScript_1E11FB:: @ 81E11FB
 	end
 
 RustboroCity_Movement_1E120E: @ 81E120E
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
 	step_end
 
 RustboroCity_Movement_1E1215: @ 81E1215
-	step_down
-	step_left
-	step_left
-	step_left
-	step_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_down
 	step_end
 
 RustboroCity_Movement_1E121B: @ 81E121B
-	step_down
-	step_left
-	step_left
-	step_down
+	walk_down
+	walk_left
+	walk_left
+	walk_down
 	step_end
 
 RustboroCity_Movement_1E1220: @ 81E1220
-	step_down
-	step_left
-	step_down
+	walk_down
+	walk_left
+	walk_down
 	step_end
 
 RustboroCity_Movement_1E1224: @ 81E1224
-	step_down
-	step_down
+	walk_down
+	walk_down
 	step_end
 
 RustboroCity_Movement_1E1227: @ 81E1227
-	step_down
-	step_right
-	step_down
+	walk_down
+	walk_right
+	walk_down
 	step_end
 
 RustboroCity_Movement_1E122B: @ 81E122B
-	step_down
-	step_right
-	step_right
-	step_down
+	walk_down
+	walk_right
+	walk_right
+	walk_down
 	step_end
 
 RustboroCity_Movement_1E1230: @ 81E1230
-	step_down
-	step_right
-	step_right
-	step_right
-	step_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_down
 	step_end
 
 RustboroCity_EventScript_1E1236:: @ 81E1236
diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc
index 9547fbd67..ffc2614cb 100644
--- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc
+++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc
@@ -73,78 +73,78 @@ RustboroCity_DevonCorp_3F_EventScript_21246E:: @ 821246E
 	end
 
 RustboroCity_DevonCorp_3F_Movement_21252F: @ 821252F
-	step_up
-	step_up
-	step_up
-	step_27
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_left
 	step_end
 
 RustboroCity_DevonCorp_3F_Movement_212534: @ 8212534
-	step_right
-	step_right
-	step_right
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_27
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_left
 	step_end
 
 RustboroCity_DevonCorp_3F_Movement_212543: @ 8212543
-	step_14
-	step_25
+	delay_16
+	walk_in_place_fastest_down
 	step_end
 
 RustboroCity_DevonCorp_3F_Movement_212546: @ 8212546
-	step_right
-	step_right
-	step_right
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 RustboroCity_DevonCorp_3F_Movement_21254F: @ 821254F
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_left
-	step_left
-	step_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_left
+	walk_left
+	walk_left
 	step_end
 
 RustboroCity_DevonCorp_3F_Movement_212558: @ 8212558
-	step_right
-	step_right
-	step_right
-	step_right
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 RustboroCity_DevonCorp_3F_Movement_212566: @ 8212566
-	step_14
-	step_14
-	step_down
-	step_down
-	step_28
+	delay_16
+	delay_16
+	walk_down
+	walk_down
+	walk_in_place_fastest_right
 	step_end
 
 RustboroCity_DevonCorp_3F_EventScript_21256C:: @ 821256C
diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/scripts/maps/RustboroCity_PokemonSchool.inc
index 46887b9c6..f5030facd 100644
--- a/data/scripts/maps/RustboroCity_PokemonSchool.inc
+++ b/data/scripts/maps/RustboroCity_PokemonSchool.inc
@@ -113,55 +113,55 @@ RustboroCity_PokemonSchool_EventScript_213FFB:: @ 8213FFB
 	end
 
 RustboroCity_PokemonSchool_Movement_214010: @ 8214010
-	step_left
-	step_down
-	step_down
-	step_right
-	step_25
-	step_14
-	step_14
-	step_14
-	step_down
-	step_27
-	step_14
-	step_14
-	step_right
-	step_14
-	step_14
-	step_13
-	step_up
-	step_left
-	step_left
-	step_up
-	step_up
-	step_right
+	walk_left
+	walk_down
+	walk_down
+	walk_right
+	walk_in_place_fastest_down
+	delay_16
+	delay_16
+	delay_16
+	walk_down
+	walk_in_place_fastest_left
+	delay_16
+	delay_16
+	walk_right
+	delay_16
+	delay_16
+	delay_8
+	walk_up
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_right
 	step_end
 
 RustboroCity_PokemonSchool_Movement_214027: @ 8214027
-	step_right
-	step_right
-	step_down
-	step_down
-	step_left
-	step_left
-	step_25
-	step_14
-	step_14
-	step_14
-	step_down
-	step_27
-	step_14
-	step_14
-	step_right
-	step_14
-	step_14
-	step_13
-	step_up
-	step_right
-	step_up
-	step_up
-	step_left
-	step_left
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_in_place_fastest_down
+	delay_16
+	delay_16
+	delay_16
+	walk_down
+	walk_in_place_fastest_left
+	delay_16
+	delay_16
+	walk_right
+	delay_16
+	delay_16
+	delay_8
+	walk_up
+	walk_right
+	walk_up
+	walk_up
+	walk_left
+	walk_left
 	step_end
 
 RustboroCity_PokemonSchool_EventScript_214040:: @ 8214040
diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc
index 52dca4c95..5e42be78d 100644
--- a/data/scripts/maps/RusturfTunnel.inc
+++ b/data/scripts/maps/RusturfTunnel.inc
@@ -150,121 +150,121 @@ RusturfTunnel_EventScript_22CFFF:: @ 822CFFF
 	return
 
 RusturfTunnel_Movement_22D017: @ 822D017
-	step_right
-	step_right
-	step_right
-	step_right
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
 	step_end
 
 RusturfTunnel_Movement_22D023: @ 822D023
-	step_right
-	step_right
-	step_right
-	step_right
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
 	step_end
 
 RusturfTunnel_Movement_22D02F: @ 822D02F
-	step_13
-	step_26
-	step_14
-	step_14
-	step_28
+	delay_8
+	walk_in_place_fastest_up
+	delay_16
+	delay_16
+	walk_in_place_fastest_right
 	step_end
 
 RusturfTunnel_Movement_22D035: @ 822D035
-	step_left
-	step_28
+	walk_left
+	walk_in_place_fastest_right
 	step_end
 
 RusturfTunnel_Movement_22D038: @ 822D038
-	step_down
-	step_26
-	step_13
-	step_28
+	walk_down
+	walk_in_place_fastest_up
+	delay_8
+	walk_in_place_fastest_right
 	step_end
 
 RusturfTunnel_Movement_22D03D: @ 822D03D
-	step_up
-	step_25
-	step_13
-	step_28
+	walk_up
+	walk_in_place_fastest_down
+	delay_8
+	walk_in_place_fastest_right
 	step_end
 
 RusturfTunnel_Movement_22D042: @ 822D042
-	step_left
-	step_28
+	walk_left
+	walk_in_place_fastest_right
 	step_end
 
 RusturfTunnel_Movement_22D045: @ 822D045
-	step_right
-	step_27
+	walk_right
+	walk_in_place_fastest_left
 	step_end
 
 RusturfTunnel_Movement_22D048: @ 822D048
-	step_up
-	step_28
+	walk_up
+	walk_in_place_fastest_right
 	step_end
 
 RusturfTunnel_Movement_22D04B: @ 822D04B
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
 	step_end
 
 RusturfTunnel_Movement_22D058: @ 822D058
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
 	step_end
 
 RusturfTunnel_Movement_22D065: @ 822D065
-	step_right
+	walk_right
 	step_end
 
 RusturfTunnel_Movement_22D067: @ 822D067
-	step_22
-	step_22
-	step_16
-	step_18
+	walk_in_place_fast_up
+	walk_in_place_fast_up
+	walk_fast_up
+	walk_fast_right
 	step_end
 
 RusturfTunnel_Movement_22D06C: @ 822D06C
-	step_24
-	step_24
-	step_18
-	step_26
+	walk_in_place_fast_right
+	walk_in_place_fast_right
+	walk_fast_right
+	walk_in_place_fastest_up
 	step_end
 
 RusturfTunnel_EventScript_22D071:: @ 822D071
@@ -293,9 +293,9 @@ RusturfTunnel_EventScript_22D083:: @ 822D083
 	end
 
 RusturfTunnel_Movement_22D0AB: @ 822D0AB
-	step_40
-	step_right
-	step_41
+	lock_facing_direction
+	walk_right
+	unlock_facing_direction
 	step_end
 
 RusturfTunnel_EventScript_22D0AF:: @ 822D0AF
@@ -353,76 +353,76 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2
 	end
 
 RusturfTunnel_Movement_22D178: @ 822D178
-	step_00
-	step_40
-	step_up
-	step_41
-	step_27
+	face_down
+	lock_facing_direction
+	walk_up
+	unlock_facing_direction
+	walk_in_place_fastest_left
 	step_end
 
 RusturfTunnel_Movement_22D17E: @ 822D17E
-	step_down
-	step_26
+	walk_down
+	walk_in_place_fastest_up
 	step_end
 
 RusturfTunnel_Movement_22D181: @ 822D181
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
 	step_end
 
 RusturfTunnel_Movement_22D18B: @ 822D18B
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 RusturfTunnel_Movement_22D193: @ 822D193
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
 	step_end
 
 RusturfTunnel_Movement_22D19F: @ 822D19F
-	step_14
-	step_13
-	step_12
-	step_27
+	delay_16
+	delay_8
+	delay_4
+	walk_in_place_fastest_left
 	step_end
 
 RusturfTunnel_Movement_22D1A4: @ 822D1A4
-	step_14
-	step_right
+	delay_16
+	walk_right
 	step_end
 
 RusturfTunnel_Movement_22D1A7: @ 822D1A7
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
 	step_end
 
 RusturfTunnel_EventScript_22D1B1:: @ 822D1B1
diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc
index ad10e2669..6d83c8841 100644
--- a/data/scripts/maps/SSTidalCorridor.inc
+++ b/data/scripts/maps/SSTidalCorridor.inc
@@ -224,47 +224,47 @@ SSTidalCorridor_EventScript_23C219:: @ 823C219
 	end
 
 SSTidalCorridor_Movement_23C26D: @ 823C26D
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
 	step_end
 
 SSTidalCorridor_Movement_23C275: @ 823C275
-	step_25
-	step_14
-	step_14
-	step_14
-	step_14
-	step_down
-	step_left
+	walk_in_place_fastest_down
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_down
+	walk_left
 	step_end
 
 SSTidalCorridor_Movement_23C27D: @ 823C27D
-	step_14
-	step_14
-	step_14
-	step_14
-	step_13
-	step_25
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_8
+	walk_in_place_fastest_down
 	step_end
 
 SSTidalCorridor_Movement_23C284: @ 823C284
-	step_14
-	step_right
-	step_right
-	step_26
-	step_14
-	step_27
+	delay_16
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	delay_16
+	walk_in_place_fastest_left
 	step_end
 
 SSTidalCorridor_Movement_23C28B: @ 823C28B
-	step_left
-	step_left
-	step_26
+	walk_left
+	walk_left
+	walk_in_place_fastest_up
 	step_end
 
 SSTidalCorridor_Text_23C28F: @ 823C28F
diff --git a/data/scripts/maps/SafariZone_South.inc b/data/scripts/maps/SafariZone_South.inc
index 4be06d00b..239a2efda 100644
--- a/data/scripts/maps/SafariZone_South.inc
+++ b/data/scripts/maps/SafariZone_South.inc
@@ -28,12 +28,12 @@ SafariZone_South_EventScript_23D2BD:: @ 823D2BD
 	return
 
 SafariZone_South_Movement_23D2C5: @ 823D2C5
-	step_down
+	walk_down
 	step_end
 
 SafariZone_South_Movement_23D2C7: @ 823D2C7
-	step_right
-	step_25
+	walk_right
+	walk_in_place_fastest_down
 	step_end
 
 SafariZone_South_EventScript_23D2CA:: @ 823D2CA
@@ -98,22 +98,22 @@ SafariZone_South_EventScript_23D373:: @ 823D373
 	end
 
 SafariZone_South_Movement_23D385: @ 823D385
-	step_up
+	walk_up
 	step_end
 
 SafariZone_South_Movement_23D387: @ 823D387
-	step_right
-	step_26
+	walk_right
+	walk_in_place_fastest_up
 	step_end
 
 SafariZone_South_Movement_23D38A: @ 823D38A
-	step_left
-	step_28
+	walk_left
+	walk_in_place_fastest_right
 	step_end
 
 SafariZone_South_Movement_23D38D: @ 823D38D
-	step_down
-	step_26
+	walk_down
+	walk_in_place_fastest_up
 	step_end
 
 SafariZone_South_EventScript_23D390:: @ 823D390
diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc
index a2247286c..e8f6323c1 100644
--- a/data/scripts/maps/SeafloorCavern_Room9.inc
+++ b/data/scripts/maps/SeafloorCavern_Room9.inc
@@ -147,78 +147,78 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
 	end
 
 SeafloorCavern_Room9_Movement_23502A: @ 823502A
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 SeafloorCavern_Room9_Movement_235032: @ 8235032
-	step_left
-	step_left
+	walk_left
+	walk_left
 	step_end
 
 SeafloorCavern_Room9_Movement_235035: @ 8235035
-	step_left
-	step_14
+	walk_left
+	delay_16
 	step_end
 
 SeafloorCavern_Room9_Movement_235038: @ 8235038
-	step_right
+	walk_right
 	step_end
 
 SeafloorCavern_Room9_Movement_23503A: @ 823503A
-	step_01
-	step_40
-	step_down
-	step_41
-	step_28
+	face_up
+	lock_facing_direction
+	walk_down
+	unlock_facing_direction
+	walk_in_place_fastest_right
 	step_end
 
 SeafloorCavern_Room9_Movement_235040: @ 8235040
-	step_14
-	step_14
-	slow_step_down
-	step_14
-	step_14
-	step_14
-	slow_step_down
-	step_14
-	step_14
-	step_14
+	delay_16
+	delay_16
+	walk_slow_down
+	delay_16
+	delay_16
+	delay_16
+	walk_slow_down
+	delay_16
+	delay_16
+	delay_16
 	step_end
 
 SeafloorCavern_Room9_Movement_23504B: @ 823504B
-	step_32
-	step_32
+	slide_up
+	slide_up
 	step_end
 
 SeafloorCavern_Room9_Movement_23504E: @ 823504E
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
 	step_end
 
 SeafloorCavern_Room9_Movement_235054: @ 8235054
-	step_right
-	step_right
+	walk_right
+	walk_right
 	step_end
 
 SeafloorCavern_Room9_Movement_235057: @ 8235057
-	step_18
-	step_18
-	step_18
-	step_18
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
 	step_end
 
 SeafloorCavern_Room9_Movement_23505C: @ 823505C
-	step_14
-	step_14
+	delay_16
+	delay_16
 	step_end
 
 SeafloorCavern_Room9_Text_23505F: @ 823505F
diff --git a/data/scripts/maps/SkyPillar_Outside.inc b/data/scripts/maps/SkyPillar_Outside.inc
index cced073aa..e9fbf4ad6 100644
--- a/data/scripts/maps/SkyPillar_Outside.inc
+++ b/data/scripts/maps/SkyPillar_Outside.inc
@@ -92,46 +92,46 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304
 	end
 
 SkyPillar_Outside_Movement_2393D3: @ 82393D3
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 SkyPillar_Outside_Movement_2393DE: @ 82393DE
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_up
-	step_right
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 SkyPillar_Outside_Movement_2393EB: @ 82393EB
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_up
-	step_right
-	step_up
-	step_up
-	step_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 SkyPillar_Outside_EventScript_2393F8:: @ 82393F8
diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc
index a652c7897..334acc8ac 100644
--- a/data/scripts/maps/SkyPillar_Top.inc
+++ b/data/scripts/maps/SkyPillar_Top.inc
@@ -98,10 +98,10 @@ SkyPillar_Top_EventScript_23979A:: @ 823979A
 	fadeoutbgm 1
 	applymovement 255, SkyPillar_Top_Movement_2725B2
 	waitmovement 0
-	special SpawnScriptFieldObject
+	special SpawnScriptEventObject
 	applymovement 127, SkyPillar_Top_Movement_239858
 	waitmovement 0
-	special RemoveScriptFieldObject
+	special RemoveScriptEventObject
 	applymovement 1, SkyPillar_Top_Movement_23983A
 	waitmovement 0
 	waitse
@@ -128,10 +128,10 @@ SkyPillar_Top_EventScript_23979A:: @ 823979A
 	closemessage
 	delay 20
 	fadeinbgm 1
-	special SpawnScriptFieldObject
+	special SpawnScriptEventObject
 	applymovement 127, SkyPillar_Top_Movement_23985C
 	waitmovement 0
-	special RemoveScriptFieldObject
+	special RemoveScriptEventObject
 	setvar VAR_0x405E, 5
 	setvar VAR_0x40CA, 1
 	setvar VAR_0x40D7, 1
@@ -139,49 +139,49 @@ SkyPillar_Top_EventScript_23979A:: @ 823979A
 	end
 
 SkyPillar_Top_Movement_23983A: @ 823983A
-	step_14
-	step_23
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_1f
-	step_14
-	step_20
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
+	delay_16
+	walk_in_place_fast_left
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_in_place_left
+	delay_16
+	walk_in_place_right
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
 	step_end
 
 SkyPillar_Top_Movement_23984B: @ 823984B
-	step_14
-	step_1d
-	step_13
-	step_20
-	step_13
-	step_2e
-	step_32
-	step_32
-	step_32
-	step_32
-	step_32
-	step_32
+	delay_16
+	walk_in_place_down
+	delay_8
+	walk_in_place_right
+	delay_8
+	walk_fastest_up
+	slide_up
+	slide_up
+	slide_up
+	slide_up
+	slide_up
+	slide_up
 	step_end
 
 SkyPillar_Top_Movement_239858: @ 8239858
-	slow_step_up
-	slow_step_up
-	slow_step_up
+	walk_slow_up
+	walk_slow_up
+	walk_slow_up
 	step_end
 
 SkyPillar_Top_Movement_23985C: @ 823985C
-	slow_step_down
-	slow_step_down
-	slow_step_down
+	walk_slow_down
+	walk_slow_down
+	walk_slow_down
 	step_end
 
 SkyPillar_Top_Text_239860: @ 8239860
diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc
index fe7cfc0fd..d860e6e7c 100644
--- a/data/scripts/maps/SlateportCity.inc
+++ b/data/scripts/maps/SlateportCity.inc
@@ -90,30 +90,30 @@ SlateportCity_EventScript_1DCD1C:: @ 81DCD1C
 	end
 
 SlateportCity_Movement_1DCDA8: @ 81DCDA8
-	step_14
-	step_13
-	step_27
+	delay_16
+	delay_8
+	walk_in_place_fastest_left
 	step_end
 
 SlateportCity_Movement_1DCDAC: @ 81DCDAC
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 SlateportCity_Movement_1DCDB4: @ 81DCDB4
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
 	step_end
 
 SlateportCity_EventScript_1DCDBD:: @ 81DCDBD
@@ -473,8 +473,8 @@ SlateportCity_EventScript_1DD0C1:: @ 81DD0C1
 	end
 
 SlateportCity_Movement_1DD147: @ 81DD147
-	step_14
-	step_14
+	delay_16
+	delay_16
 	step_end
 
 SlateportCity_EventScript_1DD14A:: @ 81DD14A
@@ -622,95 +622,95 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8
 	end
 
 SlateportCity_Movement_1DD309: @ 81DD309
-	step_14
-	step_14
-	step_57
-	step_28
-	step_14
-	step_14
-	step_27
+	delay_16
+	delay_16
+	emote_question_mark
+	walk_in_place_fastest_right
+	delay_16
+	delay_16
+	walk_in_place_fastest_left
 	step_end
 
 SlateportCity_Movement_1DD311: @ 81DD311
-	step_57
-	step_26
-	step_14
-	step_25
-	step_14
-	step_14
-	step_27
+	emote_question_mark
+	walk_in_place_fastest_up
+	delay_16
+	walk_in_place_fastest_down
+	delay_16
+	delay_16
+	walk_in_place_fastest_left
 	step_end
 
 SlateportCity_Movement_1DD319: @ 81DD319
-	step_14
-	step_left
-	step_left
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
+	delay_16
+	walk_left
+	walk_left
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
 	step_end
 
 SlateportCity_Movement_1DD326: @ 81DD326
-	step_down
-	step_left
-	step_left
-	step_left
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
 	step_end
 
 SlateportCity_Movement_1DD334: @ 81DD334
-	step_down
-	step_26
+	walk_down
+	walk_in_place_fastest_up
 	step_end
 
 SlateportCity_Movement_1DD337: @ 81DD337
-	step_right
-	step_up
-	step_up
-	step_54
+	walk_right
+	walk_up
+	walk_up
+	set_invisible
 	step_end
 
 SlateportCity_Movement_1DD33C: @ 81DD33C
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_down
-	step_left
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_down
+	walk_left
 	step_end
 
 SlateportCity_Movement_1DD344: @ 81DD344
-	step_28
-	step_14
-	step_14
-	step_right
-	step_up
+	walk_in_place_fastest_right
+	delay_16
+	delay_16
+	walk_right
+	walk_up
 	step_end
 
 SlateportCity_Movement_1DD34A: @ 81DD34A
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_25
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_in_place_fastest_down
 	step_end
 
 SlateportCity_EventScript_1DD353:: @ 81DD353
@@ -914,30 +914,30 @@ SlateportCity_EventScript_1DD5DC:: @ 81DD5DC
 	end
 
 SlateportCity_Movement_1DD630: @ 81DD630
-	step_40
-	step_down
-	step_41
+	lock_facing_direction
+	walk_down
+	unlock_facing_direction
 	step_end
 
 SlateportCity_Movement_1DD634: @ 81DD634
-	step_14
-	step_28
+	delay_16
+	walk_in_place_fastest_right
 	step_end
 
 SlateportCity_Movement_1DD637: @ 81DD637
-	step_13
-	step_down
+	delay_8
+	walk_down
 	step_end
 
 SlateportCity_Movement_1DD63A: @ 81DD63A
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 SlateportCity_EventScript_1DD643:: @ 81DD643
diff --git a/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc b/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc
index 4c5aa0371..d79849a6c 100644
--- a/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc
+++ b/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc
@@ -99,17 +99,17 @@ SlateportCity_BattleTentCorridor_EventScript_209A7B:: @ 8209A7B
 @ forced stop
 
 SlateportCity_BattleTentBattleRoom_Movement_209A99: @ 8209A99
-	step_up
-	step_up
-	step_up
-	step_28
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_right
 	step_end
 
 SlateportCity_BattleTentBattleRoom_Movement_209A9E: @ 8209A9E
-	step_down
-	step_down
-	step_down
-	step_down
-	step_27
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_in_place_fastest_left
 	step_end
 
diff --git a/data/scripts/maps/SlateportCity_BattleTentCorridor.inc b/data/scripts/maps/SlateportCity_BattleTentCorridor.inc
index 47ca641ce..7446c1002 100644
--- a/data/scripts/maps/SlateportCity_BattleTentCorridor.inc
+++ b/data/scripts/maps/SlateportCity_BattleTentCorridor.inc
@@ -147,29 +147,29 @@ SlateportCity_BattleTentCorridor_EventScript_209044:: @ 8209044
 	goto SlateportCity_BattleTentCorridor_EventScript_208F0D
 
 SlateportCity_BattleTentCorridor_Movement_209059: @ 8209059
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 SlateportCity_BattleTentCorridor_Movement_20905E: @ 820905E
-	step_up
-	step_up
-	step_54
+	walk_up
+	walk_up
+	set_invisible
 	step_end
 
 SlateportCity_BattleTentCorridor_Movement_209062: @ 8209062
-	step_up
-	step_up
-	step_up
-	step_up
-	step_25
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_down
 	step_end
 
 SlateportCity_BattleTentCorridor_Movement_209068: @ 8209068
-	step_up
-	step_54
+	walk_up
+	set_invisible
 	step_end
 
 SlateportCity_BattleTentCorridor_Text_20906B: @ 820906B
diff --git a/data/scripts/maps/SlateportCity_BattleTentLobby.inc b/data/scripts/maps/SlateportCity_BattleTentLobby.inc
index 6353856e3..187ed0751 100644
--- a/data/scripts/maps/SlateportCity_BattleTentLobby.inc
+++ b/data/scripts/maps/SlateportCity_BattleTentLobby.inc
@@ -194,26 +194,26 @@ SlateportCity_BattleTentLobby_EventScript_2089C9:: @ 82089C9
 	return
 
 SlateportCity_BattleTentLobby_Movement_2089F8: @ 82089F8
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 SlateportCity_BattleTentLobby_Movement_2089FC: @ 82089FC
-	step_up
-	step_54
+	walk_up
+	set_invisible
 	step_end
 
 SlateportCity_BattleTentLobby_Movement_2089FF: @ 82089FF
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 SlateportCity_BattleTentLobby_Movement_208A03: @ 8208A03
-	step_up
-	step_up
-	step_54
+	walk_up
+	walk_up
+	set_invisible
 	step_end
 
 SlateportCity_BattleTentLobby_EventScript_208A07:: @ 8208A07
@@ -236,10 +236,10 @@ SlateportCity_BattleTentLobby_EventScript_208A2E:: @ 8208A2E
 	end
 
 SlateportCity_BattleTentLobby_Movement_208A38:: @ 8208A38
-	step_up
-	step_up
-	step_up
-	step_54
+	walk_up
+	walk_up
+	walk_up
+	set_invisible
 	step_end
 
 SlateportCity_BattleTentLobby_EventScript_208A3D:: @ 8208A3D
diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc
index a66e0e6d9..ca6ab50b5 100644
--- a/data/scripts/maps/SlateportCity_Harbor.inc
+++ b/data/scripts/maps/SlateportCity_Harbor.inc
@@ -105,58 +105,58 @@ SlateportCity_Harbor_EventScript_20CAB3:: @ 820CAB3
 	return
 
 SlateportCity_Harbor_Movement_20CAC8: @ 820CAC8
-	step_14
-	step_14
-	step_43
-	step_54
+	delay_16
+	delay_16
+	jump_up
+	set_invisible
 	step_end
 
 SlateportCity_Harbor_Movement_20CACD: @ 820CACD
-	step_14
-	step_14
-	step_43
-	step_54
+	delay_16
+	delay_16
+	jump_up
+	set_invisible
 	step_end
 
 SlateportCity_Harbor_Movement_20CAD2: @ 820CAD2
-	step_14
-	step_14
-	step_14
-	step_14
-	step_right
-	step_right
-	step_right
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_right
+	walk_right
+	walk_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
 	step_end
 
 SlateportCity_Harbor_Movement_20CAE0: @ 820CAE0
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
 	step_end
 
 SlateportCity_Harbor_Movement_20CAE6: @ 820CAE6
-	step_left
-	step_left
-	step_up
-	step_left
+	walk_left
+	walk_left
+	walk_up
+	walk_left
 	step_end
 
 SlateportCity_Harbor_Movement_20CAEB: @ 820CAEB
-	step_left
-	step_left
-	step_left
+	walk_left
+	walk_left
+	walk_left
 	step_end
 
 SlateportCity_Harbor_Movement_20CAEF: @ 820CAEF
-	step_up
+	walk_up
 	step_end
 
 SlateportCity_Harbor_EventScript_20CAF1:: @ 820CAF1
@@ -259,12 +259,12 @@ SlateportCity_Harbor_EventScript_20CC42:: @ 820CC42
 	return
 
 SlateportCity_Harbor_Movement_20CC4D: @ 820CC4D
-	step_right
-	step_26
+	walk_right
+	walk_in_place_fastest_up
 	step_end
 
 SlateportCity_Harbor_Movement_20CC50: @ 820CC50
-	step_up
+	walk_up
 	step_end
 
 SlateportCity_Harbor_EventScript_20CC52:: @ 820CC52
diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc
index ba8575c66..4464ee582 100644
--- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc
+++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc
@@ -72,7 +72,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AE39:: @ 820AE39
 	end
 
 SlateportCity_OceanicMuseum_1F_Movement_20AE4B: @ 820AE4B
-	step_down
+	walk_down
 	step_end
 
 SlateportCity_OceanicMuseum_1F_EventScript_20AE4D:: @ 820AE4D
@@ -210,33 +210,33 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AFB5:: @ 820AFB5
 	end
 
 SlateportCity_OceanicMuseum_1F_Movement_20AFBF: @ 820AFBF
-	step_14
-	step_13
-	step_12
-	step_25
+	delay_16
+	delay_8
+	delay_4
+	walk_in_place_fastest_down
 	step_end
 
 SlateportCity_OceanicMuseum_1F_Movement_20AFC4: @ 820AFC4
-	step_14
-	step_25
+	delay_16
+	walk_in_place_fastest_down
 	step_end
 
 SlateportCity_OceanicMuseum_1F_Movement_20AFC7: @ 820AFC7
-	step_00
-	step_15
-	step_15
-	step_15
-	step_15
-	step_13
+	face_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	delay_8
 	step_end
 
 SlateportCity_OceanicMuseum_1F_Movement_20AFCE: @ 820AFCE
-	step_18
-	step_15
-	step_15
-	step_15
-	step_15
-	step_13
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	delay_8
 	step_end
 
 SlateportCity_OceanicMuseum_1F_Text_20AFD5: @ 820AFD5
diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc
index a7a24757f..4172c47ef 100644
--- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc
+++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc
@@ -116,103 +116,103 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BCB3:: @ 820BCB3
 	return
 
 SlateportCity_OceanicMuseum_2F_Movement_20BCBE: @ 820BCBE
-	step_left
-	step_down
-	step_27
+	walk_left
+	walk_down
+	walk_in_place_fastest_left
 	step_end
 
 SlateportCity_OceanicMuseum_2F_Movement_20BCC2: @ 820BCC2
-	step_up
-	step_left
-	step_left
-	step_down
-	step_27
+	walk_up
+	walk_left
+	walk_left
+	walk_down
+	walk_in_place_fastest_left
 	step_end
 
 SlateportCity_OceanicMuseum_2F_Movement_20BCC8: @ 820BCC8
-	step_up
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_left
-	step_left
-	step_up
-	step_up
-	step_13
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	delay_8
 	step_end
 
 SlateportCity_OceanicMuseum_2F_Movement_20BCD6: @ 820BCD6
-	step_right
+	walk_right
 	step_end
 
 SlateportCity_OceanicMuseum_2F_Movement_20BCD8: @ 820BCD8
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 SlateportCity_OceanicMuseum_2F_Movement_20BCE2: @ 820BCE2
-	step_right
+	walk_right
 	step_end
 
 SlateportCity_OceanicMuseum_2F_Movement_20BCE4: @ 820BCE4
-	step_down
-	step_right
-	step_25
+	walk_down
+	walk_right
+	walk_in_place_fastest_down
 	step_end
 
 SlateportCity_OceanicMuseum_2F_Movement_20BCE8: @ 820BCE8
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 SlateportCity_OceanicMuseum_2F_Movement_20BCEF: @ 820BCEF
-	step_40
-	step_left
-	step_41
+	lock_facing_direction
+	walk_left
+	unlock_facing_direction
 	step_end
 
 SlateportCity_OceanicMuseum_2F_Movement_20BCF3: @ 820BCF3
-	step_down
+	walk_down
 	step_end
 
 SlateportCity_OceanicMuseum_2F_Movement_20BCF5: @ 820BCF5
-	step_down
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 SlateportCity_OceanicMuseum_2F_Movement_20BCFE: @ 820BCFE
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_13
-	step_15
-	step_26
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_8
+	walk_fast_down
+	walk_in_place_fastest_up
 	step_end
 
 SlateportCity_OceanicMuseum_2F_EventScript_20BD0A:: @ 820BD0A
diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc
index 793b6f4fd..6a26ee0ff 100644
--- a/data/scripts/maps/SootopolisCity.inc
+++ b/data/scripts/maps/SootopolisCity.inc
@@ -212,10 +212,10 @@ SootopolisCity_EventScript_1E5926:: @ 81E5926
 
 SootopolisCity_EventScript_1E5946:: @ 81E5946
 	delay 60
-	special SpawnScriptFieldObject
+	special SpawnScriptEventObject
 	applymovement 127, SootopolisCity_Movement_1E5A68
 	waitmovement 0
-	special RemoveScriptFieldObject
+	special RemoveScriptEventObject
 	delay 60
 	fadescreenspeed 1, 8
 	setweather 15
@@ -269,53 +269,53 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946
 	applymovement 10, SootopolisCity_Movement_1E5BCF
 	applymovement 9, SootopolisCity_Movement_1E5BF0
 	waitmovement 0
-	special SpawnScriptFieldObject
+	special SpawnScriptEventObject
 	applymovement 10, SootopolisCity_Movement_1E5BD6
 	applymovement 9, SootopolisCity_Movement_1E5BF7
 	applymovement 127, SootopolisCity_Movement_1E5A75
 	waitmovement 0
-	special RemoveScriptFieldObject
+	special RemoveScriptEventObject
 	setvar VAR_0x405E, 2
 	clearflag FLAG_SPECIAL_FLAG_0x4000
 	releaseall
 	end
 
 SootopolisCity_Movement_1E5A68: @ 81E5A68
-	step_92
-	step_92
-	step_92
-	step_92
-	step_92
-	step_92
-	step_92
-	step_92
-	step_92
-	step_92
-	step_92
-	step_92
+	walk_slow_diag_southwest
+	walk_slow_diag_southwest
+	walk_slow_diag_southwest
+	walk_slow_diag_southwest
+	walk_slow_diag_southwest
+	walk_slow_diag_southwest
+	walk_slow_diag_southwest
+	walk_slow_diag_southwest
+	walk_slow_diag_southwest
+	walk_slow_diag_southwest
+	walk_slow_diag_southwest
+	walk_slow_diag_southwest
 	step_end
 
 SootopolisCity_Movement_1E5A75: @ 81E5A75
-	step_91
-	step_91
-	step_91
-	step_91
-	step_91
-	step_91
-	step_91
-	step_91
-	step_91
-	step_91
-	step_91
-	step_91
+	walk_slow_diag_northeast
+	walk_slow_diag_northeast
+	walk_slow_diag_northeast
+	walk_slow_diag_northeast
+	walk_slow_diag_northeast
+	walk_slow_diag_northeast
+	walk_slow_diag_northeast
+	walk_slow_diag_northeast
+	walk_slow_diag_northeast
+	walk_slow_diag_northeast
+	walk_slow_diag_northeast
+	walk_slow_diag_northeast
 	step_end
 
 SootopolisCity_EventScript_1E5A82:: @ 81E5A82
 	delay 60
-	special SpawnScriptFieldObject
+	special SpawnScriptEventObject
 	applymovement 127, SootopolisCity_Movement_1E5BA4
 	waitmovement 0
-	special RemoveScriptFieldObject
+	special RemoveScriptEventObject
 	delay 60
 	fadescreenspeed 1, 8
 	setweather 15
@@ -369,125 +369,125 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82
 	applymovement 10, SootopolisCity_Movement_1E5BCF
 	applymovement 9, SootopolisCity_Movement_1E5BF0
 	waitmovement 0
-	special SpawnScriptFieldObject
+	special SpawnScriptEventObject
 	applymovement 10, SootopolisCity_Movement_1E5BD6
 	applymovement 9, SootopolisCity_Movement_1E5BF7
 	applymovement 127, SootopolisCity_Movement_1E5BAE
 	waitmovement 0
-	special RemoveScriptFieldObject
+	special RemoveScriptEventObject
 	setvar VAR_0x405E, 2
 	clearflag FLAG_SPECIAL_FLAG_0x4000
 	releaseall
 	end
 
 SootopolisCity_Movement_1E5BA4: @ 81E5BA4
-	step_91
-	step_91
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_slow_diag_northeast
+	walk_slow_diag_northeast
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 SootopolisCity_Movement_1E5BAE: @ 81E5BAE
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_92
-	step_92
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_slow_diag_southwest
+	walk_slow_diag_southwest
 	step_end
 
 SootopolisCity_Movement_1E5BB8: @ 81E5BB8
-	step_1b
-	step_1b
-	step_1b
-	step_14
-	step_14
-	step_14
-	step_5e
-	step_96
-	step_5f
+	walk_in_place_slow_left
+	walk_in_place_slow_left
+	walk_in_place_slow_left
+	delay_16
+	delay_16
+	delay_16
+	init_affine_anim
+	walk_left_affine
+	clear_affine_anim
 	step_end
 
 SootopolisCity_Movement_1E5BC2: @ 81E5BC2
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_5e
-	step_96
-	step_5f
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	init_affine_anim
+	walk_left_affine
+	clear_affine_anim
 	step_end
 
 SootopolisCity_Movement_1E5BCF: @ 81E5BCF
-	step_40
-	step_right
-	step_14
-	step_14
-	step_14
-	step_41
+	lock_facing_direction
+	walk_right
+	delay_16
+	delay_16
+	delay_16
+	unlock_facing_direction
 	step_end
 
 SootopolisCity_Movement_1E5BD6: @ 81E5BD6
-	step_1b
-	step_1b
-	step_1b
-	step_1b
-	step_1b
-	step_1b
+	walk_in_place_slow_left
+	walk_in_place_slow_left
+	walk_in_place_slow_left
+	walk_in_place_slow_left
+	walk_in_place_slow_left
+	walk_in_place_slow_left
 	step_end
 
 SootopolisCity_Movement_1E5BDD: @ 81E5BDD
-	step_1c
-	step_1c
-	step_1c
-	step_14
-	step_14
-	step_14
-	step_18
+	walk_in_place_slow_right
+	walk_in_place_slow_right
+	walk_in_place_slow_right
+	delay_16
+	delay_16
+	delay_16
+	walk_fast_right
 	step_end
 
 SootopolisCity_Movement_1E5BE5: @ 81E5BE5
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_18
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_fast_right
 	step_end
 
 SootopolisCity_Movement_1E5BF0: @ 81E5BF0
-	step_40
-	step_left
-	step_14
-	step_14
-	step_14
-	step_41
+	lock_facing_direction
+	walk_left
+	delay_16
+	delay_16
+	delay_16
+	unlock_facing_direction
 	step_end
 
 SootopolisCity_Movement_1E5BF7: @ 81E5BF7
-	step_1c
-	step_1c
-	step_1c
-	step_1c
-	step_1c
-	step_1c
+	walk_in_place_slow_right
+	walk_in_place_slow_right
+	walk_in_place_slow_right
+	walk_in_place_slow_right
+	walk_in_place_slow_right
+	walk_in_place_slow_right
 	step_end
 
 SootopolisCity_EventScript_1E5BFE:: @ 81E5BFE
@@ -502,10 +502,10 @@ SootopolisCity_EventScript_1E5BFE:: @ 81E5BFE
 
 SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E
 	delay 60
-	special SpawnScriptFieldObject
+	special SpawnScriptEventObject
 	applymovement 127, SootopolisCity_Movement_1E5A68
 	waitmovement 0
-	special RemoveScriptFieldObject
+	special RemoveScriptEventObject
 	delay 60
 	fadescreenspeed 1, 8
 	call SootopolisCity_EventScript_1E5D82
@@ -516,7 +516,7 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E
 	special sub_813B7D8
 	waitstate
 	playse SE_T_KAMI
-	special SpawnScriptFieldObject
+	special SpawnScriptEventObject
 	applymovement 127, SootopolisCity_Movement_1E5E63
 	waitmovement 0
 	waitse
@@ -555,10 +555,10 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E
 
 SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE
 	delay 60
-	special SpawnScriptFieldObject
+	special SpawnScriptEventObject
 	applymovement 127, SootopolisCity_Movement_1E5BA4
 	waitmovement 0
-	special RemoveScriptFieldObject
+	special RemoveScriptEventObject
 	delay 60
 	fadescreenspeed 1, 8
 	call SootopolisCity_EventScript_1E5D82
@@ -568,7 +568,7 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE
 	setvar VAR_0x8004, 1
 	special sub_813B7D8
 	waitstate
-	special SpawnScriptFieldObject
+	special SpawnScriptEventObject
 	applymovement 127, SootopolisCity_Movement_1E5E63
 	applymovement 255, SootopolisCity_Movement_1E5E68
 	waitmovement 0
@@ -634,65 +634,65 @@ SootopolisCity_EventScript_1E5D82:: @ 81E5D82
 	return
 
 SootopolisCity_Movement_1E5E5B: @ 81E5E5B
-	step_16
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
+	walk_fast_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
 	step_end
 
 SootopolisCity_Movement_1E5E63: @ 81E5E63
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 SootopolisCity_Movement_1E5E68: @ 81E5E68
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 SootopolisCity_Movement_1E5E6D: @ 81E5E6D
-	step_down
-	step_down
-	step_down
-	step_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
 	step_end
 
 SootopolisCity_Movement_1E5E72: @ 81E5E72
-	step_91
-	step_91
-	step_91
-	step_91
-	step_91
-	step_91
-	step_91
-	step_91
-	step_right
-	step_right
-	step_right
-	step_right
+	walk_slow_diag_northeast
+	walk_slow_diag_northeast
+	walk_slow_diag_northeast
+	walk_slow_diag_northeast
+	walk_slow_diag_northeast
+	walk_slow_diag_northeast
+	walk_slow_diag_northeast
+	walk_slow_diag_northeast
+	walk_right
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 SootopolisCity_Movement_1E5E7F: @ 81E5E7F
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_92
-	step_92
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_slow_diag_southwest
+	walk_slow_diag_southwest
 	step_end
 
 SootopolisCity_EventScript_1E5E8D:: @ 81E5E8D
@@ -1004,267 +1004,267 @@ SootopolisCity_EventScript_1E6255:: @ 81E6255
 	return
 
 SootopolisCity_Movement_1E6267: @ 81E6267
-	step_up
-	step_up
-	step_up
-	step_right
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_left
-	step_up
-	step_up
-	step_up
-	step_up
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_25
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_down
 	step_end
 
 SootopolisCity_Movement_1E628C: @ 81E628C
-	step_left
-	step_up
-	step_up
-	step_up
-	step_right
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_left
-	step_up
-	step_up
-	step_up
-	step_up
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 SootopolisCity_Movement_1E62B0: @ 81E62B0
-	step_up
-	step_up
-	step_up
-	step_up
-	step_right
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_left
-	step_up
-	step_up
-	step_up
-	step_up
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 SootopolisCity_Movement_1E62D4: @ 81E62D4
-	step_up
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_12
-	step_27
-	step_14
-	step_14
-	step_right
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	delay_4
+	walk_in_place_fastest_left
+	delay_16
+	delay_16
+	walk_right
+	walk_up
+	walk_up
 	step_end
 
 SootopolisCity_Movement_1E630E: @ 81E630E
-	step_up
-	step_up
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 SootopolisCity_Movement_1E6341: @ 81E6341
-	slow_step_left
-	step_28
+	walk_slow_left
+	walk_in_place_fastest_right
 	step_end
 
 SootopolisCity_Movement_1E6344: @ 81E6344
-	step_down
-	step_down
-	step_left
-	step_13
-	step_right
-	step_up
-	step_up
-	step_up
-	step_right
-	step_27
+	walk_down
+	walk_down
+	walk_left
+	delay_8
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_in_place_fastest_left
 	step_end
 
 SootopolisCity_Movement_1E634F: @ 81E634F
-	step_14
-	step_14
-	step_14
-	step_13
-	step_right
-	step_right
-	step_up
-	step_up
-	step_up
-	step_28
+	delay_16
+	delay_16
+	delay_16
+	delay_8
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_right
 	step_end
 
 SootopolisCity_Movement_1E635A: @ 81E635A
-	step_up
-	step_up
+	walk_up
+	walk_up
 	step_end
 
 SootopolisCity_EventScript_1E635D:: @ 81E635D
@@ -1398,13 +1398,13 @@ SootopolisCity_EventScript_1E64E2:: @ 81E64E2
 	end
 
 SootopolisCity_Movement_1E64EC: @ 81E64EC
-	step_right
-	step_25
+	walk_right
+	walk_in_place_fastest_down
 	step_end
 
 SootopolisCity_Movement_1E64EF: @ 81E64EF
-	step_left
-	step_25
+	walk_left
+	walk_in_place_fastest_down
 	step_end
 
 SootopolisCity_EventScript_1E64F2:: @ 81E64F2
@@ -1454,11 +1454,11 @@ SootopolisCity_EventScript_1E654C:: @ 81E654C
 	end
 
 SootopolisCity_Movement_1E656B:: @ 81E656B
-	step_98
+	levitate
 	step_end
 
 SootopolisCity_Movement_1E656D:: @ 81E656D
-	step_9A
+	destroy_extra_task
 	step_end
 
 SootopolisCity_Text_1E656F: @ 81E656F
diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc
index 6a53dc57c..02ac01f2b 100644
--- a/data/scripts/maps/SootopolisCity_Gym_1F.inc
+++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc
@@ -82,7 +82,7 @@ SootopolisCity_Gym_1F_EventScript_224F29:: @ 8224F29
 	end
 
 SootopolisCity_Gym_1F_Movement_224F42: @ 8224F42
-	step_54
+	set_invisible
 	step_end
 
 SootopolisCity_Gym_1F_EventScript_224F44:: @ 8224F44
diff --git a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc
index 54ade5181..8d6b4631f 100644
--- a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc
+++ b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc
@@ -63,12 +63,12 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A16:: @ 8227A16
 	return
 
 SootopolisCity_MysteryEventsHouse_1F_Movement_227A1F: @ 8227A1F
-	step_down
+	walk_down
 	step_end
 
 SootopolisCity_MysteryEventsHouse_1F_Movement_227A21: @ 8227A21
-	step_right
-	step_25
+	walk_right
+	walk_in_place_fastest_down
 	step_end
 
 SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24:: @ 8227A24
@@ -152,31 +152,31 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227B22:: @ 8227B22
 	return
 
 SootopolisCity_MysteryEventsHouse_1F_Movement_227B34: @ 8227B34
-	step_14
-	step_up
-	step_up
+	delay_16
+	walk_up
+	walk_up
 	step_end
 
 SootopolisCity_MysteryEventsHouse_1F_Movement_227B38: @ 8227B38
-	step_14
-	step_right
-	step_up
+	delay_16
+	walk_right
+	walk_up
 	step_end
 
 SootopolisCity_MysteryEventsHouse_1F_Movement_227B3C: @ 8227B3C
-	step_14
-	step_left
-	step_up
+	delay_16
+	walk_left
+	walk_up
 	step_end
 
 SootopolisCity_MysteryEventsHouse_1F_Movement_227B40: @ 8227B40
-	step_left
-	step_28
+	walk_left
+	walk_in_place_fastest_right
 	step_end
 
 SootopolisCity_MysteryEventsHouse_1F_Movement_227B43: @ 8227B43
-	step_right
-	step_27
+	walk_right
+	walk_in_place_fastest_left
 	step_end
 
 SootopolisCity_MysteryEventsHouse_1F_Text_227B46: @ 8227B46
diff --git a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc
index 5a4a09735..142a8e70e 100644
--- a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc
+++ b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc
@@ -59,20 +59,20 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EE8:: @ 8227EE8
 	return
 
 SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF3: @ 8227EF3
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
 	step_end
 
 SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF9: @ 8227EF9
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_up
-	step_13
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	delay_8
 	step_end
 
diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc
index 8784a6424..bf57aa9ce 100644
--- a/data/scripts/maps/SouthernIsland_Exterior.inc
+++ b/data/scripts/maps/SouthernIsland_Exterior.inc
@@ -41,12 +41,12 @@ BattleFrontier_OutsideWest_EventScript_242A2C:: @ 8242A2C
 	return
 
 BattleFrontier_OutsideWest_Movement_242A37: @ 8242A37
-	step_down
+	walk_down
 	step_end
 
 BattleFrontier_OutsideWest_Movement_242A39: @ 8242A39
-	step_left
-	step_25
+	walk_left
+	walk_in_place_fastest_down
 	step_end
 
 SouthernIsland_Exterior_EventScript_242A3C:: @ 8242A3C
diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc
index b7d4e101c..432667cc9 100644
--- a/data/scripts/maps/SouthernIsland_Interior.inc
+++ b/data/scripts/maps/SouthernIsland_Interior.inc
@@ -66,7 +66,7 @@ SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0
 	goto_if 0, SouthernIsland_Interior_EventScript_242B9A
 	setflag FLAG_0x0CE
 	setflag FLAG_0x002
-	special SpawnScriptFieldObject
+	special SpawnScriptEventObject
 	applymovement 127, SouthernIsland_Interior_Movement_242BCA
 	waitmovement 0
 	delay 50
@@ -80,7 +80,7 @@ SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0
 	applymovement 2, SouthernIsland_Interior_Movement_242BDA
 	waitmovement 0
 	delay 50
-	special RemoveScriptFieldObject
+	special RemoveScriptEventObject
 	setvar VAR_LAST_TALKED, 2
 	compare VAR_0x40D5, 0
 	call_if 1, SouthernIsland_Interior_EventScript_242BA4
@@ -132,36 +132,36 @@ SouthernIsland_Interior_EventScript_242BB7:: @ 8242BB7
 	return
 
 SouthernIsland_Interior_Movement_242BCA: @ 8242BCA
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 SouthernIsland_Interior_Movement_242BCE: @ 8242BCE
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_down
-	step_down
-	step_down
-	step_26
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	walk_in_place_fastest_up
 	step_end
 
 SouthernIsland_Interior_Movement_242BDA: @ 8242BDA
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_14
-	step_14
-	step_down
-	step_down
-	step_down
-	step_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	delay_16
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	walk_down
 	step_end
 
diff --git a/data/scripts/maps/TerraCave_End.inc b/data/scripts/maps/TerraCave_End.inc
index be532733d..5152f85cf 100644
--- a/data/scripts/maps/TerraCave_End.inc
+++ b/data/scripts/maps/TerraCave_End.inc
@@ -66,13 +66,13 @@ TerraCave_End_EventScript_23B163:: @ 823B163
 	end
 
 TerraCave_End_Movement_23B16E: @ 823B16E
-	step_5e
-	step_62
-	step_14
-	step_14
-	step_63
-	step_14
-	step_14
-	step_63
+	init_affine_anim
+	walk_down_start_affine
+	delay_16
+	delay_16
+	walk_down_affine
+	delay_16
+	delay_16
+	walk_down_affine
 	step_end
 
diff --git a/data/scripts/maps/TrainerHill_Elevator.inc b/data/scripts/maps/TrainerHill_Elevator.inc
index 7886f91b8..155c31877 100644
--- a/data/scripts/maps/TrainerHill_Elevator.inc
+++ b/data/scripts/maps/TrainerHill_Elevator.inc
@@ -55,33 +55,33 @@ TrainerHill_Elevator_EventScript_2693D9:: @ 82693D9
 	return
 
 TrainerHill_Elevator_Movement_2693DF: @ 82693DF
-	step_up
-	step_up
-	step_right
-	step_00
+	walk_up
+	walk_up
+	walk_right
+	face_down
 	step_end
 
 TrainerHill_Elevator_Movement_2693E4: @ 82693E4
-	step_14
-	step_left
+	delay_16
+	walk_left
 	step_end
 
 TrainerHill_Elevator_Movement_2693E7: @ 82693E7
-	step_14
-	step_down
-	step_down
+	delay_16
+	walk_down
+	walk_down
 	step_end
 
 TrainerHill_Elevator_Movement_2693EB: @ 82693EB
-	step_00
-	step_14
+	face_down
+	delay_16
 	step_end
 
 TrainerHill_Elevator_Movement_2693EE: @ 82693EE
-	step_03
+	face_right
 	step_end
 
 TrainerHill_Elevator_Movement_2693F0: @ 82693F0
-	step_00
+	face_down
 	step_end
 
diff --git a/data/scripts/maps/TrainerHill_Entrance.inc b/data/scripts/maps/TrainerHill_Entrance.inc
index 6dc934f3c..84543ff2b 100644
--- a/data/scripts/maps/TrainerHill_Entrance.inc
+++ b/data/scripts/maps/TrainerHill_Entrance.inc
@@ -217,20 +217,20 @@ TrainerHill_Entrance_EventScript_26836A:: @ 826836A
 	end
 
 TrainerHill_Entrance_Movement_26837F: @ 826837F
-	step_03
+	face_right
 	step_end
 
 TrainerHill_Entrance_Movement_268381: @ 8268381
-	step_down
+	walk_down
 	step_end
 
 TrainerHill_Entrance_Movement_268383: @ 8268383
-	step_01
+	face_up
 	step_end
 
 TrainerHill_Entrance_Movement_268385: @ 8268385
-	step_down
-	step_down
+	walk_down
+	walk_down
 	step_end
 
 TrainerHill_Entrance_EventScript_268388:: @ 8268388
diff --git a/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc b/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc
index 24c319337..d7233a3aa 100644
--- a/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc
+++ b/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc
@@ -172,29 +172,29 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_20256C:: @ 820256C
 	return
 
 VerdanturfTown_BattleTentBattleRoom_Movement_202573: @ 8202573
-	step_54
+	set_invisible
 	step_end
 
 VerdanturfTown_BattleTentBattleRoom_Movement_202575: @ 8202575
-	step_55
-	step_up
-	step_up
-	step_up
-	step_03
+	set_visible
+	walk_up
+	walk_up
+	walk_up
+	face_right
 	step_end
 
 VerdanturfTown_BattleTentBattleRoom_Movement_20257B: @ 820257B
-	step_down
-	step_down
-	step_down
-	step_down
-	step_02
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	face_left
 	step_end
 
 VerdanturfTown_BattleTentBattleRoom_Movement_202581: @ 8202581
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
diff --git a/data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc b/data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc
index 0d0470fc1..96bd1f114 100644
--- a/data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc
+++ b/data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc
@@ -26,18 +26,18 @@ VerdanturfTown_BattleTentCorridor_EventScript_20209A:: @ 820209A
 	end
 
 VerdanturfTown_BattleTentCorridor_Movement_2020DE: @ 82020DE
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 VerdanturfTown_BattleTentCorridor_Movement_2020E3: @ 82020E3
-	step_up
+	walk_up
 
 VerdanturfTown_BattleTentCorridor_Movement_2020E4: @ 82020E4
-	step_up
-	step_54
+	walk_up
+	set_invisible
 	step_end
 
 VerdanturfTown_BattleTentCorridor_Text_2020E7: @ 82020E7
diff --git a/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc b/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc
index 85c5f33c7..468a34991 100644
--- a/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc
+++ b/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc
@@ -258,20 +258,20 @@ VerdanturfTown_BattleTentLobby_EventScript_201A41:: @ 8201A41
 	return
 
 VerdanturfTown_BattleTentLobby_Movement_201A70: @ 8201A70
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 VerdanturfTown_BattleTentLobby_Movement_201A74: @ 8201A74
-	step_up
-	step_54
+	walk_up
+	set_invisible
 	step_end
 
 VerdanturfTown_BattleTentLobby_Movement_201A77: @ 8201A77
-	step_up
-	step_up
-	step_54
+	walk_up
+	walk_up
+	set_invisible
 	step_end
 
 VerdanturfTown_BattleTentLobby_EventScript_201A7B:: @ 8201A7B
diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc
index 4dd00035a..2ed1c6baf 100644
--- a/data/scripts/maps/VictoryRoad_1F.inc
+++ b/data/scripts/maps/VictoryRoad_1F.inc
@@ -51,30 +51,30 @@ VictoryRoad_1F_EventScript_235DE1:: @ 8235DE1
 	end
 
 VictoryRoad_1F_Movement_235E15: @ 8235E15
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
 	step_end
 
 VictoryRoad_1F_Movement_235E21: @ 8235E21
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
 	step_end
 
 VictoryRoad_1F_EventScript_235E2C:: @ 8235E2C
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index 8f8d493f8..734831f7f 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -32,7 +32,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_292758:: @ 8292758
 	return
 
 LittlerootTown_BrendansHouse_1F_Movement_292763: @ 8292763
-	step_up
+	walk_up
 	step_end
 
 LittlerootTown_BrendansHouse_1F_EventScript_292765:: @ 8292765
@@ -119,33 +119,33 @@ LittlerootTown_BrendansHouse_2F_EventScript_292849:: @ 8292849
 	return
 
 LittlerootTown_BrendansHouse_2F_Movement_292850: @ 8292850
-	step_13
-	step_down
-	step_27
-	step_14
-	step_13
-	step_left
+	delay_8
+	walk_down
+	walk_in_place_fastest_left
+	delay_16
+	delay_8
+	walk_left
 	step_end
 
 LittlerootTown_BrendansHouse_2F_Movement_292857: @ 8292857
-	step_right
-	step_up
-	step_13
+	walk_right
+	walk_up
+	delay_8
 	step_end
 
 LittlerootTown_BrendansHouse_2F_Movement_29285B: @ 829285B
-	step_13
-	step_down
-	step_28
-	step_14
-	step_13
-	step_right
+	delay_8
+	walk_down
+	walk_in_place_fastest_right
+	delay_16
+	delay_8
+	walk_right
 	step_end
 
 LittlerootTown_BrendansHouse_2F_Movement_292862: @ 8292862
-	step_left
-	step_up
-	step_13
+	walk_left
+	walk_up
+	delay_8
 	step_end
 
 LittlerootTown_BrendansHouse_1F_EventScript_292866:: @ 8292866
@@ -227,87 +227,87 @@ LittlerootTown_MaysHouse_1F_EventScript_29296C:: @ 829296C
 	return
 
 LittlerootTown_BrendansHouse_1F_Movement_292989: @ 8292989
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_down
-	step_28
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_in_place_fastest_right
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_292991: @ 8292991
-	step_up
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
-	step_27
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_in_place_fastest_left
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_292999: @ 8292999
-	step_right
+	walk_right
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_29299B: @ 829299B
-	step_left
+	walk_left
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_29299D: @ 829299D
-	step_27
-	step_14
-	step_14
-	step_14
-	step_14
-	step_28
-	step_14
-	step_14
+	walk_in_place_fastest_left
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_in_place_fastest_right
+	delay_16
+	delay_16
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_2929A6: @ 82929A6
-	step_28
-	step_14
-	step_14
-	step_14
-	step_14
-	step_27
-	step_14
-	step_14
+	walk_in_place_fastest_right
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_in_place_fastest_left
+	delay_16
+	delay_16
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_2929AF: @ 82929AF
-	step_up
-	step_left
-	step_left
+	walk_up
+	walk_left
+	walk_left
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_2929B3: @ 82929B3
-	step_up
-	step_right
-	step_right
+	walk_up
+	walk_right
+	walk_right
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_2929B7: @ 82929B7
-	step_left
-	step_28
+	walk_left
+	walk_in_place_fastest_right
 	step_end
 
 LittlerootTown_MaysHouse_1F_Movement_2929BA: @ 82929BA
-	step_right
-	step_27
+	walk_right
+	walk_in_place_fastest_left
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_2929BD: @ 82929BD
-	step_left
-	step_down
-	step_28
+	walk_left
+	walk_down
+	walk_in_place_fastest_right
 	step_end
 
 LittlerootTown_MaysHouse_1F_Movement_2929C1: @ 82929C1
-	step_right
-	step_down
-	step_27
+	walk_right
+	walk_down
+	walk_in_place_fastest_left
 	step_end
 
 LittlerootTown_BrendansHouse_1F_EventScript_2929C5:: @ 82929C5
@@ -413,31 +413,31 @@ LittlerootTown_MaysHouse_1F_EventScript_292ACD:: @ 8292ACD
 	end
 
 LittlerootTown_BrendansHouse_1F_Movement_292AE0: @ 8292AE0
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_292AE6: @ 8292AE6
-	step_left
+	walk_left
 	step_end
 
 LittlerootTown_MaysHouse_1F_Movement_292AE8: @ 8292AE8
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 LittlerootTown_MaysHouse_1F_Movement_292AEE: @ 8292AEE
-	step_right
+	walk_right
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_292AF0: @ 8292AF0
-	step_up
+	walk_up
 	step_end
 
 LittlerootTown_BrendansHouse_1F_EventScript_292AF2:: @ 8292AF2
@@ -641,74 +641,74 @@ LittlerootTown_BrendansHouse_1F_EventScript_292D9D:: @ 8292D9D
 	return
 
 LittlerootTown_BrendansHouse_1F_Movement_292DB2: @ 8292DB2
-	step_right
-	step_right
+	walk_right
+	walk_right
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_292DB5: @ 8292DB5
-	step_left
-	step_left
+	walk_left
+	walk_left
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_292DB8: @ 8292DB8
-	step_02
+	face_left
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_292DBA: @ 8292DBA
-	step_03
+	face_right
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_292DBC: @ 8292DBC
-	step_down
-	step_right
-	step_down
-	step_13
+	walk_down
+	walk_right
+	walk_down
+	delay_8
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_292DC1: @ 8292DC1
-	step_down
-	step_left
-	step_down
-	step_13
+	walk_down
+	walk_left
+	walk_down
+	delay_8
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_292DC6: @ 8292DC6
-	step_14
-	step_down
-	step_down
-	step_down
-	step_27
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	walk_in_place_fastest_left
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_292DCC: @ 8292DCC
-	step_13
-	step_14
-	step_14
-	step_25
+	delay_8
+	delay_16
+	delay_16
+	walk_in_place_fastest_down
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_292DD1: @ 8292DD1
-	step_14
-	step_down
-	step_down
-	step_down
-	step_28
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	walk_in_place_fastest_right
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_292DD7: @ 8292DD7
-	step_up
-	step_left
-	step_left
-	step_left
-	step_left
-	step_26
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_up
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_292DDE: @ 8292DDE
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_26
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
 	step_end
diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc
index 39cca8244..9c4b46ae2 100644
--- a/data/scripts/pokeblocks.inc
+++ b/data/scripts/pokeblocks.inc
@@ -559,7 +559,7 @@ LilycoveCity_ContestLobby_EventScript_294032:: @ 8294032
 	end
 
 LilycoveCity_ContestLobby_Movement_294053: @ 8294053
-	step_28
+	walk_in_place_fastest_right
 	step_end
 
 LilycoveCity_ContestLobby_EventScript_294055:: @ 8294055
@@ -683,7 +683,7 @@ LilycoveCity_ContestLobby_EventScript_2941AA:: @ 82941AA
 	specialvar VAR_RESULT, GetLinkPartnerNames
 	copyvar VAR_0x8008, VAR_RESULT
 	copyvar VAR_0x8004, VAR_0x8008
-	special SpawnLinkPartnerFieldObject
+	special SpawnLinkPartnerEventObject
 	goto LilycoveCity_ContestLobby_EventScript_2941C4
 	end
 
diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc
index c75fb9b48..76a4ee8f1 100644
--- a/data/scripts/secret_power_tm.inc
+++ b/data/scripts/secret_power_tm.inc
@@ -77,31 +77,31 @@ Route111_EventScript_276680:: @ 8276680
 	end
 
 Route111_Movement_27668A: @ 827668A
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
-	step_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
 	step_end
 
 Route111_Movement_276696: @ 8276696
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_down
-	step_down
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
 	step_end
 
 EventScript_2766A2:: @ 82766A2
diff --git a/data/specials.inc b/data/specials.inc
index 1fa17b908..dfbac56fa 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -47,19 +47,19 @@ gSpecials:: @ 81DBA64
 	def_special sub_80B3254
 	def_special sub_80B2FD8
 	def_special GetLinkPartnerNames
-	def_special SpawnLinkPartnerFieldObject
+	def_special SpawnLinkPartnerEventObject
 	def_special SavePlayerParty
 	def_special LoadPlayerParty
 	def_special sub_80F9438
 	def_special sp02A_crash_sound
-	def_special FieldObjectInteractionGetBerryTreeData
-	def_special FieldObjectInteractionGetBerryName
-	def_special FieldObjectInteractionGetBerryCountString
+	def_special EventObjectInteractionGetBerryTreeData
+	def_special EventObjectInteractionGetBerryName
+	def_special EventObjectInteractionGetBerryCountString
 	def_special Bag_ChooseBerry
-	def_special FieldObjectInteractionPlantBerryTree
-	def_special FieldObjectInteractionPickBerryTree
-	def_special FieldObjectInteractionRemoveBerryTree
-	def_special FieldObjectInteractionWaterBerryTree
+	def_special EventObjectInteractionPlantBerryTree
+	def_special EventObjectInteractionPickBerryTree
+	def_special EventObjectInteractionRemoveBerryTree
+	def_special EventObjectInteractionWaterBerryTree
 	def_special PlayerHasBerries
 	def_special IsEnigmaBerryValid
 	def_special GetTrainerBattleMode
@@ -115,7 +115,7 @@ gSpecials:: @ 81DBA64
 	def_special ScrSpecial_SetHipsterSpokenFlag
 	def_special ScrSpecial_HipsterTeachWord
 	def_special ScrSpecial_PlayBardSong
-	def_special ScrSpecial_SetMauvilleOldManMapObjGfx
+	def_special ScrSpecial_SetMauvilleOldManEventObjGfx
 	def_special ScrSpecial_GenerateGiddyLine
 	def_special ScrSpecial_GiddyShouldTellAnotherTale
 	def_special ScrSpecial_StorytellerGetFreeStorySlot
@@ -190,7 +190,7 @@ gSpecials:: @ 81DBA64
 	def_special IsTVShowInSearchOfTrainersAiring
 	def_special GabbyAndTyGetLastQuote
 	def_special GabbyAndTyGetLastBattleTrivia
-	def_special GabbyAndTySetScriptVarsToFieldObjectLocalIds
+	def_special GabbyAndTySetScriptVarsToEventObjectLocalIds
 	def_special sub_8138B80
 	def_special GetDaycareMonNicknames
 	def_special GetDaycareState
@@ -286,8 +286,8 @@ gSpecials:: @ 81DBA64
 	def_special GameClear
 	def_special sub_8139A78
 	def_special nullsub_55
-	def_special SpawnScriptFieldObject
-	def_special RemoveScriptFieldObject
+	def_special SpawnScriptEventObject
+	def_special RemoveScriptEventObject
 	def_special GetPokeblockNameByMonNature
 	def_special GetSecretBaseNearbyMapName
 	def_special CheckRelicanthWailord
@@ -297,7 +297,7 @@ gSpecials:: @ 81DBA64
 	def_special WaitWeather
 	def_special sub_8139238
 	def_special sub_8139248
-	def_special player_get_direction_lower_nybble
+	def_special GetPlayerFacingDirection
 	def_special sub_81392AC
 	def_special sub_81392D4
 	def_special sub_81392F8
diff --git a/graphics/map_objects/palettes/field_effect_object_palette_00.pal b/graphics/event_objects/palettes/field_effect_object_palette_00.pal
index bbc9c778b..bbc9c778b 100644
--- a/graphics/map_objects/palettes/field_effect_object_palette_00.pal
+++ b/graphics/event_objects/palettes/field_effect_object_palette_00.pal
diff --git a/graphics/map_objects/palettes/field_effect_object_palette_01.pal b/graphics/event_objects/palettes/field_effect_object_palette_01.pal
index 044e1c987..044e1c987 100644
--- a/graphics/map_objects/palettes/field_effect_object_palette_01.pal
+++ b/graphics/event_objects/palettes/field_effect_object_palette_01.pal
diff --git a/graphics/map_objects/palettes/field_effect_object_palette_02.pal b/graphics/event_objects/palettes/field_effect_object_palette_02.pal
index e3a76c035..e3a76c035 100644
--- a/graphics/map_objects/palettes/field_effect_object_palette_02.pal
+++ b/graphics/event_objects/palettes/field_effect_object_palette_02.pal
diff --git a/graphics/map_objects/palettes/field_effect_object_palette_03.pal b/graphics/event_objects/palettes/field_effect_object_palette_03.pal
index b170eb1f5..b170eb1f5 100644
--- a/graphics/map_objects/palettes/field_effect_object_palette_03.pal
+++ b/graphics/event_objects/palettes/field_effect_object_palette_03.pal
diff --git a/graphics/map_objects/palettes/field_effect_object_palette_04.pal b/graphics/event_objects/palettes/field_effect_object_palette_04.pal
index 2dddefa5f..2dddefa5f 100644
--- a/graphics/map_objects/palettes/field_effect_object_palette_04.pal
+++ b/graphics/event_objects/palettes/field_effect_object_palette_04.pal
diff --git a/graphics/map_objects/palettes/field_effect_object_palette_05.pal b/graphics/event_objects/palettes/field_effect_object_palette_05.pal
index 468d7212c..468d7212c 100644
--- a/graphics/map_objects/palettes/field_effect_object_palette_05.pal
+++ b/graphics/event_objects/palettes/field_effect_object_palette_05.pal
diff --git a/graphics/map_objects/palettes/field_effect_object_palette_06.pal b/graphics/event_objects/palettes/field_effect_object_palette_06.pal
index e4a49a4b9..e4a49a4b9 100644
--- a/graphics/map_objects/palettes/field_effect_object_palette_06.pal
+++ b/graphics/event_objects/palettes/field_effect_object_palette_06.pal
diff --git a/graphics/map_objects/palettes/field_effect_object_palette_07.pal b/graphics/event_objects/palettes/field_effect_object_palette_07.pal
index 6d9e03c67..6d9e03c67 100644
--- a/graphics/map_objects/palettes/field_effect_object_palette_07.pal
+++ b/graphics/event_objects/palettes/field_effect_object_palette_07.pal
diff --git a/graphics/map_objects/palettes/field_effect_object_palette_08.pal b/graphics/event_objects/palettes/field_effect_object_palette_08.pal
index 4c41030f6..4c41030f6 100644
--- a/graphics/map_objects/palettes/field_effect_object_palette_08.pal
+++ b/graphics/event_objects/palettes/field_effect_object_palette_08.pal
diff --git a/graphics/map_objects/palettes/field_effect_object_palette_10.pal b/graphics/event_objects/palettes/field_effect_object_palette_10.pal
index 6190709ed..6190709ed 100644
--- a/graphics/map_objects/palettes/field_effect_object_palette_10.pal
+++ b/graphics/event_objects/palettes/field_effect_object_palette_10.pal
diff --git a/graphics/map_objects/palettes/field_object_palette_00.pal b/graphics/event_objects/palettes/field_object_palette_00.pal
index 7bb5bd9ed..7bb5bd9ed 100644
--- a/graphics/map_objects/palettes/field_object_palette_00.pal
+++ b/graphics/event_objects/palettes/field_object_palette_00.pal
diff --git a/graphics/map_objects/palettes/field_object_palette_01.pal b/graphics/event_objects/palettes/field_object_palette_01.pal
index 558095bda..558095bda 100644
--- a/graphics/map_objects/palettes/field_object_palette_01.pal
+++ b/graphics/event_objects/palettes/field_object_palette_01.pal
diff --git a/graphics/map_objects/palettes/field_object_palette_02.pal b/graphics/event_objects/palettes/field_object_palette_02.pal
index b84930395..b84930395 100644
--- a/graphics/map_objects/palettes/field_object_palette_02.pal
+++ b/graphics/event_objects/palettes/field_object_palette_02.pal
diff --git a/graphics/map_objects/palettes/field_object_palette_03.pal b/graphics/event_objects/palettes/field_object_palette_03.pal
index 6c53450ba..6c53450ba 100644
--- a/graphics/map_objects/palettes/field_object_palette_03.pal
+++ b/graphics/event_objects/palettes/field_object_palette_03.pal
diff --git a/graphics/map_objects/palettes/field_object_palette_04.pal b/graphics/event_objects/palettes/field_object_palette_04.pal
index 82c5ff3a1..82c5ff3a1 100644
--- a/graphics/map_objects/palettes/field_object_palette_04.pal
+++ b/graphics/event_objects/palettes/field_object_palette_04.pal
diff --git a/graphics/map_objects/palettes/field_object_palette_05.pal b/graphics/event_objects/palettes/field_object_palette_05.pal
index 72ae3cefb..72ae3cefb 100644
--- a/graphics/map_objects/palettes/field_object_palette_05.pal
+++ b/graphics/event_objects/palettes/field_object_palette_05.pal
diff --git a/graphics/map_objects/palettes/field_object_palette_06.pal b/graphics/event_objects/palettes/field_object_palette_06.pal
index 168a1329d..168a1329d 100644
--- a/graphics/map_objects/palettes/field_object_palette_06.pal
+++ b/graphics/event_objects/palettes/field_object_palette_06.pal
diff --git a/graphics/map_objects/palettes/field_object_palette_07.pal b/graphics/event_objects/palettes/field_object_palette_07.pal
index 0e604b73c..0e604b73c 100644
--- a/graphics/map_objects/palettes/field_object_palette_07.pal
+++ b/graphics/event_objects/palettes/field_object_palette_07.pal
diff --git a/graphics/map_objects/palettes/field_object_palette_08.pal b/graphics/event_objects/palettes/field_object_palette_08.pal
index a83ed903f..a83ed903f 100644
--- a/graphics/map_objects/palettes/field_object_palette_08.pal
+++ b/graphics/event_objects/palettes/field_object_palette_08.pal
diff --git a/graphics/map_objects/palettes/field_object_palette_09.pal b/graphics/event_objects/palettes/field_object_palette_09.pal
index 6a6bf4d12..6a6bf4d12 100644
--- a/graphics/map_objects/palettes/field_object_palette_09.pal
+++ b/graphics/event_objects/palettes/field_object_palette_09.pal
diff --git a/graphics/map_objects/palettes/field_object_palette_10.pal b/graphics/event_objects/palettes/field_object_palette_10.pal
index 0cebd6c4d..0cebd6c4d 100644
--- a/graphics/map_objects/palettes/field_object_palette_10.pal
+++ b/graphics/event_objects/palettes/field_object_palette_10.pal
diff --git a/graphics/map_objects/palettes/field_object_palette_11.pal b/graphics/event_objects/palettes/field_object_palette_11.pal
index b28799ed8..b28799ed8 100644
--- a/graphics/map_objects/palettes/field_object_palette_11.pal
+++ b/graphics/event_objects/palettes/field_object_palette_11.pal
diff --git a/graphics/map_objects/palettes/field_object_palette_12.pal b/graphics/event_objects/palettes/field_object_palette_12.pal
index b36c29ab1..b36c29ab1 100644
--- a/graphics/map_objects/palettes/field_object_palette_12.pal
+++ b/graphics/event_objects/palettes/field_object_palette_12.pal
diff --git a/graphics/map_objects/palettes/field_object_palette_13.pal b/graphics/event_objects/palettes/field_object_palette_13.pal
index b69e9ac0a..b69e9ac0a 100644
--- a/graphics/map_objects/palettes/field_object_palette_13.pal
+++ b/graphics/event_objects/palettes/field_object_palette_13.pal
diff --git a/graphics/map_objects/palettes/field_object_palette_14.pal b/graphics/event_objects/palettes/field_object_palette_14.pal
index c53a4d815..c53a4d815 100644
--- a/graphics/map_objects/palettes/field_object_palette_14.pal
+++ b/graphics/event_objects/palettes/field_object_palette_14.pal
diff --git a/graphics/map_objects/palettes/field_object_palette_15.pal b/graphics/event_objects/palettes/field_object_palette_15.pal
index 0026c6f69..0026c6f69 100644
--- a/graphics/map_objects/palettes/field_object_palette_15.pal
+++ b/graphics/event_objects/palettes/field_object_palette_15.pal
diff --git a/graphics/map_objects/palettes/field_object_palette_16.pal b/graphics/event_objects/palettes/field_object_palette_16.pal
index ec3c07f20..ec3c07f20 100644
--- a/graphics/map_objects/palettes/field_object_palette_16.pal
+++ b/graphics/event_objects/palettes/field_object_palette_16.pal
diff --git a/graphics/map_objects/palettes/field_object_palette_17.pal b/graphics/event_objects/palettes/field_object_palette_17.pal
index 2833b2613..2833b2613 100644
--- a/graphics/map_objects/palettes/field_object_palette_17.pal
+++ b/graphics/event_objects/palettes/field_object_palette_17.pal
diff --git a/graphics/map_objects/palettes/field_object_palette_18.pal b/graphics/event_objects/palettes/field_object_palette_18.pal
index 78b1c89b6..78b1c89b6 100644
--- a/graphics/map_objects/palettes/field_object_palette_18.pal
+++ b/graphics/event_objects/palettes/field_object_palette_18.pal
diff --git a/graphics/map_objects/palettes/field_object_palette_19.pal b/graphics/event_objects/palettes/field_object_palette_19.pal
index 53de0c383..53de0c383 100644
--- a/graphics/map_objects/palettes/field_object_palette_19.pal
+++ b/graphics/event_objects/palettes/field_object_palette_19.pal
diff --git a/graphics/map_objects/palettes/field_object_palette_20.pal b/graphics/event_objects/palettes/field_object_palette_20.pal
index 64985f6da..64985f6da 100644
--- a/graphics/map_objects/palettes/field_object_palette_20.pal
+++ b/graphics/event_objects/palettes/field_object_palette_20.pal
diff --git a/graphics/map_objects/palettes/field_object_palette_21.pal b/graphics/event_objects/palettes/field_object_palette_21.pal
index 5e68e105d..5e68e105d 100644
--- a/graphics/map_objects/palettes/field_object_palette_21.pal
+++ b/graphics/event_objects/palettes/field_object_palette_21.pal
diff --git a/graphics/map_objects/palettes/field_object_palette_22.pal b/graphics/event_objects/palettes/field_object_palette_22.pal
index 21fa9999d..21fa9999d 100644
--- a/graphics/map_objects/palettes/field_object_palette_22.pal
+++ b/graphics/event_objects/palettes/field_object_palette_22.pal
diff --git a/graphics/map_objects/palettes/field_object_palette_23.pal b/graphics/event_objects/palettes/field_object_palette_23.pal
index 73b0b1d41..73b0b1d41 100644
--- a/graphics/map_objects/palettes/field_object_palette_23.pal
+++ b/graphics/event_objects/palettes/field_object_palette_23.pal
diff --git a/graphics/map_objects/palettes/field_object_palette_24.pal b/graphics/event_objects/palettes/field_object_palette_24.pal
index d710b6830..d710b6830 100644
--- a/graphics/map_objects/palettes/field_object_palette_24.pal
+++ b/graphics/event_objects/palettes/field_object_palette_24.pal
diff --git a/graphics/map_objects/palettes/field_object_palette_25.pal b/graphics/event_objects/palettes/field_object_palette_25.pal
index f48038d41..f48038d41 100644
--- a/graphics/map_objects/palettes/field_object_palette_25.pal
+++ b/graphics/event_objects/palettes/field_object_palette_25.pal
diff --git a/graphics/map_objects/palettes/field_object_palette_26.pal b/graphics/event_objects/palettes/field_object_palette_26.pal
index fe4c1c112..fe4c1c112 100644
--- a/graphics/map_objects/palettes/field_object_palette_26.pal
+++ b/graphics/event_objects/palettes/field_object_palette_26.pal
diff --git a/graphics/map_objects/palettes/field_object_palette_27.pal b/graphics/event_objects/palettes/field_object_palette_27.pal
index 5ce2f4728..5ce2f4728 100644
--- a/graphics/map_objects/palettes/field_object_palette_27.pal
+++ b/graphics/event_objects/palettes/field_object_palette_27.pal
diff --git a/graphics/map_objects/palettes/field_object_palette_28.pal b/graphics/event_objects/palettes/field_object_palette_28.pal
index eb9930c05..eb9930c05 100644
--- a/graphics/map_objects/palettes/field_object_palette_28.pal
+++ b/graphics/event_objects/palettes/field_object_palette_28.pal
diff --git a/graphics/map_objects/palettes/field_object_palette_29.pal b/graphics/event_objects/palettes/field_object_palette_29.pal
index a69caf9df..a69caf9df 100644
--- a/graphics/map_objects/palettes/field_object_palette_29.pal
+++ b/graphics/event_objects/palettes/field_object_palette_29.pal
diff --git a/graphics/map_objects/palettes/field_object_palette_30.pal b/graphics/event_objects/palettes/field_object_palette_30.pal
index d90c4cb38..d90c4cb38 100644
--- a/graphics/map_objects/palettes/field_object_palette_30.pal
+++ b/graphics/event_objects/palettes/field_object_palette_30.pal
diff --git a/graphics/map_objects/palettes/field_object_palette_31.pal b/graphics/event_objects/palettes/field_object_palette_31.pal
index c62e8ce06..c62e8ce06 100644
--- a/graphics/map_objects/palettes/field_object_palette_31.pal
+++ b/graphics/event_objects/palettes/field_object_palette_31.pal
diff --git a/graphics/map_objects/palettes/field_object_palette_32.pal b/graphics/event_objects/palettes/field_object_palette_32.pal
index e245ba013..e245ba013 100644
--- a/graphics/map_objects/palettes/field_object_palette_32.pal
+++ b/graphics/event_objects/palettes/field_object_palette_32.pal
diff --git a/graphics/map_objects/palettes/field_object_palette_33.pal b/graphics/event_objects/palettes/field_object_palette_33.pal
index e7717d74e..e7717d74e 100644
--- a/graphics/map_objects/palettes/field_object_palette_33.pal
+++ b/graphics/event_objects/palettes/field_object_palette_33.pal
diff --git a/graphics/map_objects/palettes/field_object_palette_34.pal b/graphics/event_objects/palettes/field_object_palette_34.pal
index e106ce693..e106ce693 100644
--- a/graphics/map_objects/palettes/field_object_palette_34.pal
+++ b/graphics/event_objects/palettes/field_object_palette_34.pal
diff --git a/graphics/map_objects/palettes/unused_palette.pal b/graphics/event_objects/palettes/unused_palette.pal
index aeb04ccf8..aeb04ccf8 100644
--- a/graphics/map_objects/palettes/unused_palette.pal
+++ b/graphics/event_objects/palettes/unused_palette.pal
diff --git a/graphics/map_objects/pics/berry_trees/aguav/0.png b/graphics/event_objects/pics/berry_trees/aguav/0.png
index 0463d51db..0463d51db 100644
--- a/graphics/map_objects/pics/berry_trees/aguav/0.png
+++ b/graphics/event_objects/pics/berry_trees/aguav/0.png
diff --git a/graphics/map_objects/pics/berry_trees/aguav/1.png b/graphics/event_objects/pics/berry_trees/aguav/1.png
index a5f4b8bee..a5f4b8bee 100644
--- a/graphics/map_objects/pics/berry_trees/aguav/1.png
+++ b/graphics/event_objects/pics/berry_trees/aguav/1.png
diff --git a/graphics/map_objects/pics/berry_trees/aguav/2.png b/graphics/event_objects/pics/berry_trees/aguav/2.png
index 7af57fd97..7af57fd97 100644
--- a/graphics/map_objects/pics/berry_trees/aguav/2.png
+++ b/graphics/event_objects/pics/berry_trees/aguav/2.png
diff --git a/graphics/map_objects/pics/berry_trees/aguav/3.png b/graphics/event_objects/pics/berry_trees/aguav/3.png
index 0fdd3f994..0fdd3f994 100644
--- a/graphics/map_objects/pics/berry_trees/aguav/3.png
+++ b/graphics/event_objects/pics/berry_trees/aguav/3.png
diff --git a/graphics/map_objects/pics/berry_trees/aguav/4.png b/graphics/event_objects/pics/berry_trees/aguav/4.png
index f3fc70076..f3fc70076 100644
--- a/graphics/map_objects/pics/berry_trees/aguav/4.png
+++ b/graphics/event_objects/pics/berry_trees/aguav/4.png
diff --git a/graphics/map_objects/pics/berry_trees/aguav/5.png b/graphics/event_objects/pics/berry_trees/aguav/5.png
index b437940bf..b437940bf 100644
--- a/graphics/map_objects/pics/berry_trees/aguav/5.png
+++ b/graphics/event_objects/pics/berry_trees/aguav/5.png
diff --git a/graphics/map_objects/pics/berry_trees/aspear/0.png b/graphics/event_objects/pics/berry_trees/aspear/0.png
index 933957413..933957413 100644
--- a/graphics/map_objects/pics/berry_trees/aspear/0.png
+++ b/graphics/event_objects/pics/berry_trees/aspear/0.png
diff --git a/graphics/map_objects/pics/berry_trees/aspear/1.png b/graphics/event_objects/pics/berry_trees/aspear/1.png
index ee750e7f3..ee750e7f3 100644
--- a/graphics/map_objects/pics/berry_trees/aspear/1.png
+++ b/graphics/event_objects/pics/berry_trees/aspear/1.png
diff --git a/graphics/map_objects/pics/berry_trees/aspear/2.png b/graphics/event_objects/pics/berry_trees/aspear/2.png
index e3a4e47bb..e3a4e47bb 100644
--- a/graphics/map_objects/pics/berry_trees/aspear/2.png
+++ b/graphics/event_objects/pics/berry_trees/aspear/2.png
diff --git a/graphics/map_objects/pics/berry_trees/aspear/3.png b/graphics/event_objects/pics/berry_trees/aspear/3.png
index df16ae330..df16ae330 100644
--- a/graphics/map_objects/pics/berry_trees/aspear/3.png
+++ b/graphics/event_objects/pics/berry_trees/aspear/3.png
diff --git a/graphics/map_objects/pics/berry_trees/aspear/4.png b/graphics/event_objects/pics/berry_trees/aspear/4.png
index 8d9bd38fb..8d9bd38fb 100644
--- a/graphics/map_objects/pics/berry_trees/aspear/4.png
+++ b/graphics/event_objects/pics/berry_trees/aspear/4.png
diff --git a/graphics/map_objects/pics/berry_trees/aspear/5.png b/graphics/event_objects/pics/berry_trees/aspear/5.png
index 495119480..495119480 100644
--- a/graphics/map_objects/pics/berry_trees/aspear/5.png
+++ b/graphics/event_objects/pics/berry_trees/aspear/5.png
diff --git a/graphics/map_objects/pics/berry_trees/cheri/0.png b/graphics/event_objects/pics/berry_trees/cheri/0.png
index 18588dc6c..18588dc6c 100644
--- a/graphics/map_objects/pics/berry_trees/cheri/0.png
+++ b/graphics/event_objects/pics/berry_trees/cheri/0.png
diff --git a/graphics/map_objects/pics/berry_trees/cheri/1.png b/graphics/event_objects/pics/berry_trees/cheri/1.png
index e9419d0fe..e9419d0fe 100644
--- a/graphics/map_objects/pics/berry_trees/cheri/1.png
+++ b/graphics/event_objects/pics/berry_trees/cheri/1.png
diff --git a/graphics/map_objects/pics/berry_trees/cheri/2.png b/graphics/event_objects/pics/berry_trees/cheri/2.png
index 4022a7e5e..4022a7e5e 100644
--- a/graphics/map_objects/pics/berry_trees/cheri/2.png
+++ b/graphics/event_objects/pics/berry_trees/cheri/2.png
diff --git a/graphics/map_objects/pics/berry_trees/cheri/3.png b/graphics/event_objects/pics/berry_trees/cheri/3.png
index c2572383c..c2572383c 100644
--- a/graphics/map_objects/pics/berry_trees/cheri/3.png
+++ b/graphics/event_objects/pics/berry_trees/cheri/3.png
diff --git a/graphics/map_objects/pics/berry_trees/cheri/4.png b/graphics/event_objects/pics/berry_trees/cheri/4.png
index 462596c51..462596c51 100644
--- a/graphics/map_objects/pics/berry_trees/cheri/4.png
+++ b/graphics/event_objects/pics/berry_trees/cheri/4.png
diff --git a/graphics/map_objects/pics/berry_trees/cheri/5.png b/graphics/event_objects/pics/berry_trees/cheri/5.png
index 447f1d865..447f1d865 100644
--- a/graphics/map_objects/pics/berry_trees/cheri/5.png
+++ b/graphics/event_objects/pics/berry_trees/cheri/5.png
diff --git a/graphics/map_objects/pics/berry_trees/chesto/0.png b/graphics/event_objects/pics/berry_trees/chesto/0.png
index 516a334c1..516a334c1 100644
--- a/graphics/map_objects/pics/berry_trees/chesto/0.png
+++ b/graphics/event_objects/pics/berry_trees/chesto/0.png
diff --git a/graphics/map_objects/pics/berry_trees/chesto/1.png b/graphics/event_objects/pics/berry_trees/chesto/1.png
index dacc90fb3..dacc90fb3 100644
--- a/graphics/map_objects/pics/berry_trees/chesto/1.png
+++ b/graphics/event_objects/pics/berry_trees/chesto/1.png
diff --git a/graphics/map_objects/pics/berry_trees/chesto/2.png b/graphics/event_objects/pics/berry_trees/chesto/2.png
index c0a2ec30d..c0a2ec30d 100644
--- a/graphics/map_objects/pics/berry_trees/chesto/2.png
+++ b/graphics/event_objects/pics/berry_trees/chesto/2.png
diff --git a/graphics/map_objects/pics/berry_trees/chesto/3.png b/graphics/event_objects/pics/berry_trees/chesto/3.png
index 328fee834..328fee834 100644
--- a/graphics/map_objects/pics/berry_trees/chesto/3.png
+++ b/graphics/event_objects/pics/berry_trees/chesto/3.png
diff --git a/graphics/map_objects/pics/berry_trees/chesto/4.png b/graphics/event_objects/pics/berry_trees/chesto/4.png
index d40a393a2..d40a393a2 100644
--- a/graphics/map_objects/pics/berry_trees/chesto/4.png
+++ b/graphics/event_objects/pics/berry_trees/chesto/4.png
diff --git a/graphics/map_objects/pics/berry_trees/chesto/5.png b/graphics/event_objects/pics/berry_trees/chesto/5.png
index 3d3d03d64..3d3d03d64 100644
--- a/graphics/map_objects/pics/berry_trees/chesto/5.png
+++ b/graphics/event_objects/pics/berry_trees/chesto/5.png
diff --git a/graphics/map_objects/pics/berry_trees/cornn/0.png b/graphics/event_objects/pics/berry_trees/cornn/0.png
index 8388b030c..8388b030c 100644
--- a/graphics/map_objects/pics/berry_trees/cornn/0.png
+++ b/graphics/event_objects/pics/berry_trees/cornn/0.png
diff --git a/graphics/map_objects/pics/berry_trees/cornn/1.png b/graphics/event_objects/pics/berry_trees/cornn/1.png
index 23d529796..23d529796 100644
--- a/graphics/map_objects/pics/berry_trees/cornn/1.png
+++ b/graphics/event_objects/pics/berry_trees/cornn/1.png
diff --git a/graphics/map_objects/pics/berry_trees/cornn/2.png b/graphics/event_objects/pics/berry_trees/cornn/2.png
index 969020d39..969020d39 100644
--- a/graphics/map_objects/pics/berry_trees/cornn/2.png
+++ b/graphics/event_objects/pics/berry_trees/cornn/2.png
diff --git a/graphics/map_objects/pics/berry_trees/cornn/3.png b/graphics/event_objects/pics/berry_trees/cornn/3.png
index 88d136547..88d136547 100644
--- a/graphics/map_objects/pics/berry_trees/cornn/3.png
+++ b/graphics/event_objects/pics/berry_trees/cornn/3.png
diff --git a/graphics/map_objects/pics/berry_trees/cornn/4.png b/graphics/event_objects/pics/berry_trees/cornn/4.png
index c50789645..c50789645 100644
--- a/graphics/map_objects/pics/berry_trees/cornn/4.png
+++ b/graphics/event_objects/pics/berry_trees/cornn/4.png
diff --git a/graphics/map_objects/pics/berry_trees/cornn/5.png b/graphics/event_objects/pics/berry_trees/cornn/5.png
index de7b7f4ad..de7b7f4ad 100644
--- a/graphics/map_objects/pics/berry_trees/cornn/5.png
+++ b/graphics/event_objects/pics/berry_trees/cornn/5.png
diff --git a/graphics/map_objects/pics/berry_trees/dirt_pile.png b/graphics/event_objects/pics/berry_trees/dirt_pile.png
index 3790fd846..3790fd846 100644
--- a/graphics/map_objects/pics/berry_trees/dirt_pile.png
+++ b/graphics/event_objects/pics/berry_trees/dirt_pile.png
diff --git a/graphics/map_objects/pics/berry_trees/durin/0.png b/graphics/event_objects/pics/berry_trees/durin/0.png
index eefe4ba78..eefe4ba78 100644
--- a/graphics/map_objects/pics/berry_trees/durin/0.png
+++ b/graphics/event_objects/pics/berry_trees/durin/0.png
diff --git a/graphics/map_objects/pics/berry_trees/durin/1.png b/graphics/event_objects/pics/berry_trees/durin/1.png
index d5b75b3b3..d5b75b3b3 100644
--- a/graphics/map_objects/pics/berry_trees/durin/1.png
+++ b/graphics/event_objects/pics/berry_trees/durin/1.png
diff --git a/graphics/map_objects/pics/berry_trees/durin/2.png b/graphics/event_objects/pics/berry_trees/durin/2.png
index cf854194d..cf854194d 100644
--- a/graphics/map_objects/pics/berry_trees/durin/2.png
+++ b/graphics/event_objects/pics/berry_trees/durin/2.png
diff --git a/graphics/map_objects/pics/berry_trees/durin/3.png b/graphics/event_objects/pics/berry_trees/durin/3.png
index 41425502f..41425502f 100644
--- a/graphics/map_objects/pics/berry_trees/durin/3.png
+++ b/graphics/event_objects/pics/berry_trees/durin/3.png
diff --git a/graphics/map_objects/pics/berry_trees/durin/4.png b/graphics/event_objects/pics/berry_trees/durin/4.png
index 66337024c..66337024c 100644
--- a/graphics/map_objects/pics/berry_trees/durin/4.png
+++ b/graphics/event_objects/pics/berry_trees/durin/4.png
diff --git a/graphics/map_objects/pics/berry_trees/durin/5.png b/graphics/event_objects/pics/berry_trees/durin/5.png
index 22c672fac..22c672fac 100644
--- a/graphics/map_objects/pics/berry_trees/durin/5.png
+++ b/graphics/event_objects/pics/berry_trees/durin/5.png
diff --git a/graphics/map_objects/pics/berry_trees/figy/0.png b/graphics/event_objects/pics/berry_trees/figy/0.png
index 0eea8f98c..0eea8f98c 100644
--- a/graphics/map_objects/pics/berry_trees/figy/0.png
+++ b/graphics/event_objects/pics/berry_trees/figy/0.png
diff --git a/graphics/map_objects/pics/berry_trees/figy/1.png b/graphics/event_objects/pics/berry_trees/figy/1.png
index 018e0ae3f..018e0ae3f 100644
--- a/graphics/map_objects/pics/berry_trees/figy/1.png
+++ b/graphics/event_objects/pics/berry_trees/figy/1.png
diff --git a/graphics/map_objects/pics/berry_trees/figy/2.png b/graphics/event_objects/pics/berry_trees/figy/2.png
index df10bb526..df10bb526 100644
--- a/graphics/map_objects/pics/berry_trees/figy/2.png
+++ b/graphics/event_objects/pics/berry_trees/figy/2.png
diff --git a/graphics/map_objects/pics/berry_trees/figy/3.png b/graphics/event_objects/pics/berry_trees/figy/3.png
index bf1785f87..bf1785f87 100644
--- a/graphics/map_objects/pics/berry_trees/figy/3.png
+++ b/graphics/event_objects/pics/berry_trees/figy/3.png
diff --git a/graphics/map_objects/pics/berry_trees/figy/4.png b/graphics/event_objects/pics/berry_trees/figy/4.png
index 46d794635..46d794635 100644
--- a/graphics/map_objects/pics/berry_trees/figy/4.png
+++ b/graphics/event_objects/pics/berry_trees/figy/4.png
diff --git a/graphics/map_objects/pics/berry_trees/figy/5.png b/graphics/event_objects/pics/berry_trees/figy/5.png
index 945773fda..945773fda 100644
--- a/graphics/map_objects/pics/berry_trees/figy/5.png
+++ b/graphics/event_objects/pics/berry_trees/figy/5.png
diff --git a/graphics/map_objects/pics/berry_trees/grepa/0.png b/graphics/event_objects/pics/berry_trees/grepa/0.png
index abd265e0b..abd265e0b 100644
--- a/graphics/map_objects/pics/berry_trees/grepa/0.png
+++ b/graphics/event_objects/pics/berry_trees/grepa/0.png
diff --git a/graphics/map_objects/pics/berry_trees/grepa/1.png b/graphics/event_objects/pics/berry_trees/grepa/1.png
index 27e90c9bd..27e90c9bd 100644
--- a/graphics/map_objects/pics/berry_trees/grepa/1.png
+++ b/graphics/event_objects/pics/berry_trees/grepa/1.png
diff --git a/graphics/map_objects/pics/berry_trees/grepa/2.png b/graphics/event_objects/pics/berry_trees/grepa/2.png
index 22e354eb0..22e354eb0 100644
--- a/graphics/map_objects/pics/berry_trees/grepa/2.png
+++ b/graphics/event_objects/pics/berry_trees/grepa/2.png
diff --git a/graphics/map_objects/pics/berry_trees/grepa/3.png b/graphics/event_objects/pics/berry_trees/grepa/3.png
index e23824dd3..e23824dd3 100644
--- a/graphics/map_objects/pics/berry_trees/grepa/3.png
+++ b/graphics/event_objects/pics/berry_trees/grepa/3.png
diff --git a/graphics/map_objects/pics/berry_trees/grepa/4.png b/graphics/event_objects/pics/berry_trees/grepa/4.png
index 4b8ad19a0..4b8ad19a0 100644
--- a/graphics/map_objects/pics/berry_trees/grepa/4.png
+++ b/graphics/event_objects/pics/berry_trees/grepa/4.png
diff --git a/graphics/map_objects/pics/berry_trees/grepa/5.png b/graphics/event_objects/pics/berry_trees/grepa/5.png
index 9bf54a3e0..9bf54a3e0 100644
--- a/graphics/map_objects/pics/berry_trees/grepa/5.png
+++ b/graphics/event_objects/pics/berry_trees/grepa/5.png
diff --git a/graphics/map_objects/pics/berry_trees/hondew/0.png b/graphics/event_objects/pics/berry_trees/hondew/0.png
index ab1cffe55..ab1cffe55 100644
--- a/graphics/map_objects/pics/berry_trees/hondew/0.png
+++ b/graphics/event_objects/pics/berry_trees/hondew/0.png
diff --git a/graphics/map_objects/pics/berry_trees/hondew/1.png b/graphics/event_objects/pics/berry_trees/hondew/1.png
index e24fd5b95..e24fd5b95 100644
--- a/graphics/map_objects/pics/berry_trees/hondew/1.png
+++ b/graphics/event_objects/pics/berry_trees/hondew/1.png
diff --git a/graphics/map_objects/pics/berry_trees/hondew/2.png b/graphics/event_objects/pics/berry_trees/hondew/2.png
index dc7938958..dc7938958 100644
--- a/graphics/map_objects/pics/berry_trees/hondew/2.png
+++ b/graphics/event_objects/pics/berry_trees/hondew/2.png
diff --git a/graphics/map_objects/pics/berry_trees/hondew/3.png b/graphics/event_objects/pics/berry_trees/hondew/3.png
index 5c9536e87..5c9536e87 100644
--- a/graphics/map_objects/pics/berry_trees/hondew/3.png
+++ b/graphics/event_objects/pics/berry_trees/hondew/3.png
diff --git a/graphics/map_objects/pics/berry_trees/hondew/4.png b/graphics/event_objects/pics/berry_trees/hondew/4.png
index 2419d058b..2419d058b 100644
--- a/graphics/map_objects/pics/berry_trees/hondew/4.png
+++ b/graphics/event_objects/pics/berry_trees/hondew/4.png
diff --git a/graphics/map_objects/pics/berry_trees/hondew/5.png b/graphics/event_objects/pics/berry_trees/hondew/5.png
index 76aa9a8e3..76aa9a8e3 100644
--- a/graphics/map_objects/pics/berry_trees/hondew/5.png
+++ b/graphics/event_objects/pics/berry_trees/hondew/5.png
diff --git a/graphics/map_objects/pics/berry_trees/iapapa/0.png b/graphics/event_objects/pics/berry_trees/iapapa/0.png
index 506c8bb4b..506c8bb4b 100644
--- a/graphics/map_objects/pics/berry_trees/iapapa/0.png
+++ b/graphics/event_objects/pics/berry_trees/iapapa/0.png
diff --git a/graphics/map_objects/pics/berry_trees/iapapa/1.png b/graphics/event_objects/pics/berry_trees/iapapa/1.png
index 6eae7f4ba..6eae7f4ba 100644
--- a/graphics/map_objects/pics/berry_trees/iapapa/1.png
+++ b/graphics/event_objects/pics/berry_trees/iapapa/1.png
diff --git a/graphics/map_objects/pics/berry_trees/iapapa/2.png b/graphics/event_objects/pics/berry_trees/iapapa/2.png
index d779ca7fb..d779ca7fb 100644
--- a/graphics/map_objects/pics/berry_trees/iapapa/2.png
+++ b/graphics/event_objects/pics/berry_trees/iapapa/2.png
diff --git a/graphics/map_objects/pics/berry_trees/iapapa/3.png b/graphics/event_objects/pics/berry_trees/iapapa/3.png
index 4bbd498e3..4bbd498e3 100644
--- a/graphics/map_objects/pics/berry_trees/iapapa/3.png
+++ b/graphics/event_objects/pics/berry_trees/iapapa/3.png
diff --git a/graphics/map_objects/pics/berry_trees/iapapa/4.png b/graphics/event_objects/pics/berry_trees/iapapa/4.png
index 36cde6254..36cde6254 100644
--- a/graphics/map_objects/pics/berry_trees/iapapa/4.png
+++ b/graphics/event_objects/pics/berry_trees/iapapa/4.png
diff --git a/graphics/map_objects/pics/berry_trees/iapapa/5.png b/graphics/event_objects/pics/berry_trees/iapapa/5.png
index b6a39d318..b6a39d318 100644
--- a/graphics/map_objects/pics/berry_trees/iapapa/5.png
+++ b/graphics/event_objects/pics/berry_trees/iapapa/5.png
diff --git a/graphics/map_objects/pics/berry_trees/kelpsy/0.png b/graphics/event_objects/pics/berry_trees/kelpsy/0.png
index bb794552a..bb794552a 100644
--- a/graphics/map_objects/pics/berry_trees/kelpsy/0.png
+++ b/graphics/event_objects/pics/berry_trees/kelpsy/0.png
diff --git a/graphics/map_objects/pics/berry_trees/kelpsy/1.png b/graphics/event_objects/pics/berry_trees/kelpsy/1.png
index 90257b261..90257b261 100644
--- a/graphics/map_objects/pics/berry_trees/kelpsy/1.png
+++ b/graphics/event_objects/pics/berry_trees/kelpsy/1.png
diff --git a/graphics/map_objects/pics/berry_trees/kelpsy/2.png b/graphics/event_objects/pics/berry_trees/kelpsy/2.png
index 2f3fec1ec..2f3fec1ec 100644
--- a/graphics/map_objects/pics/berry_trees/kelpsy/2.png
+++ b/graphics/event_objects/pics/berry_trees/kelpsy/2.png
diff --git a/graphics/map_objects/pics/berry_trees/kelpsy/3.png b/graphics/event_objects/pics/berry_trees/kelpsy/3.png
index 2efd0d160..2efd0d160 100644
--- a/graphics/map_objects/pics/berry_trees/kelpsy/3.png
+++ b/graphics/event_objects/pics/berry_trees/kelpsy/3.png
diff --git a/graphics/map_objects/pics/berry_trees/kelpsy/4.png b/graphics/event_objects/pics/berry_trees/kelpsy/4.png
index cf0c47d0a..cf0c47d0a 100644
--- a/graphics/map_objects/pics/berry_trees/kelpsy/4.png
+++ b/graphics/event_objects/pics/berry_trees/kelpsy/4.png
diff --git a/graphics/map_objects/pics/berry_trees/kelpsy/5.png b/graphics/event_objects/pics/berry_trees/kelpsy/5.png
index e31dfd23f..e31dfd23f 100644
--- a/graphics/map_objects/pics/berry_trees/kelpsy/5.png
+++ b/graphics/event_objects/pics/berry_trees/kelpsy/5.png
diff --git a/graphics/map_objects/pics/berry_trees/lansat/0.png b/graphics/event_objects/pics/berry_trees/lansat/0.png
index 56d59b0a7..56d59b0a7 100644
--- a/graphics/map_objects/pics/berry_trees/lansat/0.png
+++ b/graphics/event_objects/pics/berry_trees/lansat/0.png
diff --git a/graphics/map_objects/pics/berry_trees/lansat/1.png b/graphics/event_objects/pics/berry_trees/lansat/1.png
index 59e7edcfa..59e7edcfa 100644
--- a/graphics/map_objects/pics/berry_trees/lansat/1.png
+++ b/graphics/event_objects/pics/berry_trees/lansat/1.png
diff --git a/graphics/map_objects/pics/berry_trees/lansat/2.png b/graphics/event_objects/pics/berry_trees/lansat/2.png
index f4d1145ef..f4d1145ef 100644
--- a/graphics/map_objects/pics/berry_trees/lansat/2.png
+++ b/graphics/event_objects/pics/berry_trees/lansat/2.png
diff --git a/graphics/map_objects/pics/berry_trees/lansat/3.png b/graphics/event_objects/pics/berry_trees/lansat/3.png
index 32ca5e3e9..32ca5e3e9 100644
--- a/graphics/map_objects/pics/berry_trees/lansat/3.png
+++ b/graphics/event_objects/pics/berry_trees/lansat/3.png
diff --git a/graphics/map_objects/pics/berry_trees/lansat/4.png b/graphics/event_objects/pics/berry_trees/lansat/4.png
index bf285b8ee..bf285b8ee 100644
--- a/graphics/map_objects/pics/berry_trees/lansat/4.png
+++ b/graphics/event_objects/pics/berry_trees/lansat/4.png
diff --git a/graphics/map_objects/pics/berry_trees/lansat/5.png b/graphics/event_objects/pics/berry_trees/lansat/5.png
index 3a8dae404..3a8dae404 100644
--- a/graphics/map_objects/pics/berry_trees/lansat/5.png
+++ b/graphics/event_objects/pics/berry_trees/lansat/5.png
diff --git a/graphics/map_objects/pics/berry_trees/leppa/0.png b/graphics/event_objects/pics/berry_trees/leppa/0.png
index cecd61e2d..cecd61e2d 100644
--- a/graphics/map_objects/pics/berry_trees/leppa/0.png
+++ b/graphics/event_objects/pics/berry_trees/leppa/0.png
diff --git a/graphics/map_objects/pics/berry_trees/leppa/1.png b/graphics/event_objects/pics/berry_trees/leppa/1.png
index f3ce88199..f3ce88199 100644
--- a/graphics/map_objects/pics/berry_trees/leppa/1.png
+++ b/graphics/event_objects/pics/berry_trees/leppa/1.png
diff --git a/graphics/map_objects/pics/berry_trees/leppa/2.png b/graphics/event_objects/pics/berry_trees/leppa/2.png
index d00cf5f89..d00cf5f89 100644
--- a/graphics/map_objects/pics/berry_trees/leppa/2.png
+++ b/graphics/event_objects/pics/berry_trees/leppa/2.png
diff --git a/graphics/map_objects/pics/berry_trees/leppa/3.png b/graphics/event_objects/pics/berry_trees/leppa/3.png
index 8a9ed3c34..8a9ed3c34 100644
--- a/graphics/map_objects/pics/berry_trees/leppa/3.png
+++ b/graphics/event_objects/pics/berry_trees/leppa/3.png
diff --git a/graphics/map_objects/pics/berry_trees/leppa/4.png b/graphics/event_objects/pics/berry_trees/leppa/4.png
index dd4fc6df2..dd4fc6df2 100644
--- a/graphics/map_objects/pics/berry_trees/leppa/4.png
+++ b/graphics/event_objects/pics/berry_trees/leppa/4.png
diff --git a/graphics/map_objects/pics/berry_trees/leppa/5.png b/graphics/event_objects/pics/berry_trees/leppa/5.png
index 056518295..056518295 100644
--- a/graphics/map_objects/pics/berry_trees/leppa/5.png
+++ b/graphics/event_objects/pics/berry_trees/leppa/5.png
diff --git a/graphics/map_objects/pics/berry_trees/liechi/0.png b/graphics/event_objects/pics/berry_trees/liechi/0.png
index 51827869f..51827869f 100644
--- a/graphics/map_objects/pics/berry_trees/liechi/0.png
+++ b/graphics/event_objects/pics/berry_trees/liechi/0.png
diff --git a/graphics/map_objects/pics/berry_trees/liechi/1.png b/graphics/event_objects/pics/berry_trees/liechi/1.png
index 182400260..182400260 100644
--- a/graphics/map_objects/pics/berry_trees/liechi/1.png
+++ b/graphics/event_objects/pics/berry_trees/liechi/1.png
diff --git a/graphics/map_objects/pics/berry_trees/liechi/2.png b/graphics/event_objects/pics/berry_trees/liechi/2.png
index a24565623..a24565623 100644
--- a/graphics/map_objects/pics/berry_trees/liechi/2.png
+++ b/graphics/event_objects/pics/berry_trees/liechi/2.png
diff --git a/graphics/map_objects/pics/berry_trees/liechi/3.png b/graphics/event_objects/pics/berry_trees/liechi/3.png
index b7bde2e7f..b7bde2e7f 100644
--- a/graphics/map_objects/pics/berry_trees/liechi/3.png
+++ b/graphics/event_objects/pics/berry_trees/liechi/3.png
diff --git a/graphics/map_objects/pics/berry_trees/liechi/4.png b/graphics/event_objects/pics/berry_trees/liechi/4.png
index 2ed774c17..2ed774c17 100644
--- a/graphics/map_objects/pics/berry_trees/liechi/4.png
+++ b/graphics/event_objects/pics/berry_trees/liechi/4.png
diff --git a/graphics/map_objects/pics/berry_trees/liechi/5.png b/graphics/event_objects/pics/berry_trees/liechi/5.png
index d8fe39b21..d8fe39b21 100644
--- a/graphics/map_objects/pics/berry_trees/liechi/5.png
+++ b/graphics/event_objects/pics/berry_trees/liechi/5.png
diff --git a/graphics/map_objects/pics/berry_trees/lum/0.png b/graphics/event_objects/pics/berry_trees/lum/0.png
index 4c08ea797..4c08ea797 100644
--- a/graphics/map_objects/pics/berry_trees/lum/0.png
+++ b/graphics/event_objects/pics/berry_trees/lum/0.png
diff --git a/graphics/map_objects/pics/berry_trees/lum/1.png b/graphics/event_objects/pics/berry_trees/lum/1.png
index b2035c555..b2035c555 100644
--- a/graphics/map_objects/pics/berry_trees/lum/1.png
+++ b/graphics/event_objects/pics/berry_trees/lum/1.png
diff --git a/graphics/map_objects/pics/berry_trees/lum/2.png b/graphics/event_objects/pics/berry_trees/lum/2.png
index b09991fd9..b09991fd9 100644
--- a/graphics/map_objects/pics/berry_trees/lum/2.png
+++ b/graphics/event_objects/pics/berry_trees/lum/2.png
diff --git a/graphics/map_objects/pics/berry_trees/lum/3.png b/graphics/event_objects/pics/berry_trees/lum/3.png
index e32e7b64a..e32e7b64a 100644
--- a/graphics/map_objects/pics/berry_trees/lum/3.png
+++ b/graphics/event_objects/pics/berry_trees/lum/3.png
diff --git a/graphics/map_objects/pics/berry_trees/lum/4.png b/graphics/event_objects/pics/berry_trees/lum/4.png
index 1347d66b2..1347d66b2 100644
--- a/graphics/map_objects/pics/berry_trees/lum/4.png
+++ b/graphics/event_objects/pics/berry_trees/lum/4.png
diff --git a/graphics/map_objects/pics/berry_trees/lum/5.png b/graphics/event_objects/pics/berry_trees/lum/5.png
index 1c601d09b..1c601d09b 100644
--- a/graphics/map_objects/pics/berry_trees/lum/5.png
+++ b/graphics/event_objects/pics/berry_trees/lum/5.png
diff --git a/graphics/map_objects/pics/berry_trees/mago/0.png b/graphics/event_objects/pics/berry_trees/mago/0.png
index b58d4aba1..b58d4aba1 100644
--- a/graphics/map_objects/pics/berry_trees/mago/0.png
+++ b/graphics/event_objects/pics/berry_trees/mago/0.png
diff --git a/graphics/map_objects/pics/berry_trees/mago/1.png b/graphics/event_objects/pics/berry_trees/mago/1.png
index 0ed2ad6ad..0ed2ad6ad 100644
--- a/graphics/map_objects/pics/berry_trees/mago/1.png
+++ b/graphics/event_objects/pics/berry_trees/mago/1.png
diff --git a/graphics/map_objects/pics/berry_trees/mago/2.png b/graphics/event_objects/pics/berry_trees/mago/2.png
index 221af2806..221af2806 100644
--- a/graphics/map_objects/pics/berry_trees/mago/2.png
+++ b/graphics/event_objects/pics/berry_trees/mago/2.png
diff --git a/graphics/map_objects/pics/berry_trees/mago/3.png b/graphics/event_objects/pics/berry_trees/mago/3.png
index 71a8d4294..71a8d4294 100644
--- a/graphics/map_objects/pics/berry_trees/mago/3.png
+++ b/graphics/event_objects/pics/berry_trees/mago/3.png
diff --git a/graphics/map_objects/pics/berry_trees/mago/4.png b/graphics/event_objects/pics/berry_trees/mago/4.png
index ba6bf2d00..ba6bf2d00 100644
--- a/graphics/map_objects/pics/berry_trees/mago/4.png
+++ b/graphics/event_objects/pics/berry_trees/mago/4.png
diff --git a/graphics/map_objects/pics/berry_trees/mago/5.png b/graphics/event_objects/pics/berry_trees/mago/5.png
index 6271425a3..6271425a3 100644
--- a/graphics/map_objects/pics/berry_trees/mago/5.png
+++ b/graphics/event_objects/pics/berry_trees/mago/5.png
diff --git a/graphics/map_objects/pics/berry_trees/nomel/0.png b/graphics/event_objects/pics/berry_trees/nomel/0.png
index d504524eb..d504524eb 100644
--- a/graphics/map_objects/pics/berry_trees/nomel/0.png
+++ b/graphics/event_objects/pics/berry_trees/nomel/0.png
diff --git a/graphics/map_objects/pics/berry_trees/nomel/1.png b/graphics/event_objects/pics/berry_trees/nomel/1.png
index 37ff4b082..37ff4b082 100644
--- a/graphics/map_objects/pics/berry_trees/nomel/1.png
+++ b/graphics/event_objects/pics/berry_trees/nomel/1.png
diff --git a/graphics/map_objects/pics/berry_trees/nomel/2.png b/graphics/event_objects/pics/berry_trees/nomel/2.png
index 4e5c03cb4..4e5c03cb4 100644
--- a/graphics/map_objects/pics/berry_trees/nomel/2.png
+++ b/graphics/event_objects/pics/berry_trees/nomel/2.png
diff --git a/graphics/map_objects/pics/berry_trees/nomel/3.png b/graphics/event_objects/pics/berry_trees/nomel/3.png
index 7fd46d627..7fd46d627 100644
--- a/graphics/map_objects/pics/berry_trees/nomel/3.png
+++ b/graphics/event_objects/pics/berry_trees/nomel/3.png
diff --git a/graphics/map_objects/pics/berry_trees/nomel/4.png b/graphics/event_objects/pics/berry_trees/nomel/4.png
index 913274d81..913274d81 100644
--- a/graphics/map_objects/pics/berry_trees/nomel/4.png
+++ b/graphics/event_objects/pics/berry_trees/nomel/4.png
diff --git a/graphics/map_objects/pics/berry_trees/nomel/5.png b/graphics/event_objects/pics/berry_trees/nomel/5.png
index 3af9a516a..3af9a516a 100644
--- a/graphics/map_objects/pics/berry_trees/nomel/5.png
+++ b/graphics/event_objects/pics/berry_trees/nomel/5.png
diff --git a/graphics/map_objects/pics/berry_trees/oran/0.png b/graphics/event_objects/pics/berry_trees/oran/0.png
index 8770230de..8770230de 100644
--- a/graphics/map_objects/pics/berry_trees/oran/0.png
+++ b/graphics/event_objects/pics/berry_trees/oran/0.png
diff --git a/graphics/map_objects/pics/berry_trees/oran/1.png b/graphics/event_objects/pics/berry_trees/oran/1.png
index afeb286a9..afeb286a9 100644
--- a/graphics/map_objects/pics/berry_trees/oran/1.png
+++ b/graphics/event_objects/pics/berry_trees/oran/1.png
diff --git a/graphics/map_objects/pics/berry_trees/oran/2.png b/graphics/event_objects/pics/berry_trees/oran/2.png
index 7b7dc8b1a..7b7dc8b1a 100644
--- a/graphics/map_objects/pics/berry_trees/oran/2.png
+++ b/graphics/event_objects/pics/berry_trees/oran/2.png
diff --git a/graphics/map_objects/pics/berry_trees/oran/3.png b/graphics/event_objects/pics/berry_trees/oran/3.png
index 81857442d..81857442d 100644
--- a/graphics/map_objects/pics/berry_trees/oran/3.png
+++ b/graphics/event_objects/pics/berry_trees/oran/3.png
diff --git a/graphics/map_objects/pics/berry_trees/oran/4.png b/graphics/event_objects/pics/berry_trees/oran/4.png
index 58a197d08..58a197d08 100644
--- a/graphics/map_objects/pics/berry_trees/oran/4.png
+++ b/graphics/event_objects/pics/berry_trees/oran/4.png
diff --git a/graphics/map_objects/pics/berry_trees/oran/5.png b/graphics/event_objects/pics/berry_trees/oran/5.png
index 8878c8550..8878c8550 100644
--- a/graphics/map_objects/pics/berry_trees/oran/5.png
+++ b/graphics/event_objects/pics/berry_trees/oran/5.png
diff --git a/graphics/map_objects/pics/berry_trees/pamtre/0.png b/graphics/event_objects/pics/berry_trees/pamtre/0.png
index ac56c5370..ac56c5370 100644
--- a/graphics/map_objects/pics/berry_trees/pamtre/0.png
+++ b/graphics/event_objects/pics/berry_trees/pamtre/0.png
diff --git a/graphics/map_objects/pics/berry_trees/pamtre/1.png b/graphics/event_objects/pics/berry_trees/pamtre/1.png
index 105974668..105974668 100644
--- a/graphics/map_objects/pics/berry_trees/pamtre/1.png
+++ b/graphics/event_objects/pics/berry_trees/pamtre/1.png
diff --git a/graphics/map_objects/pics/berry_trees/pamtre/2.png b/graphics/event_objects/pics/berry_trees/pamtre/2.png
index 09363b8ba..09363b8ba 100644
--- a/graphics/map_objects/pics/berry_trees/pamtre/2.png
+++ b/graphics/event_objects/pics/berry_trees/pamtre/2.png
diff --git a/graphics/map_objects/pics/berry_trees/pamtre/3.png b/graphics/event_objects/pics/berry_trees/pamtre/3.png
index 263856830..263856830 100644
--- a/graphics/map_objects/pics/berry_trees/pamtre/3.png
+++ b/graphics/event_objects/pics/berry_trees/pamtre/3.png
diff --git a/graphics/map_objects/pics/berry_trees/pamtre/4.png b/graphics/event_objects/pics/berry_trees/pamtre/4.png
index 509057976..509057976 100644
--- a/graphics/map_objects/pics/berry_trees/pamtre/4.png
+++ b/graphics/event_objects/pics/berry_trees/pamtre/4.png
diff --git a/graphics/map_objects/pics/berry_trees/pamtre/5.png b/graphics/event_objects/pics/berry_trees/pamtre/5.png
index 1adf263df..1adf263df 100644
--- a/graphics/map_objects/pics/berry_trees/pamtre/5.png
+++ b/graphics/event_objects/pics/berry_trees/pamtre/5.png
diff --git a/graphics/map_objects/pics/berry_trees/pecha/0.png b/graphics/event_objects/pics/berry_trees/pecha/0.png
index 8a69441a4..8a69441a4 100644
--- a/graphics/map_objects/pics/berry_trees/pecha/0.png
+++ b/graphics/event_objects/pics/berry_trees/pecha/0.png
diff --git a/graphics/map_objects/pics/berry_trees/pecha/1.png b/graphics/event_objects/pics/berry_trees/pecha/1.png
index 4d1923735..4d1923735 100644
--- a/graphics/map_objects/pics/berry_trees/pecha/1.png
+++ b/graphics/event_objects/pics/berry_trees/pecha/1.png
diff --git a/graphics/map_objects/pics/berry_trees/pecha/2.png b/graphics/event_objects/pics/berry_trees/pecha/2.png
index a93a37738..a93a37738 100644
--- a/graphics/map_objects/pics/berry_trees/pecha/2.png
+++ b/graphics/event_objects/pics/berry_trees/pecha/2.png
diff --git a/graphics/map_objects/pics/berry_trees/pecha/3.png b/graphics/event_objects/pics/berry_trees/pecha/3.png
index 5cd4f5e3c..5cd4f5e3c 100644
--- a/graphics/map_objects/pics/berry_trees/pecha/3.png
+++ b/graphics/event_objects/pics/berry_trees/pecha/3.png
diff --git a/graphics/map_objects/pics/berry_trees/pecha/4.png b/graphics/event_objects/pics/berry_trees/pecha/4.png
index 451d74260..451d74260 100644
--- a/graphics/map_objects/pics/berry_trees/pecha/4.png
+++ b/graphics/event_objects/pics/berry_trees/pecha/4.png
diff --git a/graphics/map_objects/pics/berry_trees/pecha/5.png b/graphics/event_objects/pics/berry_trees/pecha/5.png
index 242a9b53f..242a9b53f 100644
--- a/graphics/map_objects/pics/berry_trees/pecha/5.png
+++ b/graphics/event_objects/pics/berry_trees/pecha/5.png
diff --git a/graphics/map_objects/pics/berry_trees/persim/0.png b/graphics/event_objects/pics/berry_trees/persim/0.png
index 1996615ff..1996615ff 100644
--- a/graphics/map_objects/pics/berry_trees/persim/0.png
+++ b/graphics/event_objects/pics/berry_trees/persim/0.png
diff --git a/graphics/map_objects/pics/berry_trees/persim/1.png b/graphics/event_objects/pics/berry_trees/persim/1.png
index eda84785f..eda84785f 100644
--- a/graphics/map_objects/pics/berry_trees/persim/1.png
+++ b/graphics/event_objects/pics/berry_trees/persim/1.png
diff --git a/graphics/map_objects/pics/berry_trees/persim/2.png b/graphics/event_objects/pics/berry_trees/persim/2.png
index 6e71b3786..6e71b3786 100644
--- a/graphics/map_objects/pics/berry_trees/persim/2.png
+++ b/graphics/event_objects/pics/berry_trees/persim/2.png
diff --git a/graphics/map_objects/pics/berry_trees/persim/3.png b/graphics/event_objects/pics/berry_trees/persim/3.png
index f45bf0646..f45bf0646 100644
--- a/graphics/map_objects/pics/berry_trees/persim/3.png
+++ b/graphics/event_objects/pics/berry_trees/persim/3.png
diff --git a/graphics/map_objects/pics/berry_trees/persim/4.png b/graphics/event_objects/pics/berry_trees/persim/4.png
index a5aeda410..a5aeda410 100644
--- a/graphics/map_objects/pics/berry_trees/persim/4.png
+++ b/graphics/event_objects/pics/berry_trees/persim/4.png
diff --git a/graphics/map_objects/pics/berry_trees/persim/5.png b/graphics/event_objects/pics/berry_trees/persim/5.png
index 72c69c068..72c69c068 100644
--- a/graphics/map_objects/pics/berry_trees/persim/5.png
+++ b/graphics/event_objects/pics/berry_trees/persim/5.png
diff --git a/graphics/map_objects/pics/berry_trees/pomeg/0.png b/graphics/event_objects/pics/berry_trees/pomeg/0.png
index c343bc210..c343bc210 100644
--- a/graphics/map_objects/pics/berry_trees/pomeg/0.png
+++ b/graphics/event_objects/pics/berry_trees/pomeg/0.png
diff --git a/graphics/map_objects/pics/berry_trees/pomeg/1.png b/graphics/event_objects/pics/berry_trees/pomeg/1.png
index cc1c08f92..cc1c08f92 100644
--- a/graphics/map_objects/pics/berry_trees/pomeg/1.png
+++ b/graphics/event_objects/pics/berry_trees/pomeg/1.png
diff --git a/graphics/map_objects/pics/berry_trees/pomeg/2.png b/graphics/event_objects/pics/berry_trees/pomeg/2.png
index 46d0fb7cc..46d0fb7cc 100644
--- a/graphics/map_objects/pics/berry_trees/pomeg/2.png
+++ b/graphics/event_objects/pics/berry_trees/pomeg/2.png
diff --git a/graphics/map_objects/pics/berry_trees/pomeg/3.png b/graphics/event_objects/pics/berry_trees/pomeg/3.png
index d2475b748..d2475b748 100644
--- a/graphics/map_objects/pics/berry_trees/pomeg/3.png
+++ b/graphics/event_objects/pics/berry_trees/pomeg/3.png
diff --git a/graphics/map_objects/pics/berry_trees/pomeg/4.png b/graphics/event_objects/pics/berry_trees/pomeg/4.png
index 4f3019213..4f3019213 100644
--- a/graphics/map_objects/pics/berry_trees/pomeg/4.png
+++ b/graphics/event_objects/pics/berry_trees/pomeg/4.png
diff --git a/graphics/map_objects/pics/berry_trees/pomeg/5.png b/graphics/event_objects/pics/berry_trees/pomeg/5.png
index f519675ce..f519675ce 100644
--- a/graphics/map_objects/pics/berry_trees/pomeg/5.png
+++ b/graphics/event_objects/pics/berry_trees/pomeg/5.png
diff --git a/graphics/map_objects/pics/berry_trees/rabuta/0.png b/graphics/event_objects/pics/berry_trees/rabuta/0.png
index 5fe85e4e3..5fe85e4e3 100644
--- a/graphics/map_objects/pics/berry_trees/rabuta/0.png
+++ b/graphics/event_objects/pics/berry_trees/rabuta/0.png
diff --git a/graphics/map_objects/pics/berry_trees/rabuta/1.png b/graphics/event_objects/pics/berry_trees/rabuta/1.png
index 0973e21cb..0973e21cb 100644
--- a/graphics/map_objects/pics/berry_trees/rabuta/1.png
+++ b/graphics/event_objects/pics/berry_trees/rabuta/1.png
diff --git a/graphics/map_objects/pics/berry_trees/rabuta/2.png b/graphics/event_objects/pics/berry_trees/rabuta/2.png
index c2d027ebd..c2d027ebd 100644
--- a/graphics/map_objects/pics/berry_trees/rabuta/2.png
+++ b/graphics/event_objects/pics/berry_trees/rabuta/2.png
diff --git a/graphics/map_objects/pics/berry_trees/rabuta/3.png b/graphics/event_objects/pics/berry_trees/rabuta/3.png
index 79b2cc45f..79b2cc45f 100644
--- a/graphics/map_objects/pics/berry_trees/rabuta/3.png
+++ b/graphics/event_objects/pics/berry_trees/rabuta/3.png
diff --git a/graphics/map_objects/pics/berry_trees/rabuta/4.png b/graphics/event_objects/pics/berry_trees/rabuta/4.png
index 931350042..931350042 100644
--- a/graphics/map_objects/pics/berry_trees/rabuta/4.png
+++ b/graphics/event_objects/pics/berry_trees/rabuta/4.png
diff --git a/graphics/map_objects/pics/berry_trees/rabuta/5.png b/graphics/event_objects/pics/berry_trees/rabuta/5.png
index efa1ac89e..efa1ac89e 100644
--- a/graphics/map_objects/pics/berry_trees/rabuta/5.png
+++ b/graphics/event_objects/pics/berry_trees/rabuta/5.png
diff --git a/graphics/map_objects/pics/berry_trees/rawst/0.png b/graphics/event_objects/pics/berry_trees/rawst/0.png
index ef3548002..ef3548002 100644
--- a/graphics/map_objects/pics/berry_trees/rawst/0.png
+++ b/graphics/event_objects/pics/berry_trees/rawst/0.png
diff --git a/graphics/map_objects/pics/berry_trees/rawst/1.png b/graphics/event_objects/pics/berry_trees/rawst/1.png
index dccad21b0..dccad21b0 100644
--- a/graphics/map_objects/pics/berry_trees/rawst/1.png
+++ b/graphics/event_objects/pics/berry_trees/rawst/1.png
diff --git a/graphics/map_objects/pics/berry_trees/rawst/2.png b/graphics/event_objects/pics/berry_trees/rawst/2.png
index d89f7484e..d89f7484e 100644
--- a/graphics/map_objects/pics/berry_trees/rawst/2.png
+++ b/graphics/event_objects/pics/berry_trees/rawst/2.png
diff --git a/graphics/map_objects/pics/berry_trees/rawst/3.png b/graphics/event_objects/pics/berry_trees/rawst/3.png
index afd11e0f6..afd11e0f6 100644
--- a/graphics/map_objects/pics/berry_trees/rawst/3.png
+++ b/graphics/event_objects/pics/berry_trees/rawst/3.png
diff --git a/graphics/map_objects/pics/berry_trees/rawst/4.png b/graphics/event_objects/pics/berry_trees/rawst/4.png
index aada33789..aada33789 100644
--- a/graphics/map_objects/pics/berry_trees/rawst/4.png
+++ b/graphics/event_objects/pics/berry_trees/rawst/4.png
diff --git a/graphics/map_objects/pics/berry_trees/rawst/5.png b/graphics/event_objects/pics/berry_trees/rawst/5.png
index 311044bf0..311044bf0 100644
--- a/graphics/map_objects/pics/berry_trees/rawst/5.png
+++ b/graphics/event_objects/pics/berry_trees/rawst/5.png
diff --git a/graphics/map_objects/pics/berry_trees/razz/0.png b/graphics/event_objects/pics/berry_trees/razz/0.png
index 4685d0977..4685d0977 100644
--- a/graphics/map_objects/pics/berry_trees/razz/0.png
+++ b/graphics/event_objects/pics/berry_trees/razz/0.png
diff --git a/graphics/map_objects/pics/berry_trees/razz/1.png b/graphics/event_objects/pics/berry_trees/razz/1.png
index 396122c5b..396122c5b 100644
--- a/graphics/map_objects/pics/berry_trees/razz/1.png
+++ b/graphics/event_objects/pics/berry_trees/razz/1.png
diff --git a/graphics/map_objects/pics/berry_trees/razz/2.png b/graphics/event_objects/pics/berry_trees/razz/2.png
index f48a2c6e2..f48a2c6e2 100644
--- a/graphics/map_objects/pics/berry_trees/razz/2.png
+++ b/graphics/event_objects/pics/berry_trees/razz/2.png
diff --git a/graphics/map_objects/pics/berry_trees/razz/3.png b/graphics/event_objects/pics/berry_trees/razz/3.png
index 47e6a52c1..47e6a52c1 100644
--- a/graphics/map_objects/pics/berry_trees/razz/3.png
+++ b/graphics/event_objects/pics/berry_trees/razz/3.png
diff --git a/graphics/map_objects/pics/berry_trees/razz/4.png b/graphics/event_objects/pics/berry_trees/razz/4.png
index 075c4674b..075c4674b 100644
--- a/graphics/map_objects/pics/berry_trees/razz/4.png
+++ b/graphics/event_objects/pics/berry_trees/razz/4.png
diff --git a/graphics/map_objects/pics/berry_trees/razz/5.png b/graphics/event_objects/pics/berry_trees/razz/5.png
index 7ae7b7bba..7ae7b7bba 100644
--- a/graphics/map_objects/pics/berry_trees/razz/5.png
+++ b/graphics/event_objects/pics/berry_trees/razz/5.png
diff --git a/graphics/map_objects/pics/berry_trees/sitrus/0.png b/graphics/event_objects/pics/berry_trees/sitrus/0.png
index 64671e0a1..64671e0a1 100644
--- a/graphics/map_objects/pics/berry_trees/sitrus/0.png
+++ b/graphics/event_objects/pics/berry_trees/sitrus/0.png
diff --git a/graphics/map_objects/pics/berry_trees/sitrus/1.png b/graphics/event_objects/pics/berry_trees/sitrus/1.png
index 13f82d092..13f82d092 100644
--- a/graphics/map_objects/pics/berry_trees/sitrus/1.png
+++ b/graphics/event_objects/pics/berry_trees/sitrus/1.png
diff --git a/graphics/map_objects/pics/berry_trees/sitrus/2.png b/graphics/event_objects/pics/berry_trees/sitrus/2.png
index 7a382402a..7a382402a 100644
--- a/graphics/map_objects/pics/berry_trees/sitrus/2.png
+++ b/graphics/event_objects/pics/berry_trees/sitrus/2.png
diff --git a/graphics/map_objects/pics/berry_trees/sitrus/3.png b/graphics/event_objects/pics/berry_trees/sitrus/3.png
index 6bbc0dca0..6bbc0dca0 100644
--- a/graphics/map_objects/pics/berry_trees/sitrus/3.png
+++ b/graphics/event_objects/pics/berry_trees/sitrus/3.png
diff --git a/graphics/map_objects/pics/berry_trees/sitrus/4.png b/graphics/event_objects/pics/berry_trees/sitrus/4.png
index 1e6ff6838..1e6ff6838 100644
--- a/graphics/map_objects/pics/berry_trees/sitrus/4.png
+++ b/graphics/event_objects/pics/berry_trees/sitrus/4.png
diff --git a/graphics/map_objects/pics/berry_trees/sitrus/5.png b/graphics/event_objects/pics/berry_trees/sitrus/5.png
index cd97f552f..cd97f552f 100644
--- a/graphics/map_objects/pics/berry_trees/sitrus/5.png
+++ b/graphics/event_objects/pics/berry_trees/sitrus/5.png
diff --git a/graphics/map_objects/pics/berry_trees/spelon/0.png b/graphics/event_objects/pics/berry_trees/spelon/0.png
index 32bd06af1..32bd06af1 100644
--- a/graphics/map_objects/pics/berry_trees/spelon/0.png
+++ b/graphics/event_objects/pics/berry_trees/spelon/0.png
diff --git a/graphics/map_objects/pics/berry_trees/spelon/1.png b/graphics/event_objects/pics/berry_trees/spelon/1.png
index 37e77e391..37e77e391 100644
--- a/graphics/map_objects/pics/berry_trees/spelon/1.png
+++ b/graphics/event_objects/pics/berry_trees/spelon/1.png
diff --git a/graphics/map_objects/pics/berry_trees/spelon/2.png b/graphics/event_objects/pics/berry_trees/spelon/2.png
index d36cf3b16..d36cf3b16 100644
--- a/graphics/map_objects/pics/berry_trees/spelon/2.png
+++ b/graphics/event_objects/pics/berry_trees/spelon/2.png
diff --git a/graphics/map_objects/pics/berry_trees/spelon/3.png b/graphics/event_objects/pics/berry_trees/spelon/3.png
index 6a7099d83..6a7099d83 100644
--- a/graphics/map_objects/pics/berry_trees/spelon/3.png
+++ b/graphics/event_objects/pics/berry_trees/spelon/3.png
diff --git a/graphics/map_objects/pics/berry_trees/spelon/4.png b/graphics/event_objects/pics/berry_trees/spelon/4.png
index de1c24e58..de1c24e58 100644
--- a/graphics/map_objects/pics/berry_trees/spelon/4.png
+++ b/graphics/event_objects/pics/berry_trees/spelon/4.png
diff --git a/graphics/map_objects/pics/berry_trees/spelon/5.png b/graphics/event_objects/pics/berry_trees/spelon/5.png
index 578231a24..578231a24 100644
--- a/graphics/map_objects/pics/berry_trees/spelon/5.png
+++ b/graphics/event_objects/pics/berry_trees/spelon/5.png
diff --git a/graphics/map_objects/pics/berry_trees/sprout/0.png b/graphics/event_objects/pics/berry_trees/sprout/0.png
index df37532a7..df37532a7 100644
--- a/graphics/map_objects/pics/berry_trees/sprout/0.png
+++ b/graphics/event_objects/pics/berry_trees/sprout/0.png
diff --git a/graphics/map_objects/pics/berry_trees/sprout/1.png b/graphics/event_objects/pics/berry_trees/sprout/1.png
index f0a67f382..f0a67f382 100644
--- a/graphics/map_objects/pics/berry_trees/sprout/1.png
+++ b/graphics/event_objects/pics/berry_trees/sprout/1.png
diff --git a/graphics/map_objects/pics/berry_trees/tamato/0.png b/graphics/event_objects/pics/berry_trees/tamato/0.png
index 499e473bc..499e473bc 100644
--- a/graphics/map_objects/pics/berry_trees/tamato/0.png
+++ b/graphics/event_objects/pics/berry_trees/tamato/0.png
diff --git a/graphics/map_objects/pics/berry_trees/tamato/1.png b/graphics/event_objects/pics/berry_trees/tamato/1.png
index 2c45d60d8..2c45d60d8 100644
--- a/graphics/map_objects/pics/berry_trees/tamato/1.png
+++ b/graphics/event_objects/pics/berry_trees/tamato/1.png
diff --git a/graphics/map_objects/pics/berry_trees/tamato/2.png b/graphics/event_objects/pics/berry_trees/tamato/2.png
index ef3ac700b..ef3ac700b 100644
--- a/graphics/map_objects/pics/berry_trees/tamato/2.png
+++ b/graphics/event_objects/pics/berry_trees/tamato/2.png
diff --git a/graphics/map_objects/pics/berry_trees/tamato/3.png b/graphics/event_objects/pics/berry_trees/tamato/3.png
index 57b60904f..57b60904f 100644
--- a/graphics/map_objects/pics/berry_trees/tamato/3.png
+++ b/graphics/event_objects/pics/berry_trees/tamato/3.png
diff --git a/graphics/map_objects/pics/berry_trees/tamato/4.png b/graphics/event_objects/pics/berry_trees/tamato/4.png
index 823ff49a7..823ff49a7 100644
--- a/graphics/map_objects/pics/berry_trees/tamato/4.png
+++ b/graphics/event_objects/pics/berry_trees/tamato/4.png
diff --git a/graphics/map_objects/pics/berry_trees/tamato/5.png b/graphics/event_objects/pics/berry_trees/tamato/5.png
index 8656cb5db..8656cb5db 100644
--- a/graphics/map_objects/pics/berry_trees/tamato/5.png
+++ b/graphics/event_objects/pics/berry_trees/tamato/5.png
diff --git a/graphics/map_objects/pics/berry_trees/wepear/0.png b/graphics/event_objects/pics/berry_trees/wepear/0.png
index ccf834a94..ccf834a94 100644
--- a/graphics/map_objects/pics/berry_trees/wepear/0.png
+++ b/graphics/event_objects/pics/berry_trees/wepear/0.png
diff --git a/graphics/map_objects/pics/berry_trees/wepear/1.png b/graphics/event_objects/pics/berry_trees/wepear/1.png
index d46390bdd..d46390bdd 100644
--- a/graphics/map_objects/pics/berry_trees/wepear/1.png
+++ b/graphics/event_objects/pics/berry_trees/wepear/1.png
diff --git a/graphics/map_objects/pics/berry_trees/wepear/2.png b/graphics/event_objects/pics/berry_trees/wepear/2.png
index 040a70931..040a70931 100644
--- a/graphics/map_objects/pics/berry_trees/wepear/2.png
+++ b/graphics/event_objects/pics/berry_trees/wepear/2.png
diff --git a/graphics/map_objects/pics/berry_trees/wepear/3.png b/graphics/event_objects/pics/berry_trees/wepear/3.png
index 94918f7ff..94918f7ff 100644
--- a/graphics/map_objects/pics/berry_trees/wepear/3.png
+++ b/graphics/event_objects/pics/berry_trees/wepear/3.png
diff --git a/graphics/map_objects/pics/berry_trees/wepear/4.png b/graphics/event_objects/pics/berry_trees/wepear/4.png
index ee242d657..ee242d657 100644
--- a/graphics/map_objects/pics/berry_trees/wepear/4.png
+++ b/graphics/event_objects/pics/berry_trees/wepear/4.png
diff --git a/graphics/map_objects/pics/berry_trees/wepear/5.png b/graphics/event_objects/pics/berry_trees/wepear/5.png
index 1b5256a9e..1b5256a9e 100644
--- a/graphics/map_objects/pics/berry_trees/wepear/5.png
+++ b/graphics/event_objects/pics/berry_trees/wepear/5.png
diff --git a/graphics/map_objects/pics/berry_trees/wiki/0.png b/graphics/event_objects/pics/berry_trees/wiki/0.png
index e51325e18..e51325e18 100644
--- a/graphics/map_objects/pics/berry_trees/wiki/0.png
+++ b/graphics/event_objects/pics/berry_trees/wiki/0.png
diff --git a/graphics/map_objects/pics/berry_trees/wiki/1.png b/graphics/event_objects/pics/berry_trees/wiki/1.png
index f7f28e44b..f7f28e44b 100644
--- a/graphics/map_objects/pics/berry_trees/wiki/1.png
+++ b/graphics/event_objects/pics/berry_trees/wiki/1.png
diff --git a/graphics/map_objects/pics/berry_trees/wiki/2.png b/graphics/event_objects/pics/berry_trees/wiki/2.png
index e7d6c3824..e7d6c3824 100644
--- a/graphics/map_objects/pics/berry_trees/wiki/2.png
+++ b/graphics/event_objects/pics/berry_trees/wiki/2.png
diff --git a/graphics/map_objects/pics/berry_trees/wiki/3.png b/graphics/event_objects/pics/berry_trees/wiki/3.png
index 6447302a6..6447302a6 100644
--- a/graphics/map_objects/pics/berry_trees/wiki/3.png
+++ b/graphics/event_objects/pics/berry_trees/wiki/3.png
diff --git a/graphics/map_objects/pics/berry_trees/wiki/4.png b/graphics/event_objects/pics/berry_trees/wiki/4.png
index a494a7eaa..a494a7eaa 100644
--- a/graphics/map_objects/pics/berry_trees/wiki/4.png
+++ b/graphics/event_objects/pics/berry_trees/wiki/4.png
diff --git a/graphics/map_objects/pics/berry_trees/wiki/5.png b/graphics/event_objects/pics/berry_trees/wiki/5.png
index 5a6b9f193..5a6b9f193 100644
--- a/graphics/map_objects/pics/berry_trees/wiki/5.png
+++ b/graphics/event_objects/pics/berry_trees/wiki/5.png
diff --git a/graphics/map_objects/pics/cushions/ball_cushion.png b/graphics/event_objects/pics/cushions/ball_cushion.png
index 54ecc1980..54ecc1980 100644
--- a/graphics/map_objects/pics/cushions/ball_cushion.png
+++ b/graphics/event_objects/pics/cushions/ball_cushion.png
diff --git a/graphics/map_objects/pics/cushions/diamond_cushion.png b/graphics/event_objects/pics/cushions/diamond_cushion.png
index 747866941..747866941 100644
--- a/graphics/map_objects/pics/cushions/diamond_cushion.png
+++ b/graphics/event_objects/pics/cushions/diamond_cushion.png
diff --git a/graphics/map_objects/pics/cushions/fire_cushion.png b/graphics/event_objects/pics/cushions/fire_cushion.png
index aa9a70f2e..aa9a70f2e 100644
--- a/graphics/map_objects/pics/cushions/fire_cushion.png
+++ b/graphics/event_objects/pics/cushions/fire_cushion.png
diff --git a/graphics/map_objects/pics/cushions/grass_cushion.png b/graphics/event_objects/pics/cushions/grass_cushion.png
index 8ee854f17..8ee854f17 100644
--- a/graphics/map_objects/pics/cushions/grass_cushion.png
+++ b/graphics/event_objects/pics/cushions/grass_cushion.png
diff --git a/graphics/map_objects/pics/cushions/kiss_cushion.png b/graphics/event_objects/pics/cushions/kiss_cushion.png
index 6a99348c9..6a99348c9 100644
--- a/graphics/map_objects/pics/cushions/kiss_cushion.png
+++ b/graphics/event_objects/pics/cushions/kiss_cushion.png
diff --git a/graphics/map_objects/pics/cushions/pika_cushion.png b/graphics/event_objects/pics/cushions/pika_cushion.png
index 947713c39..947713c39 100644
--- a/graphics/map_objects/pics/cushions/pika_cushion.png
+++ b/graphics/event_objects/pics/cushions/pika_cushion.png
diff --git a/graphics/map_objects/pics/cushions/round_cushion.png b/graphics/event_objects/pics/cushions/round_cushion.png
index 0e7b71ad5..0e7b71ad5 100644
--- a/graphics/map_objects/pics/cushions/round_cushion.png
+++ b/graphics/event_objects/pics/cushions/round_cushion.png
diff --git a/graphics/map_objects/pics/cushions/spin_cushion.png b/graphics/event_objects/pics/cushions/spin_cushion.png
index 81eba708c..81eba708c 100644
--- a/graphics/map_objects/pics/cushions/spin_cushion.png
+++ b/graphics/event_objects/pics/cushions/spin_cushion.png
diff --git a/graphics/map_objects/pics/cushions/water_cushion.png b/graphics/event_objects/pics/cushions/water_cushion.png
index 9ed16c633..9ed16c633 100644
--- a/graphics/map_objects/pics/cushions/water_cushion.png
+++ b/graphics/event_objects/pics/cushions/water_cushion.png
diff --git a/graphics/map_objects/pics/cushions/zigzag_cushion.png b/graphics/event_objects/pics/cushions/zigzag_cushion.png
index 407e6a66b..407e6a66b 100644
--- a/graphics/map_objects/pics/cushions/zigzag_cushion.png
+++ b/graphics/event_objects/pics/cushions/zigzag_cushion.png
diff --git a/graphics/map_objects/pics/dolls/azurill_doll.png b/graphics/event_objects/pics/dolls/azurill_doll.png
index 1d1f7492f..1d1f7492f 100644
--- a/graphics/map_objects/pics/dolls/azurill_doll.png
+++ b/graphics/event_objects/pics/dolls/azurill_doll.png
diff --git a/graphics/map_objects/pics/dolls/baltoy_doll.png b/graphics/event_objects/pics/dolls/baltoy_doll.png
index 5205123da..5205123da 100644
--- a/graphics/map_objects/pics/dolls/baltoy_doll.png
+++ b/graphics/event_objects/pics/dolls/baltoy_doll.png
diff --git a/graphics/map_objects/pics/dolls/big_blastoise_doll.png b/graphics/event_objects/pics/dolls/big_blastoise_doll.png
index fa295f302..fa295f302 100644
--- a/graphics/map_objects/pics/dolls/big_blastoise_doll.png
+++ b/graphics/event_objects/pics/dolls/big_blastoise_doll.png
diff --git a/graphics/map_objects/pics/dolls/big_charizard_doll.png b/graphics/event_objects/pics/dolls/big_charizard_doll.png
index 4fa5aed45..4fa5aed45 100644
--- a/graphics/map_objects/pics/dolls/big_charizard_doll.png
+++ b/graphics/event_objects/pics/dolls/big_charizard_doll.png
diff --git a/graphics/map_objects/pics/dolls/big_lapras_doll.png b/graphics/event_objects/pics/dolls/big_lapras_doll.png
index 572d3c810..572d3c810 100644
--- a/graphics/map_objects/pics/dolls/big_lapras_doll.png
+++ b/graphics/event_objects/pics/dolls/big_lapras_doll.png
diff --git a/graphics/map_objects/pics/dolls/big_regice_doll.png b/graphics/event_objects/pics/dolls/big_regice_doll.png
index e437d3558..e437d3558 100644
--- a/graphics/map_objects/pics/dolls/big_regice_doll.png
+++ b/graphics/event_objects/pics/dolls/big_regice_doll.png
diff --git a/graphics/map_objects/pics/dolls/big_regirock_doll.png b/graphics/event_objects/pics/dolls/big_regirock_doll.png
index 139abbb28..139abbb28 100644
--- a/graphics/map_objects/pics/dolls/big_regirock_doll.png
+++ b/graphics/event_objects/pics/dolls/big_regirock_doll.png
diff --git a/graphics/map_objects/pics/dolls/big_registeel_doll.png b/graphics/event_objects/pics/dolls/big_registeel_doll.png
index 632a2cadd..632a2cadd 100644
--- a/graphics/map_objects/pics/dolls/big_registeel_doll.png
+++ b/graphics/event_objects/pics/dolls/big_registeel_doll.png
diff --git a/graphics/map_objects/pics/dolls/big_rhydon_doll.png b/graphics/event_objects/pics/dolls/big_rhydon_doll.png
index 2e059f8c9..2e059f8c9 100644
--- a/graphics/map_objects/pics/dolls/big_rhydon_doll.png
+++ b/graphics/event_objects/pics/dolls/big_rhydon_doll.png
diff --git a/graphics/map_objects/pics/dolls/big_snorlax_doll.png b/graphics/event_objects/pics/dolls/big_snorlax_doll.png
index 397c9baac..397c9baac 100644
--- a/graphics/map_objects/pics/dolls/big_snorlax_doll.png
+++ b/graphics/event_objects/pics/dolls/big_snorlax_doll.png
diff --git a/graphics/map_objects/pics/dolls/big_venusaur_doll.png b/graphics/event_objects/pics/dolls/big_venusaur_doll.png
index 9d1961608..9d1961608 100644
--- a/graphics/map_objects/pics/dolls/big_venusaur_doll.png
+++ b/graphics/event_objects/pics/dolls/big_venusaur_doll.png
diff --git a/graphics/map_objects/pics/dolls/big_wailmer_doll.png b/graphics/event_objects/pics/dolls/big_wailmer_doll.png
index a174d30f7..a174d30f7 100644
--- a/graphics/map_objects/pics/dolls/big_wailmer_doll.png
+++ b/graphics/event_objects/pics/dolls/big_wailmer_doll.png
diff --git a/graphics/map_objects/pics/dolls/chikorita_doll.png b/graphics/event_objects/pics/dolls/chikorita_doll.png
index 6b5e6417d..6b5e6417d 100644
--- a/graphics/map_objects/pics/dolls/chikorita_doll.png
+++ b/graphics/event_objects/pics/dolls/chikorita_doll.png
diff --git a/graphics/map_objects/pics/dolls/clefairy_doll.png b/graphics/event_objects/pics/dolls/clefairy_doll.png
index 137b20213..137b20213 100644
--- a/graphics/map_objects/pics/dolls/clefairy_doll.png
+++ b/graphics/event_objects/pics/dolls/clefairy_doll.png
diff --git a/graphics/map_objects/pics/dolls/cyndaquil_doll.png b/graphics/event_objects/pics/dolls/cyndaquil_doll.png
index b76221e1d..b76221e1d 100644
--- a/graphics/map_objects/pics/dolls/cyndaquil_doll.png
+++ b/graphics/event_objects/pics/dolls/cyndaquil_doll.png
diff --git a/graphics/map_objects/pics/dolls/ditto_doll.png b/graphics/event_objects/pics/dolls/ditto_doll.png
index da4c33018..da4c33018 100644
--- a/graphics/map_objects/pics/dolls/ditto_doll.png
+++ b/graphics/event_objects/pics/dolls/ditto_doll.png
diff --git a/graphics/map_objects/pics/dolls/duskull_doll.png b/graphics/event_objects/pics/dolls/duskull_doll.png
index fdfbe3fec..fdfbe3fec 100644
--- a/graphics/map_objects/pics/dolls/duskull_doll.png
+++ b/graphics/event_objects/pics/dolls/duskull_doll.png
diff --git a/graphics/map_objects/pics/dolls/gulpin_doll.png b/graphics/event_objects/pics/dolls/gulpin_doll.png
index 48bf1824b..48bf1824b 100644
--- a/graphics/map_objects/pics/dolls/gulpin_doll.png
+++ b/graphics/event_objects/pics/dolls/gulpin_doll.png
diff --git a/graphics/map_objects/pics/dolls/jigglypuff_doll.png b/graphics/event_objects/pics/dolls/jigglypuff_doll.png
index 1a2c8d44a..1a2c8d44a 100644
--- a/graphics/map_objects/pics/dolls/jigglypuff_doll.png
+++ b/graphics/event_objects/pics/dolls/jigglypuff_doll.png
diff --git a/graphics/map_objects/pics/dolls/kecleon_doll.png b/graphics/event_objects/pics/dolls/kecleon_doll.png
index 92869882f..92869882f 100644
--- a/graphics/map_objects/pics/dolls/kecleon_doll.png
+++ b/graphics/event_objects/pics/dolls/kecleon_doll.png
diff --git a/graphics/map_objects/pics/dolls/lotad_doll.png b/graphics/event_objects/pics/dolls/lotad_doll.png
index 9ee2182d1..9ee2182d1 100644
--- a/graphics/map_objects/pics/dolls/lotad_doll.png
+++ b/graphics/event_objects/pics/dolls/lotad_doll.png
diff --git a/graphics/map_objects/pics/dolls/marill_doll.png b/graphics/event_objects/pics/dolls/marill_doll.png
index d5372f7dd..d5372f7dd 100644
--- a/graphics/map_objects/pics/dolls/marill_doll.png
+++ b/graphics/event_objects/pics/dolls/marill_doll.png
diff --git a/graphics/map_objects/pics/dolls/meowth_doll.png b/graphics/event_objects/pics/dolls/meowth_doll.png
index 67ce3db4c..67ce3db4c 100644
--- a/graphics/map_objects/pics/dolls/meowth_doll.png
+++ b/graphics/event_objects/pics/dolls/meowth_doll.png
diff --git a/graphics/map_objects/pics/dolls/mudkip_doll.png b/graphics/event_objects/pics/dolls/mudkip_doll.png
index 8d6af157f..8d6af157f 100644
--- a/graphics/map_objects/pics/dolls/mudkip_doll.png
+++ b/graphics/event_objects/pics/dolls/mudkip_doll.png
diff --git a/graphics/map_objects/pics/dolls/pichu_doll.png b/graphics/event_objects/pics/dolls/pichu_doll.png
index 7a2aefc31..7a2aefc31 100644
--- a/graphics/map_objects/pics/dolls/pichu_doll.png
+++ b/graphics/event_objects/pics/dolls/pichu_doll.png
diff --git a/graphics/map_objects/pics/dolls/pikachu_doll.png b/graphics/event_objects/pics/dolls/pikachu_doll.png
index a762f1e15..a762f1e15 100644
--- a/graphics/map_objects/pics/dolls/pikachu_doll.png
+++ b/graphics/event_objects/pics/dolls/pikachu_doll.png
diff --git a/graphics/map_objects/pics/dolls/seedot_doll.png b/graphics/event_objects/pics/dolls/seedot_doll.png
index e00c485ae..e00c485ae 100644
--- a/graphics/map_objects/pics/dolls/seedot_doll.png
+++ b/graphics/event_objects/pics/dolls/seedot_doll.png
diff --git a/graphics/map_objects/pics/dolls/skitty_doll.png b/graphics/event_objects/pics/dolls/skitty_doll.png
index 57ae4c5ed..57ae4c5ed 100644
--- a/graphics/map_objects/pics/dolls/skitty_doll.png
+++ b/graphics/event_objects/pics/dolls/skitty_doll.png
diff --git a/graphics/map_objects/pics/dolls/smoochum_doll.png b/graphics/event_objects/pics/dolls/smoochum_doll.png
index 4adacdfd5..4adacdfd5 100644
--- a/graphics/map_objects/pics/dolls/smoochum_doll.png
+++ b/graphics/event_objects/pics/dolls/smoochum_doll.png
diff --git a/graphics/map_objects/pics/dolls/swablu_doll.png b/graphics/event_objects/pics/dolls/swablu_doll.png
index 94e3051d7..94e3051d7 100644
--- a/graphics/map_objects/pics/dolls/swablu_doll.png
+++ b/graphics/event_objects/pics/dolls/swablu_doll.png
diff --git a/graphics/map_objects/pics/dolls/togepi_doll.png b/graphics/event_objects/pics/dolls/togepi_doll.png
index 4deda750c..4deda750c 100644
--- a/graphics/map_objects/pics/dolls/togepi_doll.png
+++ b/graphics/event_objects/pics/dolls/togepi_doll.png
diff --git a/graphics/map_objects/pics/dolls/torchic_doll.png b/graphics/event_objects/pics/dolls/torchic_doll.png
index 067eae9fb..067eae9fb 100644
--- a/graphics/map_objects/pics/dolls/torchic_doll.png
+++ b/graphics/event_objects/pics/dolls/torchic_doll.png
diff --git a/graphics/map_objects/pics/dolls/totodile_doll.png b/graphics/event_objects/pics/dolls/totodile_doll.png
index b347125c9..b347125c9 100644
--- a/graphics/map_objects/pics/dolls/totodile_doll.png
+++ b/graphics/event_objects/pics/dolls/totodile_doll.png
diff --git a/graphics/map_objects/pics/dolls/treecko_doll.png b/graphics/event_objects/pics/dolls/treecko_doll.png
index 3ccf44a58..3ccf44a58 100644
--- a/graphics/map_objects/pics/dolls/treecko_doll.png
+++ b/graphics/event_objects/pics/dolls/treecko_doll.png
diff --git a/graphics/map_objects/pics/dolls/unused_magnemite_doll.png b/graphics/event_objects/pics/dolls/unused_magnemite_doll.png
index bbf386e6a..bbf386e6a 100644
--- a/graphics/map_objects/pics/dolls/unused_magnemite_doll.png
+++ b/graphics/event_objects/pics/dolls/unused_magnemite_doll.png
diff --git a/graphics/map_objects/pics/dolls/unused_natu_doll.png b/graphics/event_objects/pics/dolls/unused_natu_doll.png
index a2c4995e3..a2c4995e3 100644
--- a/graphics/map_objects/pics/dolls/unused_natu_doll.png
+++ b/graphics/event_objects/pics/dolls/unused_natu_doll.png
diff --git a/graphics/map_objects/pics/dolls/unused_pikachu_doll.png b/graphics/event_objects/pics/dolls/unused_pikachu_doll.png
index 9bf762d02..9bf762d02 100644
--- a/graphics/map_objects/pics/dolls/unused_pikachu_doll.png
+++ b/graphics/event_objects/pics/dolls/unused_pikachu_doll.png
diff --git a/graphics/map_objects/pics/dolls/unused_porygon2_doll.png b/graphics/event_objects/pics/dolls/unused_porygon2_doll.png
index 465b7a092..465b7a092 100644
--- a/graphics/map_objects/pics/dolls/unused_porygon2_doll.png
+++ b/graphics/event_objects/pics/dolls/unused_porygon2_doll.png
diff --git a/graphics/map_objects/pics/dolls/unused_squirtle_doll.png b/graphics/event_objects/pics/dolls/unused_squirtle_doll.png
index ccc526aae..ccc526aae 100644
--- a/graphics/map_objects/pics/dolls/unused_squirtle_doll.png
+++ b/graphics/event_objects/pics/dolls/unused_squirtle_doll.png
diff --git a/graphics/map_objects/pics/dolls/unused_wooper_doll.png b/graphics/event_objects/pics/dolls/unused_wooper_doll.png
index 29bc8fd99..29bc8fd99 100644
--- a/graphics/map_objects/pics/dolls/unused_wooper_doll.png
+++ b/graphics/event_objects/pics/dolls/unused_wooper_doll.png
diff --git a/graphics/map_objects/pics/dolls/wynaut_doll.png b/graphics/event_objects/pics/dolls/wynaut_doll.png
index 3ac3d1311..3ac3d1311 100644
--- a/graphics/map_objects/pics/dolls/wynaut_doll.png
+++ b/graphics/event_objects/pics/dolls/wynaut_doll.png
diff --git a/graphics/map_objects/pics/effects/arrow/0.png b/graphics/event_objects/pics/effects/arrow/0.png
index 3f06be064..3f06be064 100644
--- a/graphics/map_objects/pics/effects/arrow/0.png
+++ b/graphics/event_objects/pics/effects/arrow/0.png
diff --git a/graphics/map_objects/pics/effects/arrow/1.png b/graphics/event_objects/pics/effects/arrow/1.png
index 87bbd99ff..87bbd99ff 100644
--- a/graphics/map_objects/pics/effects/arrow/1.png
+++ b/graphics/event_objects/pics/effects/arrow/1.png
diff --git a/graphics/map_objects/pics/effects/arrow/2.png b/graphics/event_objects/pics/effects/arrow/2.png
index f9abae71d..f9abae71d 100644
--- a/graphics/map_objects/pics/effects/arrow/2.png
+++ b/graphics/event_objects/pics/effects/arrow/2.png
diff --git a/graphics/map_objects/pics/effects/arrow/3.png b/graphics/event_objects/pics/effects/arrow/3.png
index 58d43a6d8..58d43a6d8 100644
--- a/graphics/map_objects/pics/effects/arrow/3.png
+++ b/graphics/event_objects/pics/effects/arrow/3.png
diff --git a/graphics/map_objects/pics/effects/arrow/4.png b/graphics/event_objects/pics/effects/arrow/4.png
index ef95afd9e..ef95afd9e 100644
--- a/graphics/map_objects/pics/effects/arrow/4.png
+++ b/graphics/event_objects/pics/effects/arrow/4.png
diff --git a/graphics/map_objects/pics/effects/arrow/5.png b/graphics/event_objects/pics/effects/arrow/5.png
index 71b7e0c27..71b7e0c27 100644
--- a/graphics/map_objects/pics/effects/arrow/5.png
+++ b/graphics/event_objects/pics/effects/arrow/5.png
diff --git a/graphics/map_objects/pics/effects/arrow/6.png b/graphics/event_objects/pics/effects/arrow/6.png
index 53c33f44c..53c33f44c 100644
--- a/graphics/map_objects/pics/effects/arrow/6.png
+++ b/graphics/event_objects/pics/effects/arrow/6.png
diff --git a/graphics/map_objects/pics/effects/arrow/7.png b/graphics/event_objects/pics/effects/arrow/7.png
index bda7862da..bda7862da 100644
--- a/graphics/map_objects/pics/effects/arrow/7.png
+++ b/graphics/event_objects/pics/effects/arrow/7.png
diff --git a/graphics/map_objects/pics/effects/ash/0.png b/graphics/event_objects/pics/effects/ash/0.png
index 96a4b8f2a..96a4b8f2a 100644
--- a/graphics/map_objects/pics/effects/ash/0.png
+++ b/graphics/event_objects/pics/effects/ash/0.png
diff --git a/graphics/map_objects/pics/effects/ash/1.png b/graphics/event_objects/pics/effects/ash/1.png
index 8d973518d..8d973518d 100644
--- a/graphics/map_objects/pics/effects/ash/1.png
+++ b/graphics/event_objects/pics/effects/ash/1.png
diff --git a/graphics/map_objects/pics/effects/ash/2.png b/graphics/event_objects/pics/effects/ash/2.png
index eccd2e02d..eccd2e02d 100644
--- a/graphics/map_objects/pics/effects/ash/2.png
+++ b/graphics/event_objects/pics/effects/ash/2.png
diff --git a/graphics/map_objects/pics/effects/ash/3.png b/graphics/event_objects/pics/effects/ash/3.png
index 5ad0b8e5a..5ad0b8e5a 100644
--- a/graphics/map_objects/pics/effects/ash/3.png
+++ b/graphics/event_objects/pics/effects/ash/3.png
diff --git a/graphics/map_objects/pics/effects/ash/4.png b/graphics/event_objects/pics/effects/ash/4.png
index 7208f6a5b..7208f6a5b 100644
--- a/graphics/map_objects/pics/effects/ash/4.png
+++ b/graphics/event_objects/pics/effects/ash/4.png
diff --git a/graphics/map_objects/pics/effects/berry_tree_growth_sparkle/0.png b/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/0.png
index f3e751d3a..f3e751d3a 100644
--- a/graphics/map_objects/pics/effects/berry_tree_growth_sparkle/0.png
+++ b/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/0.png
diff --git a/graphics/map_objects/pics/effects/berry_tree_growth_sparkle/1.png b/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/1.png
index d48fd1234..d48fd1234 100644
--- a/graphics/map_objects/pics/effects/berry_tree_growth_sparkle/1.png
+++ b/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/1.png
diff --git a/graphics/map_objects/pics/effects/berry_tree_growth_sparkle/2.png b/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/2.png
index 9a9abf73e..9a9abf73e 100644
--- a/graphics/map_objects/pics/effects/berry_tree_growth_sparkle/2.png
+++ b/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/2.png
diff --git a/graphics/map_objects/pics/effects/berry_tree_growth_sparkle/3.png b/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/3.png
index 857abfb0b..857abfb0b 100644
--- a/graphics/map_objects/pics/effects/berry_tree_growth_sparkle/3.png
+++ b/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/3.png
diff --git a/graphics/map_objects/pics/effects/berry_tree_growth_sparkle/4.png b/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/4.png
index bce9df4c7..bce9df4c7 100644
--- a/graphics/map_objects/pics/effects/berry_tree_growth_sparkle/4.png
+++ b/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/4.png
diff --git a/graphics/map_objects/pics/effects/berry_tree_growth_sparkle/5.png b/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/5.png
index 4c757bf6b..4c757bf6b 100644
--- a/graphics/map_objects/pics/effects/berry_tree_growth_sparkle/5.png
+++ b/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/5.png
diff --git a/graphics/map_objects/pics/effects/bike_hop_big_splash/0.png b/graphics/event_objects/pics/effects/bike_hop_big_splash/0.png
index 420663da8..420663da8 100644
--- a/graphics/map_objects/pics/effects/bike_hop_big_splash/0.png
+++ b/graphics/event_objects/pics/effects/bike_hop_big_splash/0.png
diff --git a/graphics/map_objects/pics/effects/bike_hop_big_splash/1.png b/graphics/event_objects/pics/effects/bike_hop_big_splash/1.png
index 72ca8fa1c..72ca8fa1c 100644
--- a/graphics/map_objects/pics/effects/bike_hop_big_splash/1.png
+++ b/graphics/event_objects/pics/effects/bike_hop_big_splash/1.png
diff --git a/graphics/map_objects/pics/effects/bike_hop_big_splash/2.png b/graphics/event_objects/pics/effects/bike_hop_big_splash/2.png
index 96c224cdf..96c224cdf 100644
--- a/graphics/map_objects/pics/effects/bike_hop_big_splash/2.png
+++ b/graphics/event_objects/pics/effects/bike_hop_big_splash/2.png
diff --git a/graphics/map_objects/pics/effects/bike_hop_big_splash/3.png b/graphics/event_objects/pics/effects/bike_hop_big_splash/3.png
index b549ea78c..b549ea78c 100644
--- a/graphics/map_objects/pics/effects/bike_hop_big_splash/3.png
+++ b/graphics/event_objects/pics/effects/bike_hop_big_splash/3.png
diff --git a/graphics/map_objects/pics/effects/bike_hop_small_splash/0.png b/graphics/event_objects/pics/effects/bike_hop_small_splash/0.png
index b5cccb306..b5cccb306 100644
--- a/graphics/map_objects/pics/effects/bike_hop_small_splash/0.png
+++ b/graphics/event_objects/pics/effects/bike_hop_small_splash/0.png
diff --git a/graphics/map_objects/pics/effects/bike_hop_small_splash/1.png b/graphics/event_objects/pics/effects/bike_hop_small_splash/1.png
index 548198c09..548198c09 100644
--- a/graphics/map_objects/pics/effects/bike_hop_small_splash/1.png
+++ b/graphics/event_objects/pics/effects/bike_hop_small_splash/1.png
diff --git a/graphics/map_objects/pics/effects/bike_hop_small_splash/2.png b/graphics/event_objects/pics/effects/bike_hop_small_splash/2.png
index e8b86dfcb..e8b86dfcb 100644
--- a/graphics/map_objects/pics/effects/bike_hop_small_splash/2.png
+++ b/graphics/event_objects/pics/effects/bike_hop_small_splash/2.png
diff --git a/graphics/map_objects/pics/effects/bike_hop_tall_grass/0.png b/graphics/event_objects/pics/effects/bike_hop_tall_grass/0.png
index d2768ec0c..d2768ec0c 100644
--- a/graphics/map_objects/pics/effects/bike_hop_tall_grass/0.png
+++ b/graphics/event_objects/pics/effects/bike_hop_tall_grass/0.png
diff --git a/graphics/map_objects/pics/effects/bike_hop_tall_grass/1.png b/graphics/event_objects/pics/effects/bike_hop_tall_grass/1.png
index 7816f4d00..7816f4d00 100644
--- a/graphics/map_objects/pics/effects/bike_hop_tall_grass/1.png
+++ b/graphics/event_objects/pics/effects/bike_hop_tall_grass/1.png
diff --git a/graphics/map_objects/pics/effects/bike_hop_tall_grass/2.png b/graphics/event_objects/pics/effects/bike_hop_tall_grass/2.png
index 00c51d276..00c51d276 100644
--- a/graphics/map_objects/pics/effects/bike_hop_tall_grass/2.png
+++ b/graphics/event_objects/pics/effects/bike_hop_tall_grass/2.png
diff --git a/graphics/map_objects/pics/effects/bike_hop_tall_grass/3.png b/graphics/event_objects/pics/effects/bike_hop_tall_grass/3.png
index 210382b93..210382b93 100644
--- a/graphics/map_objects/pics/effects/bike_hop_tall_grass/3.png
+++ b/graphics/event_objects/pics/effects/bike_hop_tall_grass/3.png
diff --git a/graphics/map_objects/pics/effects/bike_tire_tracks/0.png b/graphics/event_objects/pics/effects/bike_tire_tracks/0.png
index d4fd46f9b..d4fd46f9b 100644
--- a/graphics/map_objects/pics/effects/bike_tire_tracks/0.png
+++ b/graphics/event_objects/pics/effects/bike_tire_tracks/0.png
diff --git a/graphics/map_objects/pics/effects/bike_tire_tracks/1.png b/graphics/event_objects/pics/effects/bike_tire_tracks/1.png
index 9095cdd74..9095cdd74 100644
--- a/graphics/map_objects/pics/effects/bike_tire_tracks/1.png
+++ b/graphics/event_objects/pics/effects/bike_tire_tracks/1.png
diff --git a/graphics/map_objects/pics/effects/bike_tire_tracks/2.png b/graphics/event_objects/pics/effects/bike_tire_tracks/2.png
index 56907c153..56907c153 100644
--- a/graphics/map_objects/pics/effects/bike_tire_tracks/2.png
+++ b/graphics/event_objects/pics/effects/bike_tire_tracks/2.png
diff --git a/graphics/map_objects/pics/effects/bike_tire_tracks/3.png b/graphics/event_objects/pics/effects/bike_tire_tracks/3.png
index 397bfb418..397bfb418 100644
--- a/graphics/map_objects/pics/effects/bike_tire_tracks/3.png
+++ b/graphics/event_objects/pics/effects/bike_tire_tracks/3.png
diff --git a/graphics/map_objects/pics/effects/bird.png b/graphics/event_objects/pics/effects/bird.png
index 3147f98f5..3147f98f5 100644
--- a/graphics/map_objects/pics/effects/bird.png
+++ b/graphics/event_objects/pics/effects/bird.png
diff --git a/graphics/map_objects/pics/effects/bubbles/0.png b/graphics/event_objects/pics/effects/bubbles/0.png
index b71b193ae..b71b193ae 100644
--- a/graphics/map_objects/pics/effects/bubbles/0.png
+++ b/graphics/event_objects/pics/effects/bubbles/0.png
diff --git a/graphics/map_objects/pics/effects/bubbles/1.png b/graphics/event_objects/pics/effects/bubbles/1.png
index 0bd744ef2..0bd744ef2 100644
--- a/graphics/map_objects/pics/effects/bubbles/1.png
+++ b/graphics/event_objects/pics/effects/bubbles/1.png
diff --git a/graphics/map_objects/pics/effects/bubbles/2.png b/graphics/event_objects/pics/effects/bubbles/2.png
index 4241e8f24..4241e8f24 100644
--- a/graphics/map_objects/pics/effects/bubbles/2.png
+++ b/graphics/event_objects/pics/effects/bubbles/2.png
diff --git a/graphics/map_objects/pics/effects/bubbles/3.png b/graphics/event_objects/pics/effects/bubbles/3.png
index 3b440d9a7..3b440d9a7 100644
--- a/graphics/map_objects/pics/effects/bubbles/3.png
+++ b/graphics/event_objects/pics/effects/bubbles/3.png
diff --git a/graphics/map_objects/pics/effects/bubbles/4.png b/graphics/event_objects/pics/effects/bubbles/4.png
index de9e66a25..de9e66a25 100644
--- a/graphics/map_objects/pics/effects/bubbles/4.png
+++ b/graphics/event_objects/pics/effects/bubbles/4.png
diff --git a/graphics/map_objects/pics/effects/bubbles/5.png b/graphics/event_objects/pics/effects/bubbles/5.png
index 54b9d768b..54b9d768b 100644
--- a/graphics/map_objects/pics/effects/bubbles/5.png
+++ b/graphics/event_objects/pics/effects/bubbles/5.png
diff --git a/graphics/map_objects/pics/effects/bubbles/6.png b/graphics/event_objects/pics/effects/bubbles/6.png
index 35c26e633..35c26e633 100644
--- a/graphics/map_objects/pics/effects/bubbles/6.png
+++ b/graphics/event_objects/pics/effects/bubbles/6.png
diff --git a/graphics/map_objects/pics/effects/bubbles/7.png b/graphics/event_objects/pics/effects/bubbles/7.png
index 6323e0cc5..6323e0cc5 100644
--- a/graphics/map_objects/pics/effects/bubbles/7.png
+++ b/graphics/event_objects/pics/effects/bubbles/7.png
diff --git a/graphics/map_objects/pics/effects/deep_sand_footprints/0.png b/graphics/event_objects/pics/effects/deep_sand_footprints/0.png
index c449b223e..c449b223e 100644
--- a/graphics/map_objects/pics/effects/deep_sand_footprints/0.png
+++ b/graphics/event_objects/pics/effects/deep_sand_footprints/0.png
diff --git a/graphics/map_objects/pics/effects/deep_sand_footprints/1.png b/graphics/event_objects/pics/effects/deep_sand_footprints/1.png
index 2a1d5cce5..2a1d5cce5 100644
--- a/graphics/map_objects/pics/effects/deep_sand_footprints/1.png
+++ b/graphics/event_objects/pics/effects/deep_sand_footprints/1.png
diff --git a/graphics/map_objects/pics/effects/ground_impact_dust/0.png b/graphics/event_objects/pics/effects/ground_impact_dust/0.png
index 57e2e8898..57e2e8898 100644
--- a/graphics/map_objects/pics/effects/ground_impact_dust/0.png
+++ b/graphics/event_objects/pics/effects/ground_impact_dust/0.png
diff --git a/graphics/map_objects/pics/effects/ground_impact_dust/1.png b/graphics/event_objects/pics/effects/ground_impact_dust/1.png
index d91554b6e..d91554b6e 100644
--- a/graphics/map_objects/pics/effects/ground_impact_dust/1.png
+++ b/graphics/event_objects/pics/effects/ground_impact_dust/1.png
diff --git a/graphics/map_objects/pics/effects/ground_impact_dust/2.png b/graphics/event_objects/pics/effects/ground_impact_dust/2.png
index 8d0235141..8d0235141 100644
--- a/graphics/map_objects/pics/effects/ground_impact_dust/2.png
+++ b/graphics/event_objects/pics/effects/ground_impact_dust/2.png
diff --git a/graphics/map_objects/pics/effects/hot_springs_water.png b/graphics/event_objects/pics/effects/hot_springs_water.png
index 1b6550b19..1b6550b19 100644
--- a/graphics/map_objects/pics/effects/hot_springs_water.png
+++ b/graphics/event_objects/pics/effects/hot_springs_water.png
diff --git a/graphics/map_objects/pics/effects/jump_out_of_ash/0.png b/graphics/event_objects/pics/effects/jump_out_of_ash/0.png
index 50f9796b2..50f9796b2 100644
--- a/graphics/map_objects/pics/effects/jump_out_of_ash/0.png
+++ b/graphics/event_objects/pics/effects/jump_out_of_ash/0.png
diff --git a/graphics/map_objects/pics/effects/jump_out_of_ash/1.png b/graphics/event_objects/pics/effects/jump_out_of_ash/1.png
index 685d31fac..685d31fac 100644
--- a/graphics/map_objects/pics/effects/jump_out_of_ash/1.png
+++ b/graphics/event_objects/pics/effects/jump_out_of_ash/1.png
diff --git a/graphics/map_objects/pics/effects/jump_out_of_ash/2.png b/graphics/event_objects/pics/effects/jump_out_of_ash/2.png
index 9f11f176f..9f11f176f 100644
--- a/graphics/map_objects/pics/effects/jump_out_of_ash/2.png
+++ b/graphics/event_objects/pics/effects/jump_out_of_ash/2.png
diff --git a/graphics/map_objects/pics/effects/jump_out_of_ash/3.png b/graphics/event_objects/pics/effects/jump_out_of_ash/3.png
index 124581f75..124581f75 100644
--- a/graphics/map_objects/pics/effects/jump_out_of_ash/3.png
+++ b/graphics/event_objects/pics/effects/jump_out_of_ash/3.png
diff --git a/graphics/map_objects/pics/effects/jump_out_of_ash/4.png b/graphics/event_objects/pics/effects/jump_out_of_ash/4.png
index 6e584a4dc..6e584a4dc 100644
--- a/graphics/map_objects/pics/effects/jump_out_of_ash/4.png
+++ b/graphics/event_objects/pics/effects/jump_out_of_ash/4.png
diff --git a/graphics/map_objects/pics/effects/long_grass/0.png b/graphics/event_objects/pics/effects/long_grass/0.png
index 4a02b3d17..4a02b3d17 100644
--- a/graphics/map_objects/pics/effects/long_grass/0.png
+++ b/graphics/event_objects/pics/effects/long_grass/0.png
diff --git a/graphics/map_objects/pics/effects/long_grass/1.png b/graphics/event_objects/pics/effects/long_grass/1.png
index 97f652c6d..97f652c6d 100644
--- a/graphics/map_objects/pics/effects/long_grass/1.png
+++ b/graphics/event_objects/pics/effects/long_grass/1.png
diff --git a/graphics/map_objects/pics/effects/long_grass/2.png b/graphics/event_objects/pics/effects/long_grass/2.png
index 313226f8b..313226f8b 100644
--- a/graphics/map_objects/pics/effects/long_grass/2.png
+++ b/graphics/event_objects/pics/effects/long_grass/2.png
diff --git a/graphics/map_objects/pics/effects/long_grass/3.png b/graphics/event_objects/pics/effects/long_grass/3.png
index 0565b4069..0565b4069 100644
--- a/graphics/map_objects/pics/effects/long_grass/3.png
+++ b/graphics/event_objects/pics/effects/long_grass/3.png
diff --git a/graphics/map_objects/pics/effects/mountain_disguise/0.png b/graphics/event_objects/pics/effects/mountain_disguise/0.png
index 104056e46..104056e46 100644
--- a/graphics/map_objects/pics/effects/mountain_disguise/0.png
+++ b/graphics/event_objects/pics/effects/mountain_disguise/0.png
diff --git a/graphics/map_objects/pics/effects/mountain_disguise/1.png b/graphics/event_objects/pics/effects/mountain_disguise/1.png
index 4b2d35963..4b2d35963 100644
--- a/graphics/map_objects/pics/effects/mountain_disguise/1.png
+++ b/graphics/event_objects/pics/effects/mountain_disguise/1.png
diff --git a/graphics/map_objects/pics/effects/mountain_disguise/2.png b/graphics/event_objects/pics/effects/mountain_disguise/2.png
index e2ea3b855..e2ea3b855 100644
--- a/graphics/map_objects/pics/effects/mountain_disguise/2.png
+++ b/graphics/event_objects/pics/effects/mountain_disguise/2.png
diff --git a/graphics/map_objects/pics/effects/mountain_disguise/3.png b/graphics/event_objects/pics/effects/mountain_disguise/3.png
index 8f0a1be2c..8f0a1be2c 100644
--- a/graphics/map_objects/pics/effects/mountain_disguise/3.png
+++ b/graphics/event_objects/pics/effects/mountain_disguise/3.png
diff --git a/graphics/map_objects/pics/effects/mountain_disguise/4.png b/graphics/event_objects/pics/effects/mountain_disguise/4.png
index 8fd4df410..8fd4df410 100644
--- a/graphics/map_objects/pics/effects/mountain_disguise/4.png
+++ b/graphics/event_objects/pics/effects/mountain_disguise/4.png
diff --git a/graphics/map_objects/pics/effects/mountain_disguise/5.png b/graphics/event_objects/pics/effects/mountain_disguise/5.png
index a364b234d..a364b234d 100644
--- a/graphics/map_objects/pics/effects/mountain_disguise/5.png
+++ b/graphics/event_objects/pics/effects/mountain_disguise/5.png
diff --git a/graphics/map_objects/pics/effects/mountain_disguise/6.png b/graphics/event_objects/pics/effects/mountain_disguise/6.png
index 2644aa9f1..2644aa9f1 100644
--- a/graphics/map_objects/pics/effects/mountain_disguise/6.png
+++ b/graphics/event_objects/pics/effects/mountain_disguise/6.png
diff --git a/graphics/map_objects/pics/effects/ripple/0.png b/graphics/event_objects/pics/effects/ripple/0.png
index 24055c7d2..24055c7d2 100644
--- a/graphics/map_objects/pics/effects/ripple/0.png
+++ b/graphics/event_objects/pics/effects/ripple/0.png
diff --git a/graphics/map_objects/pics/effects/ripple/1.png b/graphics/event_objects/pics/effects/ripple/1.png
index a47853925..a47853925 100644
--- a/graphics/map_objects/pics/effects/ripple/1.png
+++ b/graphics/event_objects/pics/effects/ripple/1.png
diff --git a/graphics/map_objects/pics/effects/ripple/2.png b/graphics/event_objects/pics/effects/ripple/2.png
index 6670cb779..6670cb779 100644
--- a/graphics/map_objects/pics/effects/ripple/2.png
+++ b/graphics/event_objects/pics/effects/ripple/2.png
diff --git a/graphics/map_objects/pics/effects/ripple/3.png b/graphics/event_objects/pics/effects/ripple/3.png
index 122df1940..122df1940 100644
--- a/graphics/map_objects/pics/effects/ripple/3.png
+++ b/graphics/event_objects/pics/effects/ripple/3.png
diff --git a/graphics/map_objects/pics/effects/ripple/4.png b/graphics/event_objects/pics/effects/ripple/4.png
index f4f79afe2..f4f79afe2 100644
--- a/graphics/map_objects/pics/effects/ripple/4.png
+++ b/graphics/event_objects/pics/effects/ripple/4.png
diff --git a/graphics/map_objects/pics/effects/sand_disguise_placeholder/0.png b/graphics/event_objects/pics/effects/sand_disguise_placeholder/0.png
index df242de2f..df242de2f 100644
--- a/graphics/map_objects/pics/effects/sand_disguise_placeholder/0.png
+++ b/graphics/event_objects/pics/effects/sand_disguise_placeholder/0.png
diff --git a/graphics/map_objects/pics/effects/sand_disguise_placeholder/1.png b/graphics/event_objects/pics/effects/sand_disguise_placeholder/1.png
index 2e993b30e..2e993b30e 100644
--- a/graphics/map_objects/pics/effects/sand_disguise_placeholder/1.png
+++ b/graphics/event_objects/pics/effects/sand_disguise_placeholder/1.png
diff --git a/graphics/map_objects/pics/effects/sand_disguise_placeholder/2.png b/graphics/event_objects/pics/effects/sand_disguise_placeholder/2.png
index 3d6864e41..3d6864e41 100644
--- a/graphics/map_objects/pics/effects/sand_disguise_placeholder/2.png
+++ b/graphics/event_objects/pics/effects/sand_disguise_placeholder/2.png
diff --git a/graphics/map_objects/pics/effects/sand_disguise_placeholder/3.png b/graphics/event_objects/pics/effects/sand_disguise_placeholder/3.png
index 690110a8c..690110a8c 100644
--- a/graphics/map_objects/pics/effects/sand_disguise_placeholder/3.png
+++ b/graphics/event_objects/pics/effects/sand_disguise_placeholder/3.png
diff --git a/graphics/map_objects/pics/effects/sand_disguise_placeholder/4.png b/graphics/event_objects/pics/effects/sand_disguise_placeholder/4.png
index caa568eac..caa568eac 100644
--- a/graphics/map_objects/pics/effects/sand_disguise_placeholder/4.png
+++ b/graphics/event_objects/pics/effects/sand_disguise_placeholder/4.png
diff --git a/graphics/map_objects/pics/effects/sand_disguise_placeholder/5.png b/graphics/event_objects/pics/effects/sand_disguise_placeholder/5.png
index 0d0bd9886..0d0bd9886 100644
--- a/graphics/map_objects/pics/effects/sand_disguise_placeholder/5.png
+++ b/graphics/event_objects/pics/effects/sand_disguise_placeholder/5.png
diff --git a/graphics/map_objects/pics/effects/sand_disguise_placeholder/6.png b/graphics/event_objects/pics/effects/sand_disguise_placeholder/6.png
index ed40527d0..ed40527d0 100644
--- a/graphics/map_objects/pics/effects/sand_disguise_placeholder/6.png
+++ b/graphics/event_objects/pics/effects/sand_disguise_placeholder/6.png
diff --git a/graphics/map_objects/pics/effects/sand_footprints/0.png b/graphics/event_objects/pics/effects/sand_footprints/0.png
index 3cc79aa18..3cc79aa18 100644
--- a/graphics/map_objects/pics/effects/sand_footprints/0.png
+++ b/graphics/event_objects/pics/effects/sand_footprints/0.png
diff --git a/graphics/map_objects/pics/effects/sand_footprints/1.png b/graphics/event_objects/pics/effects/sand_footprints/1.png
index 80d33783b..80d33783b 100644
--- a/graphics/map_objects/pics/effects/sand_footprints/1.png
+++ b/graphics/event_objects/pics/effects/sand_footprints/1.png
diff --git a/graphics/map_objects/pics/effects/shadow_extra_large.png b/graphics/event_objects/pics/effects/shadow_extra_large.png
index 41b37d8fb..41b37d8fb 100644
--- a/graphics/map_objects/pics/effects/shadow_extra_large.png
+++ b/graphics/event_objects/pics/effects/shadow_extra_large.png
diff --git a/graphics/map_objects/pics/effects/shadow_large.png b/graphics/event_objects/pics/effects/shadow_large.png
index f0e76cd7f..f0e76cd7f 100644
--- a/graphics/map_objects/pics/effects/shadow_large.png
+++ b/graphics/event_objects/pics/effects/shadow_large.png
diff --git a/graphics/map_objects/pics/effects/shadow_medium.png b/graphics/event_objects/pics/effects/shadow_medium.png
index 7bf9afef7..7bf9afef7 100644
--- a/graphics/map_objects/pics/effects/shadow_medium.png
+++ b/graphics/event_objects/pics/effects/shadow_medium.png
diff --git a/graphics/map_objects/pics/effects/shadow_small.png b/graphics/event_objects/pics/effects/shadow_small.png
index 6c13c1b86..6c13c1b86 100644
--- a/graphics/map_objects/pics/effects/shadow_small.png
+++ b/graphics/event_objects/pics/effects/shadow_small.png
diff --git a/graphics/map_objects/pics/effects/short_grass/0.png b/graphics/event_objects/pics/effects/short_grass/0.png
index a5d5181db..a5d5181db 100644
--- a/graphics/map_objects/pics/effects/short_grass/0.png
+++ b/graphics/event_objects/pics/effects/short_grass/0.png
diff --git a/graphics/map_objects/pics/effects/short_grass/1.png b/graphics/event_objects/pics/effects/short_grass/1.png
index 17a62968a..17a62968a 100644
--- a/graphics/map_objects/pics/effects/short_grass/1.png
+++ b/graphics/event_objects/pics/effects/short_grass/1.png
diff --git a/graphics/map_objects/pics/effects/splash/0.png b/graphics/event_objects/pics/effects/splash/0.png
index 2b29c76ae..2b29c76ae 100644
--- a/graphics/map_objects/pics/effects/splash/0.png
+++ b/graphics/event_objects/pics/effects/splash/0.png
diff --git a/graphics/map_objects/pics/effects/splash/1.png b/graphics/event_objects/pics/effects/splash/1.png
index 180721342..180721342 100644
--- a/graphics/map_objects/pics/effects/splash/1.png
+++ b/graphics/event_objects/pics/effects/splash/1.png
diff --git a/graphics/map_objects/pics/effects/surf_blob/0.png b/graphics/event_objects/pics/effects/surf_blob/0.png
index c4a14e052..c4a14e052 100644
--- a/graphics/map_objects/pics/effects/surf_blob/0.png
+++ b/graphics/event_objects/pics/effects/surf_blob/0.png
diff --git a/graphics/map_objects/pics/effects/surf_blob/1.png b/graphics/event_objects/pics/effects/surf_blob/1.png
index 25fd5ad92..25fd5ad92 100644
--- a/graphics/map_objects/pics/effects/surf_blob/1.png
+++ b/graphics/event_objects/pics/effects/surf_blob/1.png
diff --git a/graphics/map_objects/pics/effects/surf_blob/2.png b/graphics/event_objects/pics/effects/surf_blob/2.png
index 532da2611..532da2611 100644
--- a/graphics/map_objects/pics/effects/surf_blob/2.png
+++ b/graphics/event_objects/pics/effects/surf_blob/2.png
diff --git a/graphics/map_objects/pics/effects/tall_grass/0.png b/graphics/event_objects/pics/effects/tall_grass/0.png
index 00d596b4c..00d596b4c 100644
--- a/graphics/map_objects/pics/effects/tall_grass/0.png
+++ b/graphics/event_objects/pics/effects/tall_grass/0.png
diff --git a/graphics/map_objects/pics/effects/tall_grass/1.png b/graphics/event_objects/pics/effects/tall_grass/1.png
index 0c8bdd84e..0c8bdd84e 100644
--- a/graphics/map_objects/pics/effects/tall_grass/1.png
+++ b/graphics/event_objects/pics/effects/tall_grass/1.png
diff --git a/graphics/map_objects/pics/effects/tall_grass/2.png b/graphics/event_objects/pics/effects/tall_grass/2.png
index 55d971758..55d971758 100644
--- a/graphics/map_objects/pics/effects/tall_grass/2.png
+++ b/graphics/event_objects/pics/effects/tall_grass/2.png
diff --git a/graphics/map_objects/pics/effects/tall_grass/3.png b/graphics/event_objects/pics/effects/tall_grass/3.png
index 0add11083..0add11083 100644
--- a/graphics/map_objects/pics/effects/tall_grass/3.png
+++ b/graphics/event_objects/pics/effects/tall_grass/3.png
diff --git a/graphics/map_objects/pics/effects/tall_grass/4.png b/graphics/event_objects/pics/effects/tall_grass/4.png
index ca164d3cc..ca164d3cc 100644
--- a/graphics/map_objects/pics/effects/tall_grass/4.png
+++ b/graphics/event_objects/pics/effects/tall_grass/4.png
diff --git a/graphics/map_objects/pics/effects/tree_disguise/0.png b/graphics/event_objects/pics/effects/tree_disguise/0.png
index 2bce7f9ed..2bce7f9ed 100644
--- a/graphics/map_objects/pics/effects/tree_disguise/0.png
+++ b/graphics/event_objects/pics/effects/tree_disguise/0.png
diff --git a/graphics/map_objects/pics/effects/tree_disguise/1.png b/graphics/event_objects/pics/effects/tree_disguise/1.png
index e29336cd4..e29336cd4 100644
--- a/graphics/map_objects/pics/effects/tree_disguise/1.png
+++ b/graphics/event_objects/pics/effects/tree_disguise/1.png
diff --git a/graphics/map_objects/pics/effects/tree_disguise/2.png b/graphics/event_objects/pics/effects/tree_disguise/2.png
index 2cca165c5..2cca165c5 100644
--- a/graphics/map_objects/pics/effects/tree_disguise/2.png
+++ b/graphics/event_objects/pics/effects/tree_disguise/2.png
diff --git a/graphics/map_objects/pics/effects/tree_disguise/3.png b/graphics/event_objects/pics/effects/tree_disguise/3.png
index 85dd30cfd..85dd30cfd 100644
--- a/graphics/map_objects/pics/effects/tree_disguise/3.png
+++ b/graphics/event_objects/pics/effects/tree_disguise/3.png
diff --git a/graphics/map_objects/pics/effects/tree_disguise/4.png b/graphics/event_objects/pics/effects/tree_disguise/4.png
index 8c7821634..8c7821634 100644
--- a/graphics/map_objects/pics/effects/tree_disguise/4.png
+++ b/graphics/event_objects/pics/effects/tree_disguise/4.png
diff --git a/graphics/map_objects/pics/effects/tree_disguise/5.png b/graphics/event_objects/pics/effects/tree_disguise/5.png
index 2ffd56fcc..2ffd56fcc 100644
--- a/graphics/map_objects/pics/effects/tree_disguise/5.png
+++ b/graphics/event_objects/pics/effects/tree_disguise/5.png
diff --git a/graphics/map_objects/pics/effects/tree_disguise/6.png b/graphics/event_objects/pics/effects/tree_disguise/6.png
index bc9333162..bc9333162 100644
--- a/graphics/map_objects/pics/effects/tree_disguise/6.png
+++ b/graphics/event_objects/pics/effects/tree_disguise/6.png
diff --git a/graphics/map_objects/pics/effects/unknown_16/0.png b/graphics/event_objects/pics/effects/unknown_16/0.png
index 491801c32..491801c32 100644
--- a/graphics/map_objects/pics/effects/unknown_16/0.png
+++ b/graphics/event_objects/pics/effects/unknown_16/0.png
diff --git a/graphics/map_objects/pics/effects/unknown_16/1.png b/graphics/event_objects/pics/effects/unknown_16/1.png
index f83ca15da..f83ca15da 100644
--- a/graphics/map_objects/pics/effects/unknown_16/1.png
+++ b/graphics/event_objects/pics/effects/unknown_16/1.png
diff --git a/graphics/map_objects/pics/effects/unknown_16/2.png b/graphics/event_objects/pics/effects/unknown_16/2.png
index 073aa9b7e..073aa9b7e 100644
--- a/graphics/map_objects/pics/effects/unknown_16/2.png
+++ b/graphics/event_objects/pics/effects/unknown_16/2.png
diff --git a/graphics/map_objects/pics/effects/unknown_16/3.png b/graphics/event_objects/pics/effects/unknown_16/3.png
index e7b5c96cf..e7b5c96cf 100644
--- a/graphics/map_objects/pics/effects/unknown_16/3.png
+++ b/graphics/event_objects/pics/effects/unknown_16/3.png
diff --git a/graphics/map_objects/pics/effects/unknown_16/4.png b/graphics/event_objects/pics/effects/unknown_16/4.png
index 8972d5d81..8972d5d81 100644
--- a/graphics/map_objects/pics/effects/unknown_16/4.png
+++ b/graphics/event_objects/pics/effects/unknown_16/4.png
diff --git a/graphics/map_objects/pics/effects/unknown_16/5.png b/graphics/event_objects/pics/effects/unknown_16/5.png
index d570a9a8d..d570a9a8d 100644
--- a/graphics/map_objects/pics/effects/unknown_16/5.png
+++ b/graphics/event_objects/pics/effects/unknown_16/5.png
diff --git a/graphics/map_objects/pics/effects/unknown_17/0.png b/graphics/event_objects/pics/effects/unknown_17/0.png
index 9c804844e..9c804844e 100644
--- a/graphics/map_objects/pics/effects/unknown_17/0.png
+++ b/graphics/event_objects/pics/effects/unknown_17/0.png
diff --git a/graphics/map_objects/pics/effects/unknown_17/1.png b/graphics/event_objects/pics/effects/unknown_17/1.png
index 6628b5820..6628b5820 100644
--- a/graphics/map_objects/pics/effects/unknown_17/1.png
+++ b/graphics/event_objects/pics/effects/unknown_17/1.png
diff --git a/graphics/map_objects/pics/effects/unknown_17/2.png b/graphics/event_objects/pics/effects/unknown_17/2.png
index a5cdcca57..a5cdcca57 100644
--- a/graphics/map_objects/pics/effects/unknown_17/2.png
+++ b/graphics/event_objects/pics/effects/unknown_17/2.png
diff --git a/graphics/map_objects/pics/effects/unknown_17/3.png b/graphics/event_objects/pics/effects/unknown_17/3.png
index 2f9a20019..2f9a20019 100644
--- a/graphics/map_objects/pics/effects/unknown_17/3.png
+++ b/graphics/event_objects/pics/effects/unknown_17/3.png
diff --git a/graphics/map_objects/pics/effects/unknown_17/4.png b/graphics/event_objects/pics/effects/unknown_17/4.png
index ce0bc29aa..ce0bc29aa 100644
--- a/graphics/map_objects/pics/effects/unknown_17/4.png
+++ b/graphics/event_objects/pics/effects/unknown_17/4.png
diff --git a/graphics/map_objects/pics/effects/unknown_17/5.png b/graphics/event_objects/pics/effects/unknown_17/5.png
index f92888a3a..f92888a3a 100644
--- a/graphics/map_objects/pics/effects/unknown_17/5.png
+++ b/graphics/event_objects/pics/effects/unknown_17/5.png
diff --git a/graphics/map_objects/pics/effects/unknown_17/6.png b/graphics/event_objects/pics/effects/unknown_17/6.png
index 7e740a956..7e740a956 100644
--- a/graphics/map_objects/pics/effects/unknown_17/6.png
+++ b/graphics/event_objects/pics/effects/unknown_17/6.png
diff --git a/graphics/map_objects/pics/effects/unknown_17/7.png b/graphics/event_objects/pics/effects/unknown_17/7.png
index 25d90e16c..25d90e16c 100644
--- a/graphics/map_objects/pics/effects/unknown_17/7.png
+++ b/graphics/event_objects/pics/effects/unknown_17/7.png
diff --git a/graphics/map_objects/pics/effects/unknown_18/0.png b/graphics/event_objects/pics/effects/unknown_18/0.png
index 70b39df59..70b39df59 100644
--- a/graphics/map_objects/pics/effects/unknown_18/0.png
+++ b/graphics/event_objects/pics/effects/unknown_18/0.png
diff --git a/graphics/map_objects/pics/effects/unknown_18/1.png b/graphics/event_objects/pics/effects/unknown_18/1.png
index 392298f5a..392298f5a 100644
--- a/graphics/map_objects/pics/effects/unknown_18/1.png
+++ b/graphics/event_objects/pics/effects/unknown_18/1.png
diff --git a/graphics/map_objects/pics/effects/unknown_18/2.png b/graphics/event_objects/pics/effects/unknown_18/2.png
index ff418e940..ff418e940 100644
--- a/graphics/map_objects/pics/effects/unknown_18/2.png
+++ b/graphics/event_objects/pics/effects/unknown_18/2.png
diff --git a/graphics/map_objects/pics/effects/unknown_18/3.png b/graphics/event_objects/pics/effects/unknown_18/3.png
index 0e1e13438..0e1e13438 100644
--- a/graphics/map_objects/pics/effects/unknown_18/3.png
+++ b/graphics/event_objects/pics/effects/unknown_18/3.png
diff --git a/graphics/map_objects/pics/effects/unknown_19/0.png b/graphics/event_objects/pics/effects/unknown_19/0.png
index ef8005066..ef8005066 100644
--- a/graphics/map_objects/pics/effects/unknown_19/0.png
+++ b/graphics/event_objects/pics/effects/unknown_19/0.png
diff --git a/graphics/map_objects/pics/effects/unknown_19/1.png b/graphics/event_objects/pics/effects/unknown_19/1.png
index 6fde1a291..6fde1a291 100644
--- a/graphics/map_objects/pics/effects/unknown_19/1.png
+++ b/graphics/event_objects/pics/effects/unknown_19/1.png
diff --git a/graphics/map_objects/pics/effects/unknown_19/2.png b/graphics/event_objects/pics/effects/unknown_19/2.png
index c385fd84c..c385fd84c 100644
--- a/graphics/map_objects/pics/effects/unknown_19/2.png
+++ b/graphics/event_objects/pics/effects/unknown_19/2.png
diff --git a/graphics/map_objects/pics/effects/unknown_19/3.png b/graphics/event_objects/pics/effects/unknown_19/3.png
index 084c20314..084c20314 100644
--- a/graphics/map_objects/pics/effects/unknown_19/3.png
+++ b/graphics/event_objects/pics/effects/unknown_19/3.png
diff --git a/graphics/map_objects/pics/effects/unknown_20/0.png b/graphics/event_objects/pics/effects/unknown_20/0.png
index eec853d53..eec853d53 100644
--- a/graphics/map_objects/pics/effects/unknown_20/0.png
+++ b/graphics/event_objects/pics/effects/unknown_20/0.png
diff --git a/graphics/map_objects/pics/effects/unknown_20/1.png b/graphics/event_objects/pics/effects/unknown_20/1.png
index f4782fc67..f4782fc67 100644
--- a/graphics/map_objects/pics/effects/unknown_20/1.png
+++ b/graphics/event_objects/pics/effects/unknown_20/1.png
diff --git a/graphics/map_objects/pics/effects/unknown_20/2.png b/graphics/event_objects/pics/effects/unknown_20/2.png
index 416dae69d..416dae69d 100644
--- a/graphics/map_objects/pics/effects/unknown_20/2.png
+++ b/graphics/event_objects/pics/effects/unknown_20/2.png
diff --git a/graphics/map_objects/pics/effects/unknown_20/3.png b/graphics/event_objects/pics/effects/unknown_20/3.png
index 3d966e81c..3d966e81c 100644
--- a/graphics/map_objects/pics/effects/unknown_20/3.png
+++ b/graphics/event_objects/pics/effects/unknown_20/3.png
diff --git a/graphics/map_objects/pics/effects/unknown_20/4.png b/graphics/event_objects/pics/effects/unknown_20/4.png
index 6bbfbca12..6bbfbca12 100644
--- a/graphics/map_objects/pics/effects/unknown_20/4.png
+++ b/graphics/event_objects/pics/effects/unknown_20/4.png
diff --git a/graphics/map_objects/pics/effects/unknown_29/0.png b/graphics/event_objects/pics/effects/unknown_29/0.png
index 87fe91c97..87fe91c97 100644
--- a/graphics/map_objects/pics/effects/unknown_29/0.png
+++ b/graphics/event_objects/pics/effects/unknown_29/0.png
diff --git a/graphics/map_objects/pics/effects/unknown_29/1.png b/graphics/event_objects/pics/effects/unknown_29/1.png
index c20fb34bb..c20fb34bb 100644
--- a/graphics/map_objects/pics/effects/unknown_29/1.png
+++ b/graphics/event_objects/pics/effects/unknown_29/1.png
diff --git a/graphics/map_objects/pics/effects/unknown_29/2.png b/graphics/event_objects/pics/effects/unknown_29/2.png
index def972b20..def972b20 100644
--- a/graphics/map_objects/pics/effects/unknown_29/2.png
+++ b/graphics/event_objects/pics/effects/unknown_29/2.png
diff --git a/graphics/map_objects/pics/effects/unknown_33/0.png b/graphics/event_objects/pics/effects/unknown_33/0.png
index 2241eabd3..2241eabd3 100644
--- a/graphics/map_objects/pics/effects/unknown_33/0.png
+++ b/graphics/event_objects/pics/effects/unknown_33/0.png
diff --git a/graphics/map_objects/pics/effects/unknown_33/1.png b/graphics/event_objects/pics/effects/unknown_33/1.png
index 5f90405d8..5f90405d8 100644
--- a/graphics/map_objects/pics/effects/unknown_33/1.png
+++ b/graphics/event_objects/pics/effects/unknown_33/1.png
diff --git a/graphics/map_objects/pics/effects/unknown_33/2.png b/graphics/event_objects/pics/effects/unknown_33/2.png
index 3f1c3a76a..3f1c3a76a 100644
--- a/graphics/map_objects/pics/effects/unknown_33/2.png
+++ b/graphics/event_objects/pics/effects/unknown_33/2.png
diff --git a/graphics/map_objects/pics/effects/unknown_33/3.png b/graphics/event_objects/pics/effects/unknown_33/3.png
index 2696f4a5a..2696f4a5a 100644
--- a/graphics/map_objects/pics/effects/unknown_33/3.png
+++ b/graphics/event_objects/pics/effects/unknown_33/3.png
diff --git a/graphics/map_objects/pics/effects/unknown_33/4.png b/graphics/event_objects/pics/effects/unknown_33/4.png
index c2d1785bf..c2d1785bf 100644
--- a/graphics/map_objects/pics/effects/unknown_33/4.png
+++ b/graphics/event_objects/pics/effects/unknown_33/4.png
diff --git a/graphics/map_objects/pics/effects/unknown_35/0.png b/graphics/event_objects/pics/effects/unknown_35/0.png
index c2ae128f7..c2ae128f7 100644
--- a/graphics/map_objects/pics/effects/unknown_35/0.png
+++ b/graphics/event_objects/pics/effects/unknown_35/0.png
diff --git a/graphics/map_objects/pics/effects/unknown_35/1.png b/graphics/event_objects/pics/effects/unknown_35/1.png
index fe68b19fd..fe68b19fd 100644
--- a/graphics/map_objects/pics/effects/unknown_35/1.png
+++ b/graphics/event_objects/pics/effects/unknown_35/1.png
diff --git a/graphics/map_objects/pics/effects/unknown_4F6D38/0.png b/graphics/event_objects/pics/effects/unknown_4F6D38/0.png
index 3ee87e1cd..3ee87e1cd 100644
--- a/graphics/map_objects/pics/effects/unknown_4F6D38/0.png
+++ b/graphics/event_objects/pics/effects/unknown_4F6D38/0.png
diff --git a/graphics/map_objects/pics/effects/unknown_4F7E38/0.png b/graphics/event_objects/pics/effects/unknown_4F7E38/0.png
index 685aee28b..685aee28b 100644
--- a/graphics/map_objects/pics/effects/unknown_4F7E38/0.png
+++ b/graphics/event_objects/pics/effects/unknown_4F7E38/0.png
diff --git a/graphics/map_objects/pics/effects/unused_grass/0.png b/graphics/event_objects/pics/effects/unused_grass/0.png
index 2e16f15cb..2e16f15cb 100644
--- a/graphics/map_objects/pics/effects/unused_grass/0.png
+++ b/graphics/event_objects/pics/effects/unused_grass/0.png
diff --git a/graphics/map_objects/pics/effects/unused_grass/1.png b/graphics/event_objects/pics/effects/unused_grass/1.png
index dd33b0d88..dd33b0d88 100644
--- a/graphics/map_objects/pics/effects/unused_grass/1.png
+++ b/graphics/event_objects/pics/effects/unused_grass/1.png
diff --git a/graphics/map_objects/pics/effects/unused_grass/2.png b/graphics/event_objects/pics/effects/unused_grass/2.png
index 345d454cd..345d454cd 100644
--- a/graphics/map_objects/pics/effects/unused_grass/2.png
+++ b/graphics/event_objects/pics/effects/unused_grass/2.png
diff --git a/graphics/map_objects/pics/effects/unused_grass/3.png b/graphics/event_objects/pics/effects/unused_grass/3.png
index 087676102..087676102 100644
--- a/graphics/map_objects/pics/effects/unused_grass/3.png
+++ b/graphics/event_objects/pics/effects/unused_grass/3.png
diff --git a/graphics/map_objects/pics/misc/birchs_bag.png b/graphics/event_objects/pics/misc/birchs_bag.png
index 045e5546c..045e5546c 100644
--- a/graphics/map_objects/pics/misc/birchs_bag.png
+++ b/graphics/event_objects/pics/misc/birchs_bag.png
diff --git a/graphics/map_objects/pics/misc/birth_island_stone.png b/graphics/event_objects/pics/misc/birth_island_stone.png
index 2ec134c22..2ec134c22 100644
--- a/graphics/map_objects/pics/misc/birth_island_stone.png
+++ b/graphics/event_objects/pics/misc/birth_island_stone.png
diff --git a/graphics/map_objects/pics/misc/breakable_rock/0.png b/graphics/event_objects/pics/misc/breakable_rock/0.png
index 058324c86..058324c86 100644
--- a/graphics/map_objects/pics/misc/breakable_rock/0.png
+++ b/graphics/event_objects/pics/misc/breakable_rock/0.png
diff --git a/graphics/map_objects/pics/misc/breakable_rock/1.png b/graphics/event_objects/pics/misc/breakable_rock/1.png
index 6c8b3133a..6c8b3133a 100644
--- a/graphics/map_objects/pics/misc/breakable_rock/1.png
+++ b/graphics/event_objects/pics/misc/breakable_rock/1.png
diff --git a/graphics/map_objects/pics/misc/breakable_rock/2.png b/graphics/event_objects/pics/misc/breakable_rock/2.png
index 737148d66..737148d66 100644
--- a/graphics/map_objects/pics/misc/breakable_rock/2.png
+++ b/graphics/event_objects/pics/misc/breakable_rock/2.png
diff --git a/graphics/map_objects/pics/misc/breakable_rock/3.png b/graphics/event_objects/pics/misc/breakable_rock/3.png
index 89eedd1aa..89eedd1aa 100644
--- a/graphics/map_objects/pics/misc/breakable_rock/3.png
+++ b/graphics/event_objects/pics/misc/breakable_rock/3.png
diff --git a/graphics/map_objects/pics/misc/cable_car.png b/graphics/event_objects/pics/misc/cable_car.png
index e0bd21ddf..e0bd21ddf 100644
--- a/graphics/map_objects/pics/misc/cable_car.png
+++ b/graphics/event_objects/pics/misc/cable_car.png
diff --git a/graphics/map_objects/pics/misc/cuttable_tree/0.png b/graphics/event_objects/pics/misc/cuttable_tree/0.png
index 509d8b03c..509d8b03c 100644
--- a/graphics/map_objects/pics/misc/cuttable_tree/0.png
+++ b/graphics/event_objects/pics/misc/cuttable_tree/0.png
diff --git a/graphics/map_objects/pics/misc/cuttable_tree/1.png b/graphics/event_objects/pics/misc/cuttable_tree/1.png
index afa42cf16..afa42cf16 100644
--- a/graphics/map_objects/pics/misc/cuttable_tree/1.png
+++ b/graphics/event_objects/pics/misc/cuttable_tree/1.png
diff --git a/graphics/map_objects/pics/misc/cuttable_tree/2.png b/graphics/event_objects/pics/misc/cuttable_tree/2.png
index f222ece43..f222ece43 100644
--- a/graphics/map_objects/pics/misc/cuttable_tree/2.png
+++ b/graphics/event_objects/pics/misc/cuttable_tree/2.png
diff --git a/graphics/map_objects/pics/misc/cuttable_tree/3.png b/graphics/event_objects/pics/misc/cuttable_tree/3.png
index 09ffefd29..09ffefd29 100644
--- a/graphics/map_objects/pics/misc/cuttable_tree/3.png
+++ b/graphics/event_objects/pics/misc/cuttable_tree/3.png
diff --git a/graphics/map_objects/pics/misc/fossil.png b/graphics/event_objects/pics/misc/fossil.png
index a8da0e8ff..a8da0e8ff 100644
--- a/graphics/map_objects/pics/misc/fossil.png
+++ b/graphics/event_objects/pics/misc/fossil.png
diff --git a/graphics/map_objects/pics/misc/item_ball.png b/graphics/event_objects/pics/misc/item_ball.png
index a30e02fb1..a30e02fb1 100644
--- a/graphics/map_objects/pics/misc/item_ball.png
+++ b/graphics/event_objects/pics/misc/item_ball.png
diff --git a/graphics/map_objects/pics/misc/moving_box.png b/graphics/event_objects/pics/misc/moving_box.png
index 3cbc41900..3cbc41900 100644
--- a/graphics/map_objects/pics/misc/moving_box.png
+++ b/graphics/event_objects/pics/misc/moving_box.png
diff --git a/graphics/map_objects/pics/misc/mr_brineys_boat/0.png b/graphics/event_objects/pics/misc/mr_brineys_boat/0.png
index 593ed07c8..593ed07c8 100644
--- a/graphics/map_objects/pics/misc/mr_brineys_boat/0.png
+++ b/graphics/event_objects/pics/misc/mr_brineys_boat/0.png
diff --git a/graphics/map_objects/pics/misc/mr_brineys_boat/1.png b/graphics/event_objects/pics/misc/mr_brineys_boat/1.png
index 39b75fd73..39b75fd73 100644
--- a/graphics/map_objects/pics/misc/mr_brineys_boat/1.png
+++ b/graphics/event_objects/pics/misc/mr_brineys_boat/1.png
diff --git a/graphics/map_objects/pics/misc/mr_brineys_boat/2.png b/graphics/event_objects/pics/misc/mr_brineys_boat/2.png
index 9db6b11fe..9db6b11fe 100644
--- a/graphics/map_objects/pics/misc/mr_brineys_boat/2.png
+++ b/graphics/event_objects/pics/misc/mr_brineys_boat/2.png
diff --git a/graphics/map_objects/pics/misc/pushable_boulder.png b/graphics/event_objects/pics/misc/pushable_boulder.png
index a6962123c..a6962123c 100644
--- a/graphics/map_objects/pics/misc/pushable_boulder.png
+++ b/graphics/event_objects/pics/misc/pushable_boulder.png
diff --git a/graphics/map_objects/pics/misc/ss_tidal.png b/graphics/event_objects/pics/misc/ss_tidal.png
index 40ca9a3f3..40ca9a3f3 100644
--- a/graphics/map_objects/pics/misc/ss_tidal.png
+++ b/graphics/event_objects/pics/misc/ss_tidal.png
diff --git a/graphics/map_objects/pics/misc/statue.png b/graphics/event_objects/pics/misc/statue.png
index 725aa8a7b..725aa8a7b 100644
--- a/graphics/map_objects/pics/misc/statue.png
+++ b/graphics/event_objects/pics/misc/statue.png
diff --git a/graphics/map_objects/pics/misc/submarine_shadow.png b/graphics/event_objects/pics/misc/submarine_shadow.png
index b9dfc4c55..b9dfc4c55 100644
--- a/graphics/map_objects/pics/misc/submarine_shadow.png
+++ b/graphics/event_objects/pics/misc/submarine_shadow.png
diff --git a/graphics/map_objects/pics/misc/truck.png b/graphics/event_objects/pics/misc/truck.png
index 0d31ffbc2..0d31ffbc2 100644
--- a/graphics/map_objects/pics/misc/truck.png
+++ b/graphics/event_objects/pics/misc/truck.png
diff --git a/graphics/map_objects/pics/people/anabel/0.png b/graphics/event_objects/pics/people/anabel/0.png
index 94add04bb..94add04bb 100644
--- a/graphics/map_objects/pics/people/anabel/0.png
+++ b/graphics/event_objects/pics/people/anabel/0.png
diff --git a/graphics/map_objects/pics/people/anabel/1.png b/graphics/event_objects/pics/people/anabel/1.png
index 644510063..644510063 100644
--- a/graphics/map_objects/pics/people/anabel/1.png
+++ b/graphics/event_objects/pics/people/anabel/1.png
diff --git a/graphics/map_objects/pics/people/anabel/2.png b/graphics/event_objects/pics/people/anabel/2.png
index 92d365c9e..92d365c9e 100644
--- a/graphics/map_objects/pics/people/anabel/2.png
+++ b/graphics/event_objects/pics/people/anabel/2.png
diff --git a/graphics/map_objects/pics/people/anabel/3.png b/graphics/event_objects/pics/people/anabel/3.png
index 34a07e500..34a07e500 100644
--- a/graphics/map_objects/pics/people/anabel/3.png
+++ b/graphics/event_objects/pics/people/anabel/3.png
diff --git a/graphics/map_objects/pics/people/anabel/4.png b/graphics/event_objects/pics/people/anabel/4.png
index 78a3f6413..78a3f6413 100644
--- a/graphics/map_objects/pics/people/anabel/4.png
+++ b/graphics/event_objects/pics/people/anabel/4.png
diff --git a/graphics/map_objects/pics/people/anabel/5.png b/graphics/event_objects/pics/people/anabel/5.png
index df1f31dbb..df1f31dbb 100644
--- a/graphics/map_objects/pics/people/anabel/5.png
+++ b/graphics/event_objects/pics/people/anabel/5.png
diff --git a/graphics/map_objects/pics/people/anabel/6.png b/graphics/event_objects/pics/people/anabel/6.png
index 78914f5b2..78914f5b2 100644
--- a/graphics/map_objects/pics/people/anabel/6.png
+++ b/graphics/event_objects/pics/people/anabel/6.png
diff --git a/graphics/map_objects/pics/people/anabel/7.png b/graphics/event_objects/pics/people/anabel/7.png
index beb27e3c0..beb27e3c0 100644
--- a/graphics/map_objects/pics/people/anabel/7.png
+++ b/graphics/event_objects/pics/people/anabel/7.png
diff --git a/graphics/map_objects/pics/people/anabel/8.png b/graphics/event_objects/pics/people/anabel/8.png
index 2d41a5e11..2d41a5e11 100644
--- a/graphics/map_objects/pics/people/anabel/8.png
+++ b/graphics/event_objects/pics/people/anabel/8.png
diff --git a/graphics/map_objects/pics/people/aqua_member_f/0.png b/graphics/event_objects/pics/people/aqua_member_f/0.png
index 1f8c75cb3..1f8c75cb3 100644
--- a/graphics/map_objects/pics/people/aqua_member_f/0.png
+++ b/graphics/event_objects/pics/people/aqua_member_f/0.png
diff --git a/graphics/map_objects/pics/people/aqua_member_f/1.png b/graphics/event_objects/pics/people/aqua_member_f/1.png
index 16bc28e20..16bc28e20 100644
--- a/graphics/map_objects/pics/people/aqua_member_f/1.png
+++ b/graphics/event_objects/pics/people/aqua_member_f/1.png
diff --git a/graphics/map_objects/pics/people/aqua_member_f/2.png b/graphics/event_objects/pics/people/aqua_member_f/2.png
index 3e95c8ba2..3e95c8ba2 100644
--- a/graphics/map_objects/pics/people/aqua_member_f/2.png
+++ b/graphics/event_objects/pics/people/aqua_member_f/2.png
diff --git a/graphics/map_objects/pics/people/aqua_member_f/3.png b/graphics/event_objects/pics/people/aqua_member_f/3.png
index 8d17c85fd..8d17c85fd 100644
--- a/graphics/map_objects/pics/people/aqua_member_f/3.png
+++ b/graphics/event_objects/pics/people/aqua_member_f/3.png
diff --git a/graphics/map_objects/pics/people/aqua_member_f/4.png b/graphics/event_objects/pics/people/aqua_member_f/4.png
index f62fdb100..f62fdb100 100644
--- a/graphics/map_objects/pics/people/aqua_member_f/4.png
+++ b/graphics/event_objects/pics/people/aqua_member_f/4.png
diff --git a/graphics/map_objects/pics/people/aqua_member_f/5.png b/graphics/event_objects/pics/people/aqua_member_f/5.png
index 6ec1ea515..6ec1ea515 100644
--- a/graphics/map_objects/pics/people/aqua_member_f/5.png
+++ b/graphics/event_objects/pics/people/aqua_member_f/5.png
diff --git a/graphics/map_objects/pics/people/aqua_member_f/6.png b/graphics/event_objects/pics/people/aqua_member_f/6.png
index 0d74cf4d1..0d74cf4d1 100644
--- a/graphics/map_objects/pics/people/aqua_member_f/6.png
+++ b/graphics/event_objects/pics/people/aqua_member_f/6.png
diff --git a/graphics/map_objects/pics/people/aqua_member_f/7.png b/graphics/event_objects/pics/people/aqua_member_f/7.png
index fe5894e5f..fe5894e5f 100644
--- a/graphics/map_objects/pics/people/aqua_member_f/7.png
+++ b/graphics/event_objects/pics/people/aqua_member_f/7.png
diff --git a/graphics/map_objects/pics/people/aqua_member_f/8.png b/graphics/event_objects/pics/people/aqua_member_f/8.png
index 3b3f736cb..3b3f736cb 100644
--- a/graphics/map_objects/pics/people/aqua_member_f/8.png
+++ b/graphics/event_objects/pics/people/aqua_member_f/8.png
diff --git a/graphics/map_objects/pics/people/aqua_member_m/0.png b/graphics/event_objects/pics/people/aqua_member_m/0.png
index 60a2b8ace..60a2b8ace 100644
--- a/graphics/map_objects/pics/people/aqua_member_m/0.png
+++ b/graphics/event_objects/pics/people/aqua_member_m/0.png
diff --git a/graphics/map_objects/pics/people/aqua_member_m/1.png b/graphics/event_objects/pics/people/aqua_member_m/1.png
index d87426a18..d87426a18 100644
--- a/graphics/map_objects/pics/people/aqua_member_m/1.png
+++ b/graphics/event_objects/pics/people/aqua_member_m/1.png
diff --git a/graphics/map_objects/pics/people/aqua_member_m/2.png b/graphics/event_objects/pics/people/aqua_member_m/2.png
index c75f63396..c75f63396 100644
--- a/graphics/map_objects/pics/people/aqua_member_m/2.png
+++ b/graphics/event_objects/pics/people/aqua_member_m/2.png
diff --git a/graphics/map_objects/pics/people/aqua_member_m/3.png b/graphics/event_objects/pics/people/aqua_member_m/3.png
index aaba2d9a1..aaba2d9a1 100644
--- a/graphics/map_objects/pics/people/aqua_member_m/3.png
+++ b/graphics/event_objects/pics/people/aqua_member_m/3.png
diff --git a/graphics/map_objects/pics/people/aqua_member_m/4.png b/graphics/event_objects/pics/people/aqua_member_m/4.png
index 326628fd0..326628fd0 100644
--- a/graphics/map_objects/pics/people/aqua_member_m/4.png
+++ b/graphics/event_objects/pics/people/aqua_member_m/4.png
diff --git a/graphics/map_objects/pics/people/aqua_member_m/5.png b/graphics/event_objects/pics/people/aqua_member_m/5.png
index 647cfb95c..647cfb95c 100644
--- a/graphics/map_objects/pics/people/aqua_member_m/5.png
+++ b/graphics/event_objects/pics/people/aqua_member_m/5.png
diff --git a/graphics/map_objects/pics/people/aqua_member_m/6.png b/graphics/event_objects/pics/people/aqua_member_m/6.png
index 3918e64e9..3918e64e9 100644
--- a/graphics/map_objects/pics/people/aqua_member_m/6.png
+++ b/graphics/event_objects/pics/people/aqua_member_m/6.png
diff --git a/graphics/map_objects/pics/people/aqua_member_m/7.png b/graphics/event_objects/pics/people/aqua_member_m/7.png
index 57064088e..57064088e 100644
--- a/graphics/map_objects/pics/people/aqua_member_m/7.png
+++ b/graphics/event_objects/pics/people/aqua_member_m/7.png
diff --git a/graphics/map_objects/pics/people/aqua_member_m/8.png b/graphics/event_objects/pics/people/aqua_member_m/8.png
index 1e59c0cae..1e59c0cae 100644
--- a/graphics/map_objects/pics/people/aqua_member_m/8.png
+++ b/graphics/event_objects/pics/people/aqua_member_m/8.png
diff --git a/graphics/map_objects/pics/people/archie/0.png b/graphics/event_objects/pics/people/archie/0.png
index dd091bd16..dd091bd16 100644
--- a/graphics/map_objects/pics/people/archie/0.png
+++ b/graphics/event_objects/pics/people/archie/0.png
diff --git a/graphics/map_objects/pics/people/archie/1.png b/graphics/event_objects/pics/people/archie/1.png
index 1d278db6d..1d278db6d 100644
--- a/graphics/map_objects/pics/people/archie/1.png
+++ b/graphics/event_objects/pics/people/archie/1.png
diff --git a/graphics/map_objects/pics/people/archie/2.png b/graphics/event_objects/pics/people/archie/2.png
index 2e1b7a1ce..2e1b7a1ce 100644
--- a/graphics/map_objects/pics/people/archie/2.png
+++ b/graphics/event_objects/pics/people/archie/2.png
diff --git a/graphics/map_objects/pics/people/archie/3.png b/graphics/event_objects/pics/people/archie/3.png
index 576abb99d..576abb99d 100644
--- a/graphics/map_objects/pics/people/archie/3.png
+++ b/graphics/event_objects/pics/people/archie/3.png
diff --git a/graphics/map_objects/pics/people/archie/4.png b/graphics/event_objects/pics/people/archie/4.png
index f48687318..f48687318 100644
--- a/graphics/map_objects/pics/people/archie/4.png
+++ b/graphics/event_objects/pics/people/archie/4.png
diff --git a/graphics/map_objects/pics/people/archie/5.png b/graphics/event_objects/pics/people/archie/5.png
index f21490b7b..f21490b7b 100644
--- a/graphics/map_objects/pics/people/archie/5.png
+++ b/graphics/event_objects/pics/people/archie/5.png
diff --git a/graphics/map_objects/pics/people/archie/6.png b/graphics/event_objects/pics/people/archie/6.png
index 29305a952..29305a952 100644
--- a/graphics/map_objects/pics/people/archie/6.png
+++ b/graphics/event_objects/pics/people/archie/6.png
diff --git a/graphics/map_objects/pics/people/archie/7.png b/graphics/event_objects/pics/people/archie/7.png
index 778a7e964..778a7e964 100644
--- a/graphics/map_objects/pics/people/archie/7.png
+++ b/graphics/event_objects/pics/people/archie/7.png
diff --git a/graphics/map_objects/pics/people/archie/8.png b/graphics/event_objects/pics/people/archie/8.png
index 237101046..237101046 100644
--- a/graphics/map_objects/pics/people/archie/8.png
+++ b/graphics/event_objects/pics/people/archie/8.png
diff --git a/graphics/map_objects/pics/people/artist/0.png b/graphics/event_objects/pics/people/artist/0.png
index 9f25f9ea0..9f25f9ea0 100644
--- a/graphics/map_objects/pics/people/artist/0.png
+++ b/graphics/event_objects/pics/people/artist/0.png
diff --git a/graphics/map_objects/pics/people/artist/1.png b/graphics/event_objects/pics/people/artist/1.png
index 6056f77a5..6056f77a5 100644
--- a/graphics/map_objects/pics/people/artist/1.png
+++ b/graphics/event_objects/pics/people/artist/1.png
diff --git a/graphics/map_objects/pics/people/artist/2.png b/graphics/event_objects/pics/people/artist/2.png
index f1908e664..f1908e664 100644
--- a/graphics/map_objects/pics/people/artist/2.png
+++ b/graphics/event_objects/pics/people/artist/2.png
diff --git a/graphics/map_objects/pics/people/artist/3.png b/graphics/event_objects/pics/people/artist/3.png
index 62cafaa79..62cafaa79 100644
--- a/graphics/map_objects/pics/people/artist/3.png
+++ b/graphics/event_objects/pics/people/artist/3.png
diff --git a/graphics/map_objects/pics/people/artist/4.png b/graphics/event_objects/pics/people/artist/4.png
index 718ad2d3b..718ad2d3b 100644
--- a/graphics/map_objects/pics/people/artist/4.png
+++ b/graphics/event_objects/pics/people/artist/4.png
diff --git a/graphics/map_objects/pics/people/artist/5.png b/graphics/event_objects/pics/people/artist/5.png
index cb37c0138..cb37c0138 100644
--- a/graphics/map_objects/pics/people/artist/5.png
+++ b/graphics/event_objects/pics/people/artist/5.png
diff --git a/graphics/map_objects/pics/people/artist/6.png b/graphics/event_objects/pics/people/artist/6.png
index 281724e3d..281724e3d 100644
--- a/graphics/map_objects/pics/people/artist/6.png
+++ b/graphics/event_objects/pics/people/artist/6.png
diff --git a/graphics/map_objects/pics/people/artist/7.png b/graphics/event_objects/pics/people/artist/7.png
index 36157c6ee..36157c6ee 100644
--- a/graphics/map_objects/pics/people/artist/7.png
+++ b/graphics/event_objects/pics/people/artist/7.png
diff --git a/graphics/map_objects/pics/people/artist/8.png b/graphics/event_objects/pics/people/artist/8.png
index df7afa65e..df7afa65e 100644
--- a/graphics/map_objects/pics/people/artist/8.png
+++ b/graphics/event_objects/pics/people/artist/8.png
diff --git a/graphics/map_objects/pics/people/beauty/0.png b/graphics/event_objects/pics/people/beauty/0.png
index 50e0ece37..50e0ece37 100644
--- a/graphics/map_objects/pics/people/beauty/0.png
+++ b/graphics/event_objects/pics/people/beauty/0.png
diff --git a/graphics/map_objects/pics/people/beauty/1.png b/graphics/event_objects/pics/people/beauty/1.png
index 3a1ba51e9..3a1ba51e9 100644
--- a/graphics/map_objects/pics/people/beauty/1.png
+++ b/graphics/event_objects/pics/people/beauty/1.png
diff --git a/graphics/map_objects/pics/people/beauty/2.png b/graphics/event_objects/pics/people/beauty/2.png
index 5787f360f..5787f360f 100644
--- a/graphics/map_objects/pics/people/beauty/2.png
+++ b/graphics/event_objects/pics/people/beauty/2.png
diff --git a/graphics/map_objects/pics/people/beauty/3.png b/graphics/event_objects/pics/people/beauty/3.png
index cc200158f..cc200158f 100644
--- a/graphics/map_objects/pics/people/beauty/3.png
+++ b/graphics/event_objects/pics/people/beauty/3.png
diff --git a/graphics/map_objects/pics/people/beauty/4.png b/graphics/event_objects/pics/people/beauty/4.png
index f49ef45c6..f49ef45c6 100644
--- a/graphics/map_objects/pics/people/beauty/4.png
+++ b/graphics/event_objects/pics/people/beauty/4.png
diff --git a/graphics/map_objects/pics/people/beauty/5.png b/graphics/event_objects/pics/people/beauty/5.png
index c8eed61d1..c8eed61d1 100644
--- a/graphics/map_objects/pics/people/beauty/5.png
+++ b/graphics/event_objects/pics/people/beauty/5.png
diff --git a/graphics/map_objects/pics/people/beauty/6.png b/graphics/event_objects/pics/people/beauty/6.png
index fb298aa74..fb298aa74 100644
--- a/graphics/map_objects/pics/people/beauty/6.png
+++ b/graphics/event_objects/pics/people/beauty/6.png
diff --git a/graphics/map_objects/pics/people/beauty/7.png b/graphics/event_objects/pics/people/beauty/7.png
index 0b576e71a..0b576e71a 100644
--- a/graphics/map_objects/pics/people/beauty/7.png
+++ b/graphics/event_objects/pics/people/beauty/7.png
diff --git a/graphics/map_objects/pics/people/beauty/8.png b/graphics/event_objects/pics/people/beauty/8.png
index 77de6d5c5..77de6d5c5 100644
--- a/graphics/map_objects/pics/people/beauty/8.png
+++ b/graphics/event_objects/pics/people/beauty/8.png
diff --git a/graphics/map_objects/pics/people/black_belt/0.png b/graphics/event_objects/pics/people/black_belt/0.png
index 0003a1a88..0003a1a88 100644
--- a/graphics/map_objects/pics/people/black_belt/0.png
+++ b/graphics/event_objects/pics/people/black_belt/0.png
diff --git a/graphics/map_objects/pics/people/black_belt/1.png b/graphics/event_objects/pics/people/black_belt/1.png
index c3e3b8a1d..c3e3b8a1d 100644
--- a/graphics/map_objects/pics/people/black_belt/1.png
+++ b/graphics/event_objects/pics/people/black_belt/1.png
diff --git a/graphics/map_objects/pics/people/black_belt/2.png b/graphics/event_objects/pics/people/black_belt/2.png
index 0cb8f30bf..0cb8f30bf 100644
--- a/graphics/map_objects/pics/people/black_belt/2.png
+++ b/graphics/event_objects/pics/people/black_belt/2.png
diff --git a/graphics/map_objects/pics/people/black_belt/3.png b/graphics/event_objects/pics/people/black_belt/3.png
index 8bae80b47..8bae80b47 100644
--- a/graphics/map_objects/pics/people/black_belt/3.png
+++ b/graphics/event_objects/pics/people/black_belt/3.png
diff --git a/graphics/map_objects/pics/people/black_belt/4.png b/graphics/event_objects/pics/people/black_belt/4.png
index aacf9c3f7..aacf9c3f7 100644
--- a/graphics/map_objects/pics/people/black_belt/4.png
+++ b/graphics/event_objects/pics/people/black_belt/4.png
diff --git a/graphics/map_objects/pics/people/black_belt/5.png b/graphics/event_objects/pics/people/black_belt/5.png
index 41c60075c..41c60075c 100644
--- a/graphics/map_objects/pics/people/black_belt/5.png
+++ b/graphics/event_objects/pics/people/black_belt/5.png
diff --git a/graphics/map_objects/pics/people/black_belt/6.png b/graphics/event_objects/pics/people/black_belt/6.png
index fa1c426a1..fa1c426a1 100644
--- a/graphics/map_objects/pics/people/black_belt/6.png
+++ b/graphics/event_objects/pics/people/black_belt/6.png
diff --git a/graphics/map_objects/pics/people/black_belt/7.png b/graphics/event_objects/pics/people/black_belt/7.png
index 013986add..013986add 100644
--- a/graphics/map_objects/pics/people/black_belt/7.png
+++ b/graphics/event_objects/pics/people/black_belt/7.png
diff --git a/graphics/map_objects/pics/people/black_belt/8.png b/graphics/event_objects/pics/people/black_belt/8.png
index 5efef483a..5efef483a 100644
--- a/graphics/map_objects/pics/people/black_belt/8.png
+++ b/graphics/event_objects/pics/people/black_belt/8.png
diff --git a/graphics/map_objects/pics/people/boy_1/0.png b/graphics/event_objects/pics/people/boy_1/0.png
index ddb78aa81..ddb78aa81 100644
--- a/graphics/map_objects/pics/people/boy_1/0.png
+++ b/graphics/event_objects/pics/people/boy_1/0.png
diff --git a/graphics/map_objects/pics/people/boy_1/1.png b/graphics/event_objects/pics/people/boy_1/1.png
index 57c6245b2..57c6245b2 100644
--- a/graphics/map_objects/pics/people/boy_1/1.png
+++ b/graphics/event_objects/pics/people/boy_1/1.png
diff --git a/graphics/map_objects/pics/people/boy_1/2.png b/graphics/event_objects/pics/people/boy_1/2.png
index cc0797ac8..cc0797ac8 100644
--- a/graphics/map_objects/pics/people/boy_1/2.png
+++ b/graphics/event_objects/pics/people/boy_1/2.png
diff --git a/graphics/map_objects/pics/people/boy_1/3.png b/graphics/event_objects/pics/people/boy_1/3.png
index aa08c6302..aa08c6302 100644
--- a/graphics/map_objects/pics/people/boy_1/3.png
+++ b/graphics/event_objects/pics/people/boy_1/3.png
diff --git a/graphics/map_objects/pics/people/boy_1/4.png b/graphics/event_objects/pics/people/boy_1/4.png
index d60c49f7e..d60c49f7e 100644
--- a/graphics/map_objects/pics/people/boy_1/4.png
+++ b/graphics/event_objects/pics/people/boy_1/4.png
diff --git a/graphics/map_objects/pics/people/boy_1/5.png b/graphics/event_objects/pics/people/boy_1/5.png
index e60d62e06..e60d62e06 100644
--- a/graphics/map_objects/pics/people/boy_1/5.png
+++ b/graphics/event_objects/pics/people/boy_1/5.png
diff --git a/graphics/map_objects/pics/people/boy_1/6.png b/graphics/event_objects/pics/people/boy_1/6.png
index 9c515fb2a..9c515fb2a 100644
--- a/graphics/map_objects/pics/people/boy_1/6.png
+++ b/graphics/event_objects/pics/people/boy_1/6.png
diff --git a/graphics/map_objects/pics/people/boy_1/7.png b/graphics/event_objects/pics/people/boy_1/7.png
index 422ce9d9c..422ce9d9c 100644
--- a/graphics/map_objects/pics/people/boy_1/7.png
+++ b/graphics/event_objects/pics/people/boy_1/7.png
diff --git a/graphics/map_objects/pics/people/boy_1/8.png b/graphics/event_objects/pics/people/boy_1/8.png
index 1fcff3113..1fcff3113 100644
--- a/graphics/map_objects/pics/people/boy_1/8.png
+++ b/graphics/event_objects/pics/people/boy_1/8.png
diff --git a/graphics/map_objects/pics/people/boy_2/0.png b/graphics/event_objects/pics/people/boy_2/0.png
index aefd58a96..aefd58a96 100644
--- a/graphics/map_objects/pics/people/boy_2/0.png
+++ b/graphics/event_objects/pics/people/boy_2/0.png
diff --git a/graphics/map_objects/pics/people/boy_2/1.png b/graphics/event_objects/pics/people/boy_2/1.png
index 8b0d448cb..8b0d448cb 100644
--- a/graphics/map_objects/pics/people/boy_2/1.png
+++ b/graphics/event_objects/pics/people/boy_2/1.png
diff --git a/graphics/map_objects/pics/people/boy_2/2.png b/graphics/event_objects/pics/people/boy_2/2.png
index cad6a6cda..cad6a6cda 100644
--- a/graphics/map_objects/pics/people/boy_2/2.png
+++ b/graphics/event_objects/pics/people/boy_2/2.png
diff --git a/graphics/map_objects/pics/people/boy_2/3.png b/graphics/event_objects/pics/people/boy_2/3.png
index 11dea03b8..11dea03b8 100644
--- a/graphics/map_objects/pics/people/boy_2/3.png
+++ b/graphics/event_objects/pics/people/boy_2/3.png
diff --git a/graphics/map_objects/pics/people/boy_2/4.png b/graphics/event_objects/pics/people/boy_2/4.png
index 7aa11f526..7aa11f526 100644
--- a/graphics/map_objects/pics/people/boy_2/4.png
+++ b/graphics/event_objects/pics/people/boy_2/4.png
diff --git a/graphics/map_objects/pics/people/boy_2/5.png b/graphics/event_objects/pics/people/boy_2/5.png
index 0ff4cc622..0ff4cc622 100644
--- a/graphics/map_objects/pics/people/boy_2/5.png
+++ b/graphics/event_objects/pics/people/boy_2/5.png
diff --git a/graphics/map_objects/pics/people/boy_2/6.png b/graphics/event_objects/pics/people/boy_2/6.png
index 5e7e98f4d..5e7e98f4d 100644
--- a/graphics/map_objects/pics/people/boy_2/6.png
+++ b/graphics/event_objects/pics/people/boy_2/6.png
diff --git a/graphics/map_objects/pics/people/boy_2/7.png b/graphics/event_objects/pics/people/boy_2/7.png
index 3b7188f3a..3b7188f3a 100644
--- a/graphics/map_objects/pics/people/boy_2/7.png
+++ b/graphics/event_objects/pics/people/boy_2/7.png
diff --git a/graphics/map_objects/pics/people/boy_2/8.png b/graphics/event_objects/pics/people/boy_2/8.png
index aea1fee46..aea1fee46 100644
--- a/graphics/map_objects/pics/people/boy_2/8.png
+++ b/graphics/event_objects/pics/people/boy_2/8.png
diff --git a/graphics/map_objects/pics/people/boy_3/0.png b/graphics/event_objects/pics/people/boy_3/0.png
index 6ac8b18c2..6ac8b18c2 100644
--- a/graphics/map_objects/pics/people/boy_3/0.png
+++ b/graphics/event_objects/pics/people/boy_3/0.png
diff --git a/graphics/map_objects/pics/people/boy_3/1.png b/graphics/event_objects/pics/people/boy_3/1.png
index e42abeb9f..e42abeb9f 100644
--- a/graphics/map_objects/pics/people/boy_3/1.png
+++ b/graphics/event_objects/pics/people/boy_3/1.png
diff --git a/graphics/map_objects/pics/people/boy_3/2.png b/graphics/event_objects/pics/people/boy_3/2.png
index f6fdc1f83..f6fdc1f83 100644
--- a/graphics/map_objects/pics/people/boy_3/2.png
+++ b/graphics/event_objects/pics/people/boy_3/2.png
diff --git a/graphics/map_objects/pics/people/boy_3/3.png b/graphics/event_objects/pics/people/boy_3/3.png
index 8edb25b0c..8edb25b0c 100644
--- a/graphics/map_objects/pics/people/boy_3/3.png
+++ b/graphics/event_objects/pics/people/boy_3/3.png
diff --git a/graphics/map_objects/pics/people/boy_3/4.png b/graphics/event_objects/pics/people/boy_3/4.png
index 016f12fd4..016f12fd4 100644
--- a/graphics/map_objects/pics/people/boy_3/4.png
+++ b/graphics/event_objects/pics/people/boy_3/4.png
diff --git a/graphics/map_objects/pics/people/boy_3/5.png b/graphics/event_objects/pics/people/boy_3/5.png
index b5d5bda85..b5d5bda85 100644
--- a/graphics/map_objects/pics/people/boy_3/5.png
+++ b/graphics/event_objects/pics/people/boy_3/5.png
diff --git a/graphics/map_objects/pics/people/boy_3/6.png b/graphics/event_objects/pics/people/boy_3/6.png
index 703bcdbbc..703bcdbbc 100644
--- a/graphics/map_objects/pics/people/boy_3/6.png
+++ b/graphics/event_objects/pics/people/boy_3/6.png
diff --git a/graphics/map_objects/pics/people/boy_3/7.png b/graphics/event_objects/pics/people/boy_3/7.png
index aeaf29942..aeaf29942 100644
--- a/graphics/map_objects/pics/people/boy_3/7.png
+++ b/graphics/event_objects/pics/people/boy_3/7.png
diff --git a/graphics/map_objects/pics/people/boy_3/8.png b/graphics/event_objects/pics/people/boy_3/8.png
index 26ef82fc3..26ef82fc3 100644
--- a/graphics/map_objects/pics/people/boy_3/8.png
+++ b/graphics/event_objects/pics/people/boy_3/8.png
diff --git a/graphics/map_objects/pics/people/boy_4/0.png b/graphics/event_objects/pics/people/boy_4/0.png
index a0b93b2f4..a0b93b2f4 100644
--- a/graphics/map_objects/pics/people/boy_4/0.png
+++ b/graphics/event_objects/pics/people/boy_4/0.png
diff --git a/graphics/map_objects/pics/people/boy_4/1.png b/graphics/event_objects/pics/people/boy_4/1.png
index 9c287e39d..9c287e39d 100644
--- a/graphics/map_objects/pics/people/boy_4/1.png
+++ b/graphics/event_objects/pics/people/boy_4/1.png
diff --git a/graphics/map_objects/pics/people/boy_4/2.png b/graphics/event_objects/pics/people/boy_4/2.png
index e1cead5ad..e1cead5ad 100644
--- a/graphics/map_objects/pics/people/boy_4/2.png
+++ b/graphics/event_objects/pics/people/boy_4/2.png
diff --git a/graphics/map_objects/pics/people/boy_4/3.png b/graphics/event_objects/pics/people/boy_4/3.png
index d64420afd..d64420afd 100644
--- a/graphics/map_objects/pics/people/boy_4/3.png
+++ b/graphics/event_objects/pics/people/boy_4/3.png
diff --git a/graphics/map_objects/pics/people/boy_4/4.png b/graphics/event_objects/pics/people/boy_4/4.png
index f7779a135..f7779a135 100644
--- a/graphics/map_objects/pics/people/boy_4/4.png
+++ b/graphics/event_objects/pics/people/boy_4/4.png
diff --git a/graphics/map_objects/pics/people/boy_4/5.png b/graphics/event_objects/pics/people/boy_4/5.png
index 76485893d..76485893d 100644
--- a/graphics/map_objects/pics/people/boy_4/5.png
+++ b/graphics/event_objects/pics/people/boy_4/5.png
diff --git a/graphics/map_objects/pics/people/boy_4/6.png b/graphics/event_objects/pics/people/boy_4/6.png
index 9f63aba4e..9f63aba4e 100644
--- a/graphics/map_objects/pics/people/boy_4/6.png
+++ b/graphics/event_objects/pics/people/boy_4/6.png
diff --git a/graphics/map_objects/pics/people/boy_4/7.png b/graphics/event_objects/pics/people/boy_4/7.png
index 40d19f455..40d19f455 100644
--- a/graphics/map_objects/pics/people/boy_4/7.png
+++ b/graphics/event_objects/pics/people/boy_4/7.png
diff --git a/graphics/map_objects/pics/people/boy_4/8.png b/graphics/event_objects/pics/people/boy_4/8.png
index 1ed4d0da0..1ed4d0da0 100644
--- a/graphics/map_objects/pics/people/boy_4/8.png
+++ b/graphics/event_objects/pics/people/boy_4/8.png
diff --git a/graphics/map_objects/pics/people/boy_5/0.png b/graphics/event_objects/pics/people/boy_5/0.png
index 2a0ab6a07..2a0ab6a07 100644
--- a/graphics/map_objects/pics/people/boy_5/0.png
+++ b/graphics/event_objects/pics/people/boy_5/0.png
diff --git a/graphics/map_objects/pics/people/boy_5/1.png b/graphics/event_objects/pics/people/boy_5/1.png
index 65f7f1dcf..65f7f1dcf 100644
--- a/graphics/map_objects/pics/people/boy_5/1.png
+++ b/graphics/event_objects/pics/people/boy_5/1.png
diff --git a/graphics/map_objects/pics/people/boy_5/2.png b/graphics/event_objects/pics/people/boy_5/2.png
index ece405a28..ece405a28 100644
--- a/graphics/map_objects/pics/people/boy_5/2.png
+++ b/graphics/event_objects/pics/people/boy_5/2.png
diff --git a/graphics/map_objects/pics/people/brandon/0.png b/graphics/event_objects/pics/people/brandon/0.png
index 85d567a95..85d567a95 100644
--- a/graphics/map_objects/pics/people/brandon/0.png
+++ b/graphics/event_objects/pics/people/brandon/0.png
diff --git a/graphics/map_objects/pics/people/brandon/1.png b/graphics/event_objects/pics/people/brandon/1.png
index 90a67c879..90a67c879 100644
--- a/graphics/map_objects/pics/people/brandon/1.png
+++ b/graphics/event_objects/pics/people/brandon/1.png
diff --git a/graphics/map_objects/pics/people/brandon/2.png b/graphics/event_objects/pics/people/brandon/2.png
index 914c842d4..914c842d4 100644
--- a/graphics/map_objects/pics/people/brandon/2.png
+++ b/graphics/event_objects/pics/people/brandon/2.png
diff --git a/graphics/map_objects/pics/people/brandon/3.png b/graphics/event_objects/pics/people/brandon/3.png
index dea524915..dea524915 100644
--- a/graphics/map_objects/pics/people/brandon/3.png
+++ b/graphics/event_objects/pics/people/brandon/3.png
diff --git a/graphics/map_objects/pics/people/brandon/4.png b/graphics/event_objects/pics/people/brandon/4.png
index 60588dd0c..60588dd0c 100644
--- a/graphics/map_objects/pics/people/brandon/4.png
+++ b/graphics/event_objects/pics/people/brandon/4.png
diff --git a/graphics/map_objects/pics/people/brandon/5.png b/graphics/event_objects/pics/people/brandon/5.png
index d1f8ee242..d1f8ee242 100644
--- a/graphics/map_objects/pics/people/brandon/5.png
+++ b/graphics/event_objects/pics/people/brandon/5.png
diff --git a/graphics/map_objects/pics/people/brandon/6.png b/graphics/event_objects/pics/people/brandon/6.png
index 68564a2a3..68564a2a3 100644
--- a/graphics/map_objects/pics/people/brandon/6.png
+++ b/graphics/event_objects/pics/people/brandon/6.png
diff --git a/graphics/map_objects/pics/people/brandon/7.png b/graphics/event_objects/pics/people/brandon/7.png
index 5fdb88f6b..5fdb88f6b 100644
--- a/graphics/map_objects/pics/people/brandon/7.png
+++ b/graphics/event_objects/pics/people/brandon/7.png
diff --git a/graphics/map_objects/pics/people/brandon/8.png b/graphics/event_objects/pics/people/brandon/8.png
index 529114e45..529114e45 100644
--- a/graphics/map_objects/pics/people/brandon/8.png
+++ b/graphics/event_objects/pics/people/brandon/8.png
diff --git a/graphics/map_objects/pics/people/brawly/0.png b/graphics/event_objects/pics/people/brawly/0.png
index f22faad59..f22faad59 100644
--- a/graphics/map_objects/pics/people/brawly/0.png
+++ b/graphics/event_objects/pics/people/brawly/0.png
diff --git a/graphics/map_objects/pics/people/brawly/1.png b/graphics/event_objects/pics/people/brawly/1.png
index 38ab1f090..38ab1f090 100644
--- a/graphics/map_objects/pics/people/brawly/1.png
+++ b/graphics/event_objects/pics/people/brawly/1.png
diff --git a/graphics/map_objects/pics/people/brawly/2.png b/graphics/event_objects/pics/people/brawly/2.png
index 0f9289d0b..0f9289d0b 100644
--- a/graphics/map_objects/pics/people/brawly/2.png
+++ b/graphics/event_objects/pics/people/brawly/2.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/00.png b/graphics/event_objects/pics/people/brendan/acro_bike/00.png
index d0c556042..d0c556042 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/00.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/00.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/01.png b/graphics/event_objects/pics/people/brendan/acro_bike/01.png
index 4a4fbb0c9..4a4fbb0c9 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/01.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/01.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/02.png b/graphics/event_objects/pics/people/brendan/acro_bike/02.png
index c657e8b37..c657e8b37 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/02.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/02.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/03.png b/graphics/event_objects/pics/people/brendan/acro_bike/03.png
index 38f3a08a7..38f3a08a7 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/03.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/03.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/04.png b/graphics/event_objects/pics/people/brendan/acro_bike/04.png
index 1fa84a846..1fa84a846 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/04.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/04.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/05.png b/graphics/event_objects/pics/people/brendan/acro_bike/05.png
index cb9788e69..cb9788e69 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/05.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/05.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/06.png b/graphics/event_objects/pics/people/brendan/acro_bike/06.png
index 345a2277e..345a2277e 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/06.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/06.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/07.png b/graphics/event_objects/pics/people/brendan/acro_bike/07.png
index 0677027b0..0677027b0 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/07.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/07.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/08.png b/graphics/event_objects/pics/people/brendan/acro_bike/08.png
index a24484281..a24484281 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/08.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/08.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/09.png b/graphics/event_objects/pics/people/brendan/acro_bike/09.png
index b209676f5..b209676f5 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/09.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/09.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/10.png b/graphics/event_objects/pics/people/brendan/acro_bike/10.png
index b472a680d..b472a680d 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/10.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/10.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/11.png b/graphics/event_objects/pics/people/brendan/acro_bike/11.png
index 7a8110dd5..7a8110dd5 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/11.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/11.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/12.png b/graphics/event_objects/pics/people/brendan/acro_bike/12.png
index 719516161..719516161 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/12.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/12.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/13.png b/graphics/event_objects/pics/people/brendan/acro_bike/13.png
index 7b24c24f4..7b24c24f4 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/13.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/13.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/14.png b/graphics/event_objects/pics/people/brendan/acro_bike/14.png
index bbb91d751..bbb91d751 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/14.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/14.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/15.png b/graphics/event_objects/pics/people/brendan/acro_bike/15.png
index 3caacb23e..3caacb23e 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/15.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/15.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/16.png b/graphics/event_objects/pics/people/brendan/acro_bike/16.png
index aa26f59cc..aa26f59cc 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/16.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/16.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/17.png b/graphics/event_objects/pics/people/brendan/acro_bike/17.png
index 0a3d0c1a7..0a3d0c1a7 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/17.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/17.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/18.png b/graphics/event_objects/pics/people/brendan/acro_bike/18.png
index dd442bb2e..dd442bb2e 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/18.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/18.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/19.png b/graphics/event_objects/pics/people/brendan/acro_bike/19.png
index 705c0668e..705c0668e 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/19.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/19.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/20.png b/graphics/event_objects/pics/people/brendan/acro_bike/20.png
index 665d699aa..665d699aa 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/20.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/20.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/21.png b/graphics/event_objects/pics/people/brendan/acro_bike/21.png
index 3ea90bb2b..3ea90bb2b 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/21.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/21.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/22.png b/graphics/event_objects/pics/people/brendan/acro_bike/22.png
index b69f0e052..b69f0e052 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/22.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/22.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/23.png b/graphics/event_objects/pics/people/brendan/acro_bike/23.png
index df87a8442..df87a8442 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/23.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/23.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/24.png b/graphics/event_objects/pics/people/brendan/acro_bike/24.png
index 0e301734d..0e301734d 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/24.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/24.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/25.png b/graphics/event_objects/pics/people/brendan/acro_bike/25.png
index 1cf49c09a..1cf49c09a 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/25.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/25.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/26.png b/graphics/event_objects/pics/people/brendan/acro_bike/26.png
index 54e150a3c..54e150a3c 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/26.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/26.png
diff --git a/graphics/map_objects/pics/people/brendan/decorating.png b/graphics/event_objects/pics/people/brendan/decorating.png
index c0839120a..c0839120a 100644
--- a/graphics/map_objects/pics/people/brendan/decorating.png
+++ b/graphics/event_objects/pics/people/brendan/decorating.png
diff --git a/graphics/map_objects/pics/people/brendan/field_move/0.png b/graphics/event_objects/pics/people/brendan/field_move/0.png
index d8cd793d8..d8cd793d8 100644
--- a/graphics/map_objects/pics/people/brendan/field_move/0.png
+++ b/graphics/event_objects/pics/people/brendan/field_move/0.png
diff --git a/graphics/map_objects/pics/people/brendan/field_move/1.png b/graphics/event_objects/pics/people/brendan/field_move/1.png
index 25550176e..25550176e 100644
--- a/graphics/map_objects/pics/people/brendan/field_move/1.png
+++ b/graphics/event_objects/pics/people/brendan/field_move/1.png
diff --git a/graphics/map_objects/pics/people/brendan/field_move/2.png b/graphics/event_objects/pics/people/brendan/field_move/2.png
index a817426f9..a817426f9 100644
--- a/graphics/map_objects/pics/people/brendan/field_move/2.png
+++ b/graphics/event_objects/pics/people/brendan/field_move/2.png
diff --git a/graphics/map_objects/pics/people/brendan/field_move/3.png b/graphics/event_objects/pics/people/brendan/field_move/3.png
index 527189377..527189377 100644
--- a/graphics/map_objects/pics/people/brendan/field_move/3.png
+++ b/graphics/event_objects/pics/people/brendan/field_move/3.png
diff --git a/graphics/map_objects/pics/people/brendan/field_move/4.png b/graphics/event_objects/pics/people/brendan/field_move/4.png
index 05ac7919d..05ac7919d 100644
--- a/graphics/map_objects/pics/people/brendan/field_move/4.png
+++ b/graphics/event_objects/pics/people/brendan/field_move/4.png
diff --git a/graphics/map_objects/pics/people/brendan/fishing/00.png b/graphics/event_objects/pics/people/brendan/fishing/00.png
index db6b3d2ff..db6b3d2ff 100644
--- a/graphics/map_objects/pics/people/brendan/fishing/00.png
+++ b/graphics/event_objects/pics/people/brendan/fishing/00.png
diff --git a/graphics/map_objects/pics/people/brendan/fishing/01.png b/graphics/event_objects/pics/people/brendan/fishing/01.png
index cca89997d..cca89997d 100644
--- a/graphics/map_objects/pics/people/brendan/fishing/01.png
+++ b/graphics/event_objects/pics/people/brendan/fishing/01.png
diff --git a/graphics/map_objects/pics/people/brendan/fishing/02.png b/graphics/event_objects/pics/people/brendan/fishing/02.png
index 6adbb9f55..6adbb9f55 100644
--- a/graphics/map_objects/pics/people/brendan/fishing/02.png
+++ b/graphics/event_objects/pics/people/brendan/fishing/02.png
diff --git a/graphics/map_objects/pics/people/brendan/fishing/03.png b/graphics/event_objects/pics/people/brendan/fishing/03.png
index 22101c8b6..22101c8b6 100644
--- a/graphics/map_objects/pics/people/brendan/fishing/03.png
+++ b/graphics/event_objects/pics/people/brendan/fishing/03.png
diff --git a/graphics/map_objects/pics/people/brendan/fishing/04.png b/graphics/event_objects/pics/people/brendan/fishing/04.png
index e8fec65a2..e8fec65a2 100644
--- a/graphics/map_objects/pics/people/brendan/fishing/04.png
+++ b/graphics/event_objects/pics/people/brendan/fishing/04.png
diff --git a/graphics/map_objects/pics/people/brendan/fishing/05.png b/graphics/event_objects/pics/people/brendan/fishing/05.png
index c9ee2fa4c..c9ee2fa4c 100644
--- a/graphics/map_objects/pics/people/brendan/fishing/05.png
+++ b/graphics/event_objects/pics/people/brendan/fishing/05.png
diff --git a/graphics/map_objects/pics/people/brendan/fishing/06.png b/graphics/event_objects/pics/people/brendan/fishing/06.png
index caaeee078..caaeee078 100644
--- a/graphics/map_objects/pics/people/brendan/fishing/06.png
+++ b/graphics/event_objects/pics/people/brendan/fishing/06.png
diff --git a/graphics/map_objects/pics/people/brendan/fishing/07.png b/graphics/event_objects/pics/people/brendan/fishing/07.png
index c39110e1c..c39110e1c 100644
--- a/graphics/map_objects/pics/people/brendan/fishing/07.png
+++ b/graphics/event_objects/pics/people/brendan/fishing/07.png
diff --git a/graphics/map_objects/pics/people/brendan/fishing/08.png b/graphics/event_objects/pics/people/brendan/fishing/08.png
index 3b1b1728c..3b1b1728c 100644
--- a/graphics/map_objects/pics/people/brendan/fishing/08.png
+++ b/graphics/event_objects/pics/people/brendan/fishing/08.png
diff --git a/graphics/map_objects/pics/people/brendan/fishing/09.png b/graphics/event_objects/pics/people/brendan/fishing/09.png
index f21c37d60..f21c37d60 100644
--- a/graphics/map_objects/pics/people/brendan/fishing/09.png
+++ b/graphics/event_objects/pics/people/brendan/fishing/09.png
diff --git a/graphics/map_objects/pics/people/brendan/fishing/10.png b/graphics/event_objects/pics/people/brendan/fishing/10.png
index f80186d1f..f80186d1f 100644
--- a/graphics/map_objects/pics/people/brendan/fishing/10.png
+++ b/graphics/event_objects/pics/people/brendan/fishing/10.png
diff --git a/graphics/map_objects/pics/people/brendan/fishing/11.png b/graphics/event_objects/pics/people/brendan/fishing/11.png
index 66b2b5917..66b2b5917 100644
--- a/graphics/map_objects/pics/people/brendan/fishing/11.png
+++ b/graphics/event_objects/pics/people/brendan/fishing/11.png
diff --git a/graphics/map_objects/pics/people/brendan/mach_bike/0.png b/graphics/event_objects/pics/people/brendan/mach_bike/0.png
index d0c556042..d0c556042 100644
--- a/graphics/map_objects/pics/people/brendan/mach_bike/0.png
+++ b/graphics/event_objects/pics/people/brendan/mach_bike/0.png
diff --git a/graphics/map_objects/pics/people/brendan/mach_bike/1.png b/graphics/event_objects/pics/people/brendan/mach_bike/1.png
index 4a4fbb0c9..4a4fbb0c9 100644
--- a/graphics/map_objects/pics/people/brendan/mach_bike/1.png
+++ b/graphics/event_objects/pics/people/brendan/mach_bike/1.png
diff --git a/graphics/map_objects/pics/people/brendan/mach_bike/2.png b/graphics/event_objects/pics/people/brendan/mach_bike/2.png
index c657e8b37..c657e8b37 100644
--- a/graphics/map_objects/pics/people/brendan/mach_bike/2.png
+++ b/graphics/event_objects/pics/people/brendan/mach_bike/2.png
diff --git a/graphics/map_objects/pics/people/brendan/mach_bike/3.png b/graphics/event_objects/pics/people/brendan/mach_bike/3.png
index bbe403817..bbe403817 100644
--- a/graphics/map_objects/pics/people/brendan/mach_bike/3.png
+++ b/graphics/event_objects/pics/people/brendan/mach_bike/3.png
diff --git a/graphics/map_objects/pics/people/brendan/mach_bike/4.png b/graphics/event_objects/pics/people/brendan/mach_bike/4.png
index 9fe91dd46..9fe91dd46 100644
--- a/graphics/map_objects/pics/people/brendan/mach_bike/4.png
+++ b/graphics/event_objects/pics/people/brendan/mach_bike/4.png
diff --git a/graphics/map_objects/pics/people/brendan/mach_bike/5.png b/graphics/event_objects/pics/people/brendan/mach_bike/5.png
index cb9788e69..cb9788e69 100644
--- a/graphics/map_objects/pics/people/brendan/mach_bike/5.png
+++ b/graphics/event_objects/pics/people/brendan/mach_bike/5.png
diff --git a/graphics/map_objects/pics/people/brendan/mach_bike/6.png b/graphics/event_objects/pics/people/brendan/mach_bike/6.png
index 345a2277e..345a2277e 100644
--- a/graphics/map_objects/pics/people/brendan/mach_bike/6.png
+++ b/graphics/event_objects/pics/people/brendan/mach_bike/6.png
diff --git a/graphics/map_objects/pics/people/brendan/mach_bike/7.png b/graphics/event_objects/pics/people/brendan/mach_bike/7.png
index 0677027b0..0677027b0 100644
--- a/graphics/map_objects/pics/people/brendan/mach_bike/7.png
+++ b/graphics/event_objects/pics/people/brendan/mach_bike/7.png
diff --git a/graphics/map_objects/pics/people/brendan/mach_bike/8.png b/graphics/event_objects/pics/people/brendan/mach_bike/8.png
index a24484281..a24484281 100644
--- a/graphics/map_objects/pics/people/brendan/mach_bike/8.png
+++ b/graphics/event_objects/pics/people/brendan/mach_bike/8.png
diff --git a/graphics/map_objects/pics/people/brendan/normal/00.png b/graphics/event_objects/pics/people/brendan/normal/00.png
index 3d0f4c8d5..3d0f4c8d5 100644
--- a/graphics/map_objects/pics/people/brendan/normal/00.png
+++ b/graphics/event_objects/pics/people/brendan/normal/00.png
diff --git a/graphics/map_objects/pics/people/brendan/normal/01.png b/graphics/event_objects/pics/people/brendan/normal/01.png
index b36412513..b36412513 100644
--- a/graphics/map_objects/pics/people/brendan/normal/01.png
+++ b/graphics/event_objects/pics/people/brendan/normal/01.png
diff --git a/graphics/map_objects/pics/people/brendan/normal/02.png b/graphics/event_objects/pics/people/brendan/normal/02.png
index 0f3c3775e..0f3c3775e 100644
--- a/graphics/map_objects/pics/people/brendan/normal/02.png
+++ b/graphics/event_objects/pics/people/brendan/normal/02.png
diff --git a/graphics/map_objects/pics/people/brendan/normal/03.png b/graphics/event_objects/pics/people/brendan/normal/03.png
index b415377c7..b415377c7 100644
--- a/graphics/map_objects/pics/people/brendan/normal/03.png
+++ b/graphics/event_objects/pics/people/brendan/normal/03.png
diff --git a/graphics/map_objects/pics/people/brendan/normal/04.png b/graphics/event_objects/pics/people/brendan/normal/04.png
index fb92c09cd..fb92c09cd 100644
--- a/graphics/map_objects/pics/people/brendan/normal/04.png
+++ b/graphics/event_objects/pics/people/brendan/normal/04.png
diff --git a/graphics/map_objects/pics/people/brendan/normal/05.png b/graphics/event_objects/pics/people/brendan/normal/05.png
index a5d0518a4..a5d0518a4 100644
--- a/graphics/map_objects/pics/people/brendan/normal/05.png
+++ b/graphics/event_objects/pics/people/brendan/normal/05.png
diff --git a/graphics/map_objects/pics/people/brendan/normal/06.png b/graphics/event_objects/pics/people/brendan/normal/06.png
index 66a4293b2..66a4293b2 100644
--- a/graphics/map_objects/pics/people/brendan/normal/06.png
+++ b/graphics/event_objects/pics/people/brendan/normal/06.png
diff --git a/graphics/map_objects/pics/people/brendan/normal/07.png b/graphics/event_objects/pics/people/brendan/normal/07.png
index 7710ce994..7710ce994 100644
--- a/graphics/map_objects/pics/people/brendan/normal/07.png
+++ b/graphics/event_objects/pics/people/brendan/normal/07.png
diff --git a/graphics/map_objects/pics/people/brendan/normal/08.png b/graphics/event_objects/pics/people/brendan/normal/08.png
index 12e9f07b3..12e9f07b3 100644
--- a/graphics/map_objects/pics/people/brendan/normal/08.png
+++ b/graphics/event_objects/pics/people/brendan/normal/08.png
diff --git a/graphics/map_objects/pics/people/brendan/normal/09.png b/graphics/event_objects/pics/people/brendan/normal/09.png
index 3c7aebbf4..3c7aebbf4 100644
--- a/graphics/map_objects/pics/people/brendan/normal/09.png
+++ b/graphics/event_objects/pics/people/brendan/normal/09.png
diff --git a/graphics/map_objects/pics/people/brendan/normal/10.png b/graphics/event_objects/pics/people/brendan/normal/10.png
index ed928914f..ed928914f 100644
--- a/graphics/map_objects/pics/people/brendan/normal/10.png
+++ b/graphics/event_objects/pics/people/brendan/normal/10.png
diff --git a/graphics/map_objects/pics/people/brendan/normal/11.png b/graphics/event_objects/pics/people/brendan/normal/11.png
index 754b05a78..754b05a78 100644
--- a/graphics/map_objects/pics/people/brendan/normal/11.png
+++ b/graphics/event_objects/pics/people/brendan/normal/11.png
diff --git a/graphics/map_objects/pics/people/brendan/normal/12.png b/graphics/event_objects/pics/people/brendan/normal/12.png
index 6f707e724..6f707e724 100644
--- a/graphics/map_objects/pics/people/brendan/normal/12.png
+++ b/graphics/event_objects/pics/people/brendan/normal/12.png
diff --git a/graphics/map_objects/pics/people/brendan/normal/13.png b/graphics/event_objects/pics/people/brendan/normal/13.png
index 10ec74720..10ec74720 100644
--- a/graphics/map_objects/pics/people/brendan/normal/13.png
+++ b/graphics/event_objects/pics/people/brendan/normal/13.png
diff --git a/graphics/map_objects/pics/people/brendan/normal/14.png b/graphics/event_objects/pics/people/brendan/normal/14.png
index 5cf30bfb9..5cf30bfb9 100644
--- a/graphics/map_objects/pics/people/brendan/normal/14.png
+++ b/graphics/event_objects/pics/people/brendan/normal/14.png
diff --git a/graphics/map_objects/pics/people/brendan/normal/15.png b/graphics/event_objects/pics/people/brendan/normal/15.png
index a1e8132d5..a1e8132d5 100644
--- a/graphics/map_objects/pics/people/brendan/normal/15.png
+++ b/graphics/event_objects/pics/people/brendan/normal/15.png
diff --git a/graphics/map_objects/pics/people/brendan/normal/16.png b/graphics/event_objects/pics/people/brendan/normal/16.png
index 6a0b22992..6a0b22992 100644
--- a/graphics/map_objects/pics/people/brendan/normal/16.png
+++ b/graphics/event_objects/pics/people/brendan/normal/16.png
diff --git a/graphics/map_objects/pics/people/brendan/normal/17.png b/graphics/event_objects/pics/people/brendan/normal/17.png
index cbf76035a..cbf76035a 100644
--- a/graphics/map_objects/pics/people/brendan/normal/17.png
+++ b/graphics/event_objects/pics/people/brendan/normal/17.png
diff --git a/graphics/map_objects/pics/people/brendan/surfing/0.png b/graphics/event_objects/pics/people/brendan/surfing/0.png
index 67f4377bd..67f4377bd 100644
--- a/graphics/map_objects/pics/people/brendan/surfing/0.png
+++ b/graphics/event_objects/pics/people/brendan/surfing/0.png
diff --git a/graphics/map_objects/pics/people/brendan/surfing/1.png b/graphics/event_objects/pics/people/brendan/surfing/1.png
index cfec0e085..cfec0e085 100644
--- a/graphics/map_objects/pics/people/brendan/surfing/1.png
+++ b/graphics/event_objects/pics/people/brendan/surfing/1.png
diff --git a/graphics/map_objects/pics/people/brendan/surfing/2.png b/graphics/event_objects/pics/people/brendan/surfing/2.png
index 2d0fd5b79..2d0fd5b79 100644
--- a/graphics/map_objects/pics/people/brendan/surfing/2.png
+++ b/graphics/event_objects/pics/people/brendan/surfing/2.png
diff --git a/graphics/map_objects/pics/people/brendan/surfing/3.png b/graphics/event_objects/pics/people/brendan/surfing/3.png
index 0c2517901..0c2517901 100644
--- a/graphics/map_objects/pics/people/brendan/surfing/3.png
+++ b/graphics/event_objects/pics/people/brendan/surfing/3.png
diff --git a/graphics/map_objects/pics/people/brendan/surfing/4.png b/graphics/event_objects/pics/people/brendan/surfing/4.png
index abe894a45..abe894a45 100644
--- a/graphics/map_objects/pics/people/brendan/surfing/4.png
+++ b/graphics/event_objects/pics/people/brendan/surfing/4.png
diff --git a/graphics/map_objects/pics/people/brendan/surfing/5.png b/graphics/event_objects/pics/people/brendan/surfing/5.png
index 613114c39..613114c39 100644
--- a/graphics/map_objects/pics/people/brendan/surfing/5.png
+++ b/graphics/event_objects/pics/people/brendan/surfing/5.png
diff --git a/graphics/map_objects/pics/people/brendan/underwater/0.png b/graphics/event_objects/pics/people/brendan/underwater/0.png
index 79951c29c..79951c29c 100644
--- a/graphics/map_objects/pics/people/brendan/underwater/0.png
+++ b/graphics/event_objects/pics/people/brendan/underwater/0.png
diff --git a/graphics/map_objects/pics/people/brendan/underwater/1.png b/graphics/event_objects/pics/people/brendan/underwater/1.png
index d7c3f0783..d7c3f0783 100644
--- a/graphics/map_objects/pics/people/brendan/underwater/1.png
+++ b/graphics/event_objects/pics/people/brendan/underwater/1.png
diff --git a/graphics/map_objects/pics/people/brendan/underwater/2.png b/graphics/event_objects/pics/people/brendan/underwater/2.png
index 628a2ac88..628a2ac88 100644
--- a/graphics/map_objects/pics/people/brendan/underwater/2.png
+++ b/graphics/event_objects/pics/people/brendan/underwater/2.png
diff --git a/graphics/map_objects/pics/people/brendan/underwater/3.png b/graphics/event_objects/pics/people/brendan/underwater/3.png
index 7756a96db..7756a96db 100644
--- a/graphics/map_objects/pics/people/brendan/underwater/3.png
+++ b/graphics/event_objects/pics/people/brendan/underwater/3.png
diff --git a/graphics/map_objects/pics/people/brendan/watering/0.png b/graphics/event_objects/pics/people/brendan/watering/0.png
index 0f8d95430..0f8d95430 100644
--- a/graphics/map_objects/pics/people/brendan/watering/0.png
+++ b/graphics/event_objects/pics/people/brendan/watering/0.png
diff --git a/graphics/map_objects/pics/people/brendan/watering/1.png b/graphics/event_objects/pics/people/brendan/watering/1.png
index 7b5ddc996..7b5ddc996 100644
--- a/graphics/map_objects/pics/people/brendan/watering/1.png
+++ b/graphics/event_objects/pics/people/brendan/watering/1.png
diff --git a/graphics/map_objects/pics/people/brendan/watering/2.png b/graphics/event_objects/pics/people/brendan/watering/2.png
index 3441131fa..3441131fa 100644
--- a/graphics/map_objects/pics/people/brendan/watering/2.png
+++ b/graphics/event_objects/pics/people/brendan/watering/2.png
diff --git a/graphics/map_objects/pics/people/brendan/watering/3.png b/graphics/event_objects/pics/people/brendan/watering/3.png
index 06baf24fc..06baf24fc 100644
--- a/graphics/map_objects/pics/people/brendan/watering/3.png
+++ b/graphics/event_objects/pics/people/brendan/watering/3.png
diff --git a/graphics/map_objects/pics/people/brendan/watering/4.png b/graphics/event_objects/pics/people/brendan/watering/4.png
index 40dbbacab..40dbbacab 100644
--- a/graphics/map_objects/pics/people/brendan/watering/4.png
+++ b/graphics/event_objects/pics/people/brendan/watering/4.png
diff --git a/graphics/map_objects/pics/people/brendan/watering/5.png b/graphics/event_objects/pics/people/brendan/watering/5.png
index a72edf144..a72edf144 100644
--- a/graphics/map_objects/pics/people/brendan/watering/5.png
+++ b/graphics/event_objects/pics/people/brendan/watering/5.png
diff --git a/graphics/map_objects/pics/people/bug_catcher/0.png b/graphics/event_objects/pics/people/bug_catcher/0.png
index 860449379..860449379 100644
--- a/graphics/map_objects/pics/people/bug_catcher/0.png
+++ b/graphics/event_objects/pics/people/bug_catcher/0.png
diff --git a/graphics/map_objects/pics/people/bug_catcher/1.png b/graphics/event_objects/pics/people/bug_catcher/1.png
index a0a3b3df1..a0a3b3df1 100644
--- a/graphics/map_objects/pics/people/bug_catcher/1.png
+++ b/graphics/event_objects/pics/people/bug_catcher/1.png
diff --git a/graphics/map_objects/pics/people/bug_catcher/2.png b/graphics/event_objects/pics/people/bug_catcher/2.png
index 96363e4a8..96363e4a8 100644
--- a/graphics/map_objects/pics/people/bug_catcher/2.png
+++ b/graphics/event_objects/pics/people/bug_catcher/2.png
diff --git a/graphics/map_objects/pics/people/bug_catcher/3.png b/graphics/event_objects/pics/people/bug_catcher/3.png
index 472fa42cb..472fa42cb 100644
--- a/graphics/map_objects/pics/people/bug_catcher/3.png
+++ b/graphics/event_objects/pics/people/bug_catcher/3.png
diff --git a/graphics/map_objects/pics/people/bug_catcher/4.png b/graphics/event_objects/pics/people/bug_catcher/4.png
index f6da1bb97..f6da1bb97 100644
--- a/graphics/map_objects/pics/people/bug_catcher/4.png
+++ b/graphics/event_objects/pics/people/bug_catcher/4.png
diff --git a/graphics/map_objects/pics/people/bug_catcher/5.png b/graphics/event_objects/pics/people/bug_catcher/5.png
index bd5aea560..bd5aea560 100644
--- a/graphics/map_objects/pics/people/bug_catcher/5.png
+++ b/graphics/event_objects/pics/people/bug_catcher/5.png
diff --git a/graphics/map_objects/pics/people/bug_catcher/6.png b/graphics/event_objects/pics/people/bug_catcher/6.png
index 2a93fc6b7..2a93fc6b7 100644
--- a/graphics/map_objects/pics/people/bug_catcher/6.png
+++ b/graphics/event_objects/pics/people/bug_catcher/6.png
diff --git a/graphics/map_objects/pics/people/bug_catcher/7.png b/graphics/event_objects/pics/people/bug_catcher/7.png
index fded025e3..fded025e3 100644
--- a/graphics/map_objects/pics/people/bug_catcher/7.png
+++ b/graphics/event_objects/pics/people/bug_catcher/7.png
diff --git a/graphics/map_objects/pics/people/bug_catcher/8.png b/graphics/event_objects/pics/people/bug_catcher/8.png
index df561597b..df561597b 100644
--- a/graphics/map_objects/pics/people/bug_catcher/8.png
+++ b/graphics/event_objects/pics/people/bug_catcher/8.png
diff --git a/graphics/map_objects/pics/people/cameraman/0.png b/graphics/event_objects/pics/people/cameraman/0.png
index af6ad2878..af6ad2878 100644
--- a/graphics/map_objects/pics/people/cameraman/0.png
+++ b/graphics/event_objects/pics/people/cameraman/0.png
diff --git a/graphics/map_objects/pics/people/cameraman/1.png b/graphics/event_objects/pics/people/cameraman/1.png
index 112ee86b4..112ee86b4 100644
--- a/graphics/map_objects/pics/people/cameraman/1.png
+++ b/graphics/event_objects/pics/people/cameraman/1.png
diff --git a/graphics/map_objects/pics/people/cameraman/2.png b/graphics/event_objects/pics/people/cameraman/2.png
index 6eaca8266..6eaca8266 100644
--- a/graphics/map_objects/pics/people/cameraman/2.png
+++ b/graphics/event_objects/pics/people/cameraman/2.png
diff --git a/graphics/map_objects/pics/people/cameraman/3.png b/graphics/event_objects/pics/people/cameraman/3.png
index 6091fb350..6091fb350 100644
--- a/graphics/map_objects/pics/people/cameraman/3.png
+++ b/graphics/event_objects/pics/people/cameraman/3.png
diff --git a/graphics/map_objects/pics/people/cameraman/4.png b/graphics/event_objects/pics/people/cameraman/4.png
index ffacefa38..ffacefa38 100644
--- a/graphics/map_objects/pics/people/cameraman/4.png
+++ b/graphics/event_objects/pics/people/cameraman/4.png
diff --git a/graphics/map_objects/pics/people/cameraman/5.png b/graphics/event_objects/pics/people/cameraman/5.png
index 44c1a768c..44c1a768c 100644
--- a/graphics/map_objects/pics/people/cameraman/5.png
+++ b/graphics/event_objects/pics/people/cameraman/5.png
diff --git a/graphics/map_objects/pics/people/cameraman/6.png b/graphics/event_objects/pics/people/cameraman/6.png
index e8c41883d..e8c41883d 100644
--- a/graphics/map_objects/pics/people/cameraman/6.png
+++ b/graphics/event_objects/pics/people/cameraman/6.png
diff --git a/graphics/map_objects/pics/people/cameraman/7.png b/graphics/event_objects/pics/people/cameraman/7.png
index 2ccfeae84..2ccfeae84 100644
--- a/graphics/map_objects/pics/people/cameraman/7.png
+++ b/graphics/event_objects/pics/people/cameraman/7.png
diff --git a/graphics/map_objects/pics/people/cameraman/8.png b/graphics/event_objects/pics/people/cameraman/8.png
index e2af57df1..e2af57df1 100644
--- a/graphics/map_objects/pics/people/cameraman/8.png
+++ b/graphics/event_objects/pics/people/cameraman/8.png
diff --git a/graphics/map_objects/pics/people/camper/0.png b/graphics/event_objects/pics/people/camper/0.png
index ffdea18b6..ffdea18b6 100644
--- a/graphics/map_objects/pics/people/camper/0.png
+++ b/graphics/event_objects/pics/people/camper/0.png
diff --git a/graphics/map_objects/pics/people/camper/1.png b/graphics/event_objects/pics/people/camper/1.png
index ea5ef4d86..ea5ef4d86 100644
--- a/graphics/map_objects/pics/people/camper/1.png
+++ b/graphics/event_objects/pics/people/camper/1.png
diff --git a/graphics/map_objects/pics/people/camper/2.png b/graphics/event_objects/pics/people/camper/2.png
index c25c51a78..c25c51a78 100644
--- a/graphics/map_objects/pics/people/camper/2.png
+++ b/graphics/event_objects/pics/people/camper/2.png
diff --git a/graphics/map_objects/pics/people/camper/3.png b/graphics/event_objects/pics/people/camper/3.png
index 451f9c469..451f9c469 100644
--- a/graphics/map_objects/pics/people/camper/3.png
+++ b/graphics/event_objects/pics/people/camper/3.png
diff --git a/graphics/map_objects/pics/people/camper/4.png b/graphics/event_objects/pics/people/camper/4.png
index b17781df4..b17781df4 100644
--- a/graphics/map_objects/pics/people/camper/4.png
+++ b/graphics/event_objects/pics/people/camper/4.png
diff --git a/graphics/map_objects/pics/people/camper/5.png b/graphics/event_objects/pics/people/camper/5.png
index ea79ad5d2..ea79ad5d2 100644
--- a/graphics/map_objects/pics/people/camper/5.png
+++ b/graphics/event_objects/pics/people/camper/5.png
diff --git a/graphics/map_objects/pics/people/camper/6.png b/graphics/event_objects/pics/people/camper/6.png
index 7f003b53f..7f003b53f 100644
--- a/graphics/map_objects/pics/people/camper/6.png
+++ b/graphics/event_objects/pics/people/camper/6.png
diff --git a/graphics/map_objects/pics/people/camper/7.png b/graphics/event_objects/pics/people/camper/7.png
index 4dcb217b3..4dcb217b3 100644
--- a/graphics/map_objects/pics/people/camper/7.png
+++ b/graphics/event_objects/pics/people/camper/7.png
diff --git a/graphics/map_objects/pics/people/camper/8.png b/graphics/event_objects/pics/people/camper/8.png
index 888a0d17f..888a0d17f 100644
--- a/graphics/map_objects/pics/people/camper/8.png
+++ b/graphics/event_objects/pics/people/camper/8.png
diff --git a/graphics/map_objects/pics/people/contest_old_man/0.png b/graphics/event_objects/pics/people/contest_old_man/0.png
index 118a34463..118a34463 100644
--- a/graphics/map_objects/pics/people/contest_old_man/0.png
+++ b/graphics/event_objects/pics/people/contest_old_man/0.png
diff --git a/graphics/map_objects/pics/people/contest_old_man/1.png b/graphics/event_objects/pics/people/contest_old_man/1.png
index 75f9010dd..75f9010dd 100644
--- a/graphics/map_objects/pics/people/contest_old_man/1.png
+++ b/graphics/event_objects/pics/people/contest_old_man/1.png
diff --git a/graphics/map_objects/pics/people/contest_old_man/2.png b/graphics/event_objects/pics/people/contest_old_man/2.png
index 8ca543cef..8ca543cef 100644
--- a/graphics/map_objects/pics/people/contest_old_man/2.png
+++ b/graphics/event_objects/pics/people/contest_old_man/2.png
diff --git a/graphics/map_objects/pics/people/contest_old_man/3.png b/graphics/event_objects/pics/people/contest_old_man/3.png
index 16015e53c..16015e53c 100644
--- a/graphics/map_objects/pics/people/contest_old_man/3.png
+++ b/graphics/event_objects/pics/people/contest_old_man/3.png
diff --git a/graphics/map_objects/pics/people/contest_old_man/4.png b/graphics/event_objects/pics/people/contest_old_man/4.png
index e4fdfcc13..e4fdfcc13 100644
--- a/graphics/map_objects/pics/people/contest_old_man/4.png
+++ b/graphics/event_objects/pics/people/contest_old_man/4.png
diff --git a/graphics/map_objects/pics/people/contest_old_man/5.png b/graphics/event_objects/pics/people/contest_old_man/5.png
index 5de4a6b80..5de4a6b80 100644
--- a/graphics/map_objects/pics/people/contest_old_man/5.png
+++ b/graphics/event_objects/pics/people/contest_old_man/5.png
diff --git a/graphics/map_objects/pics/people/contest_old_man/6.png b/graphics/event_objects/pics/people/contest_old_man/6.png
index ebcb577d4..ebcb577d4 100644
--- a/graphics/map_objects/pics/people/contest_old_man/6.png
+++ b/graphics/event_objects/pics/people/contest_old_man/6.png
diff --git a/graphics/map_objects/pics/people/contest_old_man/7.png b/graphics/event_objects/pics/people/contest_old_man/7.png
index d01f156c1..d01f156c1 100644
--- a/graphics/map_objects/pics/people/contest_old_man/7.png
+++ b/graphics/event_objects/pics/people/contest_old_man/7.png
diff --git a/graphics/map_objects/pics/people/contest_old_man/8.png b/graphics/event_objects/pics/people/contest_old_man/8.png
index 84e5690b7..84e5690b7 100644
--- a/graphics/map_objects/pics/people/contest_old_man/8.png
+++ b/graphics/event_objects/pics/people/contest_old_man/8.png
diff --git a/graphics/map_objects/pics/people/cook/0.png b/graphics/event_objects/pics/people/cook/0.png
index 1413ce869..1413ce869 100644
--- a/graphics/map_objects/pics/people/cook/0.png
+++ b/graphics/event_objects/pics/people/cook/0.png
diff --git a/graphics/map_objects/pics/people/cook/1.png b/graphics/event_objects/pics/people/cook/1.png
index 622e2b2d2..622e2b2d2 100644
--- a/graphics/map_objects/pics/people/cook/1.png
+++ b/graphics/event_objects/pics/people/cook/1.png
diff --git a/graphics/map_objects/pics/people/cook/2.png b/graphics/event_objects/pics/people/cook/2.png
index b2c2231a2..b2c2231a2 100644
--- a/graphics/map_objects/pics/people/cook/2.png
+++ b/graphics/event_objects/pics/people/cook/2.png
diff --git a/graphics/map_objects/pics/people/cycling_triathlete_f/0.png b/graphics/event_objects/pics/people/cycling_triathlete_f/0.png
index 452ba3daf..452ba3daf 100644
--- a/graphics/map_objects/pics/people/cycling_triathlete_f/0.png
+++ b/graphics/event_objects/pics/people/cycling_triathlete_f/0.png
diff --git a/graphics/map_objects/pics/people/cycling_triathlete_f/1.png b/graphics/event_objects/pics/people/cycling_triathlete_f/1.png
index e4c8c78cb..e4c8c78cb 100644
--- a/graphics/map_objects/pics/people/cycling_triathlete_f/1.png
+++ b/graphics/event_objects/pics/people/cycling_triathlete_f/1.png
diff --git a/graphics/map_objects/pics/people/cycling_triathlete_f/2.png b/graphics/event_objects/pics/people/cycling_triathlete_f/2.png
index 20986da62..20986da62 100644
--- a/graphics/map_objects/pics/people/cycling_triathlete_f/2.png
+++ b/graphics/event_objects/pics/people/cycling_triathlete_f/2.png
diff --git a/graphics/map_objects/pics/people/cycling_triathlete_f/3.png b/graphics/event_objects/pics/people/cycling_triathlete_f/3.png
index 5cfda5ff6..5cfda5ff6 100644
--- a/graphics/map_objects/pics/people/cycling_triathlete_f/3.png
+++ b/graphics/event_objects/pics/people/cycling_triathlete_f/3.png
diff --git a/graphics/map_objects/pics/people/cycling_triathlete_f/4.png b/graphics/event_objects/pics/people/cycling_triathlete_f/4.png
index e52cac84e..e52cac84e 100644
--- a/graphics/map_objects/pics/people/cycling_triathlete_f/4.png
+++ b/graphics/event_objects/pics/people/cycling_triathlete_f/4.png
diff --git a/graphics/map_objects/pics/people/cycling_triathlete_f/5.png b/graphics/event_objects/pics/people/cycling_triathlete_f/5.png
index 8376cc00e..8376cc00e 100644
--- a/graphics/map_objects/pics/people/cycling_triathlete_f/5.png
+++ b/graphics/event_objects/pics/people/cycling_triathlete_f/5.png
diff --git a/graphics/map_objects/pics/people/cycling_triathlete_f/6.png b/graphics/event_objects/pics/people/cycling_triathlete_f/6.png
index d99951529..d99951529 100644
--- a/graphics/map_objects/pics/people/cycling_triathlete_f/6.png
+++ b/graphics/event_objects/pics/people/cycling_triathlete_f/6.png
diff --git a/graphics/map_objects/pics/people/cycling_triathlete_f/7.png b/graphics/event_objects/pics/people/cycling_triathlete_f/7.png
index a1c953c83..a1c953c83 100644
--- a/graphics/map_objects/pics/people/cycling_triathlete_f/7.png
+++ b/graphics/event_objects/pics/people/cycling_triathlete_f/7.png
diff --git a/graphics/map_objects/pics/people/cycling_triathlete_f/8.png b/graphics/event_objects/pics/people/cycling_triathlete_f/8.png
index 63a6ebb0c..63a6ebb0c 100644
--- a/graphics/map_objects/pics/people/cycling_triathlete_f/8.png
+++ b/graphics/event_objects/pics/people/cycling_triathlete_f/8.png
diff --git a/graphics/map_objects/pics/people/cycling_triathlete_m/0.png b/graphics/event_objects/pics/people/cycling_triathlete_m/0.png
index 107589cbc..107589cbc 100644
--- a/graphics/map_objects/pics/people/cycling_triathlete_m/0.png
+++ b/graphics/event_objects/pics/people/cycling_triathlete_m/0.png
diff --git a/graphics/map_objects/pics/people/cycling_triathlete_m/1.png b/graphics/event_objects/pics/people/cycling_triathlete_m/1.png
index 39cf99a21..39cf99a21 100644
--- a/graphics/map_objects/pics/people/cycling_triathlete_m/1.png
+++ b/graphics/event_objects/pics/people/cycling_triathlete_m/1.png
diff --git a/graphics/map_objects/pics/people/cycling_triathlete_m/2.png b/graphics/event_objects/pics/people/cycling_triathlete_m/2.png
index f5ab76d10..f5ab76d10 100644
--- a/graphics/map_objects/pics/people/cycling_triathlete_m/2.png
+++ b/graphics/event_objects/pics/people/cycling_triathlete_m/2.png
diff --git a/graphics/map_objects/pics/people/cycling_triathlete_m/3.png b/graphics/event_objects/pics/people/cycling_triathlete_m/3.png
index d54d3fcdb..d54d3fcdb 100644
--- a/graphics/map_objects/pics/people/cycling_triathlete_m/3.png
+++ b/graphics/event_objects/pics/people/cycling_triathlete_m/3.png
diff --git a/graphics/map_objects/pics/people/cycling_triathlete_m/4.png b/graphics/event_objects/pics/people/cycling_triathlete_m/4.png
index b065a1294..b065a1294 100644
--- a/graphics/map_objects/pics/people/cycling_triathlete_m/4.png
+++ b/graphics/event_objects/pics/people/cycling_triathlete_m/4.png
diff --git a/graphics/map_objects/pics/people/cycling_triathlete_m/5.png b/graphics/event_objects/pics/people/cycling_triathlete_m/5.png
index bbb47a869..bbb47a869 100644
--- a/graphics/map_objects/pics/people/cycling_triathlete_m/5.png
+++ b/graphics/event_objects/pics/people/cycling_triathlete_m/5.png
diff --git a/graphics/map_objects/pics/people/cycling_triathlete_m/6.png b/graphics/event_objects/pics/people/cycling_triathlete_m/6.png
index 7f126858f..7f126858f 100644
--- a/graphics/map_objects/pics/people/cycling_triathlete_m/6.png
+++ b/graphics/event_objects/pics/people/cycling_triathlete_m/6.png
diff --git a/graphics/map_objects/pics/people/cycling_triathlete_m/7.png b/graphics/event_objects/pics/people/cycling_triathlete_m/7.png
index 43f2e2739..43f2e2739 100644
--- a/graphics/map_objects/pics/people/cycling_triathlete_m/7.png
+++ b/graphics/event_objects/pics/people/cycling_triathlete_m/7.png
diff --git a/graphics/map_objects/pics/people/cycling_triathlete_m/8.png b/graphics/event_objects/pics/people/cycling_triathlete_m/8.png
index 1168c440b..1168c440b 100644
--- a/graphics/map_objects/pics/people/cycling_triathlete_m/8.png
+++ b/graphics/event_objects/pics/people/cycling_triathlete_m/8.png
diff --git a/graphics/map_objects/pics/people/drake/0.png b/graphics/event_objects/pics/people/drake/0.png
index 8c12cbe40..8c12cbe40 100644
--- a/graphics/map_objects/pics/people/drake/0.png
+++ b/graphics/event_objects/pics/people/drake/0.png
diff --git a/graphics/map_objects/pics/people/drake/1.png b/graphics/event_objects/pics/people/drake/1.png
index b401c3b14..b401c3b14 100644
--- a/graphics/map_objects/pics/people/drake/1.png
+++ b/graphics/event_objects/pics/people/drake/1.png
diff --git a/graphics/map_objects/pics/people/drake/2.png b/graphics/event_objects/pics/people/drake/2.png
index c116a283e..c116a283e 100644
--- a/graphics/map_objects/pics/people/drake/2.png
+++ b/graphics/event_objects/pics/people/drake/2.png
diff --git a/graphics/map_objects/pics/people/fat_man/0.png b/graphics/event_objects/pics/people/fat_man/0.png
index 290a7f9ed..290a7f9ed 100644
--- a/graphics/map_objects/pics/people/fat_man/0.png
+++ b/graphics/event_objects/pics/people/fat_man/0.png
diff --git a/graphics/map_objects/pics/people/fat_man/1.png b/graphics/event_objects/pics/people/fat_man/1.png
index d5d81dcdb..d5d81dcdb 100644
--- a/graphics/map_objects/pics/people/fat_man/1.png
+++ b/graphics/event_objects/pics/people/fat_man/1.png
diff --git a/graphics/map_objects/pics/people/fat_man/2.png b/graphics/event_objects/pics/people/fat_man/2.png
index 5b99f60da..5b99f60da 100644
--- a/graphics/map_objects/pics/people/fat_man/2.png
+++ b/graphics/event_objects/pics/people/fat_man/2.png
diff --git a/graphics/map_objects/pics/people/fat_man/3.png b/graphics/event_objects/pics/people/fat_man/3.png
index 2c6b5f0d1..2c6b5f0d1 100644
--- a/graphics/map_objects/pics/people/fat_man/3.png
+++ b/graphics/event_objects/pics/people/fat_man/3.png
diff --git a/graphics/map_objects/pics/people/fat_man/4.png b/graphics/event_objects/pics/people/fat_man/4.png
index 846d52b99..846d52b99 100644
--- a/graphics/map_objects/pics/people/fat_man/4.png
+++ b/graphics/event_objects/pics/people/fat_man/4.png
diff --git a/graphics/map_objects/pics/people/fat_man/5.png b/graphics/event_objects/pics/people/fat_man/5.png
index ee751217f..ee751217f 100644
--- a/graphics/map_objects/pics/people/fat_man/5.png
+++ b/graphics/event_objects/pics/people/fat_man/5.png
diff --git a/graphics/map_objects/pics/people/fat_man/6.png b/graphics/event_objects/pics/people/fat_man/6.png
index 8eb76d809..8eb76d809 100644
--- a/graphics/map_objects/pics/people/fat_man/6.png
+++ b/graphics/event_objects/pics/people/fat_man/6.png
diff --git a/graphics/map_objects/pics/people/fat_man/7.png b/graphics/event_objects/pics/people/fat_man/7.png
index 5694df27b..5694df27b 100644
--- a/graphics/map_objects/pics/people/fat_man/7.png
+++ b/graphics/event_objects/pics/people/fat_man/7.png
diff --git a/graphics/map_objects/pics/people/fat_man/8.png b/graphics/event_objects/pics/people/fat_man/8.png
index f3528f332..f3528f332 100644
--- a/graphics/map_objects/pics/people/fat_man/8.png
+++ b/graphics/event_objects/pics/people/fat_man/8.png
diff --git a/graphics/map_objects/pics/people/fisherman/0.png b/graphics/event_objects/pics/people/fisherman/0.png
index 5e963f889..5e963f889 100644
--- a/graphics/map_objects/pics/people/fisherman/0.png
+++ b/graphics/event_objects/pics/people/fisherman/0.png
diff --git a/graphics/map_objects/pics/people/fisherman/1.png b/graphics/event_objects/pics/people/fisherman/1.png
index 5bd83e7e1..5bd83e7e1 100644
--- a/graphics/map_objects/pics/people/fisherman/1.png
+++ b/graphics/event_objects/pics/people/fisherman/1.png
diff --git a/graphics/map_objects/pics/people/fisherman/2.png b/graphics/event_objects/pics/people/fisherman/2.png
index f587de8d9..f587de8d9 100644
--- a/graphics/map_objects/pics/people/fisherman/2.png
+++ b/graphics/event_objects/pics/people/fisherman/2.png
diff --git a/graphics/map_objects/pics/people/fisherman/3.png b/graphics/event_objects/pics/people/fisherman/3.png
index 5d79a1da8..5d79a1da8 100644
--- a/graphics/map_objects/pics/people/fisherman/3.png
+++ b/graphics/event_objects/pics/people/fisherman/3.png
diff --git a/graphics/map_objects/pics/people/fisherman/4.png b/graphics/event_objects/pics/people/fisherman/4.png
index dd3104436..dd3104436 100644
--- a/graphics/map_objects/pics/people/fisherman/4.png
+++ b/graphics/event_objects/pics/people/fisherman/4.png
diff --git a/graphics/map_objects/pics/people/fisherman/5.png b/graphics/event_objects/pics/people/fisherman/5.png
index 515f9c638..515f9c638 100644
--- a/graphics/map_objects/pics/people/fisherman/5.png
+++ b/graphics/event_objects/pics/people/fisherman/5.png
diff --git a/graphics/map_objects/pics/people/fisherman/6.png b/graphics/event_objects/pics/people/fisherman/6.png
index 83ea1ff57..83ea1ff57 100644
--- a/graphics/map_objects/pics/people/fisherman/6.png
+++ b/graphics/event_objects/pics/people/fisherman/6.png
diff --git a/graphics/map_objects/pics/people/fisherman/7.png b/graphics/event_objects/pics/people/fisherman/7.png
index 6f886b92e..6f886b92e 100644
--- a/graphics/map_objects/pics/people/fisherman/7.png
+++ b/graphics/event_objects/pics/people/fisherman/7.png
diff --git a/graphics/map_objects/pics/people/fisherman/8.png b/graphics/event_objects/pics/people/fisherman/8.png
index 26826b5e2..26826b5e2 100644
--- a/graphics/map_objects/pics/people/fisherman/8.png
+++ b/graphics/event_objects/pics/people/fisherman/8.png
diff --git a/graphics/map_objects/pics/people/flannery/0.png b/graphics/event_objects/pics/people/flannery/0.png
index 5dc2e2afe..5dc2e2afe 100644
--- a/graphics/map_objects/pics/people/flannery/0.png
+++ b/graphics/event_objects/pics/people/flannery/0.png
diff --git a/graphics/map_objects/pics/people/flannery/1.png b/graphics/event_objects/pics/people/flannery/1.png
index 83f1d9c9c..83f1d9c9c 100644
--- a/graphics/map_objects/pics/people/flannery/1.png
+++ b/graphics/event_objects/pics/people/flannery/1.png
diff --git a/graphics/map_objects/pics/people/flannery/2.png b/graphics/event_objects/pics/people/flannery/2.png
index 8c96c873e..8c96c873e 100644
--- a/graphics/map_objects/pics/people/flannery/2.png
+++ b/graphics/event_objects/pics/people/flannery/2.png
diff --git a/graphics/map_objects/pics/people/gentleman/0.png b/graphics/event_objects/pics/people/gentleman/0.png
index 9c46f8aaf..9c46f8aaf 100644
--- a/graphics/map_objects/pics/people/gentleman/0.png
+++ b/graphics/event_objects/pics/people/gentleman/0.png
diff --git a/graphics/map_objects/pics/people/gentleman/1.png b/graphics/event_objects/pics/people/gentleman/1.png
index 03eaf5570..03eaf5570 100644
--- a/graphics/map_objects/pics/people/gentleman/1.png
+++ b/graphics/event_objects/pics/people/gentleman/1.png
diff --git a/graphics/map_objects/pics/people/gentleman/2.png b/graphics/event_objects/pics/people/gentleman/2.png
index 3956a93d6..3956a93d6 100644
--- a/graphics/map_objects/pics/people/gentleman/2.png
+++ b/graphics/event_objects/pics/people/gentleman/2.png
diff --git a/graphics/map_objects/pics/people/gentleman/3.png b/graphics/event_objects/pics/people/gentleman/3.png
index a023cf3e4..a023cf3e4 100644
--- a/graphics/map_objects/pics/people/gentleman/3.png
+++ b/graphics/event_objects/pics/people/gentleman/3.png
diff --git a/graphics/map_objects/pics/people/gentleman/4.png b/graphics/event_objects/pics/people/gentleman/4.png
index 18e9bc6c3..18e9bc6c3 100644
--- a/graphics/map_objects/pics/people/gentleman/4.png
+++ b/graphics/event_objects/pics/people/gentleman/4.png
diff --git a/graphics/map_objects/pics/people/gentleman/5.png b/graphics/event_objects/pics/people/gentleman/5.png
index d9203cc9f..d9203cc9f 100644
--- a/graphics/map_objects/pics/people/gentleman/5.png
+++ b/graphics/event_objects/pics/people/gentleman/5.png
diff --git a/graphics/map_objects/pics/people/gentleman/6.png b/graphics/event_objects/pics/people/gentleman/6.png
index 963b88d61..963b88d61 100644
--- a/graphics/map_objects/pics/people/gentleman/6.png
+++ b/graphics/event_objects/pics/people/gentleman/6.png
diff --git a/graphics/map_objects/pics/people/gentleman/7.png b/graphics/event_objects/pics/people/gentleman/7.png
index 904e79189..904e79189 100644
--- a/graphics/map_objects/pics/people/gentleman/7.png
+++ b/graphics/event_objects/pics/people/gentleman/7.png
diff --git a/graphics/map_objects/pics/people/gentleman/8.png b/graphics/event_objects/pics/people/gentleman/8.png
index 85163c9ca..85163c9ca 100644
--- a/graphics/map_objects/pics/people/gentleman/8.png
+++ b/graphics/event_objects/pics/people/gentleman/8.png
diff --git a/graphics/map_objects/pics/people/girl_1/0.png b/graphics/event_objects/pics/people/girl_1/0.png
index 4b812ef41..4b812ef41 100644
--- a/graphics/map_objects/pics/people/girl_1/0.png
+++ b/graphics/event_objects/pics/people/girl_1/0.png
diff --git a/graphics/map_objects/pics/people/girl_1/1.png b/graphics/event_objects/pics/people/girl_1/1.png
index 3ec86b337..3ec86b337 100644
--- a/graphics/map_objects/pics/people/girl_1/1.png
+++ b/graphics/event_objects/pics/people/girl_1/1.png
diff --git a/graphics/map_objects/pics/people/girl_1/2.png b/graphics/event_objects/pics/people/girl_1/2.png
index 4bea7b7ca..4bea7b7ca 100644
--- a/graphics/map_objects/pics/people/girl_1/2.png
+++ b/graphics/event_objects/pics/people/girl_1/2.png
diff --git a/graphics/map_objects/pics/people/girl_1/3.png b/graphics/event_objects/pics/people/girl_1/3.png
index 06425c9eb..06425c9eb 100644
--- a/graphics/map_objects/pics/people/girl_1/3.png
+++ b/graphics/event_objects/pics/people/girl_1/3.png
diff --git a/graphics/map_objects/pics/people/girl_1/4.png b/graphics/event_objects/pics/people/girl_1/4.png
index fb940eadb..fb940eadb 100644
--- a/graphics/map_objects/pics/people/girl_1/4.png
+++ b/graphics/event_objects/pics/people/girl_1/4.png
diff --git a/graphics/map_objects/pics/people/girl_1/5.png b/graphics/event_objects/pics/people/girl_1/5.png
index 1bf4c2dc8..1bf4c2dc8 100644
--- a/graphics/map_objects/pics/people/girl_1/5.png
+++ b/graphics/event_objects/pics/people/girl_1/5.png
diff --git a/graphics/map_objects/pics/people/girl_1/6.png b/graphics/event_objects/pics/people/girl_1/6.png
index 256567cbf..256567cbf 100644
--- a/graphics/map_objects/pics/people/girl_1/6.png
+++ b/graphics/event_objects/pics/people/girl_1/6.png
diff --git a/graphics/map_objects/pics/people/girl_1/7.png b/graphics/event_objects/pics/people/girl_1/7.png
index 13bfe2af3..13bfe2af3 100644
--- a/graphics/map_objects/pics/people/girl_1/7.png
+++ b/graphics/event_objects/pics/people/girl_1/7.png
diff --git a/graphics/map_objects/pics/people/girl_1/8.png b/graphics/event_objects/pics/people/girl_1/8.png
index 5675d705d..5675d705d 100644
--- a/graphics/map_objects/pics/people/girl_1/8.png
+++ b/graphics/event_objects/pics/people/girl_1/8.png
diff --git a/graphics/map_objects/pics/people/girl_2/0.png b/graphics/event_objects/pics/people/girl_2/0.png
index 5f336f20f..5f336f20f 100644
--- a/graphics/map_objects/pics/people/girl_2/0.png
+++ b/graphics/event_objects/pics/people/girl_2/0.png
diff --git a/graphics/map_objects/pics/people/girl_2/1.png b/graphics/event_objects/pics/people/girl_2/1.png
index 3009e228c..3009e228c 100644
--- a/graphics/map_objects/pics/people/girl_2/1.png
+++ b/graphics/event_objects/pics/people/girl_2/1.png
diff --git a/graphics/map_objects/pics/people/girl_2/2.png b/graphics/event_objects/pics/people/girl_2/2.png
index 3f1c04b4b..3f1c04b4b 100644
--- a/graphics/map_objects/pics/people/girl_2/2.png
+++ b/graphics/event_objects/pics/people/girl_2/2.png
diff --git a/graphics/map_objects/pics/people/girl_2/3.png b/graphics/event_objects/pics/people/girl_2/3.png
index 4713b70dd..4713b70dd 100644
--- a/graphics/map_objects/pics/people/girl_2/3.png
+++ b/graphics/event_objects/pics/people/girl_2/3.png
diff --git a/graphics/map_objects/pics/people/girl_2/4.png b/graphics/event_objects/pics/people/girl_2/4.png
index 3a12aa48e..3a12aa48e 100644
--- a/graphics/map_objects/pics/people/girl_2/4.png
+++ b/graphics/event_objects/pics/people/girl_2/4.png
diff --git a/graphics/map_objects/pics/people/girl_2/5.png b/graphics/event_objects/pics/people/girl_2/5.png
index 885ee2de9..885ee2de9 100644
--- a/graphics/map_objects/pics/people/girl_2/5.png
+++ b/graphics/event_objects/pics/people/girl_2/5.png
diff --git a/graphics/map_objects/pics/people/girl_2/6.png b/graphics/event_objects/pics/people/girl_2/6.png
index 5ce644500..5ce644500 100644
--- a/graphics/map_objects/pics/people/girl_2/6.png
+++ b/graphics/event_objects/pics/people/girl_2/6.png
diff --git a/graphics/map_objects/pics/people/girl_2/7.png b/graphics/event_objects/pics/people/girl_2/7.png
index 28e8ed5a8..28e8ed5a8 100644
--- a/graphics/map_objects/pics/people/girl_2/7.png
+++ b/graphics/event_objects/pics/people/girl_2/7.png
diff --git a/graphics/map_objects/pics/people/girl_2/8.png b/graphics/event_objects/pics/people/girl_2/8.png
index e9b5e587e..e9b5e587e 100644
--- a/graphics/map_objects/pics/people/girl_2/8.png
+++ b/graphics/event_objects/pics/people/girl_2/8.png
diff --git a/graphics/map_objects/pics/people/girl_3/0.png b/graphics/event_objects/pics/people/girl_3/0.png
index 5927a264a..5927a264a 100644
--- a/graphics/map_objects/pics/people/girl_3/0.png
+++ b/graphics/event_objects/pics/people/girl_3/0.png
diff --git a/graphics/map_objects/pics/people/girl_3/1.png b/graphics/event_objects/pics/people/girl_3/1.png
index 6f3f32180..6f3f32180 100644
--- a/graphics/map_objects/pics/people/girl_3/1.png
+++ b/graphics/event_objects/pics/people/girl_3/1.png
diff --git a/graphics/map_objects/pics/people/girl_3/2.png b/graphics/event_objects/pics/people/girl_3/2.png
index 1a01b0031..1a01b0031 100644
--- a/graphics/map_objects/pics/people/girl_3/2.png
+++ b/graphics/event_objects/pics/people/girl_3/2.png
diff --git a/graphics/map_objects/pics/people/girl_3/3.png b/graphics/event_objects/pics/people/girl_3/3.png
index 2fb3db97b..2fb3db97b 100644
--- a/graphics/map_objects/pics/people/girl_3/3.png
+++ b/graphics/event_objects/pics/people/girl_3/3.png
diff --git a/graphics/map_objects/pics/people/girl_3/4.png b/graphics/event_objects/pics/people/girl_3/4.png
index 03287ab27..03287ab27 100644
--- a/graphics/map_objects/pics/people/girl_3/4.png
+++ b/graphics/event_objects/pics/people/girl_3/4.png
diff --git a/graphics/map_objects/pics/people/girl_3/5.png b/graphics/event_objects/pics/people/girl_3/5.png
index c30ead499..c30ead499 100644
--- a/graphics/map_objects/pics/people/girl_3/5.png
+++ b/graphics/event_objects/pics/people/girl_3/5.png
diff --git a/graphics/map_objects/pics/people/girl_3/6.png b/graphics/event_objects/pics/people/girl_3/6.png
index 10eb415ad..10eb415ad 100644
--- a/graphics/map_objects/pics/people/girl_3/6.png
+++ b/graphics/event_objects/pics/people/girl_3/6.png
diff --git a/graphics/map_objects/pics/people/girl_3/7.png b/graphics/event_objects/pics/people/girl_3/7.png
index 28fa0238b..28fa0238b 100644
--- a/graphics/map_objects/pics/people/girl_3/7.png
+++ b/graphics/event_objects/pics/people/girl_3/7.png
diff --git a/graphics/map_objects/pics/people/girl_3/8.png b/graphics/event_objects/pics/people/girl_3/8.png
index 8dc1a2fbc..8dc1a2fbc 100644
--- a/graphics/map_objects/pics/people/girl_3/8.png
+++ b/graphics/event_objects/pics/people/girl_3/8.png
diff --git a/graphics/map_objects/pics/people/glacia/0.png b/graphics/event_objects/pics/people/glacia/0.png
index 4ee3c3b3e..4ee3c3b3e 100644
--- a/graphics/map_objects/pics/people/glacia/0.png
+++ b/graphics/event_objects/pics/people/glacia/0.png
diff --git a/graphics/map_objects/pics/people/glacia/1.png b/graphics/event_objects/pics/people/glacia/1.png
index 866937df3..866937df3 100644
--- a/graphics/map_objects/pics/people/glacia/1.png
+++ b/graphics/event_objects/pics/people/glacia/1.png
diff --git a/graphics/map_objects/pics/people/glacia/2.png b/graphics/event_objects/pics/people/glacia/2.png
index 5d66ef03e..5d66ef03e 100644
--- a/graphics/map_objects/pics/people/glacia/2.png
+++ b/graphics/event_objects/pics/people/glacia/2.png
diff --git a/graphics/map_objects/pics/people/greta/0.png b/graphics/event_objects/pics/people/greta/0.png
index 033bb28e9..033bb28e9 100644
--- a/graphics/map_objects/pics/people/greta/0.png
+++ b/graphics/event_objects/pics/people/greta/0.png
diff --git a/graphics/map_objects/pics/people/greta/1.png b/graphics/event_objects/pics/people/greta/1.png
index 7035c50f3..7035c50f3 100644
--- a/graphics/map_objects/pics/people/greta/1.png
+++ b/graphics/event_objects/pics/people/greta/1.png
diff --git a/graphics/map_objects/pics/people/greta/2.png b/graphics/event_objects/pics/people/greta/2.png
index a40dda6ac..a40dda6ac 100644
--- a/graphics/map_objects/pics/people/greta/2.png
+++ b/graphics/event_objects/pics/people/greta/2.png
diff --git a/graphics/map_objects/pics/people/greta/3.png b/graphics/event_objects/pics/people/greta/3.png
index d7f33bd63..d7f33bd63 100644
--- a/graphics/map_objects/pics/people/greta/3.png
+++ b/graphics/event_objects/pics/people/greta/3.png
diff --git a/graphics/map_objects/pics/people/greta/4.png b/graphics/event_objects/pics/people/greta/4.png
index 2e1331a28..2e1331a28 100644
--- a/graphics/map_objects/pics/people/greta/4.png
+++ b/graphics/event_objects/pics/people/greta/4.png
diff --git a/graphics/map_objects/pics/people/greta/5.png b/graphics/event_objects/pics/people/greta/5.png
index 3596eea6d..3596eea6d 100644
--- a/graphics/map_objects/pics/people/greta/5.png
+++ b/graphics/event_objects/pics/people/greta/5.png
diff --git a/graphics/map_objects/pics/people/greta/6.png b/graphics/event_objects/pics/people/greta/6.png
index 71bbf717b..71bbf717b 100644
--- a/graphics/map_objects/pics/people/greta/6.png
+++ b/graphics/event_objects/pics/people/greta/6.png
diff --git a/graphics/map_objects/pics/people/greta/7.png b/graphics/event_objects/pics/people/greta/7.png
index 5e08c3774..5e08c3774 100644
--- a/graphics/map_objects/pics/people/greta/7.png
+++ b/graphics/event_objects/pics/people/greta/7.png
diff --git a/graphics/map_objects/pics/people/greta/8.png b/graphics/event_objects/pics/people/greta/8.png
index bc9cefcad..bc9cefcad 100644
--- a/graphics/map_objects/pics/people/greta/8.png
+++ b/graphics/event_objects/pics/people/greta/8.png
diff --git a/graphics/map_objects/pics/people/hex_maniac/0.png b/graphics/event_objects/pics/people/hex_maniac/0.png
index da93178a0..da93178a0 100644
--- a/graphics/map_objects/pics/people/hex_maniac/0.png
+++ b/graphics/event_objects/pics/people/hex_maniac/0.png
diff --git a/graphics/map_objects/pics/people/hex_maniac/1.png b/graphics/event_objects/pics/people/hex_maniac/1.png
index 7925ac221..7925ac221 100644
--- a/graphics/map_objects/pics/people/hex_maniac/1.png
+++ b/graphics/event_objects/pics/people/hex_maniac/1.png
diff --git a/graphics/map_objects/pics/people/hex_maniac/2.png b/graphics/event_objects/pics/people/hex_maniac/2.png
index 24598f0b0..24598f0b0 100644
--- a/graphics/map_objects/pics/people/hex_maniac/2.png
+++ b/graphics/event_objects/pics/people/hex_maniac/2.png
diff --git a/graphics/map_objects/pics/people/hex_maniac/3.png b/graphics/event_objects/pics/people/hex_maniac/3.png
index c3544aac1..c3544aac1 100644
--- a/graphics/map_objects/pics/people/hex_maniac/3.png
+++ b/graphics/event_objects/pics/people/hex_maniac/3.png
diff --git a/graphics/map_objects/pics/people/hex_maniac/4.png b/graphics/event_objects/pics/people/hex_maniac/4.png
index f07338c7a..f07338c7a 100644
--- a/graphics/map_objects/pics/people/hex_maniac/4.png
+++ b/graphics/event_objects/pics/people/hex_maniac/4.png
diff --git a/graphics/map_objects/pics/people/hex_maniac/5.png b/graphics/event_objects/pics/people/hex_maniac/5.png
index 925d6ccf9..925d6ccf9 100644
--- a/graphics/map_objects/pics/people/hex_maniac/5.png
+++ b/graphics/event_objects/pics/people/hex_maniac/5.png
diff --git a/graphics/map_objects/pics/people/hex_maniac/6.png b/graphics/event_objects/pics/people/hex_maniac/6.png
index a41a7a72b..a41a7a72b 100644
--- a/graphics/map_objects/pics/people/hex_maniac/6.png
+++ b/graphics/event_objects/pics/people/hex_maniac/6.png
diff --git a/graphics/map_objects/pics/people/hex_maniac/7.png b/graphics/event_objects/pics/people/hex_maniac/7.png
index 06bfa10d0..06bfa10d0 100644
--- a/graphics/map_objects/pics/people/hex_maniac/7.png
+++ b/graphics/event_objects/pics/people/hex_maniac/7.png
diff --git a/graphics/map_objects/pics/people/hex_maniac/8.png b/graphics/event_objects/pics/people/hex_maniac/8.png
index 1c3a57faf..1c3a57faf 100644
--- a/graphics/map_objects/pics/people/hex_maniac/8.png
+++ b/graphics/event_objects/pics/people/hex_maniac/8.png
diff --git a/graphics/map_objects/pics/people/hiker/0.png b/graphics/event_objects/pics/people/hiker/0.png
index 715cdc4f9..715cdc4f9 100644
--- a/graphics/map_objects/pics/people/hiker/0.png
+++ b/graphics/event_objects/pics/people/hiker/0.png
diff --git a/graphics/map_objects/pics/people/hiker/1.png b/graphics/event_objects/pics/people/hiker/1.png
index 7af8fb736..7af8fb736 100644
--- a/graphics/map_objects/pics/people/hiker/1.png
+++ b/graphics/event_objects/pics/people/hiker/1.png
diff --git a/graphics/map_objects/pics/people/hiker/2.png b/graphics/event_objects/pics/people/hiker/2.png
index 2b74ec3db..2b74ec3db 100644
--- a/graphics/map_objects/pics/people/hiker/2.png
+++ b/graphics/event_objects/pics/people/hiker/2.png
diff --git a/graphics/map_objects/pics/people/hiker/3.png b/graphics/event_objects/pics/people/hiker/3.png
index a7e0d91d5..a7e0d91d5 100644
--- a/graphics/map_objects/pics/people/hiker/3.png
+++ b/graphics/event_objects/pics/people/hiker/3.png
diff --git a/graphics/map_objects/pics/people/hiker/4.png b/graphics/event_objects/pics/people/hiker/4.png
index d0bb9fa9d..d0bb9fa9d 100644
--- a/graphics/map_objects/pics/people/hiker/4.png
+++ b/graphics/event_objects/pics/people/hiker/4.png
diff --git a/graphics/map_objects/pics/people/hiker/5.png b/graphics/event_objects/pics/people/hiker/5.png
index b405de51b..b405de51b 100644
--- a/graphics/map_objects/pics/people/hiker/5.png
+++ b/graphics/event_objects/pics/people/hiker/5.png
diff --git a/graphics/map_objects/pics/people/hiker/6.png b/graphics/event_objects/pics/people/hiker/6.png
index 7271f7d4d..7271f7d4d 100644
--- a/graphics/map_objects/pics/people/hiker/6.png
+++ b/graphics/event_objects/pics/people/hiker/6.png
diff --git a/graphics/map_objects/pics/people/hiker/7.png b/graphics/event_objects/pics/people/hiker/7.png
index 36db0a370..36db0a370 100644
--- a/graphics/map_objects/pics/people/hiker/7.png
+++ b/graphics/event_objects/pics/people/hiker/7.png
diff --git a/graphics/map_objects/pics/people/hiker/8.png b/graphics/event_objects/pics/people/hiker/8.png
index dbcfd8c41..dbcfd8c41 100644
--- a/graphics/map_objects/pics/people/hiker/8.png
+++ b/graphics/event_objects/pics/people/hiker/8.png
diff --git a/graphics/map_objects/pics/people/hot_springs_old_woman/0.png b/graphics/event_objects/pics/people/hot_springs_old_woman/0.png
index abb6cca16..abb6cca16 100644
--- a/graphics/map_objects/pics/people/hot_springs_old_woman/0.png
+++ b/graphics/event_objects/pics/people/hot_springs_old_woman/0.png
diff --git a/graphics/map_objects/pics/people/hot_springs_old_woman/1.png b/graphics/event_objects/pics/people/hot_springs_old_woman/1.png
index e45ab1ac4..e45ab1ac4 100644
--- a/graphics/map_objects/pics/people/hot_springs_old_woman/1.png
+++ b/graphics/event_objects/pics/people/hot_springs_old_woman/1.png
diff --git a/graphics/map_objects/pics/people/hot_springs_old_woman/2.png b/graphics/event_objects/pics/people/hot_springs_old_woman/2.png
index f5b9364b1..f5b9364b1 100644
--- a/graphics/map_objects/pics/people/hot_springs_old_woman/2.png
+++ b/graphics/event_objects/pics/people/hot_springs_old_woman/2.png
diff --git a/graphics/map_objects/pics/people/hot_springs_old_woman/3.png b/graphics/event_objects/pics/people/hot_springs_old_woman/3.png
index 8bd8dc9fb..8bd8dc9fb 100644
--- a/graphics/map_objects/pics/people/hot_springs_old_woman/3.png
+++ b/graphics/event_objects/pics/people/hot_springs_old_woman/3.png
diff --git a/graphics/map_objects/pics/people/hot_springs_old_woman/4.png b/graphics/event_objects/pics/people/hot_springs_old_woman/4.png
index 8bd8dc9fb..8bd8dc9fb 100644
--- a/graphics/map_objects/pics/people/hot_springs_old_woman/4.png
+++ b/graphics/event_objects/pics/people/hot_springs_old_woman/4.png
diff --git a/graphics/map_objects/pics/people/hot_springs_old_woman/5.png b/graphics/event_objects/pics/people/hot_springs_old_woman/5.png
index ee043baeb..ee043baeb 100644
--- a/graphics/map_objects/pics/people/hot_springs_old_woman/5.png
+++ b/graphics/event_objects/pics/people/hot_springs_old_woman/5.png
diff --git a/graphics/map_objects/pics/people/hot_springs_old_woman/6.png b/graphics/event_objects/pics/people/hot_springs_old_woman/6.png
index ee043baeb..ee043baeb 100644
--- a/graphics/map_objects/pics/people/hot_springs_old_woman/6.png
+++ b/graphics/event_objects/pics/people/hot_springs_old_woman/6.png
diff --git a/graphics/map_objects/pics/people/hot_springs_old_woman/7.png b/graphics/event_objects/pics/people/hot_springs_old_woman/7.png
index f1498d71f..f1498d71f 100644
--- a/graphics/map_objects/pics/people/hot_springs_old_woman/7.png
+++ b/graphics/event_objects/pics/people/hot_springs_old_woman/7.png
diff --git a/graphics/map_objects/pics/people/hot_springs_old_woman/8.png b/graphics/event_objects/pics/people/hot_springs_old_woman/8.png
index f1498d71f..f1498d71f 100644
--- a/graphics/map_objects/pics/people/hot_springs_old_woman/8.png
+++ b/graphics/event_objects/pics/people/hot_springs_old_woman/8.png
diff --git a/graphics/map_objects/pics/people/juan/0.png b/graphics/event_objects/pics/people/juan/0.png
index e9528a067..e9528a067 100644
--- a/graphics/map_objects/pics/people/juan/0.png
+++ b/graphics/event_objects/pics/people/juan/0.png
diff --git a/graphics/map_objects/pics/people/juan/1.png b/graphics/event_objects/pics/people/juan/1.png
index 0d4248554..0d4248554 100644
--- a/graphics/map_objects/pics/people/juan/1.png
+++ b/graphics/event_objects/pics/people/juan/1.png
diff --git a/graphics/map_objects/pics/people/juan/2.png b/graphics/event_objects/pics/people/juan/2.png
index c86967d23..c86967d23 100644
--- a/graphics/map_objects/pics/people/juan/2.png
+++ b/graphics/event_objects/pics/people/juan/2.png
diff --git a/graphics/map_objects/pics/people/juan/3.png b/graphics/event_objects/pics/people/juan/3.png
index 5d593a7ee..5d593a7ee 100644
--- a/graphics/map_objects/pics/people/juan/3.png
+++ b/graphics/event_objects/pics/people/juan/3.png
diff --git a/graphics/map_objects/pics/people/juan/4.png b/graphics/event_objects/pics/people/juan/4.png
index 4abb8aeec..4abb8aeec 100644
--- a/graphics/map_objects/pics/people/juan/4.png
+++ b/graphics/event_objects/pics/people/juan/4.png
diff --git a/graphics/map_objects/pics/people/juan/5.png b/graphics/event_objects/pics/people/juan/5.png
index b3f28869b..b3f28869b 100644
--- a/graphics/map_objects/pics/people/juan/5.png
+++ b/graphics/event_objects/pics/people/juan/5.png
diff --git a/graphics/map_objects/pics/people/juan/6.png b/graphics/event_objects/pics/people/juan/6.png
index c46584d34..c46584d34 100644
--- a/graphics/map_objects/pics/people/juan/6.png
+++ b/graphics/event_objects/pics/people/juan/6.png
diff --git a/graphics/map_objects/pics/people/juan/7.png b/graphics/event_objects/pics/people/juan/7.png
index 10ca59cd6..10ca59cd6 100644
--- a/graphics/map_objects/pics/people/juan/7.png
+++ b/graphics/event_objects/pics/people/juan/7.png
diff --git a/graphics/map_objects/pics/people/juan/8.png b/graphics/event_objects/pics/people/juan/8.png
index 24ef412c1..24ef412c1 100644
--- a/graphics/map_objects/pics/people/juan/8.png
+++ b/graphics/event_objects/pics/people/juan/8.png
diff --git a/graphics/map_objects/pics/people/lass/0.png b/graphics/event_objects/pics/people/lass/0.png
index 602f557c7..602f557c7 100644
--- a/graphics/map_objects/pics/people/lass/0.png
+++ b/graphics/event_objects/pics/people/lass/0.png
diff --git a/graphics/map_objects/pics/people/lass/1.png b/graphics/event_objects/pics/people/lass/1.png
index c11380b4a..c11380b4a 100644
--- a/graphics/map_objects/pics/people/lass/1.png
+++ b/graphics/event_objects/pics/people/lass/1.png
diff --git a/graphics/map_objects/pics/people/lass/2.png b/graphics/event_objects/pics/people/lass/2.png
index 887cc834b..887cc834b 100644
--- a/graphics/map_objects/pics/people/lass/2.png
+++ b/graphics/event_objects/pics/people/lass/2.png
diff --git a/graphics/map_objects/pics/people/lass/3.png b/graphics/event_objects/pics/people/lass/3.png
index 510d0812c..510d0812c 100644
--- a/graphics/map_objects/pics/people/lass/3.png
+++ b/graphics/event_objects/pics/people/lass/3.png
diff --git a/graphics/map_objects/pics/people/lass/4.png b/graphics/event_objects/pics/people/lass/4.png
index 8929a426b..8929a426b 100644
--- a/graphics/map_objects/pics/people/lass/4.png
+++ b/graphics/event_objects/pics/people/lass/4.png
diff --git a/graphics/map_objects/pics/people/lass/5.png b/graphics/event_objects/pics/people/lass/5.png
index da422040c..da422040c 100644
--- a/graphics/map_objects/pics/people/lass/5.png
+++ b/graphics/event_objects/pics/people/lass/5.png
diff --git a/graphics/map_objects/pics/people/lass/6.png b/graphics/event_objects/pics/people/lass/6.png
index c9235c9aa..c9235c9aa 100644
--- a/graphics/map_objects/pics/people/lass/6.png
+++ b/graphics/event_objects/pics/people/lass/6.png
diff --git a/graphics/map_objects/pics/people/lass/7.png b/graphics/event_objects/pics/people/lass/7.png
index 1adfcd0ba..1adfcd0ba 100644
--- a/graphics/map_objects/pics/people/lass/7.png
+++ b/graphics/event_objects/pics/people/lass/7.png
diff --git a/graphics/map_objects/pics/people/lass/8.png b/graphics/event_objects/pics/people/lass/8.png
index 392d65f93..392d65f93 100644
--- a/graphics/map_objects/pics/people/lass/8.png
+++ b/graphics/event_objects/pics/people/lass/8.png
diff --git a/graphics/map_objects/pics/people/leaf/0.png b/graphics/event_objects/pics/people/leaf/0.png
index d21024a8a..d21024a8a 100644
--- a/graphics/map_objects/pics/people/leaf/0.png
+++ b/graphics/event_objects/pics/people/leaf/0.png
diff --git a/graphics/map_objects/pics/people/leaf/1.png b/graphics/event_objects/pics/people/leaf/1.png
index d14f4e29e..d14f4e29e 100644
--- a/graphics/map_objects/pics/people/leaf/1.png
+++ b/graphics/event_objects/pics/people/leaf/1.png
diff --git a/graphics/map_objects/pics/people/leaf/2.png b/graphics/event_objects/pics/people/leaf/2.png
index b8f8d7b6b..b8f8d7b6b 100644
--- a/graphics/map_objects/pics/people/leaf/2.png
+++ b/graphics/event_objects/pics/people/leaf/2.png
diff --git a/graphics/map_objects/pics/people/leaf/3.png b/graphics/event_objects/pics/people/leaf/3.png
index 50a63ed30..50a63ed30 100644
--- a/graphics/map_objects/pics/people/leaf/3.png
+++ b/graphics/event_objects/pics/people/leaf/3.png
diff --git a/graphics/map_objects/pics/people/leaf/4.png b/graphics/event_objects/pics/people/leaf/4.png
index fdb21f0b3..fdb21f0b3 100644
--- a/graphics/map_objects/pics/people/leaf/4.png
+++ b/graphics/event_objects/pics/people/leaf/4.png
diff --git a/graphics/map_objects/pics/people/leaf/5.png b/graphics/event_objects/pics/people/leaf/5.png
index a90ac7c22..a90ac7c22 100644
--- a/graphics/map_objects/pics/people/leaf/5.png
+++ b/graphics/event_objects/pics/people/leaf/5.png
diff --git a/graphics/map_objects/pics/people/leaf/6.png b/graphics/event_objects/pics/people/leaf/6.png
index ac69d167c..ac69d167c 100644
--- a/graphics/map_objects/pics/people/leaf/6.png
+++ b/graphics/event_objects/pics/people/leaf/6.png
diff --git a/graphics/map_objects/pics/people/leaf/7.png b/graphics/event_objects/pics/people/leaf/7.png
index 215fab8e8..215fab8e8 100644
--- a/graphics/map_objects/pics/people/leaf/7.png
+++ b/graphics/event_objects/pics/people/leaf/7.png
diff --git a/graphics/map_objects/pics/people/leaf/8.png b/graphics/event_objects/pics/people/leaf/8.png
index 39dd27af1..39dd27af1 100644
--- a/graphics/map_objects/pics/people/leaf/8.png
+++ b/graphics/event_objects/pics/people/leaf/8.png
diff --git a/graphics/map_objects/pics/people/little_boy_1/0.png b/graphics/event_objects/pics/people/little_boy_1/0.png
index b96c644fb..b96c644fb 100644
--- a/graphics/map_objects/pics/people/little_boy_1/0.png
+++ b/graphics/event_objects/pics/people/little_boy_1/0.png
diff --git a/graphics/map_objects/pics/people/little_boy_1/1.png b/graphics/event_objects/pics/people/little_boy_1/1.png
index 01f7f13d0..01f7f13d0 100644
--- a/graphics/map_objects/pics/people/little_boy_1/1.png
+++ b/graphics/event_objects/pics/people/little_boy_1/1.png
diff --git a/graphics/map_objects/pics/people/little_boy_1/2.png b/graphics/event_objects/pics/people/little_boy_1/2.png
index e080899f6..e080899f6 100644
--- a/graphics/map_objects/pics/people/little_boy_1/2.png
+++ b/graphics/event_objects/pics/people/little_boy_1/2.png
diff --git a/graphics/map_objects/pics/people/little_boy_1/3.png b/graphics/event_objects/pics/people/little_boy_1/3.png
index 08dbedbff..08dbedbff 100644
--- a/graphics/map_objects/pics/people/little_boy_1/3.png
+++ b/graphics/event_objects/pics/people/little_boy_1/3.png
diff --git a/graphics/map_objects/pics/people/little_boy_1/4.png b/graphics/event_objects/pics/people/little_boy_1/4.png
index ed0f1c791..ed0f1c791 100644
--- a/graphics/map_objects/pics/people/little_boy_1/4.png
+++ b/graphics/event_objects/pics/people/little_boy_1/4.png
diff --git a/graphics/map_objects/pics/people/little_boy_1/5.png b/graphics/event_objects/pics/people/little_boy_1/5.png
index 761263392..761263392 100644
--- a/graphics/map_objects/pics/people/little_boy_1/5.png
+++ b/graphics/event_objects/pics/people/little_boy_1/5.png
diff --git a/graphics/map_objects/pics/people/little_boy_1/6.png b/graphics/event_objects/pics/people/little_boy_1/6.png
index f8d72807f..f8d72807f 100644
--- a/graphics/map_objects/pics/people/little_boy_1/6.png
+++ b/graphics/event_objects/pics/people/little_boy_1/6.png
diff --git a/graphics/map_objects/pics/people/little_boy_1/7.png b/graphics/event_objects/pics/people/little_boy_1/7.png
index 0f7c16ebb..0f7c16ebb 100644
--- a/graphics/map_objects/pics/people/little_boy_1/7.png
+++ b/graphics/event_objects/pics/people/little_boy_1/7.png
diff --git a/graphics/map_objects/pics/people/little_boy_1/8.png b/graphics/event_objects/pics/people/little_boy_1/8.png
index b3df6d38a..b3df6d38a 100644
--- a/graphics/map_objects/pics/people/little_boy_1/8.png
+++ b/graphics/event_objects/pics/people/little_boy_1/8.png
diff --git a/graphics/map_objects/pics/people/little_boy_2/0.png b/graphics/event_objects/pics/people/little_boy_2/0.png
index 1cb5472fc..1cb5472fc 100644
--- a/graphics/map_objects/pics/people/little_boy_2/0.png
+++ b/graphics/event_objects/pics/people/little_boy_2/0.png
diff --git a/graphics/map_objects/pics/people/little_boy_2/1.png b/graphics/event_objects/pics/people/little_boy_2/1.png
index 235933d0a..235933d0a 100644
--- a/graphics/map_objects/pics/people/little_boy_2/1.png
+++ b/graphics/event_objects/pics/people/little_boy_2/1.png
diff --git a/graphics/map_objects/pics/people/little_boy_2/2.png b/graphics/event_objects/pics/people/little_boy_2/2.png
index ced688956..ced688956 100644
--- a/graphics/map_objects/pics/people/little_boy_2/2.png
+++ b/graphics/event_objects/pics/people/little_boy_2/2.png
diff --git a/graphics/map_objects/pics/people/little_boy_2/3.png b/graphics/event_objects/pics/people/little_boy_2/3.png
index 8c743b2a3..8c743b2a3 100644
--- a/graphics/map_objects/pics/people/little_boy_2/3.png
+++ b/graphics/event_objects/pics/people/little_boy_2/3.png
diff --git a/graphics/map_objects/pics/people/little_boy_2/4.png b/graphics/event_objects/pics/people/little_boy_2/4.png
index 7af7cdbaa..7af7cdbaa 100644
--- a/graphics/map_objects/pics/people/little_boy_2/4.png
+++ b/graphics/event_objects/pics/people/little_boy_2/4.png
diff --git a/graphics/map_objects/pics/people/little_boy_2/5.png b/graphics/event_objects/pics/people/little_boy_2/5.png
index 1db5b13ba..1db5b13ba 100644
--- a/graphics/map_objects/pics/people/little_boy_2/5.png
+++ b/graphics/event_objects/pics/people/little_boy_2/5.png
diff --git a/graphics/map_objects/pics/people/little_boy_2/6.png b/graphics/event_objects/pics/people/little_boy_2/6.png
index 00633ff85..00633ff85 100644
--- a/graphics/map_objects/pics/people/little_boy_2/6.png
+++ b/graphics/event_objects/pics/people/little_boy_2/6.png
diff --git a/graphics/map_objects/pics/people/little_boy_2/7.png b/graphics/event_objects/pics/people/little_boy_2/7.png
index ac2697065..ac2697065 100644
--- a/graphics/map_objects/pics/people/little_boy_2/7.png
+++ b/graphics/event_objects/pics/people/little_boy_2/7.png
diff --git a/graphics/map_objects/pics/people/little_boy_2/8.png b/graphics/event_objects/pics/people/little_boy_2/8.png
index fd02ff7a6..fd02ff7a6 100644
--- a/graphics/map_objects/pics/people/little_boy_2/8.png
+++ b/graphics/event_objects/pics/people/little_boy_2/8.png
diff --git a/graphics/map_objects/pics/people/little_girl_1/0.png b/graphics/event_objects/pics/people/little_girl_1/0.png
index a4954285b..a4954285b 100644
--- a/graphics/map_objects/pics/people/little_girl_1/0.png
+++ b/graphics/event_objects/pics/people/little_girl_1/0.png
diff --git a/graphics/map_objects/pics/people/little_girl_1/1.png b/graphics/event_objects/pics/people/little_girl_1/1.png
index 0c6b9d411..0c6b9d411 100644
--- a/graphics/map_objects/pics/people/little_girl_1/1.png
+++ b/graphics/event_objects/pics/people/little_girl_1/1.png
diff --git a/graphics/map_objects/pics/people/little_girl_1/2.png b/graphics/event_objects/pics/people/little_girl_1/2.png
index 6e3b1e77d..6e3b1e77d 100644
--- a/graphics/map_objects/pics/people/little_girl_1/2.png
+++ b/graphics/event_objects/pics/people/little_girl_1/2.png
diff --git a/graphics/map_objects/pics/people/little_girl_1/3.png b/graphics/event_objects/pics/people/little_girl_1/3.png
index b680b277a..b680b277a 100644
--- a/graphics/map_objects/pics/people/little_girl_1/3.png
+++ b/graphics/event_objects/pics/people/little_girl_1/3.png
diff --git a/graphics/map_objects/pics/people/little_girl_1/4.png b/graphics/event_objects/pics/people/little_girl_1/4.png
index 3211eecbb..3211eecbb 100644
--- a/graphics/map_objects/pics/people/little_girl_1/4.png
+++ b/graphics/event_objects/pics/people/little_girl_1/4.png
diff --git a/graphics/map_objects/pics/people/little_girl_1/5.png b/graphics/event_objects/pics/people/little_girl_1/5.png
index 182a1a416..182a1a416 100644
--- a/graphics/map_objects/pics/people/little_girl_1/5.png
+++ b/graphics/event_objects/pics/people/little_girl_1/5.png
diff --git a/graphics/map_objects/pics/people/little_girl_1/6.png b/graphics/event_objects/pics/people/little_girl_1/6.png
index 1b0daa637..1b0daa637 100644
--- a/graphics/map_objects/pics/people/little_girl_1/6.png
+++ b/graphics/event_objects/pics/people/little_girl_1/6.png
diff --git a/graphics/map_objects/pics/people/little_girl_1/7.png b/graphics/event_objects/pics/people/little_girl_1/7.png
index f91406654..f91406654 100644
--- a/graphics/map_objects/pics/people/little_girl_1/7.png
+++ b/graphics/event_objects/pics/people/little_girl_1/7.png
diff --git a/graphics/map_objects/pics/people/little_girl_1/8.png b/graphics/event_objects/pics/people/little_girl_1/8.png
index 5c5bcbc2a..5c5bcbc2a 100644
--- a/graphics/map_objects/pics/people/little_girl_1/8.png
+++ b/graphics/event_objects/pics/people/little_girl_1/8.png
diff --git a/graphics/map_objects/pics/people/little_girl_2/0.png b/graphics/event_objects/pics/people/little_girl_2/0.png
index fadfdad57..fadfdad57 100644
--- a/graphics/map_objects/pics/people/little_girl_2/0.png
+++ b/graphics/event_objects/pics/people/little_girl_2/0.png
diff --git a/graphics/map_objects/pics/people/little_girl_2/1.png b/graphics/event_objects/pics/people/little_girl_2/1.png
index df2b66187..df2b66187 100644
--- a/graphics/map_objects/pics/people/little_girl_2/1.png
+++ b/graphics/event_objects/pics/people/little_girl_2/1.png
diff --git a/graphics/map_objects/pics/people/little_girl_2/2.png b/graphics/event_objects/pics/people/little_girl_2/2.png
index ac49cae9f..ac49cae9f 100644
--- a/graphics/map_objects/pics/people/little_girl_2/2.png
+++ b/graphics/event_objects/pics/people/little_girl_2/2.png
diff --git a/graphics/map_objects/pics/people/little_girl_2/3.png b/graphics/event_objects/pics/people/little_girl_2/3.png
index 869c4a1b3..869c4a1b3 100644
--- a/graphics/map_objects/pics/people/little_girl_2/3.png
+++ b/graphics/event_objects/pics/people/little_girl_2/3.png
diff --git a/graphics/map_objects/pics/people/little_girl_2/4.png b/graphics/event_objects/pics/people/little_girl_2/4.png
index b92551f18..b92551f18 100644
--- a/graphics/map_objects/pics/people/little_girl_2/4.png
+++ b/graphics/event_objects/pics/people/little_girl_2/4.png
diff --git a/graphics/map_objects/pics/people/little_girl_2/5.png b/graphics/event_objects/pics/people/little_girl_2/5.png
index 778a644f2..778a644f2 100644
--- a/graphics/map_objects/pics/people/little_girl_2/5.png
+++ b/graphics/event_objects/pics/people/little_girl_2/5.png
diff --git a/graphics/map_objects/pics/people/little_girl_2/6.png b/graphics/event_objects/pics/people/little_girl_2/6.png
index 1ca242176..1ca242176 100644
--- a/graphics/map_objects/pics/people/little_girl_2/6.png
+++ b/graphics/event_objects/pics/people/little_girl_2/6.png
diff --git a/graphics/map_objects/pics/people/little_girl_2/7.png b/graphics/event_objects/pics/people/little_girl_2/7.png
index d71a37cec..d71a37cec 100644
--- a/graphics/map_objects/pics/people/little_girl_2/7.png
+++ b/graphics/event_objects/pics/people/little_girl_2/7.png
diff --git a/graphics/map_objects/pics/people/little_girl_2/8.png b/graphics/event_objects/pics/people/little_girl_2/8.png
index dd76b53e0..dd76b53e0 100644
--- a/graphics/map_objects/pics/people/little_girl_2/8.png
+++ b/graphics/event_objects/pics/people/little_girl_2/8.png
diff --git a/graphics/map_objects/pics/people/liza/0.png b/graphics/event_objects/pics/people/liza/0.png
index e85ea4c5b..e85ea4c5b 100644
--- a/graphics/map_objects/pics/people/liza/0.png
+++ b/graphics/event_objects/pics/people/liza/0.png
diff --git a/graphics/map_objects/pics/people/liza/1.png b/graphics/event_objects/pics/people/liza/1.png
index dd7c4b2a6..dd7c4b2a6 100644
--- a/graphics/map_objects/pics/people/liza/1.png
+++ b/graphics/event_objects/pics/people/liza/1.png
diff --git a/graphics/map_objects/pics/people/liza/2.png b/graphics/event_objects/pics/people/liza/2.png
index 96b4628fa..96b4628fa 100644
--- a/graphics/map_objects/pics/people/liza/2.png
+++ b/graphics/event_objects/pics/people/liza/2.png
diff --git a/graphics/map_objects/pics/people/lucy/0.png b/graphics/event_objects/pics/people/lucy/0.png
index 422938505..422938505 100644
--- a/graphics/map_objects/pics/people/lucy/0.png
+++ b/graphics/event_objects/pics/people/lucy/0.png
diff --git a/graphics/map_objects/pics/people/lucy/1.png b/graphics/event_objects/pics/people/lucy/1.png
index 78eda0819..78eda0819 100644
--- a/graphics/map_objects/pics/people/lucy/1.png
+++ b/graphics/event_objects/pics/people/lucy/1.png
diff --git a/graphics/map_objects/pics/people/lucy/2.png b/graphics/event_objects/pics/people/lucy/2.png
index db2579c62..db2579c62 100644
--- a/graphics/map_objects/pics/people/lucy/2.png
+++ b/graphics/event_objects/pics/people/lucy/2.png
diff --git a/graphics/map_objects/pics/people/lucy/3.png b/graphics/event_objects/pics/people/lucy/3.png
index 4f06bbb4d..4f06bbb4d 100644
--- a/graphics/map_objects/pics/people/lucy/3.png
+++ b/graphics/event_objects/pics/people/lucy/3.png
diff --git a/graphics/map_objects/pics/people/lucy/4.png b/graphics/event_objects/pics/people/lucy/4.png
index ba42e7832..ba42e7832 100644
--- a/graphics/map_objects/pics/people/lucy/4.png
+++ b/graphics/event_objects/pics/people/lucy/4.png
diff --git a/graphics/map_objects/pics/people/lucy/5.png b/graphics/event_objects/pics/people/lucy/5.png
index 980c55dd1..980c55dd1 100644
--- a/graphics/map_objects/pics/people/lucy/5.png
+++ b/graphics/event_objects/pics/people/lucy/5.png
diff --git a/graphics/map_objects/pics/people/lucy/6.png b/graphics/event_objects/pics/people/lucy/6.png
index b5d4c74cb..b5d4c74cb 100644
--- a/graphics/map_objects/pics/people/lucy/6.png
+++ b/graphics/event_objects/pics/people/lucy/6.png
diff --git a/graphics/map_objects/pics/people/lucy/7.png b/graphics/event_objects/pics/people/lucy/7.png
index 1dd07b5ec..1dd07b5ec 100644
--- a/graphics/map_objects/pics/people/lucy/7.png
+++ b/graphics/event_objects/pics/people/lucy/7.png
diff --git a/graphics/map_objects/pics/people/lucy/8.png b/graphics/event_objects/pics/people/lucy/8.png
index 2cface4e4..2cface4e4 100644
--- a/graphics/map_objects/pics/people/lucy/8.png
+++ b/graphics/event_objects/pics/people/lucy/8.png
diff --git a/graphics/map_objects/pics/people/magma_member_f/0.png b/graphics/event_objects/pics/people/magma_member_f/0.png
index ae467df02..ae467df02 100644
--- a/graphics/map_objects/pics/people/magma_member_f/0.png
+++ b/graphics/event_objects/pics/people/magma_member_f/0.png
diff --git a/graphics/map_objects/pics/people/magma_member_f/1.png b/graphics/event_objects/pics/people/magma_member_f/1.png
index 22f8d3242..22f8d3242 100644
--- a/graphics/map_objects/pics/people/magma_member_f/1.png
+++ b/graphics/event_objects/pics/people/magma_member_f/1.png
diff --git a/graphics/map_objects/pics/people/magma_member_f/2.png b/graphics/event_objects/pics/people/magma_member_f/2.png
index 6820fc60e..6820fc60e 100644
--- a/graphics/map_objects/pics/people/magma_member_f/2.png
+++ b/graphics/event_objects/pics/people/magma_member_f/2.png
diff --git a/graphics/map_objects/pics/people/magma_member_f/3.png b/graphics/event_objects/pics/people/magma_member_f/3.png
index 759d312cc..759d312cc 100644
--- a/graphics/map_objects/pics/people/magma_member_f/3.png
+++ b/graphics/event_objects/pics/people/magma_member_f/3.png
diff --git a/graphics/map_objects/pics/people/magma_member_f/4.png b/graphics/event_objects/pics/people/magma_member_f/4.png
index 5e653b471..5e653b471 100644
--- a/graphics/map_objects/pics/people/magma_member_f/4.png
+++ b/graphics/event_objects/pics/people/magma_member_f/4.png
diff --git a/graphics/map_objects/pics/people/magma_member_f/5.png b/graphics/event_objects/pics/people/magma_member_f/5.png
index 872aaa5ae..872aaa5ae 100644
--- a/graphics/map_objects/pics/people/magma_member_f/5.png
+++ b/graphics/event_objects/pics/people/magma_member_f/5.png
diff --git a/graphics/map_objects/pics/people/magma_member_f/6.png b/graphics/event_objects/pics/people/magma_member_f/6.png
index b6f96e1e1..b6f96e1e1 100644
--- a/graphics/map_objects/pics/people/magma_member_f/6.png
+++ b/graphics/event_objects/pics/people/magma_member_f/6.png
diff --git a/graphics/map_objects/pics/people/magma_member_f/7.png b/graphics/event_objects/pics/people/magma_member_f/7.png
index 2d7ee6980..2d7ee6980 100644
--- a/graphics/map_objects/pics/people/magma_member_f/7.png
+++ b/graphics/event_objects/pics/people/magma_member_f/7.png
diff --git a/graphics/map_objects/pics/people/magma_member_f/8.png b/graphics/event_objects/pics/people/magma_member_f/8.png
index 09a2a36c7..09a2a36c7 100644
--- a/graphics/map_objects/pics/people/magma_member_f/8.png
+++ b/graphics/event_objects/pics/people/magma_member_f/8.png
diff --git a/graphics/map_objects/pics/people/magma_member_m/0.png b/graphics/event_objects/pics/people/magma_member_m/0.png
index a1886e9a1..a1886e9a1 100644
--- a/graphics/map_objects/pics/people/magma_member_m/0.png
+++ b/graphics/event_objects/pics/people/magma_member_m/0.png
diff --git a/graphics/map_objects/pics/people/magma_member_m/1.png b/graphics/event_objects/pics/people/magma_member_m/1.png
index f09d412da..f09d412da 100644
--- a/graphics/map_objects/pics/people/magma_member_m/1.png
+++ b/graphics/event_objects/pics/people/magma_member_m/1.png
diff --git a/graphics/map_objects/pics/people/magma_member_m/2.png b/graphics/event_objects/pics/people/magma_member_m/2.png
index 2b1cb90ac..2b1cb90ac 100644
--- a/graphics/map_objects/pics/people/magma_member_m/2.png
+++ b/graphics/event_objects/pics/people/magma_member_m/2.png
diff --git a/graphics/map_objects/pics/people/magma_member_m/3.png b/graphics/event_objects/pics/people/magma_member_m/3.png
index edfcf7850..edfcf7850 100644
--- a/graphics/map_objects/pics/people/magma_member_m/3.png
+++ b/graphics/event_objects/pics/people/magma_member_m/3.png
diff --git a/graphics/map_objects/pics/people/magma_member_m/4.png b/graphics/event_objects/pics/people/magma_member_m/4.png
index 6c8a2d2b0..6c8a2d2b0 100644
--- a/graphics/map_objects/pics/people/magma_member_m/4.png
+++ b/graphics/event_objects/pics/people/magma_member_m/4.png
diff --git a/graphics/map_objects/pics/people/magma_member_m/5.png b/graphics/event_objects/pics/people/magma_member_m/5.png
index 4f0068f21..4f0068f21 100644
--- a/graphics/map_objects/pics/people/magma_member_m/5.png
+++ b/graphics/event_objects/pics/people/magma_member_m/5.png
diff --git a/graphics/map_objects/pics/people/magma_member_m/6.png b/graphics/event_objects/pics/people/magma_member_m/6.png
index 758bcddb1..758bcddb1 100644
--- a/graphics/map_objects/pics/people/magma_member_m/6.png
+++ b/graphics/event_objects/pics/people/magma_member_m/6.png
diff --git a/graphics/map_objects/pics/people/magma_member_m/7.png b/graphics/event_objects/pics/people/magma_member_m/7.png
index 3b4a1be19..3b4a1be19 100644
--- a/graphics/map_objects/pics/people/magma_member_m/7.png
+++ b/graphics/event_objects/pics/people/magma_member_m/7.png
diff --git a/graphics/map_objects/pics/people/magma_member_m/8.png b/graphics/event_objects/pics/people/magma_member_m/8.png
index fc5c7b53c..fc5c7b53c 100644
--- a/graphics/map_objects/pics/people/magma_member_m/8.png
+++ b/graphics/event_objects/pics/people/magma_member_m/8.png
diff --git a/graphics/map_objects/pics/people/man_1/0.png b/graphics/event_objects/pics/people/man_1/0.png
index 83a226b7a..83a226b7a 100644
--- a/graphics/map_objects/pics/people/man_1/0.png
+++ b/graphics/event_objects/pics/people/man_1/0.png
diff --git a/graphics/map_objects/pics/people/man_1/1.png b/graphics/event_objects/pics/people/man_1/1.png
index 7eba03e27..7eba03e27 100644
--- a/graphics/map_objects/pics/people/man_1/1.png
+++ b/graphics/event_objects/pics/people/man_1/1.png
diff --git a/graphics/map_objects/pics/people/man_1/2.png b/graphics/event_objects/pics/people/man_1/2.png
index 675851b98..675851b98 100644
--- a/graphics/map_objects/pics/people/man_1/2.png
+++ b/graphics/event_objects/pics/people/man_1/2.png
diff --git a/graphics/map_objects/pics/people/man_1/3.png b/graphics/event_objects/pics/people/man_1/3.png
index d29b03948..d29b03948 100644
--- a/graphics/map_objects/pics/people/man_1/3.png
+++ b/graphics/event_objects/pics/people/man_1/3.png
diff --git a/graphics/map_objects/pics/people/man_1/4.png b/graphics/event_objects/pics/people/man_1/4.png
index a328a22f3..a328a22f3 100644
--- a/graphics/map_objects/pics/people/man_1/4.png
+++ b/graphics/event_objects/pics/people/man_1/4.png
diff --git a/graphics/map_objects/pics/people/man_1/5.png b/graphics/event_objects/pics/people/man_1/5.png
index cf993dcd4..cf993dcd4 100644
--- a/graphics/map_objects/pics/people/man_1/5.png
+++ b/graphics/event_objects/pics/people/man_1/5.png
diff --git a/graphics/map_objects/pics/people/man_1/6.png b/graphics/event_objects/pics/people/man_1/6.png
index 04ff3e1e8..04ff3e1e8 100644
--- a/graphics/map_objects/pics/people/man_1/6.png
+++ b/graphics/event_objects/pics/people/man_1/6.png
diff --git a/graphics/map_objects/pics/people/man_1/7.png b/graphics/event_objects/pics/people/man_1/7.png
index cce946285..cce946285 100644
--- a/graphics/map_objects/pics/people/man_1/7.png
+++ b/graphics/event_objects/pics/people/man_1/7.png
diff --git a/graphics/map_objects/pics/people/man_1/8.png b/graphics/event_objects/pics/people/man_1/8.png
index 8176b427d..8176b427d 100644
--- a/graphics/map_objects/pics/people/man_1/8.png
+++ b/graphics/event_objects/pics/people/man_1/8.png
diff --git a/graphics/map_objects/pics/people/man_2/0.png b/graphics/event_objects/pics/people/man_2/0.png
index e0f0ff01b..e0f0ff01b 100644
--- a/graphics/map_objects/pics/people/man_2/0.png
+++ b/graphics/event_objects/pics/people/man_2/0.png
diff --git a/graphics/map_objects/pics/people/man_2/1.png b/graphics/event_objects/pics/people/man_2/1.png
index e1a38fd4a..e1a38fd4a 100644
--- a/graphics/map_objects/pics/people/man_2/1.png
+++ b/graphics/event_objects/pics/people/man_2/1.png
diff --git a/graphics/map_objects/pics/people/man_2/2.png b/graphics/event_objects/pics/people/man_2/2.png
index e05a000ef..e05a000ef 100644
--- a/graphics/map_objects/pics/people/man_2/2.png
+++ b/graphics/event_objects/pics/people/man_2/2.png
diff --git a/graphics/map_objects/pics/people/man_2/3.png b/graphics/event_objects/pics/people/man_2/3.png
index 946a6941b..946a6941b 100644
--- a/graphics/map_objects/pics/people/man_2/3.png
+++ b/graphics/event_objects/pics/people/man_2/3.png
diff --git a/graphics/map_objects/pics/people/man_2/4.png b/graphics/event_objects/pics/people/man_2/4.png
index eee58063f..eee58063f 100644
--- a/graphics/map_objects/pics/people/man_2/4.png
+++ b/graphics/event_objects/pics/people/man_2/4.png
diff --git a/graphics/map_objects/pics/people/man_2/5.png b/graphics/event_objects/pics/people/man_2/5.png
index c32800118..c32800118 100644
--- a/graphics/map_objects/pics/people/man_2/5.png
+++ b/graphics/event_objects/pics/people/man_2/5.png
diff --git a/graphics/map_objects/pics/people/man_2/6.png b/graphics/event_objects/pics/people/man_2/6.png
index f8e3eb88a..f8e3eb88a 100644
--- a/graphics/map_objects/pics/people/man_2/6.png
+++ b/graphics/event_objects/pics/people/man_2/6.png
diff --git a/graphics/map_objects/pics/people/man_2/7.png b/graphics/event_objects/pics/people/man_2/7.png
index 43fffd1d7..43fffd1d7 100644
--- a/graphics/map_objects/pics/people/man_2/7.png
+++ b/graphics/event_objects/pics/people/man_2/7.png
diff --git a/graphics/map_objects/pics/people/man_2/8.png b/graphics/event_objects/pics/people/man_2/8.png
index 8897d2fd3..8897d2fd3 100644
--- a/graphics/map_objects/pics/people/man_2/8.png
+++ b/graphics/event_objects/pics/people/man_2/8.png
diff --git a/graphics/map_objects/pics/people/man_3/0.png b/graphics/event_objects/pics/people/man_3/0.png
index 073e015f7..073e015f7 100644
--- a/graphics/map_objects/pics/people/man_3/0.png
+++ b/graphics/event_objects/pics/people/man_3/0.png
diff --git a/graphics/map_objects/pics/people/man_3/1.png b/graphics/event_objects/pics/people/man_3/1.png
index c0762c7ff..c0762c7ff 100644
--- a/graphics/map_objects/pics/people/man_3/1.png
+++ b/graphics/event_objects/pics/people/man_3/1.png
diff --git a/graphics/map_objects/pics/people/man_3/2.png b/graphics/event_objects/pics/people/man_3/2.png
index 21608c48a..21608c48a 100644
--- a/graphics/map_objects/pics/people/man_3/2.png
+++ b/graphics/event_objects/pics/people/man_3/2.png
diff --git a/graphics/map_objects/pics/people/man_3/3.png b/graphics/event_objects/pics/people/man_3/3.png
index 85b6765b0..85b6765b0 100644
--- a/graphics/map_objects/pics/people/man_3/3.png
+++ b/graphics/event_objects/pics/people/man_3/3.png
diff --git a/graphics/map_objects/pics/people/man_3/4.png b/graphics/event_objects/pics/people/man_3/4.png
index e47dbe0fe..e47dbe0fe 100644
--- a/graphics/map_objects/pics/people/man_3/4.png
+++ b/graphics/event_objects/pics/people/man_3/4.png
diff --git a/graphics/map_objects/pics/people/man_3/5.png b/graphics/event_objects/pics/people/man_3/5.png
index 9f30a6dad..9f30a6dad 100644
--- a/graphics/map_objects/pics/people/man_3/5.png
+++ b/graphics/event_objects/pics/people/man_3/5.png
diff --git a/graphics/map_objects/pics/people/man_3/6.png b/graphics/event_objects/pics/people/man_3/6.png
index 3f6144f1a..3f6144f1a 100644
--- a/graphics/map_objects/pics/people/man_3/6.png
+++ b/graphics/event_objects/pics/people/man_3/6.png
diff --git a/graphics/map_objects/pics/people/man_3/7.png b/graphics/event_objects/pics/people/man_3/7.png
index e70347dce..e70347dce 100644
--- a/graphics/map_objects/pics/people/man_3/7.png
+++ b/graphics/event_objects/pics/people/man_3/7.png
diff --git a/graphics/map_objects/pics/people/man_3/8.png b/graphics/event_objects/pics/people/man_3/8.png
index 274a02280..274a02280 100644
--- a/graphics/map_objects/pics/people/man_3/8.png
+++ b/graphics/event_objects/pics/people/man_3/8.png
diff --git a/graphics/map_objects/pics/people/man_4/0.png b/graphics/event_objects/pics/people/man_4/0.png
index 0297b592c..0297b592c 100644
--- a/graphics/map_objects/pics/people/man_4/0.png
+++ b/graphics/event_objects/pics/people/man_4/0.png
diff --git a/graphics/map_objects/pics/people/man_4/1.png b/graphics/event_objects/pics/people/man_4/1.png
index d73e6ed5c..d73e6ed5c 100644
--- a/graphics/map_objects/pics/people/man_4/1.png
+++ b/graphics/event_objects/pics/people/man_4/1.png
diff --git a/graphics/map_objects/pics/people/man_4/2.png b/graphics/event_objects/pics/people/man_4/2.png
index 6cd7f5798..6cd7f5798 100644
--- a/graphics/map_objects/pics/people/man_4/2.png
+++ b/graphics/event_objects/pics/people/man_4/2.png
diff --git a/graphics/map_objects/pics/people/man_4/3.png b/graphics/event_objects/pics/people/man_4/3.png
index 2486efd7f..2486efd7f 100644
--- a/graphics/map_objects/pics/people/man_4/3.png
+++ b/graphics/event_objects/pics/people/man_4/3.png
diff --git a/graphics/map_objects/pics/people/man_4/4.png b/graphics/event_objects/pics/people/man_4/4.png
index 732ff9c8d..732ff9c8d 100644
--- a/graphics/map_objects/pics/people/man_4/4.png
+++ b/graphics/event_objects/pics/people/man_4/4.png
diff --git a/graphics/map_objects/pics/people/man_4/5.png b/graphics/event_objects/pics/people/man_4/5.png
index 7e20d5af9..7e20d5af9 100644
--- a/graphics/map_objects/pics/people/man_4/5.png
+++ b/graphics/event_objects/pics/people/man_4/5.png
diff --git a/graphics/map_objects/pics/people/man_4/6.png b/graphics/event_objects/pics/people/man_4/6.png
index 3d4ae58f0..3d4ae58f0 100644
--- a/graphics/map_objects/pics/people/man_4/6.png
+++ b/graphics/event_objects/pics/people/man_4/6.png
diff --git a/graphics/map_objects/pics/people/man_4/7.png b/graphics/event_objects/pics/people/man_4/7.png
index 12a9d1fa8..12a9d1fa8 100644
--- a/graphics/map_objects/pics/people/man_4/7.png
+++ b/graphics/event_objects/pics/people/man_4/7.png
diff --git a/graphics/map_objects/pics/people/man_4/8.png b/graphics/event_objects/pics/people/man_4/8.png
index 43bea13ce..43bea13ce 100644
--- a/graphics/map_objects/pics/people/man_4/8.png
+++ b/graphics/event_objects/pics/people/man_4/8.png
diff --git a/graphics/map_objects/pics/people/man_5/0.png b/graphics/event_objects/pics/people/man_5/0.png
index f1da52790..f1da52790 100644
--- a/graphics/map_objects/pics/people/man_5/0.png
+++ b/graphics/event_objects/pics/people/man_5/0.png
diff --git a/graphics/map_objects/pics/people/man_5/1.png b/graphics/event_objects/pics/people/man_5/1.png
index 80dde6ec6..80dde6ec6 100644
--- a/graphics/map_objects/pics/people/man_5/1.png
+++ b/graphics/event_objects/pics/people/man_5/1.png
diff --git a/graphics/map_objects/pics/people/man_5/2.png b/graphics/event_objects/pics/people/man_5/2.png
index 95ee60f02..95ee60f02 100644
--- a/graphics/map_objects/pics/people/man_5/2.png
+++ b/graphics/event_objects/pics/people/man_5/2.png
diff --git a/graphics/map_objects/pics/people/man_5/3.png b/graphics/event_objects/pics/people/man_5/3.png
index 52d4e65f0..52d4e65f0 100644
--- a/graphics/map_objects/pics/people/man_5/3.png
+++ b/graphics/event_objects/pics/people/man_5/3.png
diff --git a/graphics/map_objects/pics/people/man_5/4.png b/graphics/event_objects/pics/people/man_5/4.png
index 23e440b88..23e440b88 100644
--- a/graphics/map_objects/pics/people/man_5/4.png
+++ b/graphics/event_objects/pics/people/man_5/4.png
diff --git a/graphics/map_objects/pics/people/man_5/5.png b/graphics/event_objects/pics/people/man_5/5.png
index c587b3762..c587b3762 100644
--- a/graphics/map_objects/pics/people/man_5/5.png
+++ b/graphics/event_objects/pics/people/man_5/5.png
diff --git a/graphics/map_objects/pics/people/man_5/6.png b/graphics/event_objects/pics/people/man_5/6.png
index 7ee45b6db..7ee45b6db 100644
--- a/graphics/map_objects/pics/people/man_5/6.png
+++ b/graphics/event_objects/pics/people/man_5/6.png
diff --git a/graphics/map_objects/pics/people/man_5/7.png b/graphics/event_objects/pics/people/man_5/7.png
index 24a578a34..24a578a34 100644
--- a/graphics/map_objects/pics/people/man_5/7.png
+++ b/graphics/event_objects/pics/people/man_5/7.png
diff --git a/graphics/map_objects/pics/people/man_5/8.png b/graphics/event_objects/pics/people/man_5/8.png
index 6040f6f4d..6040f6f4d 100644
--- a/graphics/map_objects/pics/people/man_5/8.png
+++ b/graphics/event_objects/pics/people/man_5/8.png
diff --git a/graphics/map_objects/pics/people/man_6/0.png b/graphics/event_objects/pics/people/man_6/0.png
index ddcd545aa..ddcd545aa 100644
--- a/graphics/map_objects/pics/people/man_6/0.png
+++ b/graphics/event_objects/pics/people/man_6/0.png
diff --git a/graphics/map_objects/pics/people/man_6/1.png b/graphics/event_objects/pics/people/man_6/1.png
index 0d7007e10..0d7007e10 100644
--- a/graphics/map_objects/pics/people/man_6/1.png
+++ b/graphics/event_objects/pics/people/man_6/1.png
diff --git a/graphics/map_objects/pics/people/man_6/2.png b/graphics/event_objects/pics/people/man_6/2.png
index 4daabc15d..4daabc15d 100644
--- a/graphics/map_objects/pics/people/man_6/2.png
+++ b/graphics/event_objects/pics/people/man_6/2.png
diff --git a/graphics/map_objects/pics/people/man_6/3.png b/graphics/event_objects/pics/people/man_6/3.png
index 0373f371d..0373f371d 100644
--- a/graphics/map_objects/pics/people/man_6/3.png
+++ b/graphics/event_objects/pics/people/man_6/3.png
diff --git a/graphics/map_objects/pics/people/man_6/4.png b/graphics/event_objects/pics/people/man_6/4.png
index b0d8ee814..b0d8ee814 100644
--- a/graphics/map_objects/pics/people/man_6/4.png
+++ b/graphics/event_objects/pics/people/man_6/4.png
diff --git a/graphics/map_objects/pics/people/man_6/5.png b/graphics/event_objects/pics/people/man_6/5.png
index 3f95859a1..3f95859a1 100644
--- a/graphics/map_objects/pics/people/man_6/5.png
+++ b/graphics/event_objects/pics/people/man_6/5.png
diff --git a/graphics/map_objects/pics/people/man_6/6.png b/graphics/event_objects/pics/people/man_6/6.png
index 5a89dfc33..5a89dfc33 100644
--- a/graphics/map_objects/pics/people/man_6/6.png
+++ b/graphics/event_objects/pics/people/man_6/6.png
diff --git a/graphics/map_objects/pics/people/man_6/7.png b/graphics/event_objects/pics/people/man_6/7.png
index 6c2e07884..6c2e07884 100644
--- a/graphics/map_objects/pics/people/man_6/7.png
+++ b/graphics/event_objects/pics/people/man_6/7.png
diff --git a/graphics/map_objects/pics/people/man_6/8.png b/graphics/event_objects/pics/people/man_6/8.png
index 3db124eab..3db124eab 100644
--- a/graphics/map_objects/pics/people/man_6/8.png
+++ b/graphics/event_objects/pics/people/man_6/8.png
diff --git a/graphics/map_objects/pics/people/man_7/0.png b/graphics/event_objects/pics/people/man_7/0.png
index ce99c5a53..ce99c5a53 100644
--- a/graphics/map_objects/pics/people/man_7/0.png
+++ b/graphics/event_objects/pics/people/man_7/0.png
diff --git a/graphics/map_objects/pics/people/man_7/1.png b/graphics/event_objects/pics/people/man_7/1.png
index 4339d2481..4339d2481 100644
--- a/graphics/map_objects/pics/people/man_7/1.png
+++ b/graphics/event_objects/pics/people/man_7/1.png
diff --git a/graphics/map_objects/pics/people/man_7/2.png b/graphics/event_objects/pics/people/man_7/2.png
index 24390d9f9..24390d9f9 100644
--- a/graphics/map_objects/pics/people/man_7/2.png
+++ b/graphics/event_objects/pics/people/man_7/2.png
diff --git a/graphics/map_objects/pics/people/man_7/3.png b/graphics/event_objects/pics/people/man_7/3.png
index 39051b795..39051b795 100644
--- a/graphics/map_objects/pics/people/man_7/3.png
+++ b/graphics/event_objects/pics/people/man_7/3.png
diff --git a/graphics/map_objects/pics/people/man_7/4.png b/graphics/event_objects/pics/people/man_7/4.png
index a72a83931..a72a83931 100644
--- a/graphics/map_objects/pics/people/man_7/4.png
+++ b/graphics/event_objects/pics/people/man_7/4.png
diff --git a/graphics/map_objects/pics/people/man_7/5.png b/graphics/event_objects/pics/people/man_7/5.png
index 3de7bd28b..3de7bd28b 100644
--- a/graphics/map_objects/pics/people/man_7/5.png
+++ b/graphics/event_objects/pics/people/man_7/5.png
diff --git a/graphics/map_objects/pics/people/man_7/6.png b/graphics/event_objects/pics/people/man_7/6.png
index 2c9c2ee8f..2c9c2ee8f 100644
--- a/graphics/map_objects/pics/people/man_7/6.png
+++ b/graphics/event_objects/pics/people/man_7/6.png
diff --git a/graphics/map_objects/pics/people/man_7/7.png b/graphics/event_objects/pics/people/man_7/7.png
index 068dc873d..068dc873d 100644
--- a/graphics/map_objects/pics/people/man_7/7.png
+++ b/graphics/event_objects/pics/people/man_7/7.png
diff --git a/graphics/map_objects/pics/people/man_7/8.png b/graphics/event_objects/pics/people/man_7/8.png
index 81e41d5c4..81e41d5c4 100644
--- a/graphics/map_objects/pics/people/man_7/8.png
+++ b/graphics/event_objects/pics/people/man_7/8.png
diff --git a/graphics/map_objects/pics/people/maniac/0.png b/graphics/event_objects/pics/people/maniac/0.png
index 01f066910..01f066910 100644
--- a/graphics/map_objects/pics/people/maniac/0.png
+++ b/graphics/event_objects/pics/people/maniac/0.png
diff --git a/graphics/map_objects/pics/people/maniac/1.png b/graphics/event_objects/pics/people/maniac/1.png
index fc8efb1d4..fc8efb1d4 100644
--- a/graphics/map_objects/pics/people/maniac/1.png
+++ b/graphics/event_objects/pics/people/maniac/1.png
diff --git a/graphics/map_objects/pics/people/maniac/2.png b/graphics/event_objects/pics/people/maniac/2.png
index ea211288f..ea211288f 100644
--- a/graphics/map_objects/pics/people/maniac/2.png
+++ b/graphics/event_objects/pics/people/maniac/2.png
diff --git a/graphics/map_objects/pics/people/maniac/3.png b/graphics/event_objects/pics/people/maniac/3.png
index 7a0ab0ba1..7a0ab0ba1 100644
--- a/graphics/map_objects/pics/people/maniac/3.png
+++ b/graphics/event_objects/pics/people/maniac/3.png
diff --git a/graphics/map_objects/pics/people/maniac/4.png b/graphics/event_objects/pics/people/maniac/4.png
index 93083333d..93083333d 100644
--- a/graphics/map_objects/pics/people/maniac/4.png
+++ b/graphics/event_objects/pics/people/maniac/4.png
diff --git a/graphics/map_objects/pics/people/maniac/5.png b/graphics/event_objects/pics/people/maniac/5.png
index ac18fea6e..ac18fea6e 100644
--- a/graphics/map_objects/pics/people/maniac/5.png
+++ b/graphics/event_objects/pics/people/maniac/5.png
diff --git a/graphics/map_objects/pics/people/maniac/6.png b/graphics/event_objects/pics/people/maniac/6.png
index d8db27038..d8db27038 100644
--- a/graphics/map_objects/pics/people/maniac/6.png
+++ b/graphics/event_objects/pics/people/maniac/6.png
diff --git a/graphics/map_objects/pics/people/maniac/7.png b/graphics/event_objects/pics/people/maniac/7.png
index 647c69838..647c69838 100644
--- a/graphics/map_objects/pics/people/maniac/7.png
+++ b/graphics/event_objects/pics/people/maniac/7.png
diff --git a/graphics/map_objects/pics/people/maniac/8.png b/graphics/event_objects/pics/people/maniac/8.png
index 5d37c6d40..5d37c6d40 100644
--- a/graphics/map_objects/pics/people/maniac/8.png
+++ b/graphics/event_objects/pics/people/maniac/8.png
diff --git a/graphics/map_objects/pics/people/mart_employee/0.png b/graphics/event_objects/pics/people/mart_employee/0.png
index 4dfc880b7..4dfc880b7 100644
--- a/graphics/map_objects/pics/people/mart_employee/0.png
+++ b/graphics/event_objects/pics/people/mart_employee/0.png
diff --git a/graphics/map_objects/pics/people/mart_employee/1.png b/graphics/event_objects/pics/people/mart_employee/1.png
index 25320fff0..25320fff0 100644
--- a/graphics/map_objects/pics/people/mart_employee/1.png
+++ b/graphics/event_objects/pics/people/mart_employee/1.png
diff --git a/graphics/map_objects/pics/people/mart_employee/2.png b/graphics/event_objects/pics/people/mart_employee/2.png
index 31ad7d75b..31ad7d75b 100644
--- a/graphics/map_objects/pics/people/mart_employee/2.png
+++ b/graphics/event_objects/pics/people/mart_employee/2.png
diff --git a/graphics/map_objects/pics/people/mart_employee/3.png b/graphics/event_objects/pics/people/mart_employee/3.png
index 4e7e389d8..4e7e389d8 100644
--- a/graphics/map_objects/pics/people/mart_employee/3.png
+++ b/graphics/event_objects/pics/people/mart_employee/3.png
diff --git a/graphics/map_objects/pics/people/mart_employee/4.png b/graphics/event_objects/pics/people/mart_employee/4.png
index 4357a5946..4357a5946 100644
--- a/graphics/map_objects/pics/people/mart_employee/4.png
+++ b/graphics/event_objects/pics/people/mart_employee/4.png
diff --git a/graphics/map_objects/pics/people/mart_employee/5.png b/graphics/event_objects/pics/people/mart_employee/5.png
index 46ae73fd2..46ae73fd2 100644
--- a/graphics/map_objects/pics/people/mart_employee/5.png
+++ b/graphics/event_objects/pics/people/mart_employee/5.png
diff --git a/graphics/map_objects/pics/people/mart_employee/6.png b/graphics/event_objects/pics/people/mart_employee/6.png
index 9eb51a482..9eb51a482 100644
--- a/graphics/map_objects/pics/people/mart_employee/6.png
+++ b/graphics/event_objects/pics/people/mart_employee/6.png
diff --git a/graphics/map_objects/pics/people/mart_employee/7.png b/graphics/event_objects/pics/people/mart_employee/7.png
index b3ffb8036..b3ffb8036 100644
--- a/graphics/map_objects/pics/people/mart_employee/7.png
+++ b/graphics/event_objects/pics/people/mart_employee/7.png
diff --git a/graphics/map_objects/pics/people/mart_employee/8.png b/graphics/event_objects/pics/people/mart_employee/8.png
index b2268286c..b2268286c 100644
--- a/graphics/map_objects/pics/people/mart_employee/8.png
+++ b/graphics/event_objects/pics/people/mart_employee/8.png
diff --git a/graphics/map_objects/pics/people/mauville_old_man_1/0.png b/graphics/event_objects/pics/people/mauville_old_man_1/0.png
index 3c10d0abf..3c10d0abf 100644
--- a/graphics/map_objects/pics/people/mauville_old_man_1/0.png
+++ b/graphics/event_objects/pics/people/mauville_old_man_1/0.png
diff --git a/graphics/map_objects/pics/people/mauville_old_man_1/1.png b/graphics/event_objects/pics/people/mauville_old_man_1/1.png
index 6f4226ccb..6f4226ccb 100644
--- a/graphics/map_objects/pics/people/mauville_old_man_1/1.png
+++ b/graphics/event_objects/pics/people/mauville_old_man_1/1.png
diff --git a/graphics/map_objects/pics/people/mauville_old_man_1/2.png b/graphics/event_objects/pics/people/mauville_old_man_1/2.png
index adf126f15..adf126f15 100644
--- a/graphics/map_objects/pics/people/mauville_old_man_1/2.png
+++ b/graphics/event_objects/pics/people/mauville_old_man_1/2.png
diff --git a/graphics/map_objects/pics/people/mauville_old_man_1/3.png b/graphics/event_objects/pics/people/mauville_old_man_1/3.png
index e199433fb..e199433fb 100644
--- a/graphics/map_objects/pics/people/mauville_old_man_1/3.png
+++ b/graphics/event_objects/pics/people/mauville_old_man_1/3.png
diff --git a/graphics/map_objects/pics/people/mauville_old_man_1/4.png b/graphics/event_objects/pics/people/mauville_old_man_1/4.png
index 359e93016..359e93016 100644
--- a/graphics/map_objects/pics/people/mauville_old_man_1/4.png
+++ b/graphics/event_objects/pics/people/mauville_old_man_1/4.png
diff --git a/graphics/map_objects/pics/people/mauville_old_man_1/5.png b/graphics/event_objects/pics/people/mauville_old_man_1/5.png
index 34f15abff..34f15abff 100644
--- a/graphics/map_objects/pics/people/mauville_old_man_1/5.png
+++ b/graphics/event_objects/pics/people/mauville_old_man_1/5.png
diff --git a/graphics/map_objects/pics/people/mauville_old_man_1/6.png b/graphics/event_objects/pics/people/mauville_old_man_1/6.png
index 07af2fb1d..07af2fb1d 100644
--- a/graphics/map_objects/pics/people/mauville_old_man_1/6.png
+++ b/graphics/event_objects/pics/people/mauville_old_man_1/6.png
diff --git a/graphics/map_objects/pics/people/mauville_old_man_1/7.png b/graphics/event_objects/pics/people/mauville_old_man_1/7.png
index a4d759a26..a4d759a26 100644
--- a/graphics/map_objects/pics/people/mauville_old_man_1/7.png
+++ b/graphics/event_objects/pics/people/mauville_old_man_1/7.png
diff --git a/graphics/map_objects/pics/people/mauville_old_man_1/8.png b/graphics/event_objects/pics/people/mauville_old_man_1/8.png
index 8816c61aa..8816c61aa 100644
--- a/graphics/map_objects/pics/people/mauville_old_man_1/8.png
+++ b/graphics/event_objects/pics/people/mauville_old_man_1/8.png
diff --git a/graphics/map_objects/pics/people/mauville_old_man_2/0.png b/graphics/event_objects/pics/people/mauville_old_man_2/0.png
index d913bcbdb..d913bcbdb 100644
--- a/graphics/map_objects/pics/people/mauville_old_man_2/0.png
+++ b/graphics/event_objects/pics/people/mauville_old_man_2/0.png
diff --git a/graphics/map_objects/pics/people/mauville_old_man_2/1.png b/graphics/event_objects/pics/people/mauville_old_man_2/1.png
index f98c0ecde..f98c0ecde 100644
--- a/graphics/map_objects/pics/people/mauville_old_man_2/1.png
+++ b/graphics/event_objects/pics/people/mauville_old_man_2/1.png
diff --git a/graphics/map_objects/pics/people/mauville_old_man_2/2.png b/graphics/event_objects/pics/people/mauville_old_man_2/2.png
index abe9050a0..abe9050a0 100644
--- a/graphics/map_objects/pics/people/mauville_old_man_2/2.png
+++ b/graphics/event_objects/pics/people/mauville_old_man_2/2.png
diff --git a/graphics/map_objects/pics/people/mauville_old_man_2/3.png b/graphics/event_objects/pics/people/mauville_old_man_2/3.png
index 4d71ce720..4d71ce720 100644
--- a/graphics/map_objects/pics/people/mauville_old_man_2/3.png
+++ b/graphics/event_objects/pics/people/mauville_old_man_2/3.png
diff --git a/graphics/map_objects/pics/people/mauville_old_man_2/4.png b/graphics/event_objects/pics/people/mauville_old_man_2/4.png
index 9e0330a61..9e0330a61 100644
--- a/graphics/map_objects/pics/people/mauville_old_man_2/4.png
+++ b/graphics/event_objects/pics/people/mauville_old_man_2/4.png
diff --git a/graphics/map_objects/pics/people/mauville_old_man_2/5.png b/graphics/event_objects/pics/people/mauville_old_man_2/5.png
index 92135f48a..92135f48a 100644
--- a/graphics/map_objects/pics/people/mauville_old_man_2/5.png
+++ b/graphics/event_objects/pics/people/mauville_old_man_2/5.png
diff --git a/graphics/map_objects/pics/people/mauville_old_man_2/6.png b/graphics/event_objects/pics/people/mauville_old_man_2/6.png
index 3a328ba04..3a328ba04 100644
--- a/graphics/map_objects/pics/people/mauville_old_man_2/6.png
+++ b/graphics/event_objects/pics/people/mauville_old_man_2/6.png
diff --git a/graphics/map_objects/pics/people/mauville_old_man_2/7.png b/graphics/event_objects/pics/people/mauville_old_man_2/7.png
index ea1b4d95b..ea1b4d95b 100644
--- a/graphics/map_objects/pics/people/mauville_old_man_2/7.png
+++ b/graphics/event_objects/pics/people/mauville_old_man_2/7.png
diff --git a/graphics/map_objects/pics/people/mauville_old_man_2/8.png b/graphics/event_objects/pics/people/mauville_old_man_2/8.png
index ac7a5e12d..ac7a5e12d 100644
--- a/graphics/map_objects/pics/people/mauville_old_man_2/8.png
+++ b/graphics/event_objects/pics/people/mauville_old_man_2/8.png
diff --git a/graphics/map_objects/pics/people/maxie/0.png b/graphics/event_objects/pics/people/maxie/0.png
index 21ca72fd2..21ca72fd2 100644
--- a/graphics/map_objects/pics/people/maxie/0.png
+++ b/graphics/event_objects/pics/people/maxie/0.png
diff --git a/graphics/map_objects/pics/people/maxie/1.png b/graphics/event_objects/pics/people/maxie/1.png
index d7347de17..d7347de17 100644
--- a/graphics/map_objects/pics/people/maxie/1.png
+++ b/graphics/event_objects/pics/people/maxie/1.png
diff --git a/graphics/map_objects/pics/people/maxie/2.png b/graphics/event_objects/pics/people/maxie/2.png
index f80bb07a5..f80bb07a5 100644
--- a/graphics/map_objects/pics/people/maxie/2.png
+++ b/graphics/event_objects/pics/people/maxie/2.png
diff --git a/graphics/map_objects/pics/people/maxie/3.png b/graphics/event_objects/pics/people/maxie/3.png
index 6cb101536..6cb101536 100644
--- a/graphics/map_objects/pics/people/maxie/3.png
+++ b/graphics/event_objects/pics/people/maxie/3.png
diff --git a/graphics/map_objects/pics/people/maxie/4.png b/graphics/event_objects/pics/people/maxie/4.png
index c513206a6..c513206a6 100644
--- a/graphics/map_objects/pics/people/maxie/4.png
+++ b/graphics/event_objects/pics/people/maxie/4.png
diff --git a/graphics/map_objects/pics/people/maxie/5.png b/graphics/event_objects/pics/people/maxie/5.png
index fd6a81dc5..fd6a81dc5 100644
--- a/graphics/map_objects/pics/people/maxie/5.png
+++ b/graphics/event_objects/pics/people/maxie/5.png
diff --git a/graphics/map_objects/pics/people/maxie/6.png b/graphics/event_objects/pics/people/maxie/6.png
index ac1564204..ac1564204 100644
--- a/graphics/map_objects/pics/people/maxie/6.png
+++ b/graphics/event_objects/pics/people/maxie/6.png
diff --git a/graphics/map_objects/pics/people/maxie/7.png b/graphics/event_objects/pics/people/maxie/7.png
index adb1aa235..adb1aa235 100644
--- a/graphics/map_objects/pics/people/maxie/7.png
+++ b/graphics/event_objects/pics/people/maxie/7.png
diff --git a/graphics/map_objects/pics/people/maxie/8.png b/graphics/event_objects/pics/people/maxie/8.png
index 765803561..765803561 100644
--- a/graphics/map_objects/pics/people/maxie/8.png
+++ b/graphics/event_objects/pics/people/maxie/8.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/00.png b/graphics/event_objects/pics/people/may/acro_bike/00.png
index 389f29985..389f29985 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/00.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/00.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/01.png b/graphics/event_objects/pics/people/may/acro_bike/01.png
index d6b698965..d6b698965 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/01.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/01.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/02.png b/graphics/event_objects/pics/people/may/acro_bike/02.png
index ecb59b54f..ecb59b54f 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/02.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/02.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/03.png b/graphics/event_objects/pics/people/may/acro_bike/03.png
index dfdd7a56a..dfdd7a56a 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/03.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/03.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/04.png b/graphics/event_objects/pics/people/may/acro_bike/04.png
index 6a6fa22fd..6a6fa22fd 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/04.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/04.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/05.png b/graphics/event_objects/pics/people/may/acro_bike/05.png
index 3b73f3367..3b73f3367 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/05.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/05.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/06.png b/graphics/event_objects/pics/people/may/acro_bike/06.png
index 368f0a05b..368f0a05b 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/06.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/06.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/07.png b/graphics/event_objects/pics/people/may/acro_bike/07.png
index e43d75556..e43d75556 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/07.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/07.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/08.png b/graphics/event_objects/pics/people/may/acro_bike/08.png
index ec9ef52e6..ec9ef52e6 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/08.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/08.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/09.png b/graphics/event_objects/pics/people/may/acro_bike/09.png
index 55522bd5b..55522bd5b 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/09.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/09.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/10.png b/graphics/event_objects/pics/people/may/acro_bike/10.png
index eff73287f..eff73287f 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/10.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/10.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/11.png b/graphics/event_objects/pics/people/may/acro_bike/11.png
index 092fffddb..092fffddb 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/11.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/11.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/12.png b/graphics/event_objects/pics/people/may/acro_bike/12.png
index 233a03266..233a03266 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/12.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/12.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/13.png b/graphics/event_objects/pics/people/may/acro_bike/13.png
index f1736a0ec..f1736a0ec 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/13.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/13.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/14.png b/graphics/event_objects/pics/people/may/acro_bike/14.png
index bf4ade7f0..bf4ade7f0 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/14.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/14.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/15.png b/graphics/event_objects/pics/people/may/acro_bike/15.png
index 9fccb5026..9fccb5026 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/15.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/15.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/16.png b/graphics/event_objects/pics/people/may/acro_bike/16.png
index 6d34e41bf..6d34e41bf 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/16.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/16.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/17.png b/graphics/event_objects/pics/people/may/acro_bike/17.png
index e01484497..e01484497 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/17.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/17.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/18.png b/graphics/event_objects/pics/people/may/acro_bike/18.png
index a4bee4772..a4bee4772 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/18.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/18.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/19.png b/graphics/event_objects/pics/people/may/acro_bike/19.png
index f7e10f132..f7e10f132 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/19.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/19.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/20.png b/graphics/event_objects/pics/people/may/acro_bike/20.png
index f9f34e4ae..f9f34e4ae 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/20.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/20.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/21.png b/graphics/event_objects/pics/people/may/acro_bike/21.png
index 8784ce762..8784ce762 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/21.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/21.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/22.png b/graphics/event_objects/pics/people/may/acro_bike/22.png
index 8753ad9c9..8753ad9c9 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/22.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/22.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/23.png b/graphics/event_objects/pics/people/may/acro_bike/23.png
index c2d8a60cb..c2d8a60cb 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/23.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/23.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/24.png b/graphics/event_objects/pics/people/may/acro_bike/24.png
index 1836e5fed..1836e5fed 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/24.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/24.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/25.png b/graphics/event_objects/pics/people/may/acro_bike/25.png
index d93970171..d93970171 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/25.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/25.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/26.png b/graphics/event_objects/pics/people/may/acro_bike/26.png
index 8a5ba8ef6..8a5ba8ef6 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/26.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/26.png
diff --git a/graphics/map_objects/pics/people/may/decorating.png b/graphics/event_objects/pics/people/may/decorating.png
index 7f83dfde9..7f83dfde9 100644
--- a/graphics/map_objects/pics/people/may/decorating.png
+++ b/graphics/event_objects/pics/people/may/decorating.png
diff --git a/graphics/map_objects/pics/people/may/field_move/0.png b/graphics/event_objects/pics/people/may/field_move/0.png
index 9fecaa3d4..9fecaa3d4 100644
--- a/graphics/map_objects/pics/people/may/field_move/0.png
+++ b/graphics/event_objects/pics/people/may/field_move/0.png
diff --git a/graphics/map_objects/pics/people/may/field_move/1.png b/graphics/event_objects/pics/people/may/field_move/1.png
index 47341322b..47341322b 100644
--- a/graphics/map_objects/pics/people/may/field_move/1.png
+++ b/graphics/event_objects/pics/people/may/field_move/1.png
diff --git a/graphics/map_objects/pics/people/may/field_move/2.png b/graphics/event_objects/pics/people/may/field_move/2.png
index bdd23f0cf..bdd23f0cf 100644
--- a/graphics/map_objects/pics/people/may/field_move/2.png
+++ b/graphics/event_objects/pics/people/may/field_move/2.png
diff --git a/graphics/map_objects/pics/people/may/field_move/3.png b/graphics/event_objects/pics/people/may/field_move/3.png
index c72277f74..c72277f74 100644
--- a/graphics/map_objects/pics/people/may/field_move/3.png
+++ b/graphics/event_objects/pics/people/may/field_move/3.png
diff --git a/graphics/map_objects/pics/people/may/field_move/4.png b/graphics/event_objects/pics/people/may/field_move/4.png
index 9e62b6869..9e62b6869 100644
--- a/graphics/map_objects/pics/people/may/field_move/4.png
+++ b/graphics/event_objects/pics/people/may/field_move/4.png
diff --git a/graphics/map_objects/pics/people/may/fishing/00.png b/graphics/event_objects/pics/people/may/fishing/00.png
index 24d435e84..24d435e84 100644
--- a/graphics/map_objects/pics/people/may/fishing/00.png
+++ b/graphics/event_objects/pics/people/may/fishing/00.png
diff --git a/graphics/map_objects/pics/people/may/fishing/01.png b/graphics/event_objects/pics/people/may/fishing/01.png
index f4ec1ccdd..f4ec1ccdd 100644
--- a/graphics/map_objects/pics/people/may/fishing/01.png
+++ b/graphics/event_objects/pics/people/may/fishing/01.png
diff --git a/graphics/map_objects/pics/people/may/fishing/02.png b/graphics/event_objects/pics/people/may/fishing/02.png
index 9d2e66b4f..9d2e66b4f 100644
--- a/graphics/map_objects/pics/people/may/fishing/02.png
+++ b/graphics/event_objects/pics/people/may/fishing/02.png
diff --git a/graphics/map_objects/pics/people/may/fishing/03.png b/graphics/event_objects/pics/people/may/fishing/03.png
index a7078e584..a7078e584 100644
--- a/graphics/map_objects/pics/people/may/fishing/03.png
+++ b/graphics/event_objects/pics/people/may/fishing/03.png
diff --git a/graphics/map_objects/pics/people/may/fishing/04.png b/graphics/event_objects/pics/people/may/fishing/04.png
index f135404bc..f135404bc 100644
--- a/graphics/map_objects/pics/people/may/fishing/04.png
+++ b/graphics/event_objects/pics/people/may/fishing/04.png
diff --git a/graphics/map_objects/pics/people/may/fishing/05.png b/graphics/event_objects/pics/people/may/fishing/05.png
index cb45778ac..cb45778ac 100644
--- a/graphics/map_objects/pics/people/may/fishing/05.png
+++ b/graphics/event_objects/pics/people/may/fishing/05.png
diff --git a/graphics/map_objects/pics/people/may/fishing/06.png b/graphics/event_objects/pics/people/may/fishing/06.png
index 910e2f780..910e2f780 100644
--- a/graphics/map_objects/pics/people/may/fishing/06.png
+++ b/graphics/event_objects/pics/people/may/fishing/06.png
diff --git a/graphics/map_objects/pics/people/may/fishing/07.png b/graphics/event_objects/pics/people/may/fishing/07.png
index a13b1cad5..a13b1cad5 100644
--- a/graphics/map_objects/pics/people/may/fishing/07.png
+++ b/graphics/event_objects/pics/people/may/fishing/07.png
diff --git a/graphics/map_objects/pics/people/may/fishing/08.png b/graphics/event_objects/pics/people/may/fishing/08.png
index 297643481..297643481 100644
--- a/graphics/map_objects/pics/people/may/fishing/08.png
+++ b/graphics/event_objects/pics/people/may/fishing/08.png
diff --git a/graphics/map_objects/pics/people/may/fishing/09.png b/graphics/event_objects/pics/people/may/fishing/09.png
index 069eb2b20..069eb2b20 100644
--- a/graphics/map_objects/pics/people/may/fishing/09.png
+++ b/graphics/event_objects/pics/people/may/fishing/09.png
diff --git a/graphics/map_objects/pics/people/may/fishing/10.png b/graphics/event_objects/pics/people/may/fishing/10.png
index 5eca2728d..5eca2728d 100644
--- a/graphics/map_objects/pics/people/may/fishing/10.png
+++ b/graphics/event_objects/pics/people/may/fishing/10.png
diff --git a/graphics/map_objects/pics/people/may/fishing/11.png b/graphics/event_objects/pics/people/may/fishing/11.png
index 9895c388a..9895c388a 100644
--- a/graphics/map_objects/pics/people/may/fishing/11.png
+++ b/graphics/event_objects/pics/people/may/fishing/11.png
diff --git a/graphics/map_objects/pics/people/may/mach_bike/0.png b/graphics/event_objects/pics/people/may/mach_bike/0.png
index 389f29985..389f29985 100644
--- a/graphics/map_objects/pics/people/may/mach_bike/0.png
+++ b/graphics/event_objects/pics/people/may/mach_bike/0.png
diff --git a/graphics/map_objects/pics/people/may/mach_bike/1.png b/graphics/event_objects/pics/people/may/mach_bike/1.png
index d6b698965..d6b698965 100644
--- a/graphics/map_objects/pics/people/may/mach_bike/1.png
+++ b/graphics/event_objects/pics/people/may/mach_bike/1.png
diff --git a/graphics/map_objects/pics/people/may/mach_bike/2.png b/graphics/event_objects/pics/people/may/mach_bike/2.png
index ecb59b54f..ecb59b54f 100644
--- a/graphics/map_objects/pics/people/may/mach_bike/2.png
+++ b/graphics/event_objects/pics/people/may/mach_bike/2.png
diff --git a/graphics/map_objects/pics/people/may/mach_bike/3.png b/graphics/event_objects/pics/people/may/mach_bike/3.png
index dfdd7a56a..dfdd7a56a 100644
--- a/graphics/map_objects/pics/people/may/mach_bike/3.png
+++ b/graphics/event_objects/pics/people/may/mach_bike/3.png
diff --git a/graphics/map_objects/pics/people/may/mach_bike/4.png b/graphics/event_objects/pics/people/may/mach_bike/4.png
index 6a6fa22fd..6a6fa22fd 100644
--- a/graphics/map_objects/pics/people/may/mach_bike/4.png
+++ b/graphics/event_objects/pics/people/may/mach_bike/4.png
diff --git a/graphics/map_objects/pics/people/may/mach_bike/5.png b/graphics/event_objects/pics/people/may/mach_bike/5.png
index 3b73f3367..3b73f3367 100644
--- a/graphics/map_objects/pics/people/may/mach_bike/5.png
+++ b/graphics/event_objects/pics/people/may/mach_bike/5.png
diff --git a/graphics/map_objects/pics/people/may/mach_bike/6.png b/graphics/event_objects/pics/people/may/mach_bike/6.png
index 368f0a05b..368f0a05b 100644
--- a/graphics/map_objects/pics/people/may/mach_bike/6.png
+++ b/graphics/event_objects/pics/people/may/mach_bike/6.png
diff --git a/graphics/map_objects/pics/people/may/mach_bike/7.png b/graphics/event_objects/pics/people/may/mach_bike/7.png
index e43d75556..e43d75556 100644
--- a/graphics/map_objects/pics/people/may/mach_bike/7.png
+++ b/graphics/event_objects/pics/people/may/mach_bike/7.png
diff --git a/graphics/map_objects/pics/people/may/mach_bike/8.png b/graphics/event_objects/pics/people/may/mach_bike/8.png
index ec9ef52e6..ec9ef52e6 100644
--- a/graphics/map_objects/pics/people/may/mach_bike/8.png
+++ b/graphics/event_objects/pics/people/may/mach_bike/8.png
diff --git a/graphics/map_objects/pics/people/may/normal/00.png b/graphics/event_objects/pics/people/may/normal/00.png
index 58aac207f..58aac207f 100644
--- a/graphics/map_objects/pics/people/may/normal/00.png
+++ b/graphics/event_objects/pics/people/may/normal/00.png
diff --git a/graphics/map_objects/pics/people/may/normal/01.png b/graphics/event_objects/pics/people/may/normal/01.png
index 2c3641e0a..2c3641e0a 100644
--- a/graphics/map_objects/pics/people/may/normal/01.png
+++ b/graphics/event_objects/pics/people/may/normal/01.png
diff --git a/graphics/map_objects/pics/people/may/normal/02.png b/graphics/event_objects/pics/people/may/normal/02.png
index 32b7120a5..32b7120a5 100644
--- a/graphics/map_objects/pics/people/may/normal/02.png
+++ b/graphics/event_objects/pics/people/may/normal/02.png
diff --git a/graphics/map_objects/pics/people/may/normal/03.png b/graphics/event_objects/pics/people/may/normal/03.png
index d1047dff8..d1047dff8 100644
--- a/graphics/map_objects/pics/people/may/normal/03.png
+++ b/graphics/event_objects/pics/people/may/normal/03.png
diff --git a/graphics/map_objects/pics/people/may/normal/04.png b/graphics/event_objects/pics/people/may/normal/04.png
index 848166557..848166557 100644
--- a/graphics/map_objects/pics/people/may/normal/04.png
+++ b/graphics/event_objects/pics/people/may/normal/04.png
diff --git a/graphics/map_objects/pics/people/may/normal/05.png b/graphics/event_objects/pics/people/may/normal/05.png
index 5e6ec70ff..5e6ec70ff 100644
--- a/graphics/map_objects/pics/people/may/normal/05.png
+++ b/graphics/event_objects/pics/people/may/normal/05.png
diff --git a/graphics/map_objects/pics/people/may/normal/06.png b/graphics/event_objects/pics/people/may/normal/06.png
index 0e318b466..0e318b466 100644
--- a/graphics/map_objects/pics/people/may/normal/06.png
+++ b/graphics/event_objects/pics/people/may/normal/06.png
diff --git a/graphics/map_objects/pics/people/may/normal/07.png b/graphics/event_objects/pics/people/may/normal/07.png
index e11b30b65..e11b30b65 100644
--- a/graphics/map_objects/pics/people/may/normal/07.png
+++ b/graphics/event_objects/pics/people/may/normal/07.png
diff --git a/graphics/map_objects/pics/people/may/normal/08.png b/graphics/event_objects/pics/people/may/normal/08.png
index 4aae3e9d6..4aae3e9d6 100644
--- a/graphics/map_objects/pics/people/may/normal/08.png
+++ b/graphics/event_objects/pics/people/may/normal/08.png
diff --git a/graphics/map_objects/pics/people/may/normal/09.png b/graphics/event_objects/pics/people/may/normal/09.png
index eae4c02ee..eae4c02ee 100644
--- a/graphics/map_objects/pics/people/may/normal/09.png
+++ b/graphics/event_objects/pics/people/may/normal/09.png
diff --git a/graphics/map_objects/pics/people/may/normal/10.png b/graphics/event_objects/pics/people/may/normal/10.png
index 2a678208e..2a678208e 100644
--- a/graphics/map_objects/pics/people/may/normal/10.png
+++ b/graphics/event_objects/pics/people/may/normal/10.png
diff --git a/graphics/map_objects/pics/people/may/normal/11.png b/graphics/event_objects/pics/people/may/normal/11.png
index 7ca7d3e6f..7ca7d3e6f 100644
--- a/graphics/map_objects/pics/people/may/normal/11.png
+++ b/graphics/event_objects/pics/people/may/normal/11.png
diff --git a/graphics/map_objects/pics/people/may/normal/12.png b/graphics/event_objects/pics/people/may/normal/12.png
index 1e2d40894..1e2d40894 100644
--- a/graphics/map_objects/pics/people/may/normal/12.png
+++ b/graphics/event_objects/pics/people/may/normal/12.png
diff --git a/graphics/map_objects/pics/people/may/normal/13.png b/graphics/event_objects/pics/people/may/normal/13.png
index ca020591c..ca020591c 100644
--- a/graphics/map_objects/pics/people/may/normal/13.png
+++ b/graphics/event_objects/pics/people/may/normal/13.png
diff --git a/graphics/map_objects/pics/people/may/normal/14.png b/graphics/event_objects/pics/people/may/normal/14.png
index 6a5a2e3e5..6a5a2e3e5 100644
--- a/graphics/map_objects/pics/people/may/normal/14.png
+++ b/graphics/event_objects/pics/people/may/normal/14.png
diff --git a/graphics/map_objects/pics/people/may/normal/15.png b/graphics/event_objects/pics/people/may/normal/15.png
index 06d813167..06d813167 100644
--- a/graphics/map_objects/pics/people/may/normal/15.png
+++ b/graphics/event_objects/pics/people/may/normal/15.png
diff --git a/graphics/map_objects/pics/people/may/normal/16.png b/graphics/event_objects/pics/people/may/normal/16.png
index c1fe3d367..c1fe3d367 100644
--- a/graphics/map_objects/pics/people/may/normal/16.png
+++ b/graphics/event_objects/pics/people/may/normal/16.png
diff --git a/graphics/map_objects/pics/people/may/normal/17.png b/graphics/event_objects/pics/people/may/normal/17.png
index 334c70cf1..334c70cf1 100644
--- a/graphics/map_objects/pics/people/may/normal/17.png
+++ b/graphics/event_objects/pics/people/may/normal/17.png
diff --git a/graphics/map_objects/pics/people/may/surfing/0.png b/graphics/event_objects/pics/people/may/surfing/0.png
index 98b152f5f..98b152f5f 100644
--- a/graphics/map_objects/pics/people/may/surfing/0.png
+++ b/graphics/event_objects/pics/people/may/surfing/0.png
diff --git a/graphics/map_objects/pics/people/may/surfing/1.png b/graphics/event_objects/pics/people/may/surfing/1.png
index 45ae64705..45ae64705 100644
--- a/graphics/map_objects/pics/people/may/surfing/1.png
+++ b/graphics/event_objects/pics/people/may/surfing/1.png
diff --git a/graphics/map_objects/pics/people/may/surfing/2.png b/graphics/event_objects/pics/people/may/surfing/2.png
index eb6f7675e..eb6f7675e 100644
--- a/graphics/map_objects/pics/people/may/surfing/2.png
+++ b/graphics/event_objects/pics/people/may/surfing/2.png
diff --git a/graphics/map_objects/pics/people/may/surfing/3.png b/graphics/event_objects/pics/people/may/surfing/3.png
index 18756fe1b..18756fe1b 100644
--- a/graphics/map_objects/pics/people/may/surfing/3.png
+++ b/graphics/event_objects/pics/people/may/surfing/3.png
diff --git a/graphics/map_objects/pics/people/may/surfing/4.png b/graphics/event_objects/pics/people/may/surfing/4.png
index ac89a2672..ac89a2672 100644
--- a/graphics/map_objects/pics/people/may/surfing/4.png
+++ b/graphics/event_objects/pics/people/may/surfing/4.png
diff --git a/graphics/map_objects/pics/people/may/surfing/5.png b/graphics/event_objects/pics/people/may/surfing/5.png
index 2569df008..2569df008 100644
--- a/graphics/map_objects/pics/people/may/surfing/5.png
+++ b/graphics/event_objects/pics/people/may/surfing/5.png
diff --git a/graphics/map_objects/pics/people/may/underwater/0.png b/graphics/event_objects/pics/people/may/underwater/0.png
index 678dc4bb6..678dc4bb6 100644
--- a/graphics/map_objects/pics/people/may/underwater/0.png
+++ b/graphics/event_objects/pics/people/may/underwater/0.png
diff --git a/graphics/map_objects/pics/people/may/underwater/1.png b/graphics/event_objects/pics/people/may/underwater/1.png
index 697cec2d1..697cec2d1 100644
--- a/graphics/map_objects/pics/people/may/underwater/1.png
+++ b/graphics/event_objects/pics/people/may/underwater/1.png
diff --git a/graphics/map_objects/pics/people/may/underwater/2.png b/graphics/event_objects/pics/people/may/underwater/2.png
index 423f01f88..423f01f88 100644
--- a/graphics/map_objects/pics/people/may/underwater/2.png
+++ b/graphics/event_objects/pics/people/may/underwater/2.png
diff --git a/graphics/map_objects/pics/people/may/underwater/3.png b/graphics/event_objects/pics/people/may/underwater/3.png
index 4118573a3..4118573a3 100644
--- a/graphics/map_objects/pics/people/may/underwater/3.png
+++ b/graphics/event_objects/pics/people/may/underwater/3.png
diff --git a/graphics/map_objects/pics/people/may/watering/0.png b/graphics/event_objects/pics/people/may/watering/0.png
index 11e8944a1..11e8944a1 100644
--- a/graphics/map_objects/pics/people/may/watering/0.png
+++ b/graphics/event_objects/pics/people/may/watering/0.png
diff --git a/graphics/map_objects/pics/people/may/watering/1.png b/graphics/event_objects/pics/people/may/watering/1.png
index 84aa55502..84aa55502 100644
--- a/graphics/map_objects/pics/people/may/watering/1.png
+++ b/graphics/event_objects/pics/people/may/watering/1.png
diff --git a/graphics/map_objects/pics/people/may/watering/2.png b/graphics/event_objects/pics/people/may/watering/2.png
index 5d68e4994..5d68e4994 100644
--- a/graphics/map_objects/pics/people/may/watering/2.png
+++ b/graphics/event_objects/pics/people/may/watering/2.png
diff --git a/graphics/map_objects/pics/people/may/watering/3.png b/graphics/event_objects/pics/people/may/watering/3.png
index c0f732d72..c0f732d72 100644
--- a/graphics/map_objects/pics/people/may/watering/3.png
+++ b/graphics/event_objects/pics/people/may/watering/3.png
diff --git a/graphics/map_objects/pics/people/may/watering/4.png b/graphics/event_objects/pics/people/may/watering/4.png
index 85657cc6c..85657cc6c 100644
--- a/graphics/map_objects/pics/people/may/watering/4.png
+++ b/graphics/event_objects/pics/people/may/watering/4.png
diff --git a/graphics/map_objects/pics/people/may/watering/5.png b/graphics/event_objects/pics/people/may/watering/5.png
index 939671a31..939671a31 100644
--- a/graphics/map_objects/pics/people/may/watering/5.png
+++ b/graphics/event_objects/pics/people/may/watering/5.png
diff --git a/graphics/map_objects/pics/people/mom/0.png b/graphics/event_objects/pics/people/mom/0.png
index c2b592c9f..c2b592c9f 100644
--- a/graphics/map_objects/pics/people/mom/0.png
+++ b/graphics/event_objects/pics/people/mom/0.png
diff --git a/graphics/map_objects/pics/people/mom/1.png b/graphics/event_objects/pics/people/mom/1.png
index e1d1797cb..e1d1797cb 100644
--- a/graphics/map_objects/pics/people/mom/1.png
+++ b/graphics/event_objects/pics/people/mom/1.png
diff --git a/graphics/map_objects/pics/people/mom/2.png b/graphics/event_objects/pics/people/mom/2.png
index 8cd0c1d72..8cd0c1d72 100644
--- a/graphics/map_objects/pics/people/mom/2.png
+++ b/graphics/event_objects/pics/people/mom/2.png
diff --git a/graphics/map_objects/pics/people/mom/3.png b/graphics/event_objects/pics/people/mom/3.png
index 3a682f892..3a682f892 100644
--- a/graphics/map_objects/pics/people/mom/3.png
+++ b/graphics/event_objects/pics/people/mom/3.png
diff --git a/graphics/map_objects/pics/people/mom/4.png b/graphics/event_objects/pics/people/mom/4.png
index 96de53b7b..96de53b7b 100644
--- a/graphics/map_objects/pics/people/mom/4.png
+++ b/graphics/event_objects/pics/people/mom/4.png
diff --git a/graphics/map_objects/pics/people/mom/5.png b/graphics/event_objects/pics/people/mom/5.png
index 567e8fb53..567e8fb53 100644
--- a/graphics/map_objects/pics/people/mom/5.png
+++ b/graphics/event_objects/pics/people/mom/5.png
diff --git a/graphics/map_objects/pics/people/mom/6.png b/graphics/event_objects/pics/people/mom/6.png
index 4dfaed492..4dfaed492 100644
--- a/graphics/map_objects/pics/people/mom/6.png
+++ b/graphics/event_objects/pics/people/mom/6.png
diff --git a/graphics/map_objects/pics/people/mom/7.png b/graphics/event_objects/pics/people/mom/7.png
index 3ce984e75..3ce984e75 100644
--- a/graphics/map_objects/pics/people/mom/7.png
+++ b/graphics/event_objects/pics/people/mom/7.png
diff --git a/graphics/map_objects/pics/people/mom/8.png b/graphics/event_objects/pics/people/mom/8.png
index 6a3da67d1..6a3da67d1 100644
--- a/graphics/map_objects/pics/people/mom/8.png
+++ b/graphics/event_objects/pics/people/mom/8.png
diff --git a/graphics/map_objects/pics/people/mystery_event_deliveryman/0.png b/graphics/event_objects/pics/people/mystery_event_deliveryman/0.png
index ec3e0ac82..ec3e0ac82 100644
--- a/graphics/map_objects/pics/people/mystery_event_deliveryman/0.png
+++ b/graphics/event_objects/pics/people/mystery_event_deliveryman/0.png
diff --git a/graphics/map_objects/pics/people/mystery_event_deliveryman/1.png b/graphics/event_objects/pics/people/mystery_event_deliveryman/1.png
index 8be989045..8be989045 100644
--- a/graphics/map_objects/pics/people/mystery_event_deliveryman/1.png
+++ b/graphics/event_objects/pics/people/mystery_event_deliveryman/1.png
diff --git a/graphics/map_objects/pics/people/mystery_event_deliveryman/2.png b/graphics/event_objects/pics/people/mystery_event_deliveryman/2.png
index afff0cc5e..afff0cc5e 100644
--- a/graphics/map_objects/pics/people/mystery_event_deliveryman/2.png
+++ b/graphics/event_objects/pics/people/mystery_event_deliveryman/2.png
diff --git a/graphics/map_objects/pics/people/noland/0.png b/graphics/event_objects/pics/people/noland/0.png
index 76fb7bdf1..76fb7bdf1 100644
--- a/graphics/map_objects/pics/people/noland/0.png
+++ b/graphics/event_objects/pics/people/noland/0.png
diff --git a/graphics/map_objects/pics/people/noland/1.png b/graphics/event_objects/pics/people/noland/1.png
index 4eeceffed..4eeceffed 100644
--- a/graphics/map_objects/pics/people/noland/1.png
+++ b/graphics/event_objects/pics/people/noland/1.png
diff --git a/graphics/map_objects/pics/people/noland/2.png b/graphics/event_objects/pics/people/noland/2.png
index daeff0641..daeff0641 100644
--- a/graphics/map_objects/pics/people/noland/2.png
+++ b/graphics/event_objects/pics/people/noland/2.png
diff --git a/graphics/map_objects/pics/people/noland/3.png b/graphics/event_objects/pics/people/noland/3.png
index e54596be6..e54596be6 100644
--- a/graphics/map_objects/pics/people/noland/3.png
+++ b/graphics/event_objects/pics/people/noland/3.png
diff --git a/graphics/map_objects/pics/people/noland/4.png b/graphics/event_objects/pics/people/noland/4.png
index 35763f56f..35763f56f 100644
--- a/graphics/map_objects/pics/people/noland/4.png
+++ b/graphics/event_objects/pics/people/noland/4.png
diff --git a/graphics/map_objects/pics/people/noland/5.png b/graphics/event_objects/pics/people/noland/5.png
index ef0ac5d92..ef0ac5d92 100644
--- a/graphics/map_objects/pics/people/noland/5.png
+++ b/graphics/event_objects/pics/people/noland/5.png
diff --git a/graphics/map_objects/pics/people/noland/6.png b/graphics/event_objects/pics/people/noland/6.png
index dc6fa2a25..dc6fa2a25 100644
--- a/graphics/map_objects/pics/people/noland/6.png
+++ b/graphics/event_objects/pics/people/noland/6.png
diff --git a/graphics/map_objects/pics/people/noland/7.png b/graphics/event_objects/pics/people/noland/7.png
index ee9820106..ee9820106 100644
--- a/graphics/map_objects/pics/people/noland/7.png
+++ b/graphics/event_objects/pics/people/noland/7.png
diff --git a/graphics/map_objects/pics/people/noland/8.png b/graphics/event_objects/pics/people/noland/8.png
index e8d40a08d..e8d40a08d 100644
--- a/graphics/map_objects/pics/people/noland/8.png
+++ b/graphics/event_objects/pics/people/noland/8.png
diff --git a/graphics/map_objects/pics/people/norman/0.png b/graphics/event_objects/pics/people/norman/0.png
index 5f0bd1686..5f0bd1686 100644
--- a/graphics/map_objects/pics/people/norman/0.png
+++ b/graphics/event_objects/pics/people/norman/0.png
diff --git a/graphics/map_objects/pics/people/norman/1.png b/graphics/event_objects/pics/people/norman/1.png
index 88ea12ada..88ea12ada 100644
--- a/graphics/map_objects/pics/people/norman/1.png
+++ b/graphics/event_objects/pics/people/norman/1.png
diff --git a/graphics/map_objects/pics/people/norman/2.png b/graphics/event_objects/pics/people/norman/2.png
index 04d8694ef..04d8694ef 100644
--- a/graphics/map_objects/pics/people/norman/2.png
+++ b/graphics/event_objects/pics/people/norman/2.png
diff --git a/graphics/map_objects/pics/people/norman/3.png b/graphics/event_objects/pics/people/norman/3.png
index 90d16f675..90d16f675 100644
--- a/graphics/map_objects/pics/people/norman/3.png
+++ b/graphics/event_objects/pics/people/norman/3.png
diff --git a/graphics/map_objects/pics/people/norman/4.png b/graphics/event_objects/pics/people/norman/4.png
index 0df4412fb..0df4412fb 100644
--- a/graphics/map_objects/pics/people/norman/4.png
+++ b/graphics/event_objects/pics/people/norman/4.png
diff --git a/graphics/map_objects/pics/people/norman/5.png b/graphics/event_objects/pics/people/norman/5.png
index ea68e0952..ea68e0952 100644
--- a/graphics/map_objects/pics/people/norman/5.png
+++ b/graphics/event_objects/pics/people/norman/5.png
diff --git a/graphics/map_objects/pics/people/norman/6.png b/graphics/event_objects/pics/people/norman/6.png
index 45f8e5119..45f8e5119 100644
--- a/graphics/map_objects/pics/people/norman/6.png
+++ b/graphics/event_objects/pics/people/norman/6.png
diff --git a/graphics/map_objects/pics/people/norman/7.png b/graphics/event_objects/pics/people/norman/7.png
index 27ff65ec0..27ff65ec0 100644
--- a/graphics/map_objects/pics/people/norman/7.png
+++ b/graphics/event_objects/pics/people/norman/7.png
diff --git a/graphics/map_objects/pics/people/norman/8.png b/graphics/event_objects/pics/people/norman/8.png
index aa18f3d73..aa18f3d73 100644
--- a/graphics/map_objects/pics/people/norman/8.png
+++ b/graphics/event_objects/pics/people/norman/8.png
diff --git a/graphics/map_objects/pics/people/nurse/0.png b/graphics/event_objects/pics/people/nurse/0.png
index 3c6b14717..3c6b14717 100644
--- a/graphics/map_objects/pics/people/nurse/0.png
+++ b/graphics/event_objects/pics/people/nurse/0.png
diff --git a/graphics/map_objects/pics/people/nurse/1.png b/graphics/event_objects/pics/people/nurse/1.png
index a20bfc521..a20bfc521 100644
--- a/graphics/map_objects/pics/people/nurse/1.png
+++ b/graphics/event_objects/pics/people/nurse/1.png
diff --git a/graphics/map_objects/pics/people/nurse/2.png b/graphics/event_objects/pics/people/nurse/2.png
index ec048a040..ec048a040 100644
--- a/graphics/map_objects/pics/people/nurse/2.png
+++ b/graphics/event_objects/pics/people/nurse/2.png
diff --git a/graphics/map_objects/pics/people/nurse/3.png b/graphics/event_objects/pics/people/nurse/3.png
index ae306ff49..ae306ff49 100644
--- a/graphics/map_objects/pics/people/nurse/3.png
+++ b/graphics/event_objects/pics/people/nurse/3.png
diff --git a/graphics/map_objects/pics/people/old_man_1/0.png b/graphics/event_objects/pics/people/old_man_1/0.png
index f593b13e0..f593b13e0 100644
--- a/graphics/map_objects/pics/people/old_man_1/0.png
+++ b/graphics/event_objects/pics/people/old_man_1/0.png
diff --git a/graphics/map_objects/pics/people/old_man_1/1.png b/graphics/event_objects/pics/people/old_man_1/1.png
index 2479299b1..2479299b1 100644
--- a/graphics/map_objects/pics/people/old_man_1/1.png
+++ b/graphics/event_objects/pics/people/old_man_1/1.png
diff --git a/graphics/map_objects/pics/people/old_man_1/2.png b/graphics/event_objects/pics/people/old_man_1/2.png
index e24126007..e24126007 100644
--- a/graphics/map_objects/pics/people/old_man_1/2.png
+++ b/graphics/event_objects/pics/people/old_man_1/2.png
diff --git a/graphics/map_objects/pics/people/old_man_1/3.png b/graphics/event_objects/pics/people/old_man_1/3.png
index 058b699b3..058b699b3 100644
--- a/graphics/map_objects/pics/people/old_man_1/3.png
+++ b/graphics/event_objects/pics/people/old_man_1/3.png
diff --git a/graphics/map_objects/pics/people/old_man_1/4.png b/graphics/event_objects/pics/people/old_man_1/4.png
index 3f68a34c1..3f68a34c1 100644
--- a/graphics/map_objects/pics/people/old_man_1/4.png
+++ b/graphics/event_objects/pics/people/old_man_1/4.png
diff --git a/graphics/map_objects/pics/people/old_man_1/5.png b/graphics/event_objects/pics/people/old_man_1/5.png
index f0eb2a0ad..f0eb2a0ad 100644
--- a/graphics/map_objects/pics/people/old_man_1/5.png
+++ b/graphics/event_objects/pics/people/old_man_1/5.png
diff --git a/graphics/map_objects/pics/people/old_man_1/6.png b/graphics/event_objects/pics/people/old_man_1/6.png
index 3e4570a9c..3e4570a9c 100644
--- a/graphics/map_objects/pics/people/old_man_1/6.png
+++ b/graphics/event_objects/pics/people/old_man_1/6.png
diff --git a/graphics/map_objects/pics/people/old_man_1/7.png b/graphics/event_objects/pics/people/old_man_1/7.png
index 2066c1170..2066c1170 100644
--- a/graphics/map_objects/pics/people/old_man_1/7.png
+++ b/graphics/event_objects/pics/people/old_man_1/7.png
diff --git a/graphics/map_objects/pics/people/old_man_1/8.png b/graphics/event_objects/pics/people/old_man_1/8.png
index 10af5d1e7..10af5d1e7 100644
--- a/graphics/map_objects/pics/people/old_man_1/8.png
+++ b/graphics/event_objects/pics/people/old_man_1/8.png
diff --git a/graphics/map_objects/pics/people/old_man_2/0.png b/graphics/event_objects/pics/people/old_man_2/0.png
index 0f3537c26..0f3537c26 100644
--- a/graphics/map_objects/pics/people/old_man_2/0.png
+++ b/graphics/event_objects/pics/people/old_man_2/0.png
diff --git a/graphics/map_objects/pics/people/old_man_2/1.png b/graphics/event_objects/pics/people/old_man_2/1.png
index d47c1bd70..d47c1bd70 100644
--- a/graphics/map_objects/pics/people/old_man_2/1.png
+++ b/graphics/event_objects/pics/people/old_man_2/1.png
diff --git a/graphics/map_objects/pics/people/old_man_2/2.png b/graphics/event_objects/pics/people/old_man_2/2.png
index 43fdd9849..43fdd9849 100644
--- a/graphics/map_objects/pics/people/old_man_2/2.png
+++ b/graphics/event_objects/pics/people/old_man_2/2.png
diff --git a/graphics/map_objects/pics/people/old_woman_1/0.png b/graphics/event_objects/pics/people/old_woman_1/0.png
index 86eb3b887..86eb3b887 100644
--- a/graphics/map_objects/pics/people/old_woman_1/0.png
+++ b/graphics/event_objects/pics/people/old_woman_1/0.png
diff --git a/graphics/map_objects/pics/people/old_woman_1/1.png b/graphics/event_objects/pics/people/old_woman_1/1.png
index fcab35b2e..fcab35b2e 100644
--- a/graphics/map_objects/pics/people/old_woman_1/1.png
+++ b/graphics/event_objects/pics/people/old_woman_1/1.png
diff --git a/graphics/map_objects/pics/people/old_woman_1/2.png b/graphics/event_objects/pics/people/old_woman_1/2.png
index cdee1f84a..cdee1f84a 100644
--- a/graphics/map_objects/pics/people/old_woman_1/2.png
+++ b/graphics/event_objects/pics/people/old_woman_1/2.png
diff --git a/graphics/map_objects/pics/people/old_woman_1/3.png b/graphics/event_objects/pics/people/old_woman_1/3.png
index 40fc7f909..40fc7f909 100644
--- a/graphics/map_objects/pics/people/old_woman_1/3.png
+++ b/graphics/event_objects/pics/people/old_woman_1/3.png
diff --git a/graphics/map_objects/pics/people/old_woman_1/4.png b/graphics/event_objects/pics/people/old_woman_1/4.png
index 6b0df84d6..6b0df84d6 100644
--- a/graphics/map_objects/pics/people/old_woman_1/4.png
+++ b/graphics/event_objects/pics/people/old_woman_1/4.png
diff --git a/graphics/map_objects/pics/people/old_woman_1/5.png b/graphics/event_objects/pics/people/old_woman_1/5.png
index 6490ca64a..6490ca64a 100644
--- a/graphics/map_objects/pics/people/old_woman_1/5.png
+++ b/graphics/event_objects/pics/people/old_woman_1/5.png
diff --git a/graphics/map_objects/pics/people/old_woman_1/6.png b/graphics/event_objects/pics/people/old_woman_1/6.png
index d3cc6dd56..d3cc6dd56 100644
--- a/graphics/map_objects/pics/people/old_woman_1/6.png
+++ b/graphics/event_objects/pics/people/old_woman_1/6.png
diff --git a/graphics/map_objects/pics/people/old_woman_1/7.png b/graphics/event_objects/pics/people/old_woman_1/7.png
index fd63c293c..fd63c293c 100644
--- a/graphics/map_objects/pics/people/old_woman_1/7.png
+++ b/graphics/event_objects/pics/people/old_woman_1/7.png
diff --git a/graphics/map_objects/pics/people/old_woman_1/8.png b/graphics/event_objects/pics/people/old_woman_1/8.png
index 955bcf3db..955bcf3db 100644
--- a/graphics/map_objects/pics/people/old_woman_1/8.png
+++ b/graphics/event_objects/pics/people/old_woman_1/8.png
diff --git a/graphics/map_objects/pics/people/old_woman_2/0.png b/graphics/event_objects/pics/people/old_woman_2/0.png
index 2bccb0fb1..2bccb0fb1 100644
--- a/graphics/map_objects/pics/people/old_woman_2/0.png
+++ b/graphics/event_objects/pics/people/old_woman_2/0.png
diff --git a/graphics/map_objects/pics/people/old_woman_2/1.png b/graphics/event_objects/pics/people/old_woman_2/1.png
index 159e277d9..159e277d9 100644
--- a/graphics/map_objects/pics/people/old_woman_2/1.png
+++ b/graphics/event_objects/pics/people/old_woman_2/1.png
diff --git a/graphics/map_objects/pics/people/old_woman_2/2.png b/graphics/event_objects/pics/people/old_woman_2/2.png
index 6c2cb0fbe..6c2cb0fbe 100644
--- a/graphics/map_objects/pics/people/old_woman_2/2.png
+++ b/graphics/event_objects/pics/people/old_woman_2/2.png
diff --git a/graphics/map_objects/pics/people/old_woman_2/3.png b/graphics/event_objects/pics/people/old_woman_2/3.png
index 956af24a1..956af24a1 100644
--- a/graphics/map_objects/pics/people/old_woman_2/3.png
+++ b/graphics/event_objects/pics/people/old_woman_2/3.png
diff --git a/graphics/map_objects/pics/people/old_woman_2/4.png b/graphics/event_objects/pics/people/old_woman_2/4.png
index f3acfbc55..f3acfbc55 100644
--- a/graphics/map_objects/pics/people/old_woman_2/4.png
+++ b/graphics/event_objects/pics/people/old_woman_2/4.png
diff --git a/graphics/map_objects/pics/people/old_woman_2/5.png b/graphics/event_objects/pics/people/old_woman_2/5.png
index b07ff25e5..b07ff25e5 100644
--- a/graphics/map_objects/pics/people/old_woman_2/5.png
+++ b/graphics/event_objects/pics/people/old_woman_2/5.png
diff --git a/graphics/map_objects/pics/people/old_woman_2/6.png b/graphics/event_objects/pics/people/old_woman_2/6.png
index 7fe9b97e1..7fe9b97e1 100644
--- a/graphics/map_objects/pics/people/old_woman_2/6.png
+++ b/graphics/event_objects/pics/people/old_woman_2/6.png
diff --git a/graphics/map_objects/pics/people/old_woman_2/7.png b/graphics/event_objects/pics/people/old_woman_2/7.png
index 681aab7cc..681aab7cc 100644
--- a/graphics/map_objects/pics/people/old_woman_2/7.png
+++ b/graphics/event_objects/pics/people/old_woman_2/7.png
diff --git a/graphics/map_objects/pics/people/old_woman_2/8.png b/graphics/event_objects/pics/people/old_woman_2/8.png
index 87d5c464d..87d5c464d 100644
--- a/graphics/map_objects/pics/people/old_woman_2/8.png
+++ b/graphics/event_objects/pics/people/old_woman_2/8.png
diff --git a/graphics/map_objects/pics/people/phoebe/0.png b/graphics/event_objects/pics/people/phoebe/0.png
index 06188b539..06188b539 100644
--- a/graphics/map_objects/pics/people/phoebe/0.png
+++ b/graphics/event_objects/pics/people/phoebe/0.png
diff --git a/graphics/map_objects/pics/people/phoebe/1.png b/graphics/event_objects/pics/people/phoebe/1.png
index 505190902..505190902 100644
--- a/graphics/map_objects/pics/people/phoebe/1.png
+++ b/graphics/event_objects/pics/people/phoebe/1.png
diff --git a/graphics/map_objects/pics/people/phoebe/2.png b/graphics/event_objects/pics/people/phoebe/2.png
index a5f66cdbf..a5f66cdbf 100644
--- a/graphics/map_objects/pics/people/phoebe/2.png
+++ b/graphics/event_objects/pics/people/phoebe/2.png
diff --git a/graphics/map_objects/pics/people/picnicker/0.png b/graphics/event_objects/pics/people/picnicker/0.png
index 310170def..310170def 100644
--- a/graphics/map_objects/pics/people/picnicker/0.png
+++ b/graphics/event_objects/pics/people/picnicker/0.png
diff --git a/graphics/map_objects/pics/people/picnicker/1.png b/graphics/event_objects/pics/people/picnicker/1.png
index 9caeb6de2..9caeb6de2 100644
--- a/graphics/map_objects/pics/people/picnicker/1.png
+++ b/graphics/event_objects/pics/people/picnicker/1.png
diff --git a/graphics/map_objects/pics/people/picnicker/2.png b/graphics/event_objects/pics/people/picnicker/2.png
index 17ca91044..17ca91044 100644
--- a/graphics/map_objects/pics/people/picnicker/2.png
+++ b/graphics/event_objects/pics/people/picnicker/2.png
diff --git a/graphics/map_objects/pics/people/picnicker/3.png b/graphics/event_objects/pics/people/picnicker/3.png
index e80ca4b4e..e80ca4b4e 100644
--- a/graphics/map_objects/pics/people/picnicker/3.png
+++ b/graphics/event_objects/pics/people/picnicker/3.png
diff --git a/graphics/map_objects/pics/people/picnicker/4.png b/graphics/event_objects/pics/people/picnicker/4.png
index 1c2ad0709..1c2ad0709 100644
--- a/graphics/map_objects/pics/people/picnicker/4.png
+++ b/graphics/event_objects/pics/people/picnicker/4.png
diff --git a/graphics/map_objects/pics/people/picnicker/5.png b/graphics/event_objects/pics/people/picnicker/5.png
index a5dce80dd..a5dce80dd 100644
--- a/graphics/map_objects/pics/people/picnicker/5.png
+++ b/graphics/event_objects/pics/people/picnicker/5.png
diff --git a/graphics/map_objects/pics/people/picnicker/6.png b/graphics/event_objects/pics/people/picnicker/6.png
index 1895ff667..1895ff667 100644
--- a/graphics/map_objects/pics/people/picnicker/6.png
+++ b/graphics/event_objects/pics/people/picnicker/6.png
diff --git a/graphics/map_objects/pics/people/picnicker/7.png b/graphics/event_objects/pics/people/picnicker/7.png
index 62d0c2f68..62d0c2f68 100644
--- a/graphics/map_objects/pics/people/picnicker/7.png
+++ b/graphics/event_objects/pics/people/picnicker/7.png
diff --git a/graphics/map_objects/pics/people/picnicker/8.png b/graphics/event_objects/pics/people/picnicker/8.png
index 076c2c32b..076c2c32b 100644
--- a/graphics/map_objects/pics/people/picnicker/8.png
+++ b/graphics/event_objects/pics/people/picnicker/8.png
diff --git a/graphics/map_objects/pics/people/prof_birch/0.png b/graphics/event_objects/pics/people/prof_birch/0.png
index 2dbe3bef5..2dbe3bef5 100644
--- a/graphics/map_objects/pics/people/prof_birch/0.png
+++ b/graphics/event_objects/pics/people/prof_birch/0.png
diff --git a/graphics/map_objects/pics/people/prof_birch/1.png b/graphics/event_objects/pics/people/prof_birch/1.png
index b27c2174a..b27c2174a 100644
--- a/graphics/map_objects/pics/people/prof_birch/1.png
+++ b/graphics/event_objects/pics/people/prof_birch/1.png
diff --git a/graphics/map_objects/pics/people/prof_birch/2.png b/graphics/event_objects/pics/people/prof_birch/2.png
index 195a3da01..195a3da01 100644
--- a/graphics/map_objects/pics/people/prof_birch/2.png
+++ b/graphics/event_objects/pics/people/prof_birch/2.png
diff --git a/graphics/map_objects/pics/people/prof_birch/3.png b/graphics/event_objects/pics/people/prof_birch/3.png
index 5f9d2750e..5f9d2750e 100644
--- a/graphics/map_objects/pics/people/prof_birch/3.png
+++ b/graphics/event_objects/pics/people/prof_birch/3.png
diff --git a/graphics/map_objects/pics/people/prof_birch/4.png b/graphics/event_objects/pics/people/prof_birch/4.png
index a44244f15..a44244f15 100644
--- a/graphics/map_objects/pics/people/prof_birch/4.png
+++ b/graphics/event_objects/pics/people/prof_birch/4.png
diff --git a/graphics/map_objects/pics/people/prof_birch/5.png b/graphics/event_objects/pics/people/prof_birch/5.png
index 3c6c16ff1..3c6c16ff1 100644
--- a/graphics/map_objects/pics/people/prof_birch/5.png
+++ b/graphics/event_objects/pics/people/prof_birch/5.png
diff --git a/graphics/map_objects/pics/people/prof_birch/6.png b/graphics/event_objects/pics/people/prof_birch/6.png
index 802b89fd6..802b89fd6 100644
--- a/graphics/map_objects/pics/people/prof_birch/6.png
+++ b/graphics/event_objects/pics/people/prof_birch/6.png
diff --git a/graphics/map_objects/pics/people/prof_birch/7.png b/graphics/event_objects/pics/people/prof_birch/7.png
index 59af318a2..59af318a2 100644
--- a/graphics/map_objects/pics/people/prof_birch/7.png
+++ b/graphics/event_objects/pics/people/prof_birch/7.png
diff --git a/graphics/map_objects/pics/people/prof_birch/8.png b/graphics/event_objects/pics/people/prof_birch/8.png
index 0a936308a..0a936308a 100644
--- a/graphics/map_objects/pics/people/prof_birch/8.png
+++ b/graphics/event_objects/pics/people/prof_birch/8.png
diff --git a/graphics/map_objects/pics/people/psychic_m/0.png b/graphics/event_objects/pics/people/psychic_m/0.png
index 099e65aa1..099e65aa1 100644
--- a/graphics/map_objects/pics/people/psychic_m/0.png
+++ b/graphics/event_objects/pics/people/psychic_m/0.png
diff --git a/graphics/map_objects/pics/people/psychic_m/1.png b/graphics/event_objects/pics/people/psychic_m/1.png
index 6203b8f3a..6203b8f3a 100644
--- a/graphics/map_objects/pics/people/psychic_m/1.png
+++ b/graphics/event_objects/pics/people/psychic_m/1.png
diff --git a/graphics/map_objects/pics/people/psychic_m/2.png b/graphics/event_objects/pics/people/psychic_m/2.png
index 00f19c8c3..00f19c8c3 100644
--- a/graphics/map_objects/pics/people/psychic_m/2.png
+++ b/graphics/event_objects/pics/people/psychic_m/2.png
diff --git a/graphics/map_objects/pics/people/psychic_m/3.png b/graphics/event_objects/pics/people/psychic_m/3.png
index ec8733d45..ec8733d45 100644
--- a/graphics/map_objects/pics/people/psychic_m/3.png
+++ b/graphics/event_objects/pics/people/psychic_m/3.png
diff --git a/graphics/map_objects/pics/people/psychic_m/4.png b/graphics/event_objects/pics/people/psychic_m/4.png
index 7a2f06947..7a2f06947 100644
--- a/graphics/map_objects/pics/people/psychic_m/4.png
+++ b/graphics/event_objects/pics/people/psychic_m/4.png
diff --git a/graphics/map_objects/pics/people/psychic_m/5.png b/graphics/event_objects/pics/people/psychic_m/5.png
index 64133327d..64133327d 100644
--- a/graphics/map_objects/pics/people/psychic_m/5.png
+++ b/graphics/event_objects/pics/people/psychic_m/5.png
diff --git a/graphics/map_objects/pics/people/psychic_m/6.png b/graphics/event_objects/pics/people/psychic_m/6.png
index 7c55b4f4d..7c55b4f4d 100644
--- a/graphics/map_objects/pics/people/psychic_m/6.png
+++ b/graphics/event_objects/pics/people/psychic_m/6.png
diff --git a/graphics/map_objects/pics/people/psychic_m/7.png b/graphics/event_objects/pics/people/psychic_m/7.png
index 134953f5c..134953f5c 100644
--- a/graphics/map_objects/pics/people/psychic_m/7.png
+++ b/graphics/event_objects/pics/people/psychic_m/7.png
diff --git a/graphics/map_objects/pics/people/psychic_m/8.png b/graphics/event_objects/pics/people/psychic_m/8.png
index 79ea167fe..79ea167fe 100644
--- a/graphics/map_objects/pics/people/psychic_m/8.png
+++ b/graphics/event_objects/pics/people/psychic_m/8.png
diff --git a/graphics/map_objects/pics/people/quinty_plump/0.png b/graphics/event_objects/pics/people/quinty_plump/0.png
index 7a29230f4..7a29230f4 100644
--- a/graphics/map_objects/pics/people/quinty_plump/0.png
+++ b/graphics/event_objects/pics/people/quinty_plump/0.png
diff --git a/graphics/map_objects/pics/people/quinty_plump/1.png b/graphics/event_objects/pics/people/quinty_plump/1.png
index 6fbd85a26..6fbd85a26 100644
--- a/graphics/map_objects/pics/people/quinty_plump/1.png
+++ b/graphics/event_objects/pics/people/quinty_plump/1.png
diff --git a/graphics/map_objects/pics/people/quinty_plump/2.png b/graphics/event_objects/pics/people/quinty_plump/2.png
index 238f0a55c..238f0a55c 100644
--- a/graphics/map_objects/pics/people/quinty_plump/2.png
+++ b/graphics/event_objects/pics/people/quinty_plump/2.png
diff --git a/graphics/map_objects/pics/people/quinty_plump/3.png b/graphics/event_objects/pics/people/quinty_plump/3.png
index d1cb5d7e7..d1cb5d7e7 100644
--- a/graphics/map_objects/pics/people/quinty_plump/3.png
+++ b/graphics/event_objects/pics/people/quinty_plump/3.png
diff --git a/graphics/map_objects/pics/people/quinty_plump/4.png b/graphics/event_objects/pics/people/quinty_plump/4.png
index 4afac2056..4afac2056 100644
--- a/graphics/map_objects/pics/people/quinty_plump/4.png
+++ b/graphics/event_objects/pics/people/quinty_plump/4.png
diff --git a/graphics/map_objects/pics/people/quinty_plump/5.png b/graphics/event_objects/pics/people/quinty_plump/5.png
index 9f9404aef..9f9404aef 100644
--- a/graphics/map_objects/pics/people/quinty_plump/5.png
+++ b/graphics/event_objects/pics/people/quinty_plump/5.png
diff --git a/graphics/map_objects/pics/people/quinty_plump/6.png b/graphics/event_objects/pics/people/quinty_plump/6.png
index 11316499c..11316499c 100644
--- a/graphics/map_objects/pics/people/quinty_plump/6.png
+++ b/graphics/event_objects/pics/people/quinty_plump/6.png
diff --git a/graphics/map_objects/pics/people/red/0.png b/graphics/event_objects/pics/people/red/0.png
index d6cf06ece..d6cf06ece 100644
--- a/graphics/map_objects/pics/people/red/0.png
+++ b/graphics/event_objects/pics/people/red/0.png
diff --git a/graphics/map_objects/pics/people/red/1.png b/graphics/event_objects/pics/people/red/1.png
index 597001dfd..597001dfd 100644
--- a/graphics/map_objects/pics/people/red/1.png
+++ b/graphics/event_objects/pics/people/red/1.png
diff --git a/graphics/map_objects/pics/people/red/2.png b/graphics/event_objects/pics/people/red/2.png
index 854948cee..854948cee 100644
--- a/graphics/map_objects/pics/people/red/2.png
+++ b/graphics/event_objects/pics/people/red/2.png
diff --git a/graphics/map_objects/pics/people/red/3.png b/graphics/event_objects/pics/people/red/3.png
index 6a533d4e4..6a533d4e4 100644
--- a/graphics/map_objects/pics/people/red/3.png
+++ b/graphics/event_objects/pics/people/red/3.png
diff --git a/graphics/map_objects/pics/people/red/4.png b/graphics/event_objects/pics/people/red/4.png
index aaedd9411..aaedd9411 100644
--- a/graphics/map_objects/pics/people/red/4.png
+++ b/graphics/event_objects/pics/people/red/4.png
diff --git a/graphics/map_objects/pics/people/red/5.png b/graphics/event_objects/pics/people/red/5.png
index adc033530..adc033530 100644
--- a/graphics/map_objects/pics/people/red/5.png
+++ b/graphics/event_objects/pics/people/red/5.png
diff --git a/graphics/map_objects/pics/people/red/6.png b/graphics/event_objects/pics/people/red/6.png
index 5a5ac80e0..5a5ac80e0 100644
--- a/graphics/map_objects/pics/people/red/6.png
+++ b/graphics/event_objects/pics/people/red/6.png
diff --git a/graphics/map_objects/pics/people/red/7.png b/graphics/event_objects/pics/people/red/7.png
index 22bea3f24..22bea3f24 100644
--- a/graphics/map_objects/pics/people/red/7.png
+++ b/graphics/event_objects/pics/people/red/7.png
diff --git a/graphics/map_objects/pics/people/red/8.png b/graphics/event_objects/pics/people/red/8.png
index d0d544d16..d0d544d16 100644
--- a/graphics/map_objects/pics/people/red/8.png
+++ b/graphics/event_objects/pics/people/red/8.png
diff --git a/graphics/map_objects/pics/people/reporter_f/0.png b/graphics/event_objects/pics/people/reporter_f/0.png
index d22968ddd..d22968ddd 100644
--- a/graphics/map_objects/pics/people/reporter_f/0.png
+++ b/graphics/event_objects/pics/people/reporter_f/0.png
diff --git a/graphics/map_objects/pics/people/reporter_f/1.png b/graphics/event_objects/pics/people/reporter_f/1.png
index fb29ac66f..fb29ac66f 100644
--- a/graphics/map_objects/pics/people/reporter_f/1.png
+++ b/graphics/event_objects/pics/people/reporter_f/1.png
diff --git a/graphics/map_objects/pics/people/reporter_f/2.png b/graphics/event_objects/pics/people/reporter_f/2.png
index 4ac633368..4ac633368 100644
--- a/graphics/map_objects/pics/people/reporter_f/2.png
+++ b/graphics/event_objects/pics/people/reporter_f/2.png
diff --git a/graphics/map_objects/pics/people/reporter_f/3.png b/graphics/event_objects/pics/people/reporter_f/3.png
index 3fc93ee7f..3fc93ee7f 100644
--- a/graphics/map_objects/pics/people/reporter_f/3.png
+++ b/graphics/event_objects/pics/people/reporter_f/3.png
diff --git a/graphics/map_objects/pics/people/reporter_f/4.png b/graphics/event_objects/pics/people/reporter_f/4.png
index fa20a54c8..fa20a54c8 100644
--- a/graphics/map_objects/pics/people/reporter_f/4.png
+++ b/graphics/event_objects/pics/people/reporter_f/4.png
diff --git a/graphics/map_objects/pics/people/reporter_f/5.png b/graphics/event_objects/pics/people/reporter_f/5.png
index 015575483..015575483 100644
--- a/graphics/map_objects/pics/people/reporter_f/5.png
+++ b/graphics/event_objects/pics/people/reporter_f/5.png
diff --git a/graphics/map_objects/pics/people/reporter_f/6.png b/graphics/event_objects/pics/people/reporter_f/6.png
index e2c9d3d11..e2c9d3d11 100644
--- a/graphics/map_objects/pics/people/reporter_f/6.png
+++ b/graphics/event_objects/pics/people/reporter_f/6.png
diff --git a/graphics/map_objects/pics/people/reporter_f/7.png b/graphics/event_objects/pics/people/reporter_f/7.png
index 1b986e616..1b986e616 100644
--- a/graphics/map_objects/pics/people/reporter_f/7.png
+++ b/graphics/event_objects/pics/people/reporter_f/7.png
diff --git a/graphics/map_objects/pics/people/reporter_f/8.png b/graphics/event_objects/pics/people/reporter_f/8.png
index d1dfc31a6..d1dfc31a6 100644
--- a/graphics/map_objects/pics/people/reporter_f/8.png
+++ b/graphics/event_objects/pics/people/reporter_f/8.png
diff --git a/graphics/map_objects/pics/people/reporter_m/0.png b/graphics/event_objects/pics/people/reporter_m/0.png
index b052abfee..b052abfee 100644
--- a/graphics/map_objects/pics/people/reporter_m/0.png
+++ b/graphics/event_objects/pics/people/reporter_m/0.png
diff --git a/graphics/map_objects/pics/people/reporter_m/1.png b/graphics/event_objects/pics/people/reporter_m/1.png
index 0a273f5aa..0a273f5aa 100644
--- a/graphics/map_objects/pics/people/reporter_m/1.png
+++ b/graphics/event_objects/pics/people/reporter_m/1.png
diff --git a/graphics/map_objects/pics/people/reporter_m/2.png b/graphics/event_objects/pics/people/reporter_m/2.png
index a47cef17b..a47cef17b 100644
--- a/graphics/map_objects/pics/people/reporter_m/2.png
+++ b/graphics/event_objects/pics/people/reporter_m/2.png
diff --git a/graphics/map_objects/pics/people/reporter_m/3.png b/graphics/event_objects/pics/people/reporter_m/3.png
index 780f128b3..780f128b3 100644
--- a/graphics/map_objects/pics/people/reporter_m/3.png
+++ b/graphics/event_objects/pics/people/reporter_m/3.png
diff --git a/graphics/map_objects/pics/people/reporter_m/4.png b/graphics/event_objects/pics/people/reporter_m/4.png
index cb57002ab..cb57002ab 100644
--- a/graphics/map_objects/pics/people/reporter_m/4.png
+++ b/graphics/event_objects/pics/people/reporter_m/4.png
diff --git a/graphics/map_objects/pics/people/reporter_m/5.png b/graphics/event_objects/pics/people/reporter_m/5.png
index 6f488296c..6f488296c 100644
--- a/graphics/map_objects/pics/people/reporter_m/5.png
+++ b/graphics/event_objects/pics/people/reporter_m/5.png
diff --git a/graphics/map_objects/pics/people/reporter_m/6.png b/graphics/event_objects/pics/people/reporter_m/6.png
index 4aad5d2c6..4aad5d2c6 100644
--- a/graphics/map_objects/pics/people/reporter_m/6.png
+++ b/graphics/event_objects/pics/people/reporter_m/6.png
diff --git a/graphics/map_objects/pics/people/reporter_m/7.png b/graphics/event_objects/pics/people/reporter_m/7.png
index 7ac1d360d..7ac1d360d 100644
--- a/graphics/map_objects/pics/people/reporter_m/7.png
+++ b/graphics/event_objects/pics/people/reporter_m/7.png
diff --git a/graphics/map_objects/pics/people/reporter_m/8.png b/graphics/event_objects/pics/people/reporter_m/8.png
index 25b07efb4..25b07efb4 100644
--- a/graphics/map_objects/pics/people/reporter_m/8.png
+++ b/graphics/event_objects/pics/people/reporter_m/8.png
diff --git a/graphics/map_objects/pics/people/rooftop_sale_woman/0.png b/graphics/event_objects/pics/people/rooftop_sale_woman/0.png
index f73f91631..f73f91631 100644
--- a/graphics/map_objects/pics/people/rooftop_sale_woman/0.png
+++ b/graphics/event_objects/pics/people/rooftop_sale_woman/0.png
diff --git a/graphics/map_objects/pics/people/rooftop_sale_woman/1.png b/graphics/event_objects/pics/people/rooftop_sale_woman/1.png
index 855079988..855079988 100644
--- a/graphics/map_objects/pics/people/rooftop_sale_woman/1.png
+++ b/graphics/event_objects/pics/people/rooftop_sale_woman/1.png
diff --git a/graphics/map_objects/pics/people/rooftop_sale_woman/2.png b/graphics/event_objects/pics/people/rooftop_sale_woman/2.png
index 643eb4eb2..643eb4eb2 100644
--- a/graphics/map_objects/pics/people/rooftop_sale_woman/2.png
+++ b/graphics/event_objects/pics/people/rooftop_sale_woman/2.png
diff --git a/graphics/map_objects/pics/people/rooftop_sale_woman/3.png b/graphics/event_objects/pics/people/rooftop_sale_woman/3.png
index dbea9b53c..dbea9b53c 100644
--- a/graphics/map_objects/pics/people/rooftop_sale_woman/3.png
+++ b/graphics/event_objects/pics/people/rooftop_sale_woman/3.png
diff --git a/graphics/map_objects/pics/people/rooftop_sale_woman/4.png b/graphics/event_objects/pics/people/rooftop_sale_woman/4.png
index d6bbc98b8..d6bbc98b8 100644
--- a/graphics/map_objects/pics/people/rooftop_sale_woman/4.png
+++ b/graphics/event_objects/pics/people/rooftop_sale_woman/4.png
diff --git a/graphics/map_objects/pics/people/rooftop_sale_woman/5.png b/graphics/event_objects/pics/people/rooftop_sale_woman/5.png
index bd99cf10f..bd99cf10f 100644
--- a/graphics/map_objects/pics/people/rooftop_sale_woman/5.png
+++ b/graphics/event_objects/pics/people/rooftop_sale_woman/5.png
diff --git a/graphics/map_objects/pics/people/rooftop_sale_woman/6.png b/graphics/event_objects/pics/people/rooftop_sale_woman/6.png
index c5c447997..c5c447997 100644
--- a/graphics/map_objects/pics/people/rooftop_sale_woman/6.png
+++ b/graphics/event_objects/pics/people/rooftop_sale_woman/6.png
diff --git a/graphics/map_objects/pics/people/rooftop_sale_woman/7.png b/graphics/event_objects/pics/people/rooftop_sale_woman/7.png
index 64b7691c4..64b7691c4 100644
--- a/graphics/map_objects/pics/people/rooftop_sale_woman/7.png
+++ b/graphics/event_objects/pics/people/rooftop_sale_woman/7.png
diff --git a/graphics/map_objects/pics/people/rooftop_sale_woman/8.png b/graphics/event_objects/pics/people/rooftop_sale_woman/8.png
index b588d2b26..b588d2b26 100644
--- a/graphics/map_objects/pics/people/rooftop_sale_woman/8.png
+++ b/graphics/event_objects/pics/people/rooftop_sale_woman/8.png
diff --git a/graphics/map_objects/pics/people/roxanne/0.png b/graphics/event_objects/pics/people/roxanne/0.png
index 0a73a0723..0a73a0723 100644
--- a/graphics/map_objects/pics/people/roxanne/0.png
+++ b/graphics/event_objects/pics/people/roxanne/0.png
diff --git a/graphics/map_objects/pics/people/roxanne/1.png b/graphics/event_objects/pics/people/roxanne/1.png
index 133f097bf..133f097bf 100644
--- a/graphics/map_objects/pics/people/roxanne/1.png
+++ b/graphics/event_objects/pics/people/roxanne/1.png
diff --git a/graphics/map_objects/pics/people/roxanne/2.png b/graphics/event_objects/pics/people/roxanne/2.png
index 946765eb2..946765eb2 100644
--- a/graphics/map_objects/pics/people/roxanne/2.png
+++ b/graphics/event_objects/pics/people/roxanne/2.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/00.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/00.png
index 780360c4f..780360c4f 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_brendan/00.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_brendan/00.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/01.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/01.png
index f83064047..f83064047 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_brendan/01.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_brendan/01.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/02.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/02.png
index ffb8ad34b..ffb8ad34b 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_brendan/02.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_brendan/02.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/03.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/03.png
index d0721bbb4..d0721bbb4 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_brendan/03.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_brendan/03.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/04.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/04.png
index 07817e55f..07817e55f 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_brendan/04.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_brendan/04.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/05.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/05.png
index afc322129..afc322129 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_brendan/05.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_brendan/05.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/06.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/06.png
index 84a8cceb1..84a8cceb1 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_brendan/06.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_brendan/06.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/07.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/07.png
index ca518d8a0..ca518d8a0 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_brendan/07.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_brendan/07.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/08.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/08.png
index 3430ff243..3430ff243 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_brendan/08.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_brendan/08.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/09.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/09.png
index 392f019e7..392f019e7 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_brendan/09.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_brendan/09.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/10.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/10.png
index 722f2d04d..722f2d04d 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_brendan/10.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_brendan/10.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/11.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/11.png
index eff0cbc5f..eff0cbc5f 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_brendan/11.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_brendan/11.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/12.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/12.png
index 0a5037d43..0a5037d43 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_brendan/12.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_brendan/12.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/13.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/13.png
index 8dc245c0e..8dc245c0e 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_brendan/13.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_brendan/13.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/14.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/14.png
index 53844c0c1..53844c0c1 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_brendan/14.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_brendan/14.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/15.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/15.png
index 34d73e7f6..34d73e7f6 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_brendan/15.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_brendan/15.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/16.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/16.png
index b324f5538..b324f5538 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_brendan/16.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_brendan/16.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_brendan/17.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/17.png
index 9a736dc02..9a736dc02 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_brendan/17.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_brendan/17.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/0.png b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/0.png
index fb4365f0e..fb4365f0e 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/0.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/0.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/1.png b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/1.png
index f681154dd..f681154dd 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/1.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/1.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/2.png b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/2.png
index 20f838bb2..20f838bb2 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/2.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/2.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/3.png b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/3.png
index 4a83b0c97..4a83b0c97 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/3.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/3.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/4.png b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/4.png
index b6573d454..b6573d454 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/4.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/4.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/5.png b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/5.png
index a1a9b08cf..a1a9b08cf 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/5.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/5.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/6.png b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/6.png
index 8f34c74e4..8f34c74e4 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/6.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/6.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/7.png b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/7.png
index 7d8d2c23c..7d8d2c23c 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/7.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/7.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/8.png b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/8.png
index 4799db90c..4799db90c 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_little_boy/8.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/8.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/00.png b/graphics/event_objects/pics/people/ruby_sapphire_may/00.png
index 2ccd3399a..2ccd3399a 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_may/00.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_may/00.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/01.png b/graphics/event_objects/pics/people/ruby_sapphire_may/01.png
index 94aad9ac7..94aad9ac7 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_may/01.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_may/01.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/02.png b/graphics/event_objects/pics/people/ruby_sapphire_may/02.png
index e61943fbb..e61943fbb 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_may/02.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_may/02.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/03.png b/graphics/event_objects/pics/people/ruby_sapphire_may/03.png
index b8d1255d5..b8d1255d5 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_may/03.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_may/03.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/04.png b/graphics/event_objects/pics/people/ruby_sapphire_may/04.png
index 7d3cac765..7d3cac765 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_may/04.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_may/04.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/05.png b/graphics/event_objects/pics/people/ruby_sapphire_may/05.png
index d5a4ab94e..d5a4ab94e 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_may/05.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_may/05.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/06.png b/graphics/event_objects/pics/people/ruby_sapphire_may/06.png
index d22684057..d22684057 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_may/06.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_may/06.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/07.png b/graphics/event_objects/pics/people/ruby_sapphire_may/07.png
index d0f0c3716..d0f0c3716 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_may/07.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_may/07.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/08.png b/graphics/event_objects/pics/people/ruby_sapphire_may/08.png
index dbb26c4e7..dbb26c4e7 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_may/08.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_may/08.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/09.png b/graphics/event_objects/pics/people/ruby_sapphire_may/09.png
index 714316485..714316485 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_may/09.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_may/09.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/10.png b/graphics/event_objects/pics/people/ruby_sapphire_may/10.png
index 07897594f..07897594f 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_may/10.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_may/10.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/11.png b/graphics/event_objects/pics/people/ruby_sapphire_may/11.png
index e4583aa91..e4583aa91 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_may/11.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_may/11.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/12.png b/graphics/event_objects/pics/people/ruby_sapphire_may/12.png
index 34405b837..34405b837 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_may/12.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_may/12.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/13.png b/graphics/event_objects/pics/people/ruby_sapphire_may/13.png
index 3b0ec86b3..3b0ec86b3 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_may/13.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_may/13.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/14.png b/graphics/event_objects/pics/people/ruby_sapphire_may/14.png
index 18ee35cb9..18ee35cb9 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_may/14.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_may/14.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/15.png b/graphics/event_objects/pics/people/ruby_sapphire_may/15.png
index ea5e0fd5f..ea5e0fd5f 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_may/15.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_may/15.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/16.png b/graphics/event_objects/pics/people/ruby_sapphire_may/16.png
index c7e9dd58b..c7e9dd58b 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_may/16.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_may/16.png
diff --git a/graphics/map_objects/pics/people/ruby_sapphire_may/17.png b/graphics/event_objects/pics/people/ruby_sapphire_may/17.png
index e79de8152..e79de8152 100644
--- a/graphics/map_objects/pics/people/ruby_sapphire_may/17.png
+++ b/graphics/event_objects/pics/people/ruby_sapphire_may/17.png
diff --git a/graphics/map_objects/pics/people/running_triathlete_f/0.png b/graphics/event_objects/pics/people/running_triathlete_f/0.png
index 195edef7b..195edef7b 100644
--- a/graphics/map_objects/pics/people/running_triathlete_f/0.png
+++ b/graphics/event_objects/pics/people/running_triathlete_f/0.png
diff --git a/graphics/map_objects/pics/people/running_triathlete_f/1.png b/graphics/event_objects/pics/people/running_triathlete_f/1.png
index 1a7069621..1a7069621 100644
--- a/graphics/map_objects/pics/people/running_triathlete_f/1.png
+++ b/graphics/event_objects/pics/people/running_triathlete_f/1.png
diff --git a/graphics/map_objects/pics/people/running_triathlete_f/2.png b/graphics/event_objects/pics/people/running_triathlete_f/2.png
index aab9ca24b..aab9ca24b 100644
--- a/graphics/map_objects/pics/people/running_triathlete_f/2.png
+++ b/graphics/event_objects/pics/people/running_triathlete_f/2.png
diff --git a/graphics/map_objects/pics/people/running_triathlete_f/3.png b/graphics/event_objects/pics/people/running_triathlete_f/3.png
index 909fc0f60..909fc0f60 100644
--- a/graphics/map_objects/pics/people/running_triathlete_f/3.png
+++ b/graphics/event_objects/pics/people/running_triathlete_f/3.png
diff --git a/graphics/map_objects/pics/people/running_triathlete_f/4.png b/graphics/event_objects/pics/people/running_triathlete_f/4.png
index 301d13d09..301d13d09 100644
--- a/graphics/map_objects/pics/people/running_triathlete_f/4.png
+++ b/graphics/event_objects/pics/people/running_triathlete_f/4.png
diff --git a/graphics/map_objects/pics/people/running_triathlete_f/5.png b/graphics/event_objects/pics/people/running_triathlete_f/5.png
index 84914d619..84914d619 100644
--- a/graphics/map_objects/pics/people/running_triathlete_f/5.png
+++ b/graphics/event_objects/pics/people/running_triathlete_f/5.png
diff --git a/graphics/map_objects/pics/people/running_triathlete_f/6.png b/graphics/event_objects/pics/people/running_triathlete_f/6.png
index 9ee690631..9ee690631 100644
--- a/graphics/map_objects/pics/people/running_triathlete_f/6.png
+++ b/graphics/event_objects/pics/people/running_triathlete_f/6.png
diff --git a/graphics/map_objects/pics/people/running_triathlete_f/7.png b/graphics/event_objects/pics/people/running_triathlete_f/7.png
index 2441def63..2441def63 100644
--- a/graphics/map_objects/pics/people/running_triathlete_f/7.png
+++ b/graphics/event_objects/pics/people/running_triathlete_f/7.png
diff --git a/graphics/map_objects/pics/people/running_triathlete_f/8.png b/graphics/event_objects/pics/people/running_triathlete_f/8.png
index a96d1e221..a96d1e221 100644
--- a/graphics/map_objects/pics/people/running_triathlete_f/8.png
+++ b/graphics/event_objects/pics/people/running_triathlete_f/8.png
diff --git a/graphics/map_objects/pics/people/running_triathlete_m/0.png b/graphics/event_objects/pics/people/running_triathlete_m/0.png
index 0d02be87e..0d02be87e 100644
--- a/graphics/map_objects/pics/people/running_triathlete_m/0.png
+++ b/graphics/event_objects/pics/people/running_triathlete_m/0.png
diff --git a/graphics/map_objects/pics/people/running_triathlete_m/1.png b/graphics/event_objects/pics/people/running_triathlete_m/1.png
index 21e2fdf11..21e2fdf11 100644
--- a/graphics/map_objects/pics/people/running_triathlete_m/1.png
+++ b/graphics/event_objects/pics/people/running_triathlete_m/1.png
diff --git a/graphics/map_objects/pics/people/running_triathlete_m/2.png b/graphics/event_objects/pics/people/running_triathlete_m/2.png
index d571938e3..d571938e3 100644
--- a/graphics/map_objects/pics/people/running_triathlete_m/2.png
+++ b/graphics/event_objects/pics/people/running_triathlete_m/2.png
diff --git a/graphics/map_objects/pics/people/running_triathlete_m/3.png b/graphics/event_objects/pics/people/running_triathlete_m/3.png
index f60cc6b5b..f60cc6b5b 100644
--- a/graphics/map_objects/pics/people/running_triathlete_m/3.png
+++ b/graphics/event_objects/pics/people/running_triathlete_m/3.png
diff --git a/graphics/map_objects/pics/people/running_triathlete_m/4.png b/graphics/event_objects/pics/people/running_triathlete_m/4.png
index 6ec60997a..6ec60997a 100644
--- a/graphics/map_objects/pics/people/running_triathlete_m/4.png
+++ b/graphics/event_objects/pics/people/running_triathlete_m/4.png
diff --git a/graphics/map_objects/pics/people/running_triathlete_m/5.png b/graphics/event_objects/pics/people/running_triathlete_m/5.png
index 4f5742f1a..4f5742f1a 100644
--- a/graphics/map_objects/pics/people/running_triathlete_m/5.png
+++ b/graphics/event_objects/pics/people/running_triathlete_m/5.png
diff --git a/graphics/map_objects/pics/people/running_triathlete_m/6.png b/graphics/event_objects/pics/people/running_triathlete_m/6.png
index be048ac7e..be048ac7e 100644
--- a/graphics/map_objects/pics/people/running_triathlete_m/6.png
+++ b/graphics/event_objects/pics/people/running_triathlete_m/6.png
diff --git a/graphics/map_objects/pics/people/running_triathlete_m/7.png b/graphics/event_objects/pics/people/running_triathlete_m/7.png
index 9a972be67..9a972be67 100644
--- a/graphics/map_objects/pics/people/running_triathlete_m/7.png
+++ b/graphics/event_objects/pics/people/running_triathlete_m/7.png
diff --git a/graphics/map_objects/pics/people/running_triathlete_m/8.png b/graphics/event_objects/pics/people/running_triathlete_m/8.png
index 18ea0d178..18ea0d178 100644
--- a/graphics/map_objects/pics/people/running_triathlete_m/8.png
+++ b/graphics/event_objects/pics/people/running_triathlete_m/8.png
diff --git a/graphics/map_objects/pics/people/sailor/0.png b/graphics/event_objects/pics/people/sailor/0.png
index 8dc44669a..8dc44669a 100644
--- a/graphics/map_objects/pics/people/sailor/0.png
+++ b/graphics/event_objects/pics/people/sailor/0.png
diff --git a/graphics/map_objects/pics/people/sailor/1.png b/graphics/event_objects/pics/people/sailor/1.png
index 8cb9ba620..8cb9ba620 100644
--- a/graphics/map_objects/pics/people/sailor/1.png
+++ b/graphics/event_objects/pics/people/sailor/1.png
diff --git a/graphics/map_objects/pics/people/sailor/2.png b/graphics/event_objects/pics/people/sailor/2.png
index 34a832cbf..34a832cbf 100644
--- a/graphics/map_objects/pics/people/sailor/2.png
+++ b/graphics/event_objects/pics/people/sailor/2.png
diff --git a/graphics/map_objects/pics/people/sailor/3.png b/graphics/event_objects/pics/people/sailor/3.png
index 1ad0918a8..1ad0918a8 100644
--- a/graphics/map_objects/pics/people/sailor/3.png
+++ b/graphics/event_objects/pics/people/sailor/3.png
diff --git a/graphics/map_objects/pics/people/sailor/4.png b/graphics/event_objects/pics/people/sailor/4.png
index 623c42211..623c42211 100644
--- a/graphics/map_objects/pics/people/sailor/4.png
+++ b/graphics/event_objects/pics/people/sailor/4.png
diff --git a/graphics/map_objects/pics/people/sailor/5.png b/graphics/event_objects/pics/people/sailor/5.png
index 01795d75f..01795d75f 100644
--- a/graphics/map_objects/pics/people/sailor/5.png
+++ b/graphics/event_objects/pics/people/sailor/5.png
diff --git a/graphics/map_objects/pics/people/sailor/6.png b/graphics/event_objects/pics/people/sailor/6.png
index a3babaa42..a3babaa42 100644
--- a/graphics/map_objects/pics/people/sailor/6.png
+++ b/graphics/event_objects/pics/people/sailor/6.png
diff --git a/graphics/map_objects/pics/people/sailor/7.png b/graphics/event_objects/pics/people/sailor/7.png
index 08abf8a71..08abf8a71 100644
--- a/graphics/map_objects/pics/people/sailor/7.png
+++ b/graphics/event_objects/pics/people/sailor/7.png
diff --git a/graphics/map_objects/pics/people/sailor/8.png b/graphics/event_objects/pics/people/sailor/8.png
index f7d2ec655..f7d2ec655 100644
--- a/graphics/map_objects/pics/people/sailor/8.png
+++ b/graphics/event_objects/pics/people/sailor/8.png
diff --git a/graphics/map_objects/pics/people/school_kid_m/0.png b/graphics/event_objects/pics/people/school_kid_m/0.png
index 3f700ffaf..3f700ffaf 100644
--- a/graphics/map_objects/pics/people/school_kid_m/0.png
+++ b/graphics/event_objects/pics/people/school_kid_m/0.png
diff --git a/graphics/map_objects/pics/people/school_kid_m/1.png b/graphics/event_objects/pics/people/school_kid_m/1.png
index c47d69d34..c47d69d34 100644
--- a/graphics/map_objects/pics/people/school_kid_m/1.png
+++ b/graphics/event_objects/pics/people/school_kid_m/1.png
diff --git a/graphics/map_objects/pics/people/school_kid_m/2.png b/graphics/event_objects/pics/people/school_kid_m/2.png
index b4116862b..b4116862b 100644
--- a/graphics/map_objects/pics/people/school_kid_m/2.png
+++ b/graphics/event_objects/pics/people/school_kid_m/2.png
diff --git a/graphics/map_objects/pics/people/school_kid_m/3.png b/graphics/event_objects/pics/people/school_kid_m/3.png
index 078ce5bc4..078ce5bc4 100644
--- a/graphics/map_objects/pics/people/school_kid_m/3.png
+++ b/graphics/event_objects/pics/people/school_kid_m/3.png
diff --git a/graphics/map_objects/pics/people/school_kid_m/4.png b/graphics/event_objects/pics/people/school_kid_m/4.png
index 330979128..330979128 100644
--- a/graphics/map_objects/pics/people/school_kid_m/4.png
+++ b/graphics/event_objects/pics/people/school_kid_m/4.png
diff --git a/graphics/map_objects/pics/people/school_kid_m/5.png b/graphics/event_objects/pics/people/school_kid_m/5.png
index 44ab9e8aa..44ab9e8aa 100644
--- a/graphics/map_objects/pics/people/school_kid_m/5.png
+++ b/graphics/event_objects/pics/people/school_kid_m/5.png
diff --git a/graphics/map_objects/pics/people/school_kid_m/6.png b/graphics/event_objects/pics/people/school_kid_m/6.png
index ba20fc113..ba20fc113 100644
--- a/graphics/map_objects/pics/people/school_kid_m/6.png
+++ b/graphics/event_objects/pics/people/school_kid_m/6.png
diff --git a/graphics/map_objects/pics/people/school_kid_m/7.png b/graphics/event_objects/pics/people/school_kid_m/7.png
index c4a5444e0..c4a5444e0 100644
--- a/graphics/map_objects/pics/people/school_kid_m/7.png
+++ b/graphics/event_objects/pics/people/school_kid_m/7.png
diff --git a/graphics/map_objects/pics/people/school_kid_m/8.png b/graphics/event_objects/pics/people/school_kid_m/8.png
index 047b340fb..047b340fb 100644
--- a/graphics/map_objects/pics/people/school_kid_m/8.png
+++ b/graphics/event_objects/pics/people/school_kid_m/8.png
diff --git a/graphics/map_objects/pics/people/scientist_1/0.png b/graphics/event_objects/pics/people/scientist_1/0.png
index ef85b5985..ef85b5985 100644
--- a/graphics/map_objects/pics/people/scientist_1/0.png
+++ b/graphics/event_objects/pics/people/scientist_1/0.png
diff --git a/graphics/map_objects/pics/people/scientist_1/1.png b/graphics/event_objects/pics/people/scientist_1/1.png
index 2a2ade370..2a2ade370 100644
--- a/graphics/map_objects/pics/people/scientist_1/1.png
+++ b/graphics/event_objects/pics/people/scientist_1/1.png
diff --git a/graphics/map_objects/pics/people/scientist_1/2.png b/graphics/event_objects/pics/people/scientist_1/2.png
index 6d3e31618..6d3e31618 100644
--- a/graphics/map_objects/pics/people/scientist_1/2.png
+++ b/graphics/event_objects/pics/people/scientist_1/2.png
diff --git a/graphics/map_objects/pics/people/scientist_1/3.png b/graphics/event_objects/pics/people/scientist_1/3.png
index 433dd879d..433dd879d 100644
--- a/graphics/map_objects/pics/people/scientist_1/3.png
+++ b/graphics/event_objects/pics/people/scientist_1/3.png
diff --git a/graphics/map_objects/pics/people/scientist_1/4.png b/graphics/event_objects/pics/people/scientist_1/4.png
index 3c0594e4f..3c0594e4f 100644
--- a/graphics/map_objects/pics/people/scientist_1/4.png
+++ b/graphics/event_objects/pics/people/scientist_1/4.png
diff --git a/graphics/map_objects/pics/people/scientist_1/5.png b/graphics/event_objects/pics/people/scientist_1/5.png
index 12fdc5c84..12fdc5c84 100644
--- a/graphics/map_objects/pics/people/scientist_1/5.png
+++ b/graphics/event_objects/pics/people/scientist_1/5.png
diff --git a/graphics/map_objects/pics/people/scientist_1/6.png b/graphics/event_objects/pics/people/scientist_1/6.png
index 6ea4c5577..6ea4c5577 100644
--- a/graphics/map_objects/pics/people/scientist_1/6.png
+++ b/graphics/event_objects/pics/people/scientist_1/6.png
diff --git a/graphics/map_objects/pics/people/scientist_1/7.png b/graphics/event_objects/pics/people/scientist_1/7.png
index 7496fcc98..7496fcc98 100644
--- a/graphics/map_objects/pics/people/scientist_1/7.png
+++ b/graphics/event_objects/pics/people/scientist_1/7.png
diff --git a/graphics/map_objects/pics/people/scientist_1/8.png b/graphics/event_objects/pics/people/scientist_1/8.png
index 7487b1b46..7487b1b46 100644
--- a/graphics/map_objects/pics/people/scientist_1/8.png
+++ b/graphics/event_objects/pics/people/scientist_1/8.png
diff --git a/graphics/map_objects/pics/people/scientist_2/0.png b/graphics/event_objects/pics/people/scientist_2/0.png
index 0a2f65a81..0a2f65a81 100644
--- a/graphics/map_objects/pics/people/scientist_2/0.png
+++ b/graphics/event_objects/pics/people/scientist_2/0.png
diff --git a/graphics/map_objects/pics/people/scientist_2/1.png b/graphics/event_objects/pics/people/scientist_2/1.png
index c7ef46ca1..c7ef46ca1 100644
--- a/graphics/map_objects/pics/people/scientist_2/1.png
+++ b/graphics/event_objects/pics/people/scientist_2/1.png
diff --git a/graphics/map_objects/pics/people/scientist_2/2.png b/graphics/event_objects/pics/people/scientist_2/2.png
index 3e8d2f530..3e8d2f530 100644
--- a/graphics/map_objects/pics/people/scientist_2/2.png
+++ b/graphics/event_objects/pics/people/scientist_2/2.png
diff --git a/graphics/map_objects/pics/people/scientist_2/3.png b/graphics/event_objects/pics/people/scientist_2/3.png
index 9c3f70989..9c3f70989 100644
--- a/graphics/map_objects/pics/people/scientist_2/3.png
+++ b/graphics/event_objects/pics/people/scientist_2/3.png
diff --git a/graphics/map_objects/pics/people/scientist_2/4.png b/graphics/event_objects/pics/people/scientist_2/4.png
index 28ac9b4cb..28ac9b4cb 100644
--- a/graphics/map_objects/pics/people/scientist_2/4.png
+++ b/graphics/event_objects/pics/people/scientist_2/4.png
diff --git a/graphics/map_objects/pics/people/scientist_2/5.png b/graphics/event_objects/pics/people/scientist_2/5.png
index 836241dc9..836241dc9 100644
--- a/graphics/map_objects/pics/people/scientist_2/5.png
+++ b/graphics/event_objects/pics/people/scientist_2/5.png
diff --git a/graphics/map_objects/pics/people/scientist_2/6.png b/graphics/event_objects/pics/people/scientist_2/6.png
index 894ba989e..894ba989e 100644
--- a/graphics/map_objects/pics/people/scientist_2/6.png
+++ b/graphics/event_objects/pics/people/scientist_2/6.png
diff --git a/graphics/map_objects/pics/people/scientist_2/7.png b/graphics/event_objects/pics/people/scientist_2/7.png
index b3176d10e..b3176d10e 100644
--- a/graphics/map_objects/pics/people/scientist_2/7.png
+++ b/graphics/event_objects/pics/people/scientist_2/7.png
diff --git a/graphics/map_objects/pics/people/scientist_2/8.png b/graphics/event_objects/pics/people/scientist_2/8.png
index 4666c2f9a..4666c2f9a 100644
--- a/graphics/map_objects/pics/people/scientist_2/8.png
+++ b/graphics/event_objects/pics/people/scientist_2/8.png
diff --git a/graphics/map_objects/pics/people/scott/0.png b/graphics/event_objects/pics/people/scott/0.png
index 44a9f0dc2..44a9f0dc2 100644
--- a/graphics/map_objects/pics/people/scott/0.png
+++ b/graphics/event_objects/pics/people/scott/0.png
diff --git a/graphics/map_objects/pics/people/scott/1.png b/graphics/event_objects/pics/people/scott/1.png
index 63510a313..63510a313 100644
--- a/graphics/map_objects/pics/people/scott/1.png
+++ b/graphics/event_objects/pics/people/scott/1.png
diff --git a/graphics/map_objects/pics/people/scott/2.png b/graphics/event_objects/pics/people/scott/2.png
index ef11e8e1f..ef11e8e1f 100644
--- a/graphics/map_objects/pics/people/scott/2.png
+++ b/graphics/event_objects/pics/people/scott/2.png
diff --git a/graphics/map_objects/pics/people/scott/3.png b/graphics/event_objects/pics/people/scott/3.png
index 8e087335f..8e087335f 100644
--- a/graphics/map_objects/pics/people/scott/3.png
+++ b/graphics/event_objects/pics/people/scott/3.png
diff --git a/graphics/map_objects/pics/people/scott/4.png b/graphics/event_objects/pics/people/scott/4.png
index 1ab051fc0..1ab051fc0 100644
--- a/graphics/map_objects/pics/people/scott/4.png
+++ b/graphics/event_objects/pics/people/scott/4.png
diff --git a/graphics/map_objects/pics/people/scott/5.png b/graphics/event_objects/pics/people/scott/5.png
index 167ada21d..167ada21d 100644
--- a/graphics/map_objects/pics/people/scott/5.png
+++ b/graphics/event_objects/pics/people/scott/5.png
diff --git a/graphics/map_objects/pics/people/scott/6.png b/graphics/event_objects/pics/people/scott/6.png
index e3c489f99..e3c489f99 100644
--- a/graphics/map_objects/pics/people/scott/6.png
+++ b/graphics/event_objects/pics/people/scott/6.png
diff --git a/graphics/map_objects/pics/people/scott/7.png b/graphics/event_objects/pics/people/scott/7.png
index 3d2b77b1b..3d2b77b1b 100644
--- a/graphics/map_objects/pics/people/scott/7.png
+++ b/graphics/event_objects/pics/people/scott/7.png
diff --git a/graphics/map_objects/pics/people/scott/8.png b/graphics/event_objects/pics/people/scott/8.png
index 5ac07720c..5ac07720c 100644
--- a/graphics/map_objects/pics/people/scott/8.png
+++ b/graphics/event_objects/pics/people/scott/8.png
diff --git a/graphics/map_objects/pics/people/sidney/0.png b/graphics/event_objects/pics/people/sidney/0.png
index abbbcd3fb..abbbcd3fb 100644
--- a/graphics/map_objects/pics/people/sidney/0.png
+++ b/graphics/event_objects/pics/people/sidney/0.png
diff --git a/graphics/map_objects/pics/people/sidney/1.png b/graphics/event_objects/pics/people/sidney/1.png
index e13e8ef32..e13e8ef32 100644
--- a/graphics/map_objects/pics/people/sidney/1.png
+++ b/graphics/event_objects/pics/people/sidney/1.png
diff --git a/graphics/map_objects/pics/people/sidney/2.png b/graphics/event_objects/pics/people/sidney/2.png
index 8c6d51434..8c6d51434 100644
--- a/graphics/map_objects/pics/people/sidney/2.png
+++ b/graphics/event_objects/pics/people/sidney/2.png
diff --git a/graphics/map_objects/pics/people/spenser/0.png b/graphics/event_objects/pics/people/spenser/0.png
index 526e77c75..526e77c75 100644
--- a/graphics/map_objects/pics/people/spenser/0.png
+++ b/graphics/event_objects/pics/people/spenser/0.png
diff --git a/graphics/map_objects/pics/people/spenser/1.png b/graphics/event_objects/pics/people/spenser/1.png
index 1009f4344..1009f4344 100644
--- a/graphics/map_objects/pics/people/spenser/1.png
+++ b/graphics/event_objects/pics/people/spenser/1.png
diff --git a/graphics/map_objects/pics/people/spenser/2.png b/graphics/event_objects/pics/people/spenser/2.png
index 2b6eb8fa9..2b6eb8fa9 100644
--- a/graphics/map_objects/pics/people/spenser/2.png
+++ b/graphics/event_objects/pics/people/spenser/2.png
diff --git a/graphics/map_objects/pics/people/spenser/3.png b/graphics/event_objects/pics/people/spenser/3.png
index 5fbc2044d..5fbc2044d 100644
--- a/graphics/map_objects/pics/people/spenser/3.png
+++ b/graphics/event_objects/pics/people/spenser/3.png
diff --git a/graphics/map_objects/pics/people/spenser/4.png b/graphics/event_objects/pics/people/spenser/4.png
index 64a194e36..64a194e36 100644
--- a/graphics/map_objects/pics/people/spenser/4.png
+++ b/graphics/event_objects/pics/people/spenser/4.png
diff --git a/graphics/map_objects/pics/people/spenser/5.png b/graphics/event_objects/pics/people/spenser/5.png
index 4e024fac0..4e024fac0 100644
--- a/graphics/map_objects/pics/people/spenser/5.png
+++ b/graphics/event_objects/pics/people/spenser/5.png
diff --git a/graphics/map_objects/pics/people/spenser/6.png b/graphics/event_objects/pics/people/spenser/6.png
index 2f6fefd88..2f6fefd88 100644
--- a/graphics/map_objects/pics/people/spenser/6.png
+++ b/graphics/event_objects/pics/people/spenser/6.png
diff --git a/graphics/map_objects/pics/people/spenser/7.png b/graphics/event_objects/pics/people/spenser/7.png
index 23be07f56..23be07f56 100644
--- a/graphics/map_objects/pics/people/spenser/7.png
+++ b/graphics/event_objects/pics/people/spenser/7.png
diff --git a/graphics/map_objects/pics/people/spenser/8.png b/graphics/event_objects/pics/people/spenser/8.png
index 71fff631b..71fff631b 100644
--- a/graphics/map_objects/pics/people/spenser/8.png
+++ b/graphics/event_objects/pics/people/spenser/8.png
diff --git a/graphics/map_objects/pics/people/steven/0.png b/graphics/event_objects/pics/people/steven/0.png
index 35cc4d404..35cc4d404 100644
--- a/graphics/map_objects/pics/people/steven/0.png
+++ b/graphics/event_objects/pics/people/steven/0.png
diff --git a/graphics/map_objects/pics/people/steven/1.png b/graphics/event_objects/pics/people/steven/1.png
index 37a8367ea..37a8367ea 100644
--- a/graphics/map_objects/pics/people/steven/1.png
+++ b/graphics/event_objects/pics/people/steven/1.png
diff --git a/graphics/map_objects/pics/people/steven/2.png b/graphics/event_objects/pics/people/steven/2.png
index 4d0447529..4d0447529 100644
--- a/graphics/map_objects/pics/people/steven/2.png
+++ b/graphics/event_objects/pics/people/steven/2.png
diff --git a/graphics/map_objects/pics/people/steven/3.png b/graphics/event_objects/pics/people/steven/3.png
index b2094c8b6..b2094c8b6 100644
--- a/graphics/map_objects/pics/people/steven/3.png
+++ b/graphics/event_objects/pics/people/steven/3.png
diff --git a/graphics/map_objects/pics/people/steven/4.png b/graphics/event_objects/pics/people/steven/4.png
index d47448bc8..d47448bc8 100644
--- a/graphics/map_objects/pics/people/steven/4.png
+++ b/graphics/event_objects/pics/people/steven/4.png
diff --git a/graphics/map_objects/pics/people/steven/5.png b/graphics/event_objects/pics/people/steven/5.png
index e023078ee..e023078ee 100644
--- a/graphics/map_objects/pics/people/steven/5.png
+++ b/graphics/event_objects/pics/people/steven/5.png
diff --git a/graphics/map_objects/pics/people/steven/6.png b/graphics/event_objects/pics/people/steven/6.png
index fb885a1bd..fb885a1bd 100644
--- a/graphics/map_objects/pics/people/steven/6.png
+++ b/graphics/event_objects/pics/people/steven/6.png
diff --git a/graphics/map_objects/pics/people/steven/7.png b/graphics/event_objects/pics/people/steven/7.png
index ee2fbbb5f..ee2fbbb5f 100644
--- a/graphics/map_objects/pics/people/steven/7.png
+++ b/graphics/event_objects/pics/people/steven/7.png
diff --git a/graphics/map_objects/pics/people/steven/8.png b/graphics/event_objects/pics/people/steven/8.png
index e140731cd..e140731cd 100644
--- a/graphics/map_objects/pics/people/steven/8.png
+++ b/graphics/event_objects/pics/people/steven/8.png
diff --git a/graphics/map_objects/pics/people/swimmer_f/0.png b/graphics/event_objects/pics/people/swimmer_f/0.png
index e34972cc7..e34972cc7 100644
--- a/graphics/map_objects/pics/people/swimmer_f/0.png
+++ b/graphics/event_objects/pics/people/swimmer_f/0.png
diff --git a/graphics/map_objects/pics/people/swimmer_f/1.png b/graphics/event_objects/pics/people/swimmer_f/1.png
index 64c3c79e5..64c3c79e5 100644
--- a/graphics/map_objects/pics/people/swimmer_f/1.png
+++ b/graphics/event_objects/pics/people/swimmer_f/1.png
diff --git a/graphics/map_objects/pics/people/swimmer_f/2.png b/graphics/event_objects/pics/people/swimmer_f/2.png
index cf4d17d5d..cf4d17d5d 100644
--- a/graphics/map_objects/pics/people/swimmer_f/2.png
+++ b/graphics/event_objects/pics/people/swimmer_f/2.png
diff --git a/graphics/map_objects/pics/people/swimmer_f/3.png b/graphics/event_objects/pics/people/swimmer_f/3.png
index e8edbc9a6..e8edbc9a6 100644
--- a/graphics/map_objects/pics/people/swimmer_f/3.png
+++ b/graphics/event_objects/pics/people/swimmer_f/3.png
diff --git a/graphics/map_objects/pics/people/swimmer_f/4.png b/graphics/event_objects/pics/people/swimmer_f/4.png
index 1f5abf77e..1f5abf77e 100644
--- a/graphics/map_objects/pics/people/swimmer_f/4.png
+++ b/graphics/event_objects/pics/people/swimmer_f/4.png
diff --git a/graphics/map_objects/pics/people/swimmer_f/5.png b/graphics/event_objects/pics/people/swimmer_f/5.png
index 5e19861cb..5e19861cb 100644
--- a/graphics/map_objects/pics/people/swimmer_f/5.png
+++ b/graphics/event_objects/pics/people/swimmer_f/5.png
diff --git a/graphics/map_objects/pics/people/swimmer_f/6.png b/graphics/event_objects/pics/people/swimmer_f/6.png
index c4b602391..c4b602391 100644
--- a/graphics/map_objects/pics/people/swimmer_f/6.png
+++ b/graphics/event_objects/pics/people/swimmer_f/6.png
diff --git a/graphics/map_objects/pics/people/swimmer_f/7.png b/graphics/event_objects/pics/people/swimmer_f/7.png
index beb17704a..beb17704a 100644
--- a/graphics/map_objects/pics/people/swimmer_f/7.png
+++ b/graphics/event_objects/pics/people/swimmer_f/7.png
diff --git a/graphics/map_objects/pics/people/swimmer_f/8.png b/graphics/event_objects/pics/people/swimmer_f/8.png
index db5588f7c..db5588f7c 100644
--- a/graphics/map_objects/pics/people/swimmer_f/8.png
+++ b/graphics/event_objects/pics/people/swimmer_f/8.png
diff --git a/graphics/map_objects/pics/people/swimmer_m/0.png b/graphics/event_objects/pics/people/swimmer_m/0.png
index 51d63bb26..51d63bb26 100644
--- a/graphics/map_objects/pics/people/swimmer_m/0.png
+++ b/graphics/event_objects/pics/people/swimmer_m/0.png
diff --git a/graphics/map_objects/pics/people/swimmer_m/1.png b/graphics/event_objects/pics/people/swimmer_m/1.png
index d1f976558..d1f976558 100644
--- a/graphics/map_objects/pics/people/swimmer_m/1.png
+++ b/graphics/event_objects/pics/people/swimmer_m/1.png
diff --git a/graphics/map_objects/pics/people/swimmer_m/2.png b/graphics/event_objects/pics/people/swimmer_m/2.png
index b4087efb5..b4087efb5 100644
--- a/graphics/map_objects/pics/people/swimmer_m/2.png
+++ b/graphics/event_objects/pics/people/swimmer_m/2.png
diff --git a/graphics/map_objects/pics/people/swimmer_m/3.png b/graphics/event_objects/pics/people/swimmer_m/3.png
index 4f445b8a8..4f445b8a8 100644
--- a/graphics/map_objects/pics/people/swimmer_m/3.png
+++ b/graphics/event_objects/pics/people/swimmer_m/3.png
diff --git a/graphics/map_objects/pics/people/swimmer_m/4.png b/graphics/event_objects/pics/people/swimmer_m/4.png
index 940e8cf5d..940e8cf5d 100644
--- a/graphics/map_objects/pics/people/swimmer_m/4.png
+++ b/graphics/event_objects/pics/people/swimmer_m/4.png
diff --git a/graphics/map_objects/pics/people/swimmer_m/5.png b/graphics/event_objects/pics/people/swimmer_m/5.png
index d6be697b0..d6be697b0 100644
--- a/graphics/map_objects/pics/people/swimmer_m/5.png
+++ b/graphics/event_objects/pics/people/swimmer_m/5.png
diff --git a/graphics/map_objects/pics/people/swimmer_m/6.png b/graphics/event_objects/pics/people/swimmer_m/6.png
index cb2de823b..cb2de823b 100644
--- a/graphics/map_objects/pics/people/swimmer_m/6.png
+++ b/graphics/event_objects/pics/people/swimmer_m/6.png
diff --git a/graphics/map_objects/pics/people/swimmer_m/7.png b/graphics/event_objects/pics/people/swimmer_m/7.png
index b17892261..b17892261 100644
--- a/graphics/map_objects/pics/people/swimmer_m/7.png
+++ b/graphics/event_objects/pics/people/swimmer_m/7.png
diff --git a/graphics/map_objects/pics/people/swimmer_m/8.png b/graphics/event_objects/pics/people/swimmer_m/8.png
index 1f3fd48d0..1f3fd48d0 100644
--- a/graphics/map_objects/pics/people/swimmer_m/8.png
+++ b/graphics/event_objects/pics/people/swimmer_m/8.png
diff --git a/graphics/map_objects/pics/people/tate/0.png b/graphics/event_objects/pics/people/tate/0.png
index f2481f1e2..f2481f1e2 100644
--- a/graphics/map_objects/pics/people/tate/0.png
+++ b/graphics/event_objects/pics/people/tate/0.png
diff --git a/graphics/map_objects/pics/people/tate/1.png b/graphics/event_objects/pics/people/tate/1.png
index ff1608cf2..ff1608cf2 100644
--- a/graphics/map_objects/pics/people/tate/1.png
+++ b/graphics/event_objects/pics/people/tate/1.png
diff --git a/graphics/map_objects/pics/people/tate/2.png b/graphics/event_objects/pics/people/tate/2.png
index 9fba8459d..9fba8459d 100644
--- a/graphics/map_objects/pics/people/tate/2.png
+++ b/graphics/event_objects/pics/people/tate/2.png
diff --git a/graphics/map_objects/pics/people/teala/0.png b/graphics/event_objects/pics/people/teala/0.png
index 173152306..173152306 100644
--- a/graphics/map_objects/pics/people/teala/0.png
+++ b/graphics/event_objects/pics/people/teala/0.png
diff --git a/graphics/map_objects/pics/people/teala/1.png b/graphics/event_objects/pics/people/teala/1.png
index 2340f3262..2340f3262 100644
--- a/graphics/map_objects/pics/people/teala/1.png
+++ b/graphics/event_objects/pics/people/teala/1.png
diff --git a/graphics/map_objects/pics/people/teala/2.png b/graphics/event_objects/pics/people/teala/2.png
index 1900d9e8d..1900d9e8d 100644
--- a/graphics/map_objects/pics/people/teala/2.png
+++ b/graphics/event_objects/pics/people/teala/2.png
diff --git a/graphics/map_objects/pics/people/teala/3.png b/graphics/event_objects/pics/people/teala/3.png
index f3d46c920..f3d46c920 100644
--- a/graphics/map_objects/pics/people/teala/3.png
+++ b/graphics/event_objects/pics/people/teala/3.png
diff --git a/graphics/map_objects/pics/people/teala/4.png b/graphics/event_objects/pics/people/teala/4.png
index 5b70939b2..5b70939b2 100644
--- a/graphics/map_objects/pics/people/teala/4.png
+++ b/graphics/event_objects/pics/people/teala/4.png
diff --git a/graphics/map_objects/pics/people/teala/5.png b/graphics/event_objects/pics/people/teala/5.png
index fcba35792..fcba35792 100644
--- a/graphics/map_objects/pics/people/teala/5.png
+++ b/graphics/event_objects/pics/people/teala/5.png
diff --git a/graphics/map_objects/pics/people/teala/6.png b/graphics/event_objects/pics/people/teala/6.png
index 85a574bb8..85a574bb8 100644
--- a/graphics/map_objects/pics/people/teala/6.png
+++ b/graphics/event_objects/pics/people/teala/6.png
diff --git a/graphics/map_objects/pics/people/teala/7.png b/graphics/event_objects/pics/people/teala/7.png
index 882d7adca..882d7adca 100644
--- a/graphics/map_objects/pics/people/teala/7.png
+++ b/graphics/event_objects/pics/people/teala/7.png
diff --git a/graphics/map_objects/pics/people/teala/8.png b/graphics/event_objects/pics/people/teala/8.png
index 4366d38f9..4366d38f9 100644
--- a/graphics/map_objects/pics/people/teala/8.png
+++ b/graphics/event_objects/pics/people/teala/8.png
diff --git a/graphics/map_objects/pics/people/tuber_f/0.png b/graphics/event_objects/pics/people/tuber_f/0.png
index 34081dbad..34081dbad 100644
--- a/graphics/map_objects/pics/people/tuber_f/0.png
+++ b/graphics/event_objects/pics/people/tuber_f/0.png
diff --git a/graphics/map_objects/pics/people/tuber_f/1.png b/graphics/event_objects/pics/people/tuber_f/1.png
index 5ad154c38..5ad154c38 100644
--- a/graphics/map_objects/pics/people/tuber_f/1.png
+++ b/graphics/event_objects/pics/people/tuber_f/1.png
diff --git a/graphics/map_objects/pics/people/tuber_f/2.png b/graphics/event_objects/pics/people/tuber_f/2.png
index d87de1307..d87de1307 100644
--- a/graphics/map_objects/pics/people/tuber_f/2.png
+++ b/graphics/event_objects/pics/people/tuber_f/2.png
diff --git a/graphics/map_objects/pics/people/tuber_f/3.png b/graphics/event_objects/pics/people/tuber_f/3.png
index 17ffb8845..17ffb8845 100644
--- a/graphics/map_objects/pics/people/tuber_f/3.png
+++ b/graphics/event_objects/pics/people/tuber_f/3.png
diff --git a/graphics/map_objects/pics/people/tuber_f/4.png b/graphics/event_objects/pics/people/tuber_f/4.png
index 9de7aa0ab..9de7aa0ab 100644
--- a/graphics/map_objects/pics/people/tuber_f/4.png
+++ b/graphics/event_objects/pics/people/tuber_f/4.png
diff --git a/graphics/map_objects/pics/people/tuber_f/5.png b/graphics/event_objects/pics/people/tuber_f/5.png
index 16bd9c685..16bd9c685 100644
--- a/graphics/map_objects/pics/people/tuber_f/5.png
+++ b/graphics/event_objects/pics/people/tuber_f/5.png
diff --git a/graphics/map_objects/pics/people/tuber_f/6.png b/graphics/event_objects/pics/people/tuber_f/6.png
index e026ea45d..e026ea45d 100644
--- a/graphics/map_objects/pics/people/tuber_f/6.png
+++ b/graphics/event_objects/pics/people/tuber_f/6.png
diff --git a/graphics/map_objects/pics/people/tuber_f/7.png b/graphics/event_objects/pics/people/tuber_f/7.png
index fbabc200d..fbabc200d 100644
--- a/graphics/map_objects/pics/people/tuber_f/7.png
+++ b/graphics/event_objects/pics/people/tuber_f/7.png
diff --git a/graphics/map_objects/pics/people/tuber_f/8.png b/graphics/event_objects/pics/people/tuber_f/8.png
index ad08f016b..ad08f016b 100644
--- a/graphics/map_objects/pics/people/tuber_f/8.png
+++ b/graphics/event_objects/pics/people/tuber_f/8.png
diff --git a/graphics/map_objects/pics/people/tuber_m/0.png b/graphics/event_objects/pics/people/tuber_m/0.png
index 323439703..323439703 100644
--- a/graphics/map_objects/pics/people/tuber_m/0.png
+++ b/graphics/event_objects/pics/people/tuber_m/0.png
diff --git a/graphics/map_objects/pics/people/tuber_m/1.png b/graphics/event_objects/pics/people/tuber_m/1.png
index dfce73bbc..dfce73bbc 100644
--- a/graphics/map_objects/pics/people/tuber_m/1.png
+++ b/graphics/event_objects/pics/people/tuber_m/1.png
diff --git a/graphics/map_objects/pics/people/tuber_m/2.png b/graphics/event_objects/pics/people/tuber_m/2.png
index 1b1de564f..1b1de564f 100644
--- a/graphics/map_objects/pics/people/tuber_m/2.png
+++ b/graphics/event_objects/pics/people/tuber_m/2.png
diff --git a/graphics/map_objects/pics/people/tuber_m/3.png b/graphics/event_objects/pics/people/tuber_m/3.png
index 39f37a19b..39f37a19b 100644
--- a/graphics/map_objects/pics/people/tuber_m/3.png
+++ b/graphics/event_objects/pics/people/tuber_m/3.png
diff --git a/graphics/map_objects/pics/people/tuber_m/4.png b/graphics/event_objects/pics/people/tuber_m/4.png
index 78fae1160..78fae1160 100644
--- a/graphics/map_objects/pics/people/tuber_m/4.png
+++ b/graphics/event_objects/pics/people/tuber_m/4.png
diff --git a/graphics/map_objects/pics/people/tuber_m/5.png b/graphics/event_objects/pics/people/tuber_m/5.png
index 690add8ad..690add8ad 100644
--- a/graphics/map_objects/pics/people/tuber_m/5.png
+++ b/graphics/event_objects/pics/people/tuber_m/5.png
diff --git a/graphics/map_objects/pics/people/tuber_m/6.png b/graphics/event_objects/pics/people/tuber_m/6.png
index ff61406b9..ff61406b9 100644
--- a/graphics/map_objects/pics/people/tuber_m/6.png
+++ b/graphics/event_objects/pics/people/tuber_m/6.png
diff --git a/graphics/map_objects/pics/people/tuber_m/7.png b/graphics/event_objects/pics/people/tuber_m/7.png
index d8c7b98cf..d8c7b98cf 100644
--- a/graphics/map_objects/pics/people/tuber_m/7.png
+++ b/graphics/event_objects/pics/people/tuber_m/7.png
diff --git a/graphics/map_objects/pics/people/tuber_m/8.png b/graphics/event_objects/pics/people/tuber_m/8.png
index 4ec4b5599..4ec4b5599 100644
--- a/graphics/map_objects/pics/people/tuber_m/8.png
+++ b/graphics/event_objects/pics/people/tuber_m/8.png
diff --git a/graphics/map_objects/pics/people/tuber_m_swimming/0.png b/graphics/event_objects/pics/people/tuber_m_swimming/0.png
index c6ba83d87..c6ba83d87 100644
--- a/graphics/map_objects/pics/people/tuber_m_swimming/0.png
+++ b/graphics/event_objects/pics/people/tuber_m_swimming/0.png
diff --git a/graphics/map_objects/pics/people/tuber_m_swimming/1.png b/graphics/event_objects/pics/people/tuber_m_swimming/1.png
index 85eb42650..85eb42650 100644
--- a/graphics/map_objects/pics/people/tuber_m_swimming/1.png
+++ b/graphics/event_objects/pics/people/tuber_m_swimming/1.png
diff --git a/graphics/map_objects/pics/people/tuber_m_swimming/2.png b/graphics/event_objects/pics/people/tuber_m_swimming/2.png
index 1cca717b0..1cca717b0 100644
--- a/graphics/map_objects/pics/people/tuber_m_swimming/2.png
+++ b/graphics/event_objects/pics/people/tuber_m_swimming/2.png
diff --git a/graphics/map_objects/pics/people/tuber_m_swimming/3.png b/graphics/event_objects/pics/people/tuber_m_swimming/3.png
index 253d75ed0..253d75ed0 100644
--- a/graphics/map_objects/pics/people/tuber_m_swimming/3.png
+++ b/graphics/event_objects/pics/people/tuber_m_swimming/3.png
diff --git a/graphics/map_objects/pics/people/tuber_m_swimming/4.png b/graphics/event_objects/pics/people/tuber_m_swimming/4.png
index d64c9033f..d64c9033f 100644
--- a/graphics/map_objects/pics/people/tuber_m_swimming/4.png
+++ b/graphics/event_objects/pics/people/tuber_m_swimming/4.png
diff --git a/graphics/map_objects/pics/people/tuber_m_swimming/5.png b/graphics/event_objects/pics/people/tuber_m_swimming/5.png
index 2a8e7d67d..2a8e7d67d 100644
--- a/graphics/map_objects/pics/people/tuber_m_swimming/5.png
+++ b/graphics/event_objects/pics/people/tuber_m_swimming/5.png
diff --git a/graphics/map_objects/pics/people/tuber_m_swimming/6.png b/graphics/event_objects/pics/people/tuber_m_swimming/6.png
index c55acdf29..c55acdf29 100644
--- a/graphics/map_objects/pics/people/tuber_m_swimming/6.png
+++ b/graphics/event_objects/pics/people/tuber_m_swimming/6.png
diff --git a/graphics/map_objects/pics/people/tuber_m_swimming/7.png b/graphics/event_objects/pics/people/tuber_m_swimming/7.png
index 7a203920f..7a203920f 100644
--- a/graphics/map_objects/pics/people/tuber_m_swimming/7.png
+++ b/graphics/event_objects/pics/people/tuber_m_swimming/7.png
diff --git a/graphics/map_objects/pics/people/tuber_m_swimming/8.png b/graphics/event_objects/pics/people/tuber_m_swimming/8.png
index 321f8acca..321f8acca 100644
--- a/graphics/map_objects/pics/people/tuber_m_swimming/8.png
+++ b/graphics/event_objects/pics/people/tuber_m_swimming/8.png
diff --git a/graphics/map_objects/pics/people/tucker/0.png b/graphics/event_objects/pics/people/tucker/0.png
index ec733c959..ec733c959 100644
--- a/graphics/map_objects/pics/people/tucker/0.png
+++ b/graphics/event_objects/pics/people/tucker/0.png
diff --git a/graphics/map_objects/pics/people/tucker/1.png b/graphics/event_objects/pics/people/tucker/1.png
index ad4af677c..ad4af677c 100644
--- a/graphics/map_objects/pics/people/tucker/1.png
+++ b/graphics/event_objects/pics/people/tucker/1.png
diff --git a/graphics/map_objects/pics/people/tucker/2.png b/graphics/event_objects/pics/people/tucker/2.png
index 2496ded57..2496ded57 100644
--- a/graphics/map_objects/pics/people/tucker/2.png
+++ b/graphics/event_objects/pics/people/tucker/2.png
diff --git a/graphics/map_objects/pics/people/tucker/3.png b/graphics/event_objects/pics/people/tucker/3.png
index 3f7b156f0..3f7b156f0 100644
--- a/graphics/map_objects/pics/people/tucker/3.png
+++ b/graphics/event_objects/pics/people/tucker/3.png
diff --git a/graphics/map_objects/pics/people/tucker/4.png b/graphics/event_objects/pics/people/tucker/4.png
index 4262e1be0..4262e1be0 100644
--- a/graphics/map_objects/pics/people/tucker/4.png
+++ b/graphics/event_objects/pics/people/tucker/4.png
diff --git a/graphics/map_objects/pics/people/tucker/5.png b/graphics/event_objects/pics/people/tucker/5.png
index 53304c221..53304c221 100644
--- a/graphics/map_objects/pics/people/tucker/5.png
+++ b/graphics/event_objects/pics/people/tucker/5.png
diff --git a/graphics/map_objects/pics/people/tucker/6.png b/graphics/event_objects/pics/people/tucker/6.png
index 0bab43c10..0bab43c10 100644
--- a/graphics/map_objects/pics/people/tucker/6.png
+++ b/graphics/event_objects/pics/people/tucker/6.png
diff --git a/graphics/map_objects/pics/people/tucker/7.png b/graphics/event_objects/pics/people/tucker/7.png
index a98ef8819..a98ef8819 100644
--- a/graphics/map_objects/pics/people/tucker/7.png
+++ b/graphics/event_objects/pics/people/tucker/7.png
diff --git a/graphics/map_objects/pics/people/tucker/8.png b/graphics/event_objects/pics/people/tucker/8.png
index 7b6d30a22..7b6d30a22 100644
--- a/graphics/map_objects/pics/people/tucker/8.png
+++ b/graphics/event_objects/pics/people/tucker/8.png
diff --git a/graphics/map_objects/pics/people/union_room_attendant/0.png b/graphics/event_objects/pics/people/union_room_attendant/0.png
index cfccc0049..cfccc0049 100644
--- a/graphics/map_objects/pics/people/union_room_attendant/0.png
+++ b/graphics/event_objects/pics/people/union_room_attendant/0.png
diff --git a/graphics/map_objects/pics/people/union_room_attendant/1.png b/graphics/event_objects/pics/people/union_room_attendant/1.png
index 6790d092e..6790d092e 100644
--- a/graphics/map_objects/pics/people/union_room_attendant/1.png
+++ b/graphics/event_objects/pics/people/union_room_attendant/1.png
diff --git a/graphics/map_objects/pics/people/union_room_attendant/2.png b/graphics/event_objects/pics/people/union_room_attendant/2.png
index 38fb1eb74..38fb1eb74 100644
--- a/graphics/map_objects/pics/people/union_room_attendant/2.png
+++ b/graphics/event_objects/pics/people/union_room_attendant/2.png
diff --git a/graphics/map_objects/pics/people/unused_woman/0.png b/graphics/event_objects/pics/people/unused_woman/0.png
index 01ba70b56..01ba70b56 100644
--- a/graphics/map_objects/pics/people/unused_woman/0.png
+++ b/graphics/event_objects/pics/people/unused_woman/0.png
diff --git a/graphics/map_objects/pics/people/unused_woman/1.png b/graphics/event_objects/pics/people/unused_woman/1.png
index 78534f0dc..78534f0dc 100644
--- a/graphics/map_objects/pics/people/unused_woman/1.png
+++ b/graphics/event_objects/pics/people/unused_woman/1.png
diff --git a/graphics/map_objects/pics/people/unused_woman/2.png b/graphics/event_objects/pics/people/unused_woman/2.png
index b42a12532..b42a12532 100644
--- a/graphics/map_objects/pics/people/unused_woman/2.png
+++ b/graphics/event_objects/pics/people/unused_woman/2.png
diff --git a/graphics/map_objects/pics/people/unused_woman/3.png b/graphics/event_objects/pics/people/unused_woman/3.png
index c66653c17..c66653c17 100644
--- a/graphics/map_objects/pics/people/unused_woman/3.png
+++ b/graphics/event_objects/pics/people/unused_woman/3.png
diff --git a/graphics/map_objects/pics/people/unused_woman/4.png b/graphics/event_objects/pics/people/unused_woman/4.png
index 75a457c2f..75a457c2f 100644
--- a/graphics/map_objects/pics/people/unused_woman/4.png
+++ b/graphics/event_objects/pics/people/unused_woman/4.png
diff --git a/graphics/map_objects/pics/people/unused_woman/5.png b/graphics/event_objects/pics/people/unused_woman/5.png
index e27f0760f..e27f0760f 100644
--- a/graphics/map_objects/pics/people/unused_woman/5.png
+++ b/graphics/event_objects/pics/people/unused_woman/5.png
diff --git a/graphics/map_objects/pics/people/unused_woman/6.png b/graphics/event_objects/pics/people/unused_woman/6.png
index 53102c01e..53102c01e 100644
--- a/graphics/map_objects/pics/people/unused_woman/6.png
+++ b/graphics/event_objects/pics/people/unused_woman/6.png
diff --git a/graphics/map_objects/pics/people/unused_woman/7.png b/graphics/event_objects/pics/people/unused_woman/7.png
index 3d2d436c2..3d2d436c2 100644
--- a/graphics/map_objects/pics/people/unused_woman/7.png
+++ b/graphics/event_objects/pics/people/unused_woman/7.png
diff --git a/graphics/map_objects/pics/people/unused_woman/8.png b/graphics/event_objects/pics/people/unused_woman/8.png
index 3773e7f48..3773e7f48 100644
--- a/graphics/map_objects/pics/people/unused_woman/8.png
+++ b/graphics/event_objects/pics/people/unused_woman/8.png
diff --git a/graphics/map_objects/pics/people/wallace/0.png b/graphics/event_objects/pics/people/wallace/0.png
index 349d65049..349d65049 100644
--- a/graphics/map_objects/pics/people/wallace/0.png
+++ b/graphics/event_objects/pics/people/wallace/0.png
diff --git a/graphics/map_objects/pics/people/wallace/1.png b/graphics/event_objects/pics/people/wallace/1.png
index 698b03fad..698b03fad 100644
--- a/graphics/map_objects/pics/people/wallace/1.png
+++ b/graphics/event_objects/pics/people/wallace/1.png
diff --git a/graphics/map_objects/pics/people/wallace/2.png b/graphics/event_objects/pics/people/wallace/2.png
index 576346bcb..576346bcb 100644
--- a/graphics/map_objects/pics/people/wallace/2.png
+++ b/graphics/event_objects/pics/people/wallace/2.png
diff --git a/graphics/map_objects/pics/people/wallace/3.png b/graphics/event_objects/pics/people/wallace/3.png
index 56773b97d..56773b97d 100644
--- a/graphics/map_objects/pics/people/wallace/3.png
+++ b/graphics/event_objects/pics/people/wallace/3.png
diff --git a/graphics/map_objects/pics/people/wallace/4.png b/graphics/event_objects/pics/people/wallace/4.png
index 6281a56ef..6281a56ef 100644
--- a/graphics/map_objects/pics/people/wallace/4.png
+++ b/graphics/event_objects/pics/people/wallace/4.png
diff --git a/graphics/map_objects/pics/people/wallace/5.png b/graphics/event_objects/pics/people/wallace/5.png
index 5f61598d9..5f61598d9 100644
--- a/graphics/map_objects/pics/people/wallace/5.png
+++ b/graphics/event_objects/pics/people/wallace/5.png
diff --git a/graphics/map_objects/pics/people/wallace/6.png b/graphics/event_objects/pics/people/wallace/6.png
index 1abba4e1b..1abba4e1b 100644
--- a/graphics/map_objects/pics/people/wallace/6.png
+++ b/graphics/event_objects/pics/people/wallace/6.png
diff --git a/graphics/map_objects/pics/people/wallace/7.png b/graphics/event_objects/pics/people/wallace/7.png
index 477dd9e01..477dd9e01 100644
--- a/graphics/map_objects/pics/people/wallace/7.png
+++ b/graphics/event_objects/pics/people/wallace/7.png
diff --git a/graphics/map_objects/pics/people/wallace/8.png b/graphics/event_objects/pics/people/wallace/8.png
index da5a51f76..da5a51f76 100644
--- a/graphics/map_objects/pics/people/wallace/8.png
+++ b/graphics/event_objects/pics/people/wallace/8.png
diff --git a/graphics/map_objects/pics/people/wally/0.png b/graphics/event_objects/pics/people/wally/0.png
index b185bc294..b185bc294 100644
--- a/graphics/map_objects/pics/people/wally/0.png
+++ b/graphics/event_objects/pics/people/wally/0.png
diff --git a/graphics/map_objects/pics/people/wally/1.png b/graphics/event_objects/pics/people/wally/1.png
index 42f5a3f0a..42f5a3f0a 100644
--- a/graphics/map_objects/pics/people/wally/1.png
+++ b/graphics/event_objects/pics/people/wally/1.png
diff --git a/graphics/map_objects/pics/people/wally/2.png b/graphics/event_objects/pics/people/wally/2.png
index ed32f1f41..ed32f1f41 100644
--- a/graphics/map_objects/pics/people/wally/2.png
+++ b/graphics/event_objects/pics/people/wally/2.png
diff --git a/graphics/map_objects/pics/people/wally/3.png b/graphics/event_objects/pics/people/wally/3.png
index 5d2213b2c..5d2213b2c 100644
--- a/graphics/map_objects/pics/people/wally/3.png
+++ b/graphics/event_objects/pics/people/wally/3.png
diff --git a/graphics/map_objects/pics/people/wally/4.png b/graphics/event_objects/pics/people/wally/4.png
index af996a72a..af996a72a 100644
--- a/graphics/map_objects/pics/people/wally/4.png
+++ b/graphics/event_objects/pics/people/wally/4.png
diff --git a/graphics/map_objects/pics/people/wally/5.png b/graphics/event_objects/pics/people/wally/5.png
index de23077ce..de23077ce 100644
--- a/graphics/map_objects/pics/people/wally/5.png
+++ b/graphics/event_objects/pics/people/wally/5.png
diff --git a/graphics/map_objects/pics/people/wally/6.png b/graphics/event_objects/pics/people/wally/6.png
index 42397e95e..42397e95e 100644
--- a/graphics/map_objects/pics/people/wally/6.png
+++ b/graphics/event_objects/pics/people/wally/6.png
diff --git a/graphics/map_objects/pics/people/wally/7.png b/graphics/event_objects/pics/people/wally/7.png
index 46dbdfa3b..46dbdfa3b 100644
--- a/graphics/map_objects/pics/people/wally/7.png
+++ b/graphics/event_objects/pics/people/wally/7.png
diff --git a/graphics/map_objects/pics/people/wally/8.png b/graphics/event_objects/pics/people/wally/8.png
index 5b7038b44..5b7038b44 100644
--- a/graphics/map_objects/pics/people/wally/8.png
+++ b/graphics/event_objects/pics/people/wally/8.png
diff --git a/graphics/map_objects/pics/people/wattson/0.png b/graphics/event_objects/pics/people/wattson/0.png
index 28eaa1bf2..28eaa1bf2 100644
--- a/graphics/map_objects/pics/people/wattson/0.png
+++ b/graphics/event_objects/pics/people/wattson/0.png
diff --git a/graphics/map_objects/pics/people/wattson/1.png b/graphics/event_objects/pics/people/wattson/1.png
index b26ab83f4..b26ab83f4 100644
--- a/graphics/map_objects/pics/people/wattson/1.png
+++ b/graphics/event_objects/pics/people/wattson/1.png
diff --git a/graphics/map_objects/pics/people/wattson/2.png b/graphics/event_objects/pics/people/wattson/2.png
index 2d7fe024b..2d7fe024b 100644
--- a/graphics/map_objects/pics/people/wattson/2.png
+++ b/graphics/event_objects/pics/people/wattson/2.png
diff --git a/graphics/map_objects/pics/people/winona/0.png b/graphics/event_objects/pics/people/winona/0.png
index 4df463363..4df463363 100644
--- a/graphics/map_objects/pics/people/winona/0.png
+++ b/graphics/event_objects/pics/people/winona/0.png
diff --git a/graphics/map_objects/pics/people/winona/1.png b/graphics/event_objects/pics/people/winona/1.png
index 75d255c7a..75d255c7a 100644
--- a/graphics/map_objects/pics/people/winona/1.png
+++ b/graphics/event_objects/pics/people/winona/1.png
diff --git a/graphics/map_objects/pics/people/winona/2.png b/graphics/event_objects/pics/people/winona/2.png
index 569dea105..569dea105 100644
--- a/graphics/map_objects/pics/people/winona/2.png
+++ b/graphics/event_objects/pics/people/winona/2.png
diff --git a/graphics/map_objects/pics/people/woman_1/0.png b/graphics/event_objects/pics/people/woman_1/0.png
index cb2949038..cb2949038 100644
--- a/graphics/map_objects/pics/people/woman_1/0.png
+++ b/graphics/event_objects/pics/people/woman_1/0.png
diff --git a/graphics/map_objects/pics/people/woman_1/1.png b/graphics/event_objects/pics/people/woman_1/1.png
index ea8dc9119..ea8dc9119 100644
--- a/graphics/map_objects/pics/people/woman_1/1.png
+++ b/graphics/event_objects/pics/people/woman_1/1.png
diff --git a/graphics/map_objects/pics/people/woman_1/2.png b/graphics/event_objects/pics/people/woman_1/2.png
index b0bd3e1b1..b0bd3e1b1 100644
--- a/graphics/map_objects/pics/people/woman_1/2.png
+++ b/graphics/event_objects/pics/people/woman_1/2.png
diff --git a/graphics/map_objects/pics/people/woman_1/3.png b/graphics/event_objects/pics/people/woman_1/3.png
index e7ed6c112..e7ed6c112 100644
--- a/graphics/map_objects/pics/people/woman_1/3.png
+++ b/graphics/event_objects/pics/people/woman_1/3.png
diff --git a/graphics/map_objects/pics/people/woman_1/4.png b/graphics/event_objects/pics/people/woman_1/4.png
index 05f7e7839..05f7e7839 100644
--- a/graphics/map_objects/pics/people/woman_1/4.png
+++ b/graphics/event_objects/pics/people/woman_1/4.png
diff --git a/graphics/map_objects/pics/people/woman_1/5.png b/graphics/event_objects/pics/people/woman_1/5.png
index e23e364cd..e23e364cd 100644
--- a/graphics/map_objects/pics/people/woman_1/5.png
+++ b/graphics/event_objects/pics/people/woman_1/5.png
diff --git a/graphics/map_objects/pics/people/woman_1/6.png b/graphics/event_objects/pics/people/woman_1/6.png
index a1e6f69ab..a1e6f69ab 100644
--- a/graphics/map_objects/pics/people/woman_1/6.png
+++ b/graphics/event_objects/pics/people/woman_1/6.png
diff --git a/graphics/map_objects/pics/people/woman_1/7.png b/graphics/event_objects/pics/people/woman_1/7.png
index 985172d52..985172d52 100644
--- a/graphics/map_objects/pics/people/woman_1/7.png
+++ b/graphics/event_objects/pics/people/woman_1/7.png
diff --git a/graphics/map_objects/pics/people/woman_1/8.png b/graphics/event_objects/pics/people/woman_1/8.png
index f5e560b59..f5e560b59 100644
--- a/graphics/map_objects/pics/people/woman_1/8.png
+++ b/graphics/event_objects/pics/people/woman_1/8.png
diff --git a/graphics/map_objects/pics/people/woman_2/0.png b/graphics/event_objects/pics/people/woman_2/0.png
index d9656ce73..d9656ce73 100644
--- a/graphics/map_objects/pics/people/woman_2/0.png
+++ b/graphics/event_objects/pics/people/woman_2/0.png
diff --git a/graphics/map_objects/pics/people/woman_2/1.png b/graphics/event_objects/pics/people/woman_2/1.png
index 23d97812b..23d97812b 100644
--- a/graphics/map_objects/pics/people/woman_2/1.png
+++ b/graphics/event_objects/pics/people/woman_2/1.png
diff --git a/graphics/map_objects/pics/people/woman_2/2.png b/graphics/event_objects/pics/people/woman_2/2.png
index f298e6eea..f298e6eea 100644
--- a/graphics/map_objects/pics/people/woman_2/2.png
+++ b/graphics/event_objects/pics/people/woman_2/2.png
diff --git a/graphics/map_objects/pics/people/woman_2/3.png b/graphics/event_objects/pics/people/woman_2/3.png
index 53809fd32..53809fd32 100644
--- a/graphics/map_objects/pics/people/woman_2/3.png
+++ b/graphics/event_objects/pics/people/woman_2/3.png
diff --git a/graphics/map_objects/pics/people/woman_2/4.png b/graphics/event_objects/pics/people/woman_2/4.png
index 8f3fbe35f..8f3fbe35f 100644
--- a/graphics/map_objects/pics/people/woman_2/4.png
+++ b/graphics/event_objects/pics/people/woman_2/4.png
diff --git a/graphics/map_objects/pics/people/woman_2/5.png b/graphics/event_objects/pics/people/woman_2/5.png
index d02680904..d02680904 100644
--- a/graphics/map_objects/pics/people/woman_2/5.png
+++ b/graphics/event_objects/pics/people/woman_2/5.png
diff --git a/graphics/map_objects/pics/people/woman_2/6.png b/graphics/event_objects/pics/people/woman_2/6.png
index 4999cf1b1..4999cf1b1 100644
--- a/graphics/map_objects/pics/people/woman_2/6.png
+++ b/graphics/event_objects/pics/people/woman_2/6.png
diff --git a/graphics/map_objects/pics/people/woman_2/7.png b/graphics/event_objects/pics/people/woman_2/7.png
index 17e669531..17e669531 100644
--- a/graphics/map_objects/pics/people/woman_2/7.png
+++ b/graphics/event_objects/pics/people/woman_2/7.png
diff --git a/graphics/map_objects/pics/people/woman_2/8.png b/graphics/event_objects/pics/people/woman_2/8.png
index f59199574..f59199574 100644
--- a/graphics/map_objects/pics/people/woman_2/8.png
+++ b/graphics/event_objects/pics/people/woman_2/8.png
diff --git a/graphics/map_objects/pics/people/woman_3/0.png b/graphics/event_objects/pics/people/woman_3/0.png
index ac9ed557e..ac9ed557e 100644
--- a/graphics/map_objects/pics/people/woman_3/0.png
+++ b/graphics/event_objects/pics/people/woman_3/0.png
diff --git a/graphics/map_objects/pics/people/woman_3/1.png b/graphics/event_objects/pics/people/woman_3/1.png
index a7dbe7ec3..a7dbe7ec3 100644
--- a/graphics/map_objects/pics/people/woman_3/1.png
+++ b/graphics/event_objects/pics/people/woman_3/1.png
diff --git a/graphics/map_objects/pics/people/woman_3/2.png b/graphics/event_objects/pics/people/woman_3/2.png
index 23852c71b..23852c71b 100644
--- a/graphics/map_objects/pics/people/woman_3/2.png
+++ b/graphics/event_objects/pics/people/woman_3/2.png
diff --git a/graphics/map_objects/pics/people/woman_3/3.png b/graphics/event_objects/pics/people/woman_3/3.png
index 525958cbb..525958cbb 100644
--- a/graphics/map_objects/pics/people/woman_3/3.png
+++ b/graphics/event_objects/pics/people/woman_3/3.png
diff --git a/graphics/map_objects/pics/people/woman_3/4.png b/graphics/event_objects/pics/people/woman_3/4.png
index 6feabedd0..6feabedd0 100644
--- a/graphics/map_objects/pics/people/woman_3/4.png
+++ b/graphics/event_objects/pics/people/woman_3/4.png
diff --git a/graphics/map_objects/pics/people/woman_3/5.png b/graphics/event_objects/pics/people/woman_3/5.png
index f174b0184..f174b0184 100644
--- a/graphics/map_objects/pics/people/woman_3/5.png
+++ b/graphics/event_objects/pics/people/woman_3/5.png
diff --git a/graphics/map_objects/pics/people/woman_3/6.png b/graphics/event_objects/pics/people/woman_3/6.png
index 1b4b6d08a..1b4b6d08a 100644
--- a/graphics/map_objects/pics/people/woman_3/6.png
+++ b/graphics/event_objects/pics/people/woman_3/6.png
diff --git a/graphics/map_objects/pics/people/woman_3/7.png b/graphics/event_objects/pics/people/woman_3/7.png
index d8c2bfd99..d8c2bfd99 100644
--- a/graphics/map_objects/pics/people/woman_3/7.png
+++ b/graphics/event_objects/pics/people/woman_3/7.png
diff --git a/graphics/map_objects/pics/people/woman_3/8.png b/graphics/event_objects/pics/people/woman_3/8.png
index 0517b9993..0517b9993 100644
--- a/graphics/map_objects/pics/people/woman_3/8.png
+++ b/graphics/event_objects/pics/people/woman_3/8.png
diff --git a/graphics/map_objects/pics/people/woman_4/0.png b/graphics/event_objects/pics/people/woman_4/0.png
index 88489b6a6..88489b6a6 100644
--- a/graphics/map_objects/pics/people/woman_4/0.png
+++ b/graphics/event_objects/pics/people/woman_4/0.png
diff --git a/graphics/map_objects/pics/people/woman_4/1.png b/graphics/event_objects/pics/people/woman_4/1.png
index 1cc24ca36..1cc24ca36 100644
--- a/graphics/map_objects/pics/people/woman_4/1.png
+++ b/graphics/event_objects/pics/people/woman_4/1.png
diff --git a/graphics/map_objects/pics/people/woman_4/2.png b/graphics/event_objects/pics/people/woman_4/2.png
index efedc4a01..efedc4a01 100644
--- a/graphics/map_objects/pics/people/woman_4/2.png
+++ b/graphics/event_objects/pics/people/woman_4/2.png
diff --git a/graphics/map_objects/pics/people/woman_4/3.png b/graphics/event_objects/pics/people/woman_4/3.png
index a186b454e..a186b454e 100644
--- a/graphics/map_objects/pics/people/woman_4/3.png
+++ b/graphics/event_objects/pics/people/woman_4/3.png
diff --git a/graphics/map_objects/pics/people/woman_4/4.png b/graphics/event_objects/pics/people/woman_4/4.png
index c5cc8670d..c5cc8670d 100644
--- a/graphics/map_objects/pics/people/woman_4/4.png
+++ b/graphics/event_objects/pics/people/woman_4/4.png
diff --git a/graphics/map_objects/pics/people/woman_4/5.png b/graphics/event_objects/pics/people/woman_4/5.png
index f08133faa..f08133faa 100644
--- a/graphics/map_objects/pics/people/woman_4/5.png
+++ b/graphics/event_objects/pics/people/woman_4/5.png
diff --git a/graphics/map_objects/pics/people/woman_4/6.png b/graphics/event_objects/pics/people/woman_4/6.png
index dec6f3146..dec6f3146 100644
--- a/graphics/map_objects/pics/people/woman_4/6.png
+++ b/graphics/event_objects/pics/people/woman_4/6.png
diff --git a/graphics/map_objects/pics/people/woman_4/7.png b/graphics/event_objects/pics/people/woman_4/7.png
index 4912065a5..4912065a5 100644
--- a/graphics/map_objects/pics/people/woman_4/7.png
+++ b/graphics/event_objects/pics/people/woman_4/7.png
diff --git a/graphics/map_objects/pics/people/woman_4/8.png b/graphics/event_objects/pics/people/woman_4/8.png
index 21cd91f67..21cd91f67 100644
--- a/graphics/map_objects/pics/people/woman_4/8.png
+++ b/graphics/event_objects/pics/people/woman_4/8.png
diff --git a/graphics/map_objects/pics/people/woman_5/0.png b/graphics/event_objects/pics/people/woman_5/0.png
index 30ff1cf1c..30ff1cf1c 100644
--- a/graphics/map_objects/pics/people/woman_5/0.png
+++ b/graphics/event_objects/pics/people/woman_5/0.png
diff --git a/graphics/map_objects/pics/people/woman_5/1.png b/graphics/event_objects/pics/people/woman_5/1.png
index 3a5cf543e..3a5cf543e 100644
--- a/graphics/map_objects/pics/people/woman_5/1.png
+++ b/graphics/event_objects/pics/people/woman_5/1.png
diff --git a/graphics/map_objects/pics/people/woman_5/2.png b/graphics/event_objects/pics/people/woman_5/2.png
index 066d52259..066d52259 100644
--- a/graphics/map_objects/pics/people/woman_5/2.png
+++ b/graphics/event_objects/pics/people/woman_5/2.png
diff --git a/graphics/map_objects/pics/people/woman_5/3.png b/graphics/event_objects/pics/people/woman_5/3.png
index 737877bb6..737877bb6 100644
--- a/graphics/map_objects/pics/people/woman_5/3.png
+++ b/graphics/event_objects/pics/people/woman_5/3.png
diff --git a/graphics/map_objects/pics/people/woman_5/4.png b/graphics/event_objects/pics/people/woman_5/4.png
index 170d45929..170d45929 100644
--- a/graphics/map_objects/pics/people/woman_5/4.png
+++ b/graphics/event_objects/pics/people/woman_5/4.png
diff --git a/graphics/map_objects/pics/people/woman_5/5.png b/graphics/event_objects/pics/people/woman_5/5.png
index 2bae62dde..2bae62dde 100644
--- a/graphics/map_objects/pics/people/woman_5/5.png
+++ b/graphics/event_objects/pics/people/woman_5/5.png
diff --git a/graphics/map_objects/pics/people/woman_5/6.png b/graphics/event_objects/pics/people/woman_5/6.png
index 519897644..519897644 100644
--- a/graphics/map_objects/pics/people/woman_5/6.png
+++ b/graphics/event_objects/pics/people/woman_5/6.png
diff --git a/graphics/map_objects/pics/people/woman_5/7.png b/graphics/event_objects/pics/people/woman_5/7.png
index c8ec75432..c8ec75432 100644
--- a/graphics/map_objects/pics/people/woman_5/7.png
+++ b/graphics/event_objects/pics/people/woman_5/7.png
diff --git a/graphics/map_objects/pics/people/woman_5/8.png b/graphics/event_objects/pics/people/woman_5/8.png
index c4c05fcd9..c4c05fcd9 100644
--- a/graphics/map_objects/pics/people/woman_5/8.png
+++ b/graphics/event_objects/pics/people/woman_5/8.png
diff --git a/graphics/map_objects/pics/people/woman_6/0.png b/graphics/event_objects/pics/people/woman_6/0.png
index 61cce57b0..61cce57b0 100644
--- a/graphics/map_objects/pics/people/woman_6/0.png
+++ b/graphics/event_objects/pics/people/woman_6/0.png
diff --git a/graphics/map_objects/pics/people/woman_6/1.png b/graphics/event_objects/pics/people/woman_6/1.png
index ea399ef74..ea399ef74 100644
--- a/graphics/map_objects/pics/people/woman_6/1.png
+++ b/graphics/event_objects/pics/people/woman_6/1.png
diff --git a/graphics/map_objects/pics/people/woman_6/2.png b/graphics/event_objects/pics/people/woman_6/2.png
index 574121114..574121114 100644
--- a/graphics/map_objects/pics/people/woman_6/2.png
+++ b/graphics/event_objects/pics/people/woman_6/2.png
diff --git a/graphics/map_objects/pics/people/woman_6/3.png b/graphics/event_objects/pics/people/woman_6/3.png
index 538e60433..538e60433 100644
--- a/graphics/map_objects/pics/people/woman_6/3.png
+++ b/graphics/event_objects/pics/people/woman_6/3.png
diff --git a/graphics/map_objects/pics/people/woman_6/4.png b/graphics/event_objects/pics/people/woman_6/4.png
index 746cefd09..746cefd09 100644
--- a/graphics/map_objects/pics/people/woman_6/4.png
+++ b/graphics/event_objects/pics/people/woman_6/4.png
diff --git a/graphics/map_objects/pics/people/woman_6/5.png b/graphics/event_objects/pics/people/woman_6/5.png
index 4c4e2c5b0..4c4e2c5b0 100644
--- a/graphics/map_objects/pics/people/woman_6/5.png
+++ b/graphics/event_objects/pics/people/woman_6/5.png
diff --git a/graphics/map_objects/pics/people/woman_6/6.png b/graphics/event_objects/pics/people/woman_6/6.png
index efd7b76ca..efd7b76ca 100644
--- a/graphics/map_objects/pics/people/woman_6/6.png
+++ b/graphics/event_objects/pics/people/woman_6/6.png
diff --git a/graphics/map_objects/pics/people/woman_6/7.png b/graphics/event_objects/pics/people/woman_6/7.png
index 2009f5e9a..2009f5e9a 100644
--- a/graphics/map_objects/pics/people/woman_6/7.png
+++ b/graphics/event_objects/pics/people/woman_6/7.png
diff --git a/graphics/map_objects/pics/people/woman_6/8.png b/graphics/event_objects/pics/people/woman_6/8.png
index 9dd33b643..9dd33b643 100644
--- a/graphics/map_objects/pics/people/woman_6/8.png
+++ b/graphics/event_objects/pics/people/woman_6/8.png
diff --git a/graphics/map_objects/pics/people/woman_7/0.png b/graphics/event_objects/pics/people/woman_7/0.png
index a235d670e..a235d670e 100644
--- a/graphics/map_objects/pics/people/woman_7/0.png
+++ b/graphics/event_objects/pics/people/woman_7/0.png
diff --git a/graphics/map_objects/pics/people/woman_7/1.png b/graphics/event_objects/pics/people/woman_7/1.png
index 62de3d528..62de3d528 100644
--- a/graphics/map_objects/pics/people/woman_7/1.png
+++ b/graphics/event_objects/pics/people/woman_7/1.png
diff --git a/graphics/map_objects/pics/people/woman_7/2.png b/graphics/event_objects/pics/people/woman_7/2.png
index 3893cd292..3893cd292 100644
--- a/graphics/map_objects/pics/people/woman_7/2.png
+++ b/graphics/event_objects/pics/people/woman_7/2.png
diff --git a/graphics/map_objects/pics/people/woman_7/3.png b/graphics/event_objects/pics/people/woman_7/3.png
index b893b9574..b893b9574 100644
--- a/graphics/map_objects/pics/people/woman_7/3.png
+++ b/graphics/event_objects/pics/people/woman_7/3.png
diff --git a/graphics/map_objects/pics/people/woman_7/4.png b/graphics/event_objects/pics/people/woman_7/4.png
index 4f0493124..4f0493124 100644
--- a/graphics/map_objects/pics/people/woman_7/4.png
+++ b/graphics/event_objects/pics/people/woman_7/4.png
diff --git a/graphics/map_objects/pics/people/woman_7/5.png b/graphics/event_objects/pics/people/woman_7/5.png
index 6a1e56d2c..6a1e56d2c 100644
--- a/graphics/map_objects/pics/people/woman_7/5.png
+++ b/graphics/event_objects/pics/people/woman_7/5.png
diff --git a/graphics/map_objects/pics/people/woman_7/6.png b/graphics/event_objects/pics/people/woman_7/6.png
index 8a3488157..8a3488157 100644
--- a/graphics/map_objects/pics/people/woman_7/6.png
+++ b/graphics/event_objects/pics/people/woman_7/6.png
diff --git a/graphics/map_objects/pics/people/woman_7/7.png b/graphics/event_objects/pics/people/woman_7/7.png
index fe1dbe735..fe1dbe735 100644
--- a/graphics/map_objects/pics/people/woman_7/7.png
+++ b/graphics/event_objects/pics/people/woman_7/7.png
diff --git a/graphics/map_objects/pics/people/woman_7/8.png b/graphics/event_objects/pics/people/woman_7/8.png
index 08a1fad82..08a1fad82 100644
--- a/graphics/map_objects/pics/people/woman_7/8.png
+++ b/graphics/event_objects/pics/people/woman_7/8.png
diff --git a/graphics/map_objects/pics/people/youngster/0.png b/graphics/event_objects/pics/people/youngster/0.png
index b370f8141..b370f8141 100644
--- a/graphics/map_objects/pics/people/youngster/0.png
+++ b/graphics/event_objects/pics/people/youngster/0.png
diff --git a/graphics/map_objects/pics/people/youngster/1.png b/graphics/event_objects/pics/people/youngster/1.png
index 1c1f15b89..1c1f15b89 100644
--- a/graphics/map_objects/pics/people/youngster/1.png
+++ b/graphics/event_objects/pics/people/youngster/1.png
diff --git a/graphics/map_objects/pics/people/youngster/2.png b/graphics/event_objects/pics/people/youngster/2.png
index c8a936dd2..c8a936dd2 100644
--- a/graphics/map_objects/pics/people/youngster/2.png
+++ b/graphics/event_objects/pics/people/youngster/2.png
diff --git a/graphics/map_objects/pics/people/youngster/3.png b/graphics/event_objects/pics/people/youngster/3.png
index c9fa72ddb..c9fa72ddb 100644
--- a/graphics/map_objects/pics/people/youngster/3.png
+++ b/graphics/event_objects/pics/people/youngster/3.png
diff --git a/graphics/map_objects/pics/people/youngster/4.png b/graphics/event_objects/pics/people/youngster/4.png
index ba17f34ac..ba17f34ac 100644
--- a/graphics/map_objects/pics/people/youngster/4.png
+++ b/graphics/event_objects/pics/people/youngster/4.png
diff --git a/graphics/map_objects/pics/people/youngster/5.png b/graphics/event_objects/pics/people/youngster/5.png
index fcd2f196a..fcd2f196a 100644
--- a/graphics/map_objects/pics/people/youngster/5.png
+++ b/graphics/event_objects/pics/people/youngster/5.png
diff --git a/graphics/map_objects/pics/people/youngster/6.png b/graphics/event_objects/pics/people/youngster/6.png
index fd12b99ea..fd12b99ea 100644
--- a/graphics/map_objects/pics/people/youngster/6.png
+++ b/graphics/event_objects/pics/people/youngster/6.png
diff --git a/graphics/map_objects/pics/people/youngster/7.png b/graphics/event_objects/pics/people/youngster/7.png
index 626716b8d..626716b8d 100644
--- a/graphics/map_objects/pics/people/youngster/7.png
+++ b/graphics/event_objects/pics/people/youngster/7.png
diff --git a/graphics/map_objects/pics/people/youngster/8.png b/graphics/event_objects/pics/people/youngster/8.png
index 3c9662746..3c9662746 100644
--- a/graphics/map_objects/pics/people/youngster/8.png
+++ b/graphics/event_objects/pics/people/youngster/8.png
diff --git a/graphics/map_objects/pics/pokemon/azumarill/0.png b/graphics/event_objects/pics/pokemon/azumarill/0.png
index 9b219e552..9b219e552 100644
--- a/graphics/map_objects/pics/pokemon/azumarill/0.png
+++ b/graphics/event_objects/pics/pokemon/azumarill/0.png
diff --git a/graphics/map_objects/pics/pokemon/azumarill/1.png b/graphics/event_objects/pics/pokemon/azumarill/1.png
index 16e493f8b..16e493f8b 100644
--- a/graphics/map_objects/pics/pokemon/azumarill/1.png
+++ b/graphics/event_objects/pics/pokemon/azumarill/1.png
diff --git a/graphics/map_objects/pics/pokemon/azumarill/2.png b/graphics/event_objects/pics/pokemon/azumarill/2.png
index b10e6a283..b10e6a283 100644
--- a/graphics/map_objects/pics/pokemon/azumarill/2.png
+++ b/graphics/event_objects/pics/pokemon/azumarill/2.png
diff --git a/graphics/map_objects/pics/pokemon/azurill/0.png b/graphics/event_objects/pics/pokemon/azurill/0.png
index efbcea03f..efbcea03f 100644
--- a/graphics/map_objects/pics/pokemon/azurill/0.png
+++ b/graphics/event_objects/pics/pokemon/azurill/0.png
diff --git a/graphics/map_objects/pics/pokemon/azurill/1.png b/graphics/event_objects/pics/pokemon/azurill/1.png
index 4e00acdc6..4e00acdc6 100644
--- a/graphics/map_objects/pics/pokemon/azurill/1.png
+++ b/graphics/event_objects/pics/pokemon/azurill/1.png
diff --git a/graphics/map_objects/pics/pokemon/azurill/2.png b/graphics/event_objects/pics/pokemon/azurill/2.png
index 08bf43c5b..08bf43c5b 100644
--- a/graphics/map_objects/pics/pokemon/azurill/2.png
+++ b/graphics/event_objects/pics/pokemon/azurill/2.png
diff --git a/graphics/map_objects/pics/pokemon/deoxys/0.png b/graphics/event_objects/pics/pokemon/deoxys/0.png
index 37b90dbfe..37b90dbfe 100644
--- a/graphics/map_objects/pics/pokemon/deoxys/0.png
+++ b/graphics/event_objects/pics/pokemon/deoxys/0.png
diff --git a/graphics/map_objects/pics/pokemon/deoxys/1.png b/graphics/event_objects/pics/pokemon/deoxys/1.png
index 4d38cb946..4d38cb946 100644
--- a/graphics/map_objects/pics/pokemon/deoxys/1.png
+++ b/graphics/event_objects/pics/pokemon/deoxys/1.png
diff --git a/graphics/map_objects/pics/pokemon/dusclops/0.png b/graphics/event_objects/pics/pokemon/dusclops/0.png
index b738a9ef1..b738a9ef1 100644
--- a/graphics/map_objects/pics/pokemon/dusclops/0.png
+++ b/graphics/event_objects/pics/pokemon/dusclops/0.png
diff --git a/graphics/map_objects/pics/pokemon/dusclops/1.png b/graphics/event_objects/pics/pokemon/dusclops/1.png
index 70ec671c8..70ec671c8 100644
--- a/graphics/map_objects/pics/pokemon/dusclops/1.png
+++ b/graphics/event_objects/pics/pokemon/dusclops/1.png
diff --git a/graphics/map_objects/pics/pokemon/dusclops/2.png b/graphics/event_objects/pics/pokemon/dusclops/2.png
index 0cbb7c620..0cbb7c620 100644
--- a/graphics/map_objects/pics/pokemon/dusclops/2.png
+++ b/graphics/event_objects/pics/pokemon/dusclops/2.png
diff --git a/graphics/map_objects/pics/pokemon/dusclops/3.png b/graphics/event_objects/pics/pokemon/dusclops/3.png
index 3d5858ff6..3d5858ff6 100644
--- a/graphics/map_objects/pics/pokemon/dusclops/3.png
+++ b/graphics/event_objects/pics/pokemon/dusclops/3.png
diff --git a/graphics/map_objects/pics/pokemon/dusclops/4.png b/graphics/event_objects/pics/pokemon/dusclops/4.png
index f99269afa..f99269afa 100644
--- a/graphics/map_objects/pics/pokemon/dusclops/4.png
+++ b/graphics/event_objects/pics/pokemon/dusclops/4.png
diff --git a/graphics/map_objects/pics/pokemon/dusclops/5.png b/graphics/event_objects/pics/pokemon/dusclops/5.png
index 6b496be3c..6b496be3c 100644
--- a/graphics/map_objects/pics/pokemon/dusclops/5.png
+++ b/graphics/event_objects/pics/pokemon/dusclops/5.png
diff --git a/graphics/map_objects/pics/pokemon/dusclops/6.png b/graphics/event_objects/pics/pokemon/dusclops/6.png
index 3ff10d7ab..3ff10d7ab 100644
--- a/graphics/map_objects/pics/pokemon/dusclops/6.png
+++ b/graphics/event_objects/pics/pokemon/dusclops/6.png
diff --git a/graphics/map_objects/pics/pokemon/dusclops/7.png b/graphics/event_objects/pics/pokemon/dusclops/7.png
index 925080a4f..925080a4f 100644
--- a/graphics/map_objects/pics/pokemon/dusclops/7.png
+++ b/graphics/event_objects/pics/pokemon/dusclops/7.png
diff --git a/graphics/map_objects/pics/pokemon/dusclops/8.png b/graphics/event_objects/pics/pokemon/dusclops/8.png
index 57dcef596..57dcef596 100644
--- a/graphics/map_objects/pics/pokemon/dusclops/8.png
+++ b/graphics/event_objects/pics/pokemon/dusclops/8.png
diff --git a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/0.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/0.png
index 9fa5da9c1..9fa5da9c1 100644
--- a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/0.png
+++ b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/0.png
diff --git a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/1.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/1.png
index b328fc844..b328fc844 100644
--- a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/1.png
+++ b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/1.png
diff --git a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/2.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/2.png
index e4935a1cd..e4935a1cd 100644
--- a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/2.png
+++ b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/2.png
diff --git a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/3.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/3.png
index 3ea74a6ea..3ea74a6ea 100644
--- a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/3.png
+++ b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/3.png
diff --git a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/4.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/4.png
index ab2dbf891..ab2dbf891 100644
--- a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/4.png
+++ b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/4.png
diff --git a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/5.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/5.png
index a16efcb6e..a16efcb6e 100644
--- a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/5.png
+++ b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/5.png
diff --git a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/6.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/6.png
index 38fec7b46..38fec7b46 100644
--- a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/6.png
+++ b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/6.png
diff --git a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/7.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/7.png
index a5a8c034d..a5a8c034d 100644
--- a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/7.png
+++ b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/7.png
diff --git a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/8.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/8.png
index 727908cf9..727908cf9 100644
--- a/graphics/map_objects/pics/pokemon/enemy_zigzagoon/8.png
+++ b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/8.png
diff --git a/graphics/map_objects/pics/pokemon/groudon_front/0.png b/graphics/event_objects/pics/pokemon/groudon_front/0.png
index 05cb16433..05cb16433 100644
--- a/graphics/map_objects/pics/pokemon/groudon_front/0.png
+++ b/graphics/event_objects/pics/pokemon/groudon_front/0.png
diff --git a/graphics/map_objects/pics/pokemon/groudon_front/1.png b/graphics/event_objects/pics/pokemon/groudon_front/1.png
index fcafab2a0..fcafab2a0 100644
--- a/graphics/map_objects/pics/pokemon/groudon_front/1.png
+++ b/graphics/event_objects/pics/pokemon/groudon_front/1.png
diff --git a/graphics/map_objects/pics/pokemon/groudon_side/0.png b/graphics/event_objects/pics/pokemon/groudon_side/0.png
index 76bd8a11c..76bd8a11c 100644
--- a/graphics/map_objects/pics/pokemon/groudon_side/0.png
+++ b/graphics/event_objects/pics/pokemon/groudon_side/0.png
diff --git a/graphics/map_objects/pics/pokemon/groudon_side/1.png b/graphics/event_objects/pics/pokemon/groudon_side/1.png
index 2ecf09822..2ecf09822 100644
--- a/graphics/map_objects/pics/pokemon/groudon_side/1.png
+++ b/graphics/event_objects/pics/pokemon/groudon_side/1.png
diff --git a/graphics/map_objects/pics/pokemon/ho_oh/0.png b/graphics/event_objects/pics/pokemon/ho_oh/0.png
index 0d8ef71e1..0d8ef71e1 100644
--- a/graphics/map_objects/pics/pokemon/ho_oh/0.png
+++ b/graphics/event_objects/pics/pokemon/ho_oh/0.png
diff --git a/graphics/map_objects/pics/pokemon/ho_oh/1.png b/graphics/event_objects/pics/pokemon/ho_oh/1.png
index 03d3b0874..03d3b0874 100644
--- a/graphics/map_objects/pics/pokemon/ho_oh/1.png
+++ b/graphics/event_objects/pics/pokemon/ho_oh/1.png
diff --git a/graphics/map_objects/pics/pokemon/kecleon/0.png b/graphics/event_objects/pics/pokemon/kecleon/0.png
index 691797af0..691797af0 100644
--- a/graphics/map_objects/pics/pokemon/kecleon/0.png
+++ b/graphics/event_objects/pics/pokemon/kecleon/0.png
diff --git a/graphics/map_objects/pics/pokemon/kecleon/1.png b/graphics/event_objects/pics/pokemon/kecleon/1.png
index 0d82cc66d..0d82cc66d 100644
--- a/graphics/map_objects/pics/pokemon/kecleon/1.png
+++ b/graphics/event_objects/pics/pokemon/kecleon/1.png
diff --git a/graphics/map_objects/pics/pokemon/kecleon/2.png b/graphics/event_objects/pics/pokemon/kecleon/2.png
index 2713ce057..2713ce057 100644
--- a/graphics/map_objects/pics/pokemon/kecleon/2.png
+++ b/graphics/event_objects/pics/pokemon/kecleon/2.png
diff --git a/graphics/map_objects/pics/pokemon/kirlia/0.png b/graphics/event_objects/pics/pokemon/kirlia/0.png
index e069df489..e069df489 100644
--- a/graphics/map_objects/pics/pokemon/kirlia/0.png
+++ b/graphics/event_objects/pics/pokemon/kirlia/0.png
diff --git a/graphics/map_objects/pics/pokemon/kirlia/1.png b/graphics/event_objects/pics/pokemon/kirlia/1.png
index d158bd335..d158bd335 100644
--- a/graphics/map_objects/pics/pokemon/kirlia/1.png
+++ b/graphics/event_objects/pics/pokemon/kirlia/1.png
diff --git a/graphics/map_objects/pics/pokemon/kirlia/2.png b/graphics/event_objects/pics/pokemon/kirlia/2.png
index 388077d93..388077d93 100644
--- a/graphics/map_objects/pics/pokemon/kirlia/2.png
+++ b/graphics/event_objects/pics/pokemon/kirlia/2.png
diff --git a/graphics/map_objects/pics/pokemon/kirlia/3.png b/graphics/event_objects/pics/pokemon/kirlia/3.png
index 4887b1653..4887b1653 100644
--- a/graphics/map_objects/pics/pokemon/kirlia/3.png
+++ b/graphics/event_objects/pics/pokemon/kirlia/3.png
diff --git a/graphics/map_objects/pics/pokemon/kirlia/4.png b/graphics/event_objects/pics/pokemon/kirlia/4.png
index e734a8f60..e734a8f60 100644
--- a/graphics/map_objects/pics/pokemon/kirlia/4.png
+++ b/graphics/event_objects/pics/pokemon/kirlia/4.png
diff --git a/graphics/map_objects/pics/pokemon/kirlia/5.png b/graphics/event_objects/pics/pokemon/kirlia/5.png
index e2e36561b..e2e36561b 100644
--- a/graphics/map_objects/pics/pokemon/kirlia/5.png
+++ b/graphics/event_objects/pics/pokemon/kirlia/5.png
diff --git a/graphics/map_objects/pics/pokemon/kirlia/6.png b/graphics/event_objects/pics/pokemon/kirlia/6.png
index 0731cb711..0731cb711 100644
--- a/graphics/map_objects/pics/pokemon/kirlia/6.png
+++ b/graphics/event_objects/pics/pokemon/kirlia/6.png
diff --git a/graphics/map_objects/pics/pokemon/kirlia/7.png b/graphics/event_objects/pics/pokemon/kirlia/7.png
index c4f33879c..c4f33879c 100644
--- a/graphics/map_objects/pics/pokemon/kirlia/7.png
+++ b/graphics/event_objects/pics/pokemon/kirlia/7.png
diff --git a/graphics/map_objects/pics/pokemon/kirlia/8.png b/graphics/event_objects/pics/pokemon/kirlia/8.png
index 87fe530c5..87fe530c5 100644
--- a/graphics/map_objects/pics/pokemon/kirlia/8.png
+++ b/graphics/event_objects/pics/pokemon/kirlia/8.png
diff --git a/graphics/map_objects/pics/pokemon/kyogre_front/0.png b/graphics/event_objects/pics/pokemon/kyogre_front/0.png
index 2cfea8e01..2cfea8e01 100644
--- a/graphics/map_objects/pics/pokemon/kyogre_front/0.png
+++ b/graphics/event_objects/pics/pokemon/kyogre_front/0.png
diff --git a/graphics/map_objects/pics/pokemon/kyogre_front/1.png b/graphics/event_objects/pics/pokemon/kyogre_front/1.png
index 8f2dcd7af..8f2dcd7af 100644
--- a/graphics/map_objects/pics/pokemon/kyogre_front/1.png
+++ b/graphics/event_objects/pics/pokemon/kyogre_front/1.png
diff --git a/graphics/map_objects/pics/pokemon/kyogre_side/0.png b/graphics/event_objects/pics/pokemon/kyogre_side/0.png
index f60199f77..f60199f77 100644
--- a/graphics/map_objects/pics/pokemon/kyogre_side/0.png
+++ b/graphics/event_objects/pics/pokemon/kyogre_side/0.png
diff --git a/graphics/map_objects/pics/pokemon/kyogre_side/1.png b/graphics/event_objects/pics/pokemon/kyogre_side/1.png
index 00d53d563..00d53d563 100644
--- a/graphics/map_objects/pics/pokemon/kyogre_side/1.png
+++ b/graphics/event_objects/pics/pokemon/kyogre_side/1.png
diff --git a/graphics/map_objects/pics/pokemon/latias_latios/0.png b/graphics/event_objects/pics/pokemon/latias_latios/0.png
index 5338fc55a..5338fc55a 100644
--- a/graphics/map_objects/pics/pokemon/latias_latios/0.png
+++ b/graphics/event_objects/pics/pokemon/latias_latios/0.png
diff --git a/graphics/map_objects/pics/pokemon/latias_latios/1.png b/graphics/event_objects/pics/pokemon/latias_latios/1.png
index 57cde71a9..57cde71a9 100644
--- a/graphics/map_objects/pics/pokemon/latias_latios/1.png
+++ b/graphics/event_objects/pics/pokemon/latias_latios/1.png
diff --git a/graphics/map_objects/pics/pokemon/latias_latios/2.png b/graphics/event_objects/pics/pokemon/latias_latios/2.png
index c8812bec0..c8812bec0 100644
--- a/graphics/map_objects/pics/pokemon/latias_latios/2.png
+++ b/graphics/event_objects/pics/pokemon/latias_latios/2.png
diff --git a/graphics/map_objects/pics/pokemon/lugia/0.png b/graphics/event_objects/pics/pokemon/lugia/0.png
index 4e50209fe..4e50209fe 100644
--- a/graphics/map_objects/pics/pokemon/lugia/0.png
+++ b/graphics/event_objects/pics/pokemon/lugia/0.png
diff --git a/graphics/map_objects/pics/pokemon/lugia/1.png b/graphics/event_objects/pics/pokemon/lugia/1.png
index 6f36abc91..6f36abc91 100644
--- a/graphics/map_objects/pics/pokemon/lugia/1.png
+++ b/graphics/event_objects/pics/pokemon/lugia/1.png
diff --git a/graphics/map_objects/pics/pokemon/mew/0.png b/graphics/event_objects/pics/pokemon/mew/0.png
index 55955453c..55955453c 100644
--- a/graphics/map_objects/pics/pokemon/mew/0.png
+++ b/graphics/event_objects/pics/pokemon/mew/0.png
diff --git a/graphics/map_objects/pics/pokemon/mew/1.png b/graphics/event_objects/pics/pokemon/mew/1.png
index 3c6062bd7..3c6062bd7 100644
--- a/graphics/map_objects/pics/pokemon/mew/1.png
+++ b/graphics/event_objects/pics/pokemon/mew/1.png
diff --git a/graphics/map_objects/pics/pokemon/mew/2.png b/graphics/event_objects/pics/pokemon/mew/2.png
index 1c3c6e52d..1c3c6e52d 100644
--- a/graphics/map_objects/pics/pokemon/mew/2.png
+++ b/graphics/event_objects/pics/pokemon/mew/2.png
diff --git a/graphics/map_objects/pics/pokemon/mew/3.png b/graphics/event_objects/pics/pokemon/mew/3.png
index be04a769b..be04a769b 100644
--- a/graphics/map_objects/pics/pokemon/mew/3.png
+++ b/graphics/event_objects/pics/pokemon/mew/3.png
diff --git a/graphics/map_objects/pics/pokemon/mew/4.png b/graphics/event_objects/pics/pokemon/mew/4.png
index 3ddbfa03a..3ddbfa03a 100644
--- a/graphics/map_objects/pics/pokemon/mew/4.png
+++ b/graphics/event_objects/pics/pokemon/mew/4.png
diff --git a/graphics/map_objects/pics/pokemon/mew/5.png b/graphics/event_objects/pics/pokemon/mew/5.png
index 44b7bd56b..44b7bd56b 100644
--- a/graphics/map_objects/pics/pokemon/mew/5.png
+++ b/graphics/event_objects/pics/pokemon/mew/5.png
diff --git a/graphics/map_objects/pics/pokemon/mew/6.png b/graphics/event_objects/pics/pokemon/mew/6.png
index c6abc021a..c6abc021a 100644
--- a/graphics/map_objects/pics/pokemon/mew/6.png
+++ b/graphics/event_objects/pics/pokemon/mew/6.png
diff --git a/graphics/map_objects/pics/pokemon/mew/7.png b/graphics/event_objects/pics/pokemon/mew/7.png
index f22f4072a..f22f4072a 100644
--- a/graphics/map_objects/pics/pokemon/mew/7.png
+++ b/graphics/event_objects/pics/pokemon/mew/7.png
diff --git a/graphics/map_objects/pics/pokemon/mew/8.png b/graphics/event_objects/pics/pokemon/mew/8.png
index c603d7ced..c603d7ced 100644
--- a/graphics/map_objects/pics/pokemon/mew/8.png
+++ b/graphics/event_objects/pics/pokemon/mew/8.png
diff --git a/graphics/map_objects/pics/pokemon/pikachu/0.png b/graphics/event_objects/pics/pokemon/pikachu/0.png
index 1a08b623c..1a08b623c 100644
--- a/graphics/map_objects/pics/pokemon/pikachu/0.png
+++ b/graphics/event_objects/pics/pokemon/pikachu/0.png
diff --git a/graphics/map_objects/pics/pokemon/pikachu/1.png b/graphics/event_objects/pics/pokemon/pikachu/1.png
index f1640a1e5..f1640a1e5 100644
--- a/graphics/map_objects/pics/pokemon/pikachu/1.png
+++ b/graphics/event_objects/pics/pokemon/pikachu/1.png
diff --git a/graphics/map_objects/pics/pokemon/pikachu/2.png b/graphics/event_objects/pics/pokemon/pikachu/2.png
index 68836768b..68836768b 100644
--- a/graphics/map_objects/pics/pokemon/pikachu/2.png
+++ b/graphics/event_objects/pics/pokemon/pikachu/2.png
diff --git a/graphics/map_objects/pics/pokemon/poochyena/0.png b/graphics/event_objects/pics/pokemon/poochyena/0.png
index 1ee042572..1ee042572 100644
--- a/graphics/map_objects/pics/pokemon/poochyena/0.png
+++ b/graphics/event_objects/pics/pokemon/poochyena/0.png
diff --git a/graphics/map_objects/pics/pokemon/poochyena/1.png b/graphics/event_objects/pics/pokemon/poochyena/1.png
index 3dbdb383c..3dbdb383c 100644
--- a/graphics/map_objects/pics/pokemon/poochyena/1.png
+++ b/graphics/event_objects/pics/pokemon/poochyena/1.png
diff --git a/graphics/map_objects/pics/pokemon/poochyena/2.png b/graphics/event_objects/pics/pokemon/poochyena/2.png
index bda367b94..bda367b94 100644
--- a/graphics/map_objects/pics/pokemon/poochyena/2.png
+++ b/graphics/event_objects/pics/pokemon/poochyena/2.png
diff --git a/graphics/map_objects/pics/pokemon/poochyena/3.png b/graphics/event_objects/pics/pokemon/poochyena/3.png
index 8b7d8f803..8b7d8f803 100644
--- a/graphics/map_objects/pics/pokemon/poochyena/3.png
+++ b/graphics/event_objects/pics/pokemon/poochyena/3.png
diff --git a/graphics/map_objects/pics/pokemon/poochyena/4.png b/graphics/event_objects/pics/pokemon/poochyena/4.png
index 47012ad54..47012ad54 100644
--- a/graphics/map_objects/pics/pokemon/poochyena/4.png
+++ b/graphics/event_objects/pics/pokemon/poochyena/4.png
diff --git a/graphics/map_objects/pics/pokemon/poochyena/5.png b/graphics/event_objects/pics/pokemon/poochyena/5.png
index e256e8a07..e256e8a07 100644
--- a/graphics/map_objects/pics/pokemon/poochyena/5.png
+++ b/graphics/event_objects/pics/pokemon/poochyena/5.png
diff --git a/graphics/map_objects/pics/pokemon/poochyena/6.png b/graphics/event_objects/pics/pokemon/poochyena/6.png
index 173b9fe5e..173b9fe5e 100644
--- a/graphics/map_objects/pics/pokemon/poochyena/6.png
+++ b/graphics/event_objects/pics/pokemon/poochyena/6.png
diff --git a/graphics/map_objects/pics/pokemon/poochyena/7.png b/graphics/event_objects/pics/pokemon/poochyena/7.png
index 8fdc28209..8fdc28209 100644
--- a/graphics/map_objects/pics/pokemon/poochyena/7.png
+++ b/graphics/event_objects/pics/pokemon/poochyena/7.png
diff --git a/graphics/map_objects/pics/pokemon/poochyena/8.png b/graphics/event_objects/pics/pokemon/poochyena/8.png
index 911619f6a..911619f6a 100644
--- a/graphics/map_objects/pics/pokemon/poochyena/8.png
+++ b/graphics/event_objects/pics/pokemon/poochyena/8.png
diff --git a/graphics/map_objects/pics/pokemon/rayquaza/0.png b/graphics/event_objects/pics/pokemon/rayquaza/0.png
index 9f5db910f..9f5db910f 100644
--- a/graphics/map_objects/pics/pokemon/rayquaza/0.png
+++ b/graphics/event_objects/pics/pokemon/rayquaza/0.png
diff --git a/graphics/map_objects/pics/pokemon/rayquaza/1.png b/graphics/event_objects/pics/pokemon/rayquaza/1.png
index e770b6549..e770b6549 100644
--- a/graphics/map_objects/pics/pokemon/rayquaza/1.png
+++ b/graphics/event_objects/pics/pokemon/rayquaza/1.png
diff --git a/graphics/map_objects/pics/pokemon/rayquaza/2.png b/graphics/event_objects/pics/pokemon/rayquaza/2.png
index e72c17b07..e72c17b07 100644
--- a/graphics/map_objects/pics/pokemon/rayquaza/2.png
+++ b/graphics/event_objects/pics/pokemon/rayquaza/2.png
diff --git a/graphics/map_objects/pics/pokemon/rayquaza/3.png b/graphics/event_objects/pics/pokemon/rayquaza/3.png
index edcfe94ba..edcfe94ba 100644
--- a/graphics/map_objects/pics/pokemon/rayquaza/3.png
+++ b/graphics/event_objects/pics/pokemon/rayquaza/3.png
diff --git a/graphics/map_objects/pics/pokemon/rayquaza/4.png b/graphics/event_objects/pics/pokemon/rayquaza/4.png
index d34cb5d58..d34cb5d58 100644
--- a/graphics/map_objects/pics/pokemon/rayquaza/4.png
+++ b/graphics/event_objects/pics/pokemon/rayquaza/4.png
diff --git a/graphics/map_objects/pics/pokemon/rayquaza_still.png b/graphics/event_objects/pics/pokemon/rayquaza_still.png
index 1c18b2ffc..1c18b2ffc 100644
--- a/graphics/map_objects/pics/pokemon/rayquaza_still.png
+++ b/graphics/event_objects/pics/pokemon/rayquaza_still.png
diff --git a/graphics/map_objects/pics/pokemon/regi.png b/graphics/event_objects/pics/pokemon/regi.png
index 8425040dd..8425040dd 100644
--- a/graphics/map_objects/pics/pokemon/regi.png
+++ b/graphics/event_objects/pics/pokemon/regi.png
diff --git a/graphics/map_objects/pics/pokemon/skitty/0.png b/graphics/event_objects/pics/pokemon/skitty/0.png
index 105611a10..105611a10 100644
--- a/graphics/map_objects/pics/pokemon/skitty/0.png
+++ b/graphics/event_objects/pics/pokemon/skitty/0.png
diff --git a/graphics/map_objects/pics/pokemon/skitty/1.png b/graphics/event_objects/pics/pokemon/skitty/1.png
index 66a9640e0..66a9640e0 100644
--- a/graphics/map_objects/pics/pokemon/skitty/1.png
+++ b/graphics/event_objects/pics/pokemon/skitty/1.png
diff --git a/graphics/map_objects/pics/pokemon/skitty/2.png b/graphics/event_objects/pics/pokemon/skitty/2.png
index 2ab6cabfa..2ab6cabfa 100644
--- a/graphics/map_objects/pics/pokemon/skitty/2.png
+++ b/graphics/event_objects/pics/pokemon/skitty/2.png
diff --git a/graphics/map_objects/pics/pokemon/sudowoodo/0.png b/graphics/event_objects/pics/pokemon/sudowoodo/0.png
index 20584b1a6..20584b1a6 100644
--- a/graphics/map_objects/pics/pokemon/sudowoodo/0.png
+++ b/graphics/event_objects/pics/pokemon/sudowoodo/0.png
diff --git a/graphics/map_objects/pics/pokemon/sudowoodo/1.png b/graphics/event_objects/pics/pokemon/sudowoodo/1.png
index 1d865c43a..1d865c43a 100644
--- a/graphics/map_objects/pics/pokemon/sudowoodo/1.png
+++ b/graphics/event_objects/pics/pokemon/sudowoodo/1.png
diff --git a/graphics/map_objects/pics/pokemon/sudowoodo/2.png b/graphics/event_objects/pics/pokemon/sudowoodo/2.png
index 319220edf..319220edf 100644
--- a/graphics/map_objects/pics/pokemon/sudowoodo/2.png
+++ b/graphics/event_objects/pics/pokemon/sudowoodo/2.png
diff --git a/graphics/map_objects/pics/pokemon/vigoroth_carrying_box/0.png b/graphics/event_objects/pics/pokemon/vigoroth_carrying_box/0.png
index 088986e80..088986e80 100644
--- a/graphics/map_objects/pics/pokemon/vigoroth_carrying_box/0.png
+++ b/graphics/event_objects/pics/pokemon/vigoroth_carrying_box/0.png
diff --git a/graphics/map_objects/pics/pokemon/vigoroth_carrying_box/1.png b/graphics/event_objects/pics/pokemon/vigoroth_carrying_box/1.png
index 79d269e55..79d269e55 100644
--- a/graphics/map_objects/pics/pokemon/vigoroth_carrying_box/1.png
+++ b/graphics/event_objects/pics/pokemon/vigoroth_carrying_box/1.png
diff --git a/graphics/map_objects/pics/pokemon/vigoroth_carrying_box/2.png b/graphics/event_objects/pics/pokemon/vigoroth_carrying_box/2.png
index 2918caf22..2918caf22 100644
--- a/graphics/map_objects/pics/pokemon/vigoroth_carrying_box/2.png
+++ b/graphics/event_objects/pics/pokemon/vigoroth_carrying_box/2.png
diff --git a/graphics/map_objects/pics/pokemon/vigoroth_facing_away/0.png b/graphics/event_objects/pics/pokemon/vigoroth_facing_away/0.png
index 30f989ca5..30f989ca5 100644
--- a/graphics/map_objects/pics/pokemon/vigoroth_facing_away/0.png
+++ b/graphics/event_objects/pics/pokemon/vigoroth_facing_away/0.png
diff --git a/graphics/map_objects/pics/pokemon/vigoroth_facing_away/1.png b/graphics/event_objects/pics/pokemon/vigoroth_facing_away/1.png
index f0edeb876..f0edeb876 100644
--- a/graphics/map_objects/pics/pokemon/vigoroth_facing_away/1.png
+++ b/graphics/event_objects/pics/pokemon/vigoroth_facing_away/1.png
diff --git a/graphics/map_objects/pics/pokemon/wingull/0.png b/graphics/event_objects/pics/pokemon/wingull/0.png
index 2e83a4b4e..2e83a4b4e 100644
--- a/graphics/map_objects/pics/pokemon/wingull/0.png
+++ b/graphics/event_objects/pics/pokemon/wingull/0.png
diff --git a/graphics/map_objects/pics/pokemon/wingull/1.png b/graphics/event_objects/pics/pokemon/wingull/1.png
index 22dadf0ae..22dadf0ae 100644
--- a/graphics/map_objects/pics/pokemon/wingull/1.png
+++ b/graphics/event_objects/pics/pokemon/wingull/1.png
diff --git a/graphics/map_objects/pics/pokemon/wingull/2.png b/graphics/event_objects/pics/pokemon/wingull/2.png
index 9758aff0a..9758aff0a 100644
--- a/graphics/map_objects/pics/pokemon/wingull/2.png
+++ b/graphics/event_objects/pics/pokemon/wingull/2.png
diff --git a/graphics/map_objects/pics/pokemon/wingull/3.png b/graphics/event_objects/pics/pokemon/wingull/3.png
index c3404d20d..c3404d20d 100644
--- a/graphics/map_objects/pics/pokemon/wingull/3.png
+++ b/graphics/event_objects/pics/pokemon/wingull/3.png
diff --git a/graphics/map_objects/pics/pokemon/wingull/4.png b/graphics/event_objects/pics/pokemon/wingull/4.png
index 11052fe99..11052fe99 100644
--- a/graphics/map_objects/pics/pokemon/wingull/4.png
+++ b/graphics/event_objects/pics/pokemon/wingull/4.png
diff --git a/graphics/map_objects/pics/pokemon/wingull/5.png b/graphics/event_objects/pics/pokemon/wingull/5.png
index af5505e31..af5505e31 100644
--- a/graphics/map_objects/pics/pokemon/wingull/5.png
+++ b/graphics/event_objects/pics/pokemon/wingull/5.png
diff --git a/graphics/map_objects/pics/pokemon/zigzagoon/0.png b/graphics/event_objects/pics/pokemon/zigzagoon/0.png
index 0601efade..0601efade 100644
--- a/graphics/map_objects/pics/pokemon/zigzagoon/0.png
+++ b/graphics/event_objects/pics/pokemon/zigzagoon/0.png
diff --git a/graphics/map_objects/pics/pokemon/zigzagoon/1.png b/graphics/event_objects/pics/pokemon/zigzagoon/1.png
index c7e067a6d..c7e067a6d 100644
--- a/graphics/map_objects/pics/pokemon/zigzagoon/1.png
+++ b/graphics/event_objects/pics/pokemon/zigzagoon/1.png
diff --git a/graphics/map_objects/pics/pokemon/zigzagoon/2.png b/graphics/event_objects/pics/pokemon/zigzagoon/2.png
index d44a71b8d..d44a71b8d 100644
--- a/graphics/map_objects/pics/pokemon/zigzagoon/2.png
+++ b/graphics/event_objects/pics/pokemon/zigzagoon/2.png
diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index dad4ea026..fb250ad82 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -18,7 +18,7 @@ SLOTMACHINEGFXDIR := graphics/slot_machine
 PKNAVGFXDIR := graphics/pokenav
 PKNAVOPTIONSGFXDIR := graphics/pokenav/options
 PSSGFXDIR := graphics/pokemon_storage
-MAPOBJGFXDIR := graphics/map_objects
+EVENTOBJGFXDIR := graphics/event_objects
 MISCGFXDIR := graphics/misc
 
 types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark
@@ -628,7 +628,7 @@ $(PSSGFXDIR)/ludicolo.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/ludico
 $(PSSGFXDIR)/whiscash.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/whiscash_bg.4bpp
 	@cat $^ >$@
 
-$(MAPOBJGFXDIR)/pics/effects/unknown_4F6D38/0.4bpp: %.4bpp: %.png
+$(EVENTOBJGFXDIR)/pics/effects/unknown_4F6D38/0.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 11
 
 $(INTERFACEGFXDIR)/selector_outline.4bpp: %.4bpp: %.png
diff --git a/include/battle_setup.h b/include/battle_setup.h
index e4bae6fdb..0caa3df27 100644
--- a/include/battle_setup.h
+++ b/include/battle_setup.h
@@ -51,8 +51,8 @@ void ChooseStarter(void);
 void ResetTrainerOpponentIds(void);
 void SetMapVarsToTrainer(void);
 const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data);
-void ConfigureAndSetUpOneTrainerBattle(u8 trainerMapObjId, const u8 *trainerScript);
-void ConfigureTwoTrainersBattle(u8 trainerMapObjId, const u8 *trainerScript);
+void ConfigureAndSetUpOneTrainerBattle(u8 trainerEventObjId, const u8 *trainerScript);
+void ConfigureTwoTrainersBattle(u8 trainerEventObjId, const u8 *trainerScript);
 void SetUpTwoTrainersBattle(void);
 bool32 GetTrainerFlagFromScriptPointer(const u8 *data);
 void sub_80B16D8(void);
diff --git a/include/berry.h b/include/berry.h
index 425a664c9..1a8b7fa25 100644
--- a/include/berry.h
+++ b/include/berry.h
@@ -23,9 +23,9 @@ enum
 
 #define NUM_BERRIES 44
 
-extern const u8 *const gBerryTreeFieldObjectGraphicsIdTablePointers[NUM_BERRIES];
-extern const struct SpriteFrameImage *const gBerryTreePicTablePointers[NUM_BERRIES];
-extern const u8 *const gBerryTreePaletteSlotTablePointers[NUM_BERRIES];
+extern const u8 *const gBerryTreeEventObjectGraphicsIdTablePointers[];
+extern const struct SpriteFrameImage *const gBerryTreePicTablePointers[];
+extern const u8 *const gBerryTreePaletteSlotTablePointers[];
 
 void ClearEnigmaBerries(void);
 void SetEnigmaBerry(u8 *src);
@@ -33,7 +33,7 @@ u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry);
 bool32 IsEnigmaBerryValid(void);
 const struct Berry *GetBerryInfo(u8 berry);
 struct BerryTree *GetBerryTreeInfo(u8 id);
-bool32 FieldObjectInteractionWaterBerryTree(void);
+bool32 EventObjectInteractionWaterBerryTree(void);
 bool8 IsPlayerFacingPlantedBerryTree(void);
 bool8 TryToWaterBerryTree(void);
 void ClearBerryTrees(void);
@@ -54,10 +54,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 EventObjectInteractionGetBerryTreeData(void);
+void EventObjectInteractionPlantBerryTree(void);
+void EventObjectInteractionPickBerryTree(void);
+void EventObjectInteractionRemoveBerryTree(void);
 u8 PlayerHasBerries(void);
 void ResetBerryTreeSparkleFlags(void);
 
diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h
new file mode 100644
index 000000000..d04f0a1f9
--- /dev/null
+++ b/include/constants/event_objects.h
@@ -0,0 +1,263 @@
+#ifndef GUARD_CONSTANTS_EVENT_OBJECTS_H
+#define GUARD_CONSTANTS_EVENT_OBJECTS_H
+
+#define EVENT_OBJ_GFX_BRENDAN_NORMAL               0
+#define EVENT_OBJ_GFX_BRENDAN_MACH_BIKE            1
+#define EVENT_OBJ_GFX_BRENDAN_SURFING              2
+#define EVENT_OBJ_GFX_BRENDAN_FIELD_MOVE           3
+#define EVENT_OBJ_GFX_QUINTY_PLUMP                 4
+#define EVENT_OBJ_GFX_LITTLE_BOY_1                 5
+#define EVENT_OBJ_GFX_LITTLE_GIRL_1                6
+#define EVENT_OBJ_GFX_BOY_1                        7
+#define EVENT_OBJ_GFX_GIRL_1                       8
+#define EVENT_OBJ_GFX_BOY_2                        9
+#define EVENT_OBJ_GFX_GIRL_2                      10
+#define EVENT_OBJ_GFX_LITTLE_BOY_2                11
+#define EVENT_OBJ_GFX_LITTLE_GIRL_2               12
+#define EVENT_OBJ_GFX_BOY_3                       13
+#define EVENT_OBJ_GFX_GIRL_3                      14
+#define EVENT_OBJ_GFX_BOY_4                       15
+#define EVENT_OBJ_GFX_WOMAN_1                     16
+#define EVENT_OBJ_GFX_FAT_MAN                     17
+#define EVENT_OBJ_GFX_WOMAN_2                     18
+#define EVENT_OBJ_GFX_MAN_1                       19
+#define EVENT_OBJ_GFX_WOMAN_3                     20
+#define EVENT_OBJ_GFX_OLD_MAN_1                   21
+#define EVENT_OBJ_GFX_OLD_WOMAN_1                 22
+#define EVENT_OBJ_GFX_MAN_2                       23
+#define EVENT_OBJ_GFX_WOMAN_4                     24
+#define EVENT_OBJ_GFX_MAN_3                       25
+#define EVENT_OBJ_GFX_WOMAN_5                     26
+#define EVENT_OBJ_GFX_COOK                        27
+#define EVENT_OBJ_GFX_WOMAN_6                     28
+#define EVENT_OBJ_GFX_OLD_MAN_2                   29
+#define EVENT_OBJ_GFX_OLD_WOMAN_2                 30
+#define EVENT_OBJ_GFX_CAMPER                      31
+#define EVENT_OBJ_GFX_PICNICKER                   32
+#define EVENT_OBJ_GFX_MAN_4                       33
+#define EVENT_OBJ_GFX_WOMAN_7                     34
+#define EVENT_OBJ_GFX_YOUNGSTER                   35
+#define EVENT_OBJ_GFX_BUG_CATCHER                 36
+#define EVENT_OBJ_GFX_PSYCHIC_M                   37
+#define EVENT_OBJ_GFX_SCHOOL_KID_M                38
+#define EVENT_OBJ_GFX_MANIAC                      39
+#define EVENT_OBJ_GFX_HEX_MANIAC                  40
+#define EVENT_OBJ_GFX_RAYQUAZA_1                  41
+#define EVENT_OBJ_GFX_SWIMMER_M                   42
+#define EVENT_OBJ_GFX_SWIMMER_F                   43
+#define EVENT_OBJ_GFX_BLACK_BELT                  44
+#define EVENT_OBJ_GFX_BEAUTY                      45
+#define EVENT_OBJ_GFX_SCIENTIST_1                 46
+#define EVENT_OBJ_GFX_LASS                        47
+#define EVENT_OBJ_GFX_GENTLEMAN                   48
+#define EVENT_OBJ_GFX_SAILOR                      49
+#define EVENT_OBJ_GFX_FISHERMAN                   50
+#define EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M        51
+#define EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F        52
+#define EVENT_OBJ_GFX_TUBER_F                     53
+#define EVENT_OBJ_GFX_TUBER_M                     54
+#define EVENT_OBJ_GFX_HIKER                       55
+#define EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M        56
+#define EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F        57
+#define EVENT_OBJ_GFX_NURSE                       58
+#define EVENT_OBJ_GFX_ITEM_BALL                   59
+#define EVENT_OBJ_GFX_BERRY_TREE                  60
+#define EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES     61
+#define EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES      62
+#define EVENT_OBJ_GFX_BRENDAN_ACRO_BIKE           63
+#define EVENT_OBJ_GFX_PROF_BIRCH                  64
+#define EVENT_OBJ_GFX_MAN_5                       65
+#define EVENT_OBJ_GFX_MAN_6                       66
+#define EVENT_OBJ_GFX_REPORTER_M                  67
+#define EVENT_OBJ_GFX_REPORTER_F                  68
+#define EVENT_OBJ_GFX_BARD                        69
+#define EVENT_OBJ_GFX_ANABEL                      70
+#define EVENT_OBJ_GFX_TUCKER                      71
+#define EVENT_OBJ_GFX_GRETA                       72
+#define EVENT_OBJ_GFX_SPENSER                     73
+#define EVENT_OBJ_GFX_NOLAND                      74
+#define EVENT_OBJ_GFX_LUCY                        75
+#define EVENT_OBJ_GFX_UNUSED_NATU_DOLL            76
+#define EVENT_OBJ_GFX_UNUSED_MAGNEMITE_DOLL       77
+#define EVENT_OBJ_GFX_UNUSED_SQUIRTLE_DOLL        78
+#define EVENT_OBJ_GFX_UNUSED_WOOPER_DOLL          79
+#define EVENT_OBJ_GFX_UNUSED_PIKACHU_DOLL         80
+#define EVENT_OBJ_GFX_UNUSED_PORYGON2_DOLL        81
+#define EVENT_OBJ_GFX_CUTTABLE_TREE               82
+#define EVENT_OBJ_GFX_MART_EMPLOYEE               83
+#define EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN          84
+#define EVENT_OBJ_GFX_TEALA                       85
+#define EVENT_OBJ_GFX_BREAKABLE_ROCK              86
+#define EVENT_OBJ_GFX_PUSHABLE_BOULDER            87
+#define EVENT_OBJ_GFX_MR_BRINEYS_BOAT             88
+#define EVENT_OBJ_GFX_MAY_NORMAL                  89
+#define EVENT_OBJ_GFX_MAY_MACH_BIKE               90
+#define EVENT_OBJ_GFX_MAY_ACRO_BIKE               91
+#define EVENT_OBJ_GFX_MAY_SURFING                 92
+#define EVENT_OBJ_GFX_MAY_FIELD_MOVE              93
+#define EVENT_OBJ_GFX_TRUCK                       94
+#define EVENT_OBJ_GFX_VIGAROTH_CARRYING_BOX       95
+#define EVENT_OBJ_GFX_VIGAROTH_FACING_AWAY        96
+#define EVENT_OBJ_GFX_BIRCHS_BAG                  97
+#define EVENT_OBJ_GFX_ZIGZAGOON_1                 98
+#define EVENT_OBJ_GFX_ARTIST                      99
+#define EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL       100
+#define EVENT_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE    101
+#define EVENT_OBJ_GFX_RIVAL_BRENDAN_ACRO_BIKE    102
+#define EVENT_OBJ_GFX_RIVAL_BRENDAN_SURFING      103
+#define EVENT_OBJ_GFX_RIVAL_BRENDAN_FIELD_MOVE   104
+#define EVENT_OBJ_GFX_RIVAL_MAY_NORMAL           105
+#define EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE        106
+#define EVENT_OBJ_GFX_RIVAL_MAY_ACRO_BIKE        107
+#define EVENT_OBJ_GFX_RIVAL_MAY_SURFING          108
+#define EVENT_OBJ_GFX_RIVAL_MAY_FIELD_MOVE       109
+#define EVENT_OBJ_GFX_CAMERAMAN                  110
+#define EVENT_OBJ_GFX_BRENDAN_UNDERWATER         111
+#define EVENT_OBJ_GFX_MAY_UNDERWATER             112
+#define EVENT_OBJ_GFX_MOVING_BOX                 113
+#define EVENT_OBJ_GFX_CABLE_CAR                  114
+#define EVENT_OBJ_GFX_SCIENTIST_2                115
+#define EVENT_OBJ_GFX_MAN_7                      116
+#define EVENT_OBJ_GFX_AQUA_MEMBER_M              117
+#define EVENT_OBJ_GFX_AQUA_MEMBER_F              118
+#define EVENT_OBJ_GFX_MAGMA_MEMBER_M             119
+#define EVENT_OBJ_GFX_MAGMA_MEMBER_F             120
+#define EVENT_OBJ_GFX_SIDNEY                     121
+#define EVENT_OBJ_GFX_PHOEBE                     122
+#define EVENT_OBJ_GFX_GLACIA                     123
+#define EVENT_OBJ_GFX_DRAKE                      124
+#define EVENT_OBJ_GFX_ROXANNE                    125
+#define EVENT_OBJ_GFX_BRAWLY                     126
+#define EVENT_OBJ_GFX_WATTSON                    127
+#define EVENT_OBJ_GFX_FLANNERY                   128
+#define EVENT_OBJ_GFX_NORMAN                     129
+#define EVENT_OBJ_GFX_WINONA                     130
+#define EVENT_OBJ_GFX_LIZA                       131
+#define EVENT_OBJ_GFX_TATE                       132
+#define EVENT_OBJ_GFX_WALLACE                    133
+#define EVENT_OBJ_GFX_STEVEN                     134
+#define EVENT_OBJ_GFX_WALLY                      135
+#define EVENT_OBJ_GFX_LITTLE_BOY_3               136
+#define EVENT_OBJ_GFX_BRENDAN_FISHING            137
+#define EVENT_OBJ_GFX_MAY_FISHING                138
+#define EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN      139
+#define EVENT_OBJ_GFX_SS_TIDAL                   140
+#define EVENT_OBJ_GFX_SUBMARINE_SHADOW           141
+#define EVENT_OBJ_GFX_PICHU_DOLL                 142
+#define EVENT_OBJ_GFX_PIKACHU_DOLL               143
+#define EVENT_OBJ_GFX_MARILL_DOLL                144
+#define EVENT_OBJ_GFX_TOGEPI_DOLL                145
+#define EVENT_OBJ_GFX_CYNDAQUIL_DOLL             146
+#define EVENT_OBJ_GFX_CHIKORITA_DOLL             147
+#define EVENT_OBJ_GFX_TOTODILE_DOLL              148
+#define EVENT_OBJ_GFX_JIGGLYPUFF_DOLL            149
+#define EVENT_OBJ_GFX_MEOWTH_DOLL                150
+#define EVENT_OBJ_GFX_CLEFAIRY_DOLL              151
+#define EVENT_OBJ_GFX_DITTO_DOLL                 152
+#define EVENT_OBJ_GFX_SMOOCHUM_DOLL              153
+#define EVENT_OBJ_GFX_TREECKO_DOLL               154
+#define EVENT_OBJ_GFX_TORCHIC_DOLL               155
+#define EVENT_OBJ_GFX_MUDKIP_DOLL                156
+#define EVENT_OBJ_GFX_DUSKULL_DOLL               157
+#define EVENT_OBJ_GFX_WYNAUT_DOLL                158
+#define EVENT_OBJ_GFX_BALTOY_DOLL                159
+#define EVENT_OBJ_GFX_KECLEON_DOLL               160
+#define EVENT_OBJ_GFX_AZURILL_DOLL               161
+#define EVENT_OBJ_GFX_SKITTY_DOLL                162
+#define EVENT_OBJ_GFX_SWABLU_DOLL                163
+#define EVENT_OBJ_GFX_GULPIN_DOLL                164
+#define EVENT_OBJ_GFX_LOTAD_DOLL                 165
+#define EVENT_OBJ_GFX_SEEDOT_DOLL                166
+#define EVENT_OBJ_GFX_PIKA_CUSHION               167
+#define EVENT_OBJ_GFX_ROUND_CUSHION              168
+#define EVENT_OBJ_GFX_KISS_CUSHION               169
+#define EVENT_OBJ_GFX_ZIGZAG_CUSHION             170
+#define EVENT_OBJ_GFX_SPIN_CUSHION               171
+#define EVENT_OBJ_GFX_DIAMOND_CUSHION            172
+#define EVENT_OBJ_GFX_BALL_CUSHION               173
+#define EVENT_OBJ_GFX_GRASS_CUSHION              174
+#define EVENT_OBJ_GFX_FIRE_CUSHION               175
+#define EVENT_OBJ_GFX_WATER_CUSHION              176
+#define EVENT_OBJ_GFX_BIG_SNORLAX_DOLL           177
+#define EVENT_OBJ_GFX_BIG_RHYDON_DOLL            178
+#define EVENT_OBJ_GFX_BIG_LAPRAS_DOLL            179
+#define EVENT_OBJ_GFX_BIG_VENUSAUR_DOLL          180
+#define EVENT_OBJ_GFX_BIG_CHARIZARD_DOLL         181
+#define EVENT_OBJ_GFX_BIG_BLASTOISE_DOLL         182
+#define EVENT_OBJ_GFX_BIG_WAILMER_DOLL           183
+#define EVENT_OBJ_GFX_BIG_REGIROCK_DOLL          184
+#define EVENT_OBJ_GFX_BIG_REGICE_DOLL            185
+#define EVENT_OBJ_GFX_BIG_REGISTEEL_DOLL         186
+#define EVENT_OBJ_GFX_LATIAS                     187
+#define EVENT_OBJ_GFX_LATIOS                     188
+#define EVENT_OBJ_GFX_BOY_5                      189
+#define EVENT_OBJ_GFX_CONTEST_JUDGE              190
+#define EVENT_OBJ_GFX_BRENDAN_WATERING           191
+#define EVENT_OBJ_GFX_MAY_WATERING               192
+#define EVENT_OBJ_GFX_BRENDAN_DECORATING         193
+#define EVENT_OBJ_GFX_MAY_DECORATING             194
+#define EVENT_OBJ_GFX_ARCHIE                     195
+#define EVENT_OBJ_GFX_MAXIE                      196
+#define EVENT_OBJ_GFX_KYOGRE_1                   197
+#define EVENT_OBJ_GFX_GROUDON_1                  198
+#define EVENT_OBJ_GFX_FOSSIL                     199
+#define EVENT_OBJ_GFX_REGIROCK                   200
+#define EVENT_OBJ_GFX_REGICE                     201
+#define EVENT_OBJ_GFX_REGISTEEL                  202
+#define EVENT_OBJ_GFX_SKITTY                     203
+#define EVENT_OBJ_GFX_KECLEON_1                  204
+#define EVENT_OBJ_GFX_KYOGRE_2                   205
+#define EVENT_OBJ_GFX_GROUDON_2                  206
+#define EVENT_OBJ_GFX_RAYQUAZA_2                 207
+#define EVENT_OBJ_GFX_ZIGZAGOON_2                208
+#define EVENT_OBJ_GFX_PIKACHU                    209
+#define EVENT_OBJ_GFX_AZUMARILL                  210
+#define EVENT_OBJ_GFX_WINGULL                    211
+#define EVENT_OBJ_GFX_KECLEON_2                  212
+#define EVENT_OBJ_GFX_TUBER_M_SWIMMING           213
+#define EVENT_OBJ_GFX_AZURILL                    214
+#define EVENT_OBJ_GFX_MOM                        215
+#define EVENT_OBJ_GFX_LINK_BRENDAN               216
+#define EVENT_OBJ_GFX_LINK_MAY                   217
+#define EVENT_OBJ_GFX_JUAN                       218
+#define EVENT_OBJ_GFX_SCOTT                      219
+#define EVENT_OBJ_GFX_POOCHYENA                  220
+#define EVENT_OBJ_GFX_KYOGRE_3                   221
+#define EVENT_OBJ_GFX_GROUDON_3                  222
+#define EVENT_OBJ_GFX_MYSTERY_GIFT_MAN           223
+#define EVENT_OBJ_GFX_TRICK_HOUSE_STATUE         224
+#define EVENT_OBJ_GFX_KIRLIA                     225
+#define EVENT_OBJ_GFX_DUSCLOPS                   226
+#define EVENT_OBJ_GFX_UNION_ROOM_NURSE           227
+#define EVENT_OBJ_GFX_SUDOWOODO                  228
+#define EVENT_OBJ_GFX_MEW                        229
+#define EVENT_OBJ_GFX_RED                        230
+#define EVENT_OBJ_GFX_LEAF                       231
+#define EVENT_OBJ_GFX_DEOXYS                     232
+#define EVENT_OBJ_GFX_DEOXYS_TRIANGLE            233
+#define EVENT_OBJ_GFX_BRANDON                    234
+#define EVENT_OBJ_GFX_LINK_RS_BRENDAN            235
+#define EVENT_OBJ_GFX_LINK_RS_MAY                236
+#define EVENT_OBJ_GFX_LUGIA                      237
+#define EVENT_OBJ_GFX_HOOH                       238
+#define EVENT_OBJ_GFX_BARD_2                     239
+#define EVENT_OBJ_GFX_HIPSTER                    240
+#define EVENT_OBJ_GFX_TRADER                     241
+#define EVENT_OBJ_GFX_STORYTELLER                242
+#define EVENT_OBJ_GFX_GIDDY                      243
+#define EVENT_OBJ_GFX_PLACEHOLDER_1              244
+#define EVENT_OBJ_GFX_PLACEHOLDER_2              245
+
+#define SHADOW_SIZE_S   0
+#define SHADOW_SIZE_M   1
+#define SHADOW_SIZE_L   2
+#define SHADOW_SIZE_XL  3
+
+#define F_INANIMATE                        (1 << 6)
+#define F_DISABLE_REFLECTION_PALETTE_LOAD  (1 << 7)
+
+#define TRACKS_NONE       0
+#define TRACKS_FOOT       1
+#define TRACKS_BIKE_TIRE  2
+
+#endif  // GUARD_CONSTANTS_EVENT_OBJECTS_H
diff --git a/include/constants/map_objects.h b/include/constants/map_objects.h
deleted file mode 100644
index d5b983005..000000000
--- a/include/constants/map_objects.h
+++ /dev/null
@@ -1,263 +0,0 @@
-#ifndef GUARD_CONSTANTS_MAP_OBJECTS_H
-#define GUARD_CONSTANTS_MAP_OBJECTS_H
-
-#define MAP_OBJ_GFX_BRENDAN_NORMAL               0
-#define MAP_OBJ_GFX_BRENDAN_MACH_BIKE            1
-#define MAP_OBJ_GFX_BRENDAN_SURFING              2
-#define MAP_OBJ_GFX_BRENDAN_FIELD_MOVE           3
-#define MAP_OBJ_GFX_QUINTY_PLUMP                 4
-#define MAP_OBJ_GFX_LITTLE_BOY_1                 5
-#define MAP_OBJ_GFX_LITTLE_GIRL_1                6
-#define MAP_OBJ_GFX_BOY_1                        7
-#define MAP_OBJ_GFX_GIRL_1                       8
-#define MAP_OBJ_GFX_BOY_2                        9
-#define MAP_OBJ_GFX_GIRL_2                      10
-#define MAP_OBJ_GFX_LITTLE_BOY_2                11
-#define MAP_OBJ_GFX_LITTLE_GIRL_2               12
-#define MAP_OBJ_GFX_BOY_3                       13
-#define MAP_OBJ_GFX_GIRL_3                      14
-#define MAP_OBJ_GFX_BOY_4                       15
-#define MAP_OBJ_GFX_WOMAN_1                     16
-#define MAP_OBJ_GFX_FAT_MAN                     17
-#define MAP_OBJ_GFX_WOMAN_2                     18
-#define MAP_OBJ_GFX_MAN_1                       19
-#define MAP_OBJ_GFX_WOMAN_3                     20
-#define MAP_OBJ_GFX_OLD_MAN_1                   21
-#define MAP_OBJ_GFX_OLD_WOMAN_1                 22
-#define MAP_OBJ_GFX_MAN_2                       23
-#define MAP_OBJ_GFX_WOMAN_4                     24
-#define MAP_OBJ_GFX_MAN_3                       25
-#define MAP_OBJ_GFX_WOMAN_5                     26
-#define MAP_OBJ_GFX_COOK                        27
-#define MAP_OBJ_GFX_WOMAN_6                     28
-#define MAP_OBJ_GFX_OLD_MAN_2                   29
-#define MAP_OBJ_GFX_OLD_WOMAN_2                 30
-#define MAP_OBJ_GFX_CAMPER                      31
-#define MAP_OBJ_GFX_PICNICKER                   32
-#define MAP_OBJ_GFX_MAN_4                       33
-#define MAP_OBJ_GFX_WOMAN_7                     34
-#define MAP_OBJ_GFX_YOUNGSTER                   35
-#define MAP_OBJ_GFX_BUG_CATCHER                 36
-#define MAP_OBJ_GFX_PSYCHIC_M                   37
-#define MAP_OBJ_GFX_SCHOOL_KID_M                38
-#define MAP_OBJ_GFX_MANIAC                      39
-#define MAP_OBJ_GFX_HEX_MANIAC                  40
-#define MAP_OBJ_GFX_RAYQUAZA_1                  41
-#define MAP_OBJ_GFX_SWIMMER_M                   42
-#define MAP_OBJ_GFX_SWIMMER_F                   43
-#define MAP_OBJ_GFX_BLACK_BELT                  44
-#define MAP_OBJ_GFX_BEAUTY                      45
-#define MAP_OBJ_GFX_SCIENTIST_1                 46
-#define MAP_OBJ_GFX_LASS                        47
-#define MAP_OBJ_GFX_GENTLEMAN                   48
-#define MAP_OBJ_GFX_SAILOR                      49
-#define MAP_OBJ_GFX_FISHERMAN                   50
-#define MAP_OBJ_GFX_RUNNING_TRIATHLETE_M        51
-#define MAP_OBJ_GFX_RUNNING_TRIATHLETE_F        52
-#define MAP_OBJ_GFX_TUBER_F                     53
-#define MAP_OBJ_GFX_TUBER_M                     54
-#define MAP_OBJ_GFX_HIKER                       55
-#define MAP_OBJ_GFX_CYCLING_TRIATHLETE_M        56
-#define MAP_OBJ_GFX_CYCLING_TRIATHLETE_F        57
-#define MAP_OBJ_GFX_NURSE                       58
-#define MAP_OBJ_GFX_ITEM_BALL                   59
-#define MAP_OBJ_GFX_BERRY_TREE                  60
-#define MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES     61
-#define MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES      62
-#define MAP_OBJ_GFX_BRENDAN_ACRO_BIKE           63
-#define MAP_OBJ_GFX_PROF_BIRCH                  64
-#define MAP_OBJ_GFX_MAN_5                       65
-#define MAP_OBJ_GFX_MAN_6                       66
-#define MAP_OBJ_GFX_REPORTER_M                  67
-#define MAP_OBJ_GFX_REPORTER_F                  68
-#define MAP_OBJ_GFX_BARD                        69
-#define MAP_OBJ_GFX_ANABEL                      70
-#define MAP_OBJ_GFX_TUCKER                      71
-#define MAP_OBJ_GFX_GRETA                       72
-#define MAP_OBJ_GFX_SPENSER                     73
-#define MAP_OBJ_GFX_NOLAND                      74
-#define MAP_OBJ_GFX_LUCY                        75
-#define MAP_OBJ_GFX_UNUSED_NATU_DOLL            76
-#define MAP_OBJ_GFX_UNUSED_MAGNEMITE_DOLL       77
-#define MAP_OBJ_GFX_UNUSED_SQUIRTLE_DOLL        78
-#define MAP_OBJ_GFX_UNUSED_WOOPER_DOLL          79
-#define MAP_OBJ_GFX_UNUSED_PIKACHU_DOLL         80
-#define MAP_OBJ_GFX_UNUSED_PORYGON2_DOLL        81
-#define MAP_OBJ_GFX_CUTTABLE_TREE               82
-#define MAP_OBJ_GFX_MART_EMPLOYEE               83
-#define MAP_OBJ_GFX_ROOFTOP_SALE_WOMAN          84
-#define MAP_OBJ_GFX_TEALA                       85
-#define MAP_OBJ_GFX_BREAKABLE_ROCK              86
-#define MAP_OBJ_GFX_PUSHABLE_BOULDER            87
-#define MAP_OBJ_GFX_MR_BRINEYS_BOAT             88
-#define MAP_OBJ_GFX_MAY_NORMAL                  89
-#define MAP_OBJ_GFX_MAY_MACH_BIKE               90
-#define MAP_OBJ_GFX_MAY_ACRO_BIKE               91
-#define MAP_OBJ_GFX_MAY_SURFING                 92
-#define MAP_OBJ_GFX_MAY_FIELD_MOVE              93
-#define MAP_OBJ_GFX_TRUCK                       94
-#define MAP_OBJ_GFX_VIGAROTH_CARRYING_BOX       95
-#define MAP_OBJ_GFX_VIGAROTH_FACING_AWAY        96
-#define MAP_OBJ_GFX_BIRCHS_BAG                  97
-#define MAP_OBJ_GFX_ZIGZAGOON_1                 98
-#define MAP_OBJ_GFX_ARTIST                      99
-#define MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL       100
-#define MAP_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE    101
-#define MAP_OBJ_GFX_RIVAL_BRENDAN_ACRO_BIKE    102
-#define MAP_OBJ_GFX_RIVAL_BRENDAN_SURFING      103
-#define MAP_OBJ_GFX_RIVAL_BRENDAN_FIELD_MOVE   104
-#define MAP_OBJ_GFX_RIVAL_MAY_NORMAL           105
-#define MAP_OBJ_GFX_RIVAL_MAY_MACH_BIKE        106
-#define MAP_OBJ_GFX_RIVAL_MAY_ACRO_BIKE        107
-#define MAP_OBJ_GFX_RIVAL_MAY_SURFING          108
-#define MAP_OBJ_GFX_RIVAL_MAY_FIELD_MOVE       109
-#define MAP_OBJ_GFX_CAMERAMAN                  110
-#define MAP_OBJ_GFX_BRENDAN_UNDERWATER         111
-#define MAP_OBJ_GFX_MAY_UNDERWATER             112
-#define MAP_OBJ_GFX_MOVING_BOX                 113
-#define MAP_OBJ_GFX_CABLE_CAR                  114
-#define MAP_OBJ_GFX_SCIENTIST_2                115
-#define MAP_OBJ_GFX_MAN_7                      116
-#define MAP_OBJ_GFX_AQUA_MEMBER_M              117
-#define MAP_OBJ_GFX_AQUA_MEMBER_F              118
-#define MAP_OBJ_GFX_MAGMA_MEMBER_M             119
-#define MAP_OBJ_GFX_MAGMA_MEMBER_F             120
-#define MAP_OBJ_GFX_SIDNEY                     121
-#define MAP_OBJ_GFX_PHOEBE                     122
-#define MAP_OBJ_GFX_GLACIA                     123
-#define MAP_OBJ_GFX_DRAKE                      124
-#define MAP_OBJ_GFX_ROXANNE                    125
-#define MAP_OBJ_GFX_BRAWLY                     126
-#define MAP_OBJ_GFX_WATTSON                    127
-#define MAP_OBJ_GFX_FLANNERY                   128
-#define MAP_OBJ_GFX_NORMAN                     129
-#define MAP_OBJ_GFX_WINONA                     130
-#define MAP_OBJ_GFX_LIZA                       131
-#define MAP_OBJ_GFX_TATE                       132
-#define MAP_OBJ_GFX_WALLACE                    133
-#define MAP_OBJ_GFX_STEVEN                     134
-#define MAP_OBJ_GFX_WALLY                      135
-#define MAP_OBJ_GFX_LITTLE_BOY_3               136
-#define MAP_OBJ_GFX_BRENDAN_FISHING            137
-#define MAP_OBJ_GFX_MAY_FISHING                138
-#define MAP_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN      139
-#define MAP_OBJ_GFX_SS_TIDAL                   140
-#define MAP_OBJ_GFX_SUBMARINE_SHADOW           141
-#define MAP_OBJ_GFX_PICHU_DOLL                 142
-#define MAP_OBJ_GFX_PIKACHU_DOLL               143
-#define MAP_OBJ_GFX_MARILL_DOLL                144
-#define MAP_OBJ_GFX_TOGEPI_DOLL                145
-#define MAP_OBJ_GFX_CYNDAQUIL_DOLL             146
-#define MAP_OBJ_GFX_CHIKORITA_DOLL             147
-#define MAP_OBJ_GFX_TOTODILE_DOLL              148
-#define MAP_OBJ_GFX_JIGGLYPUFF_DOLL            149
-#define MAP_OBJ_GFX_MEOWTH_DOLL                150
-#define MAP_OBJ_GFX_CLEFAIRY_DOLL              151
-#define MAP_OBJ_GFX_DITTO_DOLL                 152
-#define MAP_OBJ_GFX_SMOOCHUM_DOLL              153
-#define MAP_OBJ_GFX_TREECKO_DOLL               154
-#define MAP_OBJ_GFX_TORCHIC_DOLL               155
-#define MAP_OBJ_GFX_MUDKIP_DOLL                156
-#define MAP_OBJ_GFX_DUSKULL_DOLL               157
-#define MAP_OBJ_GFX_WYNAUT_DOLL                158
-#define MAP_OBJ_GFX_BALTOY_DOLL                159
-#define MAP_OBJ_GFX_KECLEON_DOLL               160
-#define MAP_OBJ_GFX_AZURILL_DOLL               161
-#define MAP_OBJ_GFX_SKITTY_DOLL                162
-#define MAP_OBJ_GFX_SWABLU_DOLL                163
-#define MAP_OBJ_GFX_GULPIN_DOLL                164
-#define MAP_OBJ_GFX_LOTAD_DOLL                 165
-#define MAP_OBJ_GFX_SEEDOT_DOLL                166
-#define MAP_OBJ_GFX_PIKA_CUSHION               167
-#define MAP_OBJ_GFX_ROUND_CUSHION              168
-#define MAP_OBJ_GFX_KISS_CUSHION               169
-#define MAP_OBJ_GFX_ZIGZAG_CUSHION             170
-#define MAP_OBJ_GFX_SPIN_CUSHION               171
-#define MAP_OBJ_GFX_DIAMOND_CUSHION            172
-#define MAP_OBJ_GFX_BALL_CUSHION               173
-#define MAP_OBJ_GFX_GRASS_CUSHION              174
-#define MAP_OBJ_GFX_FIRE_CUSHION               175
-#define MAP_OBJ_GFX_WATER_CUSHION              176
-#define MAP_OBJ_GFX_BIG_SNORLAX_DOLL           177
-#define MAP_OBJ_GFX_BIG_RHYDON_DOLL            178
-#define MAP_OBJ_GFX_BIG_LAPRAS_DOLL            179
-#define MAP_OBJ_GFX_BIG_VENUSAUR_DOLL          180
-#define MAP_OBJ_GFX_BIG_CHARIZARD_DOLL         181
-#define MAP_OBJ_GFX_BIG_BLASTOISE_DOLL         182
-#define MAP_OBJ_GFX_BIG_WAILMER_DOLL           183
-#define MAP_OBJ_GFX_BIG_REGIROCK_DOLL          184
-#define MAP_OBJ_GFX_BIG_REGICE_DOLL            185
-#define MAP_OBJ_GFX_BIG_REGISTEEL_DOLL         186
-#define MAP_OBJ_GFX_LATIAS                     187
-#define MAP_OBJ_GFX_LATIOS                     188
-#define MAP_OBJ_GFX_BOY_5                      189
-#define MAP_OBJ_GFX_CONTEST_JUDGE              190
-#define MAP_OBJ_GFX_BRENDAN_WATERING           191
-#define MAP_OBJ_GFX_MAY_WATERING               192
-#define MAP_OBJ_GFX_BRENDAN_DECORATING         193
-#define MAP_OBJ_GFX_MAY_DECORATING             194
-#define MAP_OBJ_GFX_ARCHIE                     195
-#define MAP_OBJ_GFX_MAXIE                      196
-#define MAP_OBJ_GFX_KYOGRE_1                   197
-#define MAP_OBJ_GFX_GROUDON_1                  198
-#define MAP_OBJ_GFX_FOSSIL                     199
-#define MAP_OBJ_GFX_REGIROCK                   200
-#define MAP_OBJ_GFX_REGICE                     201
-#define MAP_OBJ_GFX_REGISTEEL                  202
-#define MAP_OBJ_GFX_SKITTY                     203
-#define MAP_OBJ_GFX_KECLEON_1                  204
-#define MAP_OBJ_GFX_KYOGRE_2                   205
-#define MAP_OBJ_GFX_GROUDON_2                  206
-#define MAP_OBJ_GFX_RAYQUAZA_2                 207
-#define MAP_OBJ_GFX_ZIGZAGOON_2                208
-#define MAP_OBJ_GFX_PIKACHU                    209
-#define MAP_OBJ_GFX_AZUMARILL                  210
-#define MAP_OBJ_GFX_WINGULL                    211
-#define MAP_OBJ_GFX_KECLEON_2                  212
-#define MAP_OBJ_GFX_TUBER_M_SWIMMING           213
-#define MAP_OBJ_GFX_AZURILL                    214
-#define MAP_OBJ_GFX_MOM                        215
-#define MAP_OBJ_GFX_LINK_BRENDAN               216
-#define MAP_OBJ_GFX_LINK_MAY                   217
-#define MAP_OBJ_GFX_JUAN                       218
-#define MAP_OBJ_GFX_SCOTT                      219
-#define MAP_OBJ_GFX_POOCHYENA                  220
-#define MAP_OBJ_GFX_KYOGRE_3                   221
-#define MAP_OBJ_GFX_GROUDON_3                  222
-#define MAP_OBJ_GFX_MYSTERY_GIFT_MAN           223
-#define MAP_OBJ_GFX_TRICK_HOUSE_STATUE         224
-#define MAP_OBJ_GFX_KIRLIA                     225
-#define MAP_OBJ_GFX_DUSCLOPS                   226
-#define MAP_OBJ_GFX_UNION_ROOM_NURSE           227
-#define MAP_OBJ_GFX_SUDOWOODO                  228
-#define MAP_OBJ_GFX_MEW                        229
-#define MAP_OBJ_GFX_RED                        230
-#define MAP_OBJ_GFX_LEAF                       231
-#define MAP_OBJ_GFX_DEOXYS                     232
-#define MAP_OBJ_GFX_DEOXYS_TRIANGLE            233
-#define MAP_OBJ_GFX_BRANDON                    234
-#define MAP_OBJ_GFX_LINK_RS_BRENDAN            235
-#define MAP_OBJ_GFX_LINK_RS_MAY                236
-#define MAP_OBJ_GFX_LUGIA                      237
-#define MAP_OBJ_GFX_HOOH                       238
-#define MAP_OBJ_GFX_BARD_2                     239
-#define MAP_OBJ_GFX_HIPSTER                    240
-#define MAP_OBJ_GFX_TRADER                     241
-#define MAP_OBJ_GFX_STORYTELLER                242
-#define MAP_OBJ_GFX_GIDDY                      243
-#define MAP_OBJ_GFX_PLACEHOLDER_1              244
-#define MAP_OBJ_GFX_PLACEHOLDER_2              245
-
-#define SHADOW_SIZE_S   0
-#define SHADOW_SIZE_M   1
-#define SHADOW_SIZE_L   2
-#define SHADOW_SIZE_XL  3
-
-#define F_INANIMATE                        (1 << 6)
-#define F_DISABLE_REFLECTION_PALETTE_LOAD  (1 << 7)
-
-#define TRACKS_NONE       0
-#define TRACKS_FOOT       1
-#define TRACKS_BIKE_TIRE  2
-
-#endif  // GUARD_CONSTANTS_MAP_OBJECTS_H
diff --git a/include/constants/vars.h b/include/constants/vars.h
index 976c6a739..ed4a7797b 100644
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -27,7 +27,7 @@
 // object gfx id vars
 // These 0x10 vars are used to dynamically control a map object's sprite.
 // For example, the rival's sprite id is dynamically set based on the player's gender.
-// See VarGetFieldObjectGraphicsId().
+// See VarGetEventObjectGraphicsId().
 #define VAR_OBJ_GFX_ID_0           0x4010
 #define VAR_OBJ_GFX_ID_1           0x4011
 #define VAR_OBJ_GFX_ID_2           0x4012
diff --git a/include/data/decoration/tiles.h b/include/data/decoration/tiles.h
index 9a3f8a222..6b3ed699f 100644
--- a/include/data/decoration/tiles.h
+++ b/include/data/decoration/tiles.h
@@ -464,183 +464,183 @@ const u16 DecorGfx_KISS_POSTER[] = {
 };
 
 const u16 DecorGfx_PICHU_DOLL[] = {
-    MAP_OBJ_GFX_PICHU_DOLL
+    EVENT_OBJ_GFX_PICHU_DOLL
 };
 
 const u16 DecorGfx_PIKACHU_DOLL[] = {
-    MAP_OBJ_GFX_PIKACHU_DOLL
+    EVENT_OBJ_GFX_PIKACHU_DOLL
 };
 
 const u16 DecorGfx_MARILL_DOLL[] = {
-    MAP_OBJ_GFX_MARILL_DOLL
+    EVENT_OBJ_GFX_MARILL_DOLL
 };
 
 const u16 DecorGfx_TOGEPI_DOLL[] = {
-    MAP_OBJ_GFX_TOGEPI_DOLL
+    EVENT_OBJ_GFX_TOGEPI_DOLL
 };
 
 const u16 DecorGfx_CYNDAQUIL_DOLL[] = {
-    MAP_OBJ_GFX_CYNDAQUIL_DOLL
+    EVENT_OBJ_GFX_CYNDAQUIL_DOLL
 };
 
 const u16 DecorGfx_CHIKORITA_DOLL[] = {
-    MAP_OBJ_GFX_CHIKORITA_DOLL
+    EVENT_OBJ_GFX_CHIKORITA_DOLL
 };
 
 const u16 DecorGfx_TOTODILE_DOLL[] = {
-    MAP_OBJ_GFX_TOTODILE_DOLL
+    EVENT_OBJ_GFX_TOTODILE_DOLL
 };
 
 const u16 DecorGfx_JIGGLYPUFF_DOLL[] = {
-    MAP_OBJ_GFX_JIGGLYPUFF_DOLL
+    EVENT_OBJ_GFX_JIGGLYPUFF_DOLL
 };
 
 const u16 DecorGfx_MEOWTH_DOLL[] = {
-    MAP_OBJ_GFX_MEOWTH_DOLL
+    EVENT_OBJ_GFX_MEOWTH_DOLL
 };
 
 const u16 DecorGfx_CLEFAIRY_DOLL[] = {
-    MAP_OBJ_GFX_CLEFAIRY_DOLL
+    EVENT_OBJ_GFX_CLEFAIRY_DOLL
 };
 
 const u16 DecorGfx_DITTO_DOLL[] = {
-    MAP_OBJ_GFX_DITTO_DOLL
+    EVENT_OBJ_GFX_DITTO_DOLL
 };
 
 const u16 DecorGfx_SMOOCHUM_DOLL[] = {
-    MAP_OBJ_GFX_SMOOCHUM_DOLL
+    EVENT_OBJ_GFX_SMOOCHUM_DOLL
 };
 
 const u16 DecorGfx_TREECKO_DOLL[] = {
-    MAP_OBJ_GFX_TREECKO_DOLL
+    EVENT_OBJ_GFX_TREECKO_DOLL
 };
 
 const u16 DecorGfx_TORCHIC_DOLL[] = {
-    MAP_OBJ_GFX_TORCHIC_DOLL
+    EVENT_OBJ_GFX_TORCHIC_DOLL
 };
 
 const u16 DecorGfx_MUDKIP_DOLL[] = {
-    MAP_OBJ_GFX_MUDKIP_DOLL
+    EVENT_OBJ_GFX_MUDKIP_DOLL
 };
 
 const u16 DecorGfx_DUSKULL_DOLL[] = {
-    MAP_OBJ_GFX_DUSKULL_DOLL
+    EVENT_OBJ_GFX_DUSKULL_DOLL
 };
 
 const u16 DecorGfx_WYNAUT_DOLL[] = {
-    MAP_OBJ_GFX_WYNAUT_DOLL
+    EVENT_OBJ_GFX_WYNAUT_DOLL
 };
 
 const u16 DecorGfx_BALTOY_DOLL[] = {
-    MAP_OBJ_GFX_BALTOY_DOLL
+    EVENT_OBJ_GFX_BALTOY_DOLL
 };
 
 const u16 DecorGfx_KECLEON_DOLL[] = {
-    MAP_OBJ_GFX_KECLEON_DOLL
+    EVENT_OBJ_GFX_KECLEON_DOLL
 };
 
 const u16 DecorGfx_AZURILL_DOLL[] = {
-    MAP_OBJ_GFX_AZURILL_DOLL
+    EVENT_OBJ_GFX_AZURILL_DOLL
 };
 
 const u16 DecorGfx_SKITTY_DOLL[] = {
-    MAP_OBJ_GFX_SKITTY_DOLL
+    EVENT_OBJ_GFX_SKITTY_DOLL
 };
 
 const u16 DecorGfx_SWABLU_DOLL[] = {
-    MAP_OBJ_GFX_SWABLU_DOLL
+    EVENT_OBJ_GFX_SWABLU_DOLL
 };
 
 const u16 DecorGfx_GULPIN_DOLL[] = {
-    MAP_OBJ_GFX_GULPIN_DOLL
+    EVENT_OBJ_GFX_GULPIN_DOLL
 };
 
 const u16 DecorGfx_LOTAD_DOLL[] = {
-    MAP_OBJ_GFX_LOTAD_DOLL
+    EVENT_OBJ_GFX_LOTAD_DOLL
 };
 
 const u16 DecorGfx_SEEDOT_DOLL[] = {
-    MAP_OBJ_GFX_SEEDOT_DOLL
+    EVENT_OBJ_GFX_SEEDOT_DOLL
 };
 
 const u16 DecorGfx_PIKA_CUSHION[] = {
-    MAP_OBJ_GFX_PIKA_CUSHION
+    EVENT_OBJ_GFX_PIKA_CUSHION
 };
 
 const u16 DecorGfx_ROUND_CUSHION[] = {
-    MAP_OBJ_GFX_ROUND_CUSHION
+    EVENT_OBJ_GFX_ROUND_CUSHION
 };
 
 const u16 DecorGfx_KISS_CUSHION[] = {
-    MAP_OBJ_GFX_KISS_CUSHION
+    EVENT_OBJ_GFX_KISS_CUSHION
 };
 
 const u16 DecorGfx_ZIGZAG_CUSHION[] = {
-    MAP_OBJ_GFX_ZIGZAG_CUSHION
+    EVENT_OBJ_GFX_ZIGZAG_CUSHION
 };
 
 const u16 DecorGfx_SPIN_CUSHION[] = {
-    MAP_OBJ_GFX_SPIN_CUSHION
+    EVENT_OBJ_GFX_SPIN_CUSHION
 };
 
 const u16 DecorGfx_DIAMOND_CUSHION[] = {
-    MAP_OBJ_GFX_DIAMOND_CUSHION
+    EVENT_OBJ_GFX_DIAMOND_CUSHION
 };
 
 const u16 DecorGfx_BALL_CUSHION[] = {
-    MAP_OBJ_GFX_BALL_CUSHION
+    EVENT_OBJ_GFX_BALL_CUSHION
 };
 
 const u16 DecorGfx_GRASS_CUSHION[] = {
-    MAP_OBJ_GFX_GRASS_CUSHION
+    EVENT_OBJ_GFX_GRASS_CUSHION
 };
 
 const u16 DecorGfx_FIRE_CUSHION[] = {
-    MAP_OBJ_GFX_FIRE_CUSHION
+    EVENT_OBJ_GFX_FIRE_CUSHION
 };
 
 const u16 DecorGfx_WATER_CUSHION[] = {
-    MAP_OBJ_GFX_WATER_CUSHION
+    EVENT_OBJ_GFX_WATER_CUSHION
 };
 
 const u16 DecorGfx_SNORLAX_DOLL[] = {
-    MAP_OBJ_GFX_BIG_SNORLAX_DOLL
+    EVENT_OBJ_GFX_BIG_SNORLAX_DOLL
 };
 
 const u16 DecorGfx_RHYDON_DOLL[] = {
-    MAP_OBJ_GFX_BIG_RHYDON_DOLL
+    EVENT_OBJ_GFX_BIG_RHYDON_DOLL
 };
 
 const u16 DecorGfx_LAPRAS_DOLL[] = {
-    MAP_OBJ_GFX_BIG_LAPRAS_DOLL
+    EVENT_OBJ_GFX_BIG_LAPRAS_DOLL
 };
 
 const u16 DecorGfx_VENUSAUR_DOLL[] = {
-    MAP_OBJ_GFX_BIG_VENUSAUR_DOLL
+    EVENT_OBJ_GFX_BIG_VENUSAUR_DOLL
 };
 
 const u16 DecorGfx_CHARIZARD_DOLL[] = {
-    MAP_OBJ_GFX_BIG_CHARIZARD_DOLL
+    EVENT_OBJ_GFX_BIG_CHARIZARD_DOLL
 };
 
 const u16 DecorGfx_BLASTOISE_DOLL[] = {
-    MAP_OBJ_GFX_BIG_BLASTOISE_DOLL
+    EVENT_OBJ_GFX_BIG_BLASTOISE_DOLL
 };
 
 const u16 DecorGfx_WAILMER_DOLL[] = {
-    MAP_OBJ_GFX_BIG_WAILMER_DOLL
+    EVENT_OBJ_GFX_BIG_WAILMER_DOLL
 };
 
 const u16 DecorGfx_REGIROCK_DOLL[] = {
-    MAP_OBJ_GFX_BIG_REGIROCK_DOLL
+    EVENT_OBJ_GFX_BIG_REGIROCK_DOLL
 };
 
 const u16 DecorGfx_REGICE_DOLL[] = {
-    MAP_OBJ_GFX_BIG_REGICE_DOLL
+    EVENT_OBJ_GFX_BIG_REGICE_DOLL
 };
 
 const u16 DecorGfx_REGISTEEL_DOLL[] = {
-    MAP_OBJ_GFX_BIG_REGISTEEL_DOLL
+    EVENT_OBJ_GFX_BIG_REGISTEEL_DOLL
 };
 
 #endif // GUARD_DATA_DECORATION_TILES
diff --git a/include/event_data.h b/include/event_data.h
index f829d3b87..e09b32d44 100644
--- a/include/event_data.h
+++ b/include/event_data.h
@@ -24,7 +24,7 @@ bool32 CanResetRTC(void);
 u16 *GetVarPointer(u16 id);
 u16 VarGet(u16 id);
 bool8 VarSet(u16 id, u16 value);
-u8 VarGetFieldObjectGraphicsId(u8 id);
+u8 VarGetEventObjectGraphicsId(u8 id);
 u8 *GetFlagPointer(u16 id);
 u8 FlagSet(u16 id);
 u8 FlagClear(u16 id);
diff --git a/include/event_obj_lock.h b/include/event_obj_lock.h
new file mode 100644
index 000000000..59532fdcb
--- /dev/null
+++ b/include/event_obj_lock.h
@@ -0,0 +1,11 @@
+#ifndef GUARD_EVENT_OBJ_LOCK_H
+#define GUARD_EVENT_OBJ_LOCK_H
+
+bool8 sub_80983C4(void);
+void ScriptFreezeEventObjects(void);
+bool8 sub_809847C(void);
+void LockSelectedEventObject(void);
+void sub_8098630(void);
+bool8 sub_8098734(void);
+
+#endif // GUARD_EVENT_OBJ_LOCK_H
diff --git a/include/event_object_movement.h b/include/event_object_movement.h
new file mode 100644
index 000000000..8a1749b0b
--- /dev/null
+++ b/include/event_object_movement.h
@@ -0,0 +1,652 @@
+#ifndef GUARD_FIELD_EVENT_OBJ_H
+#define GUARD_FIELD_EVENT_OBJ_H
+
+#define NUM_OBJECT_GRAPHICS_INFO 239
+#define SPRITE_VAR 240
+
+enum
+{
+    MOVEMENT_TYPE_NONE,
+    MOVEMENT_TYPE_LOOK_AROUND,
+    MOVEMENT_TYPE_WANDER_AROUND,
+    MOVEMENT_TYPE_WANDER_UP_AND_DOWN,
+    MOVEMENT_TYPE_WANDER_DOWN_AND_UP,
+    MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT,
+    MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT,
+    MOVEMENT_TYPE_FACE_UP,
+    MOVEMENT_TYPE_FACE_DOWN,
+    MOVEMENT_TYPE_FACE_LEFT,
+    MOVEMENT_TYPE_FACE_RIGHT,
+    MOVEMENT_TYPE_PLAYER,
+    MOVEMENT_TYPE_BERRY_TREE_GROWTH,
+    MOVEMENT_TYPE_FACE_DOWN_AND_UP,
+    MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT,
+    MOVEMENT_TYPE_FACE_UP_AND_LEFT,
+    MOVEMENT_TYPE_FACE_UP_AND_RIGHT,
+    MOVEMENT_TYPE_FACE_DOWN_AND_LEFT,
+    MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT,
+    MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT,
+    MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT,
+    MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT,
+    MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT,
+    MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE,
+    MOVEMENT_TYPE_ROTATE_CLOCKWISE,
+    MOVEMENT_TYPE_WALK_UP_AND_DOWN,
+    MOVEMENT_TYPE_WALK_DOWN_AND_UP,
+    MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT,
+    MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT,
+    MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN,
+    MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP,
+    MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT,
+    MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT,
+    MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN,
+    MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP,
+    MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT,
+    MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT,
+    MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT,
+    MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT,
+    MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN,
+    MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP,
+    MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT,
+    MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT,
+    MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN,
+    MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP,
+    MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT,
+    MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT,
+    MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP,
+    MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN,
+    MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT,
+    MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT,
+    MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN,
+    MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP,
+    MOVEMENT_TYPE_COPY_PLAYER,
+    MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE,
+    MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE,
+    MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE,
+    MOVEMENT_TYPE_TREE_DISGUISE,
+    MOVEMENT_TYPE_MOUNTAIN_DISGUISE,
+    MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS,
+    MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS,
+    MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS,
+    MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS,
+    MOVEMENT_TYPE_HIDDEN,
+    MOVEMENT_TYPE_WALK_IN_PLACE_DOWN,
+    MOVEMENT_TYPE_WALK_IN_PLACE_UP,
+    MOVEMENT_TYPE_WALK_IN_PLACE_LEFT,
+    MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT,
+    MOVEMENT_TYPE_JOG_IN_PLACE_DOWN,
+    MOVEMENT_TYPE_JOG_IN_PLACE_UP,
+    MOVEMENT_TYPE_JOG_IN_PLACE_LEFT,
+    MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT,
+    MOVEMENT_TYPE_RUN_IN_PLACE_DOWN,
+    MOVEMENT_TYPE_RUN_IN_PLACE_UP,
+    MOVEMENT_TYPE_RUN_IN_PLACE_LEFT,
+    MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT,
+    MOVEMENT_TYPE_INVISIBLE,
+    MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN,
+    MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP,
+    MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT,
+    MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT,
+};
+
+enum
+{
+    MOVEMENT_ACTION_FACE_DOWN,
+    MOVEMENT_ACTION_FACE_UP,
+    MOVEMENT_ACTION_FACE_LEFT,
+    MOVEMENT_ACTION_FACE_RIGHT,
+    MOVEMENT_ACTION_WALK_SLOW_DOWN,
+    MOVEMENT_ACTION_WALK_SLOW_UP,
+    MOVEMENT_ACTION_WALK_SLOW_LEFT,
+    MOVEMENT_ACTION_WALK_SLOW_RIGHT,
+    MOVEMENT_ACTION_WALK_NORMAL_DOWN,
+    MOVEMENT_ACTION_WALK_NORMAL_UP,
+    MOVEMENT_ACTION_WALK_NORMAL_LEFT,
+    MOVEMENT_ACTION_WALK_NORMAL_RIGHT,
+    MOVEMENT_ACTION_JUMP_2_DOWN,
+    MOVEMENT_ACTION_JUMP_2_UP,
+    MOVEMENT_ACTION_JUMP_2_LEFT,
+    MOVEMENT_ACTION_JUMP_2_RIGHT,
+    MOVEMENT_ACTION_DELAY_1,
+    MOVEMENT_ACTION_DELAY_2,
+    MOVEMENT_ACTION_DELAY_4,
+    MOVEMENT_ACTION_DELAY_8,
+    MOVEMENT_ACTION_DELAY_16,
+    MOVEMENT_ACTION_WALK_FAST_DOWN,
+    MOVEMENT_ACTION_WALK_FAST_UP,
+    MOVEMENT_ACTION_WALK_FAST_LEFT,
+    MOVEMENT_ACTION_WALK_FAST_RIGHT,
+    MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN,
+    MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP,
+    MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT,
+    MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT,
+    MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN,
+    MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP,
+    MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT,
+    MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT,
+    MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN,
+    MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP,
+    MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT,
+    MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT,
+    MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN,
+    MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP,
+    MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT,
+    MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT,
+    MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN,
+    MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP,
+    MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT,
+    MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT,
+    MOVEMENT_ACTION_WALK_FASTEST_DOWN,
+    MOVEMENT_ACTION_WALK_FASTEST_UP,
+    MOVEMENT_ACTION_WALK_FASTEST_LEFT,
+    MOVEMENT_ACTION_WALK_FASTEST_RIGHT,
+    MOVEMENT_ACTION_SLIDE_DOWN,
+    MOVEMENT_ACTION_SLIDE_UP,
+    MOVEMENT_ACTION_SLIDE_LEFT,
+    MOVEMENT_ACTION_SLIDE_RIGHT,
+    MOVEMENT_ACTION_PLAYER_RUN_DOWN,
+    MOVEMENT_ACTION_PLAYER_RUN_UP,
+    MOVEMENT_ACTION_PLAYER_RUN_LEFT,
+    MOVEMENT_ACTION_PLAYER_RUN_RIGHT,
+    MOVEMENT_ACTION_START_ANIM_IN_DIRECTION,
+    MOVEMENT_ACTION_JUMP_SPECIAL_DOWN,
+    MOVEMENT_ACTION_JUMP_SPECIAL_UP,
+    MOVEMENT_ACTION_JUMP_SPECIAL_LEFT,
+    MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT,
+    MOVEMENT_ACTION_FACE_PLAYER,
+    MOVEMENT_ACTION_FACE_AWAY_PLAYER,
+    MOVEMENT_ACTION_LOCK_FACING_DIRECTION,
+    MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION,
+    MOVEMENT_ACTION_JUMP_DOWN,
+    MOVEMENT_ACTION_JUMP_UP,
+    MOVEMENT_ACTION_JUMP_LEFT,
+    MOVEMENT_ACTION_JUMP_RIGHT,
+    MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN,
+    MOVEMENT_ACTION_JUMP_IN_PLACE_UP,
+    MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT,
+    MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT,
+    MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP,
+    MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN,
+    MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT,
+    MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT,
+    MOVEMENT_ACTION_FACE_ORIGINAL_DIRECTION,
+    MOVEMENT_ACTION_NURSE_JOY_BOW_DOWN,
+    MOVEMENT_ACTION_ENABLE_JUMP_LANDING_GROUND_EFFECT,
+    MOVEMENT_ACTION_DISABLE_JUMP_LANDING_GROUND_EFFECT,
+    MOVEMENT_ACTION_DISABLE_ANIMATION,
+    MOVEMENT_ACTION_RESTORE_ANIMATION,
+    MOVEMENT_ACTION_SET_INVISIBLE,
+    MOVEMENT_ACTION_SET_VISIBLE,
+    MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK,
+    MOVEMENT_ACTION_EMOTE_QUESTION_MARK,
+    MOVEMENT_ACTION_EMOTE_HEART,
+    MOVEMENT_ACTION_REVEAL_TRAINER,
+    MOVEMENT_ACTION_ROCK_SMASH_BREAK,
+    MOVEMENT_ACTION_CUT_TREE,
+    MOVEMENT_ACTION_SET_FIXED_PRIORITY,
+    MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY,
+    MOVEMENT_ACTION_INIT_AFFINE_ANIM,
+    MOVEMENT_ACTION_CLEAR_AFFINE_ANIM,
+    MOVEMENT_ACTION_UNKNOWN1,
+    MOVEMENT_ACTION_UNKNOWN2,
+    MOVEMENT_ACTION_WALK_DOWN_START_AFFINE,
+    MOVEMENT_ACTION_WALK_DOWN_AFFINE,
+    MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN,
+    MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP,
+    MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT,
+    MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN,
+    MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP,
+    MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT,
+    MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT,
+    MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN,
+    MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP,
+    MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT,
+    MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN,
+    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP,
+    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN,
+    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP,
+    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN,
+    MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP,
+    MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN,
+    MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP,
+    MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT,
+    MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN,
+    MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP,
+    MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT,
+    MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN,
+    MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP,
+    MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT,
+    MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN,
+    MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP,
+    MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT,
+    MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT,
+    MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_LEFT,
+    MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_RIGHT,
+    MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_LEFT,
+    MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_RIGHT,
+    MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_LEFT,
+    MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_RIGHT,
+    MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_LEFT,
+    MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_RIGHT,
+    MOVEMENT_ACTION_STORE_AND_LOCK_ANIM,
+    MOVEMENT_ACTION_FREE_AND_UNLOCK_ANIM,
+    MOVEMENT_ACTION_WALK_LEFT_AFFINE,
+    MOVEMENT_ACTION_WALK_RIGHT_AFFINE,
+    MOVEMENT_ACTION_LEVITATE,
+    MOVEMENT_ACTION_STOP_LEVITATE,
+    MOVEMENT_ACTION_DESTROY_EXTRA_TASK_IF_AT_TOP,
+    MOVEMENT_ACTION_FIGURE_8,
+    MOVEMENT_ACTION_FLY_UP,
+    MOVEMENT_ACTION_FLY_DOWN,
+};
+
+enum SpinnerRunnerFollowPatterns
+{
+    RUNFOLLOW_ANY,
+    RUNFOLLOW_NORTH_SOUTH,
+    RUNFOLLOW_EAST_WEST,
+    RUNFOLLOW_NORTH_WEST,
+    RUNFOLLOW_NORTH_EAST,
+    RUNFOLLOW_SOUTH_WEST,
+    RUNFOLLOW_SOUTH_EAST,
+    RUNFOLLOW_NORTH_SOUTH_WEST,
+    RUNFOLLOW_NORTH_SOUTH_EAST,
+    RUNFOLLOW_NORTH_EAST_WEST,
+    RUNFOLLOW_SOUTH_EAST_WEST
+};
+
+struct UnkStruct_085094AC {
+    const union AnimCmd *const *anims;
+    u8 animPos[4];
+};
+
+#define GROUND_EFFECT_FLAG_TALL_GRASS_ON_SPAWN   (1 << 0)
+#define GROUND_EFFECT_FLAG_TALL_GRASS_ON_MOVE    (1 << 1)
+#define GROUND_EFFECT_FLAG_LONG_GRASS_ON_SPAWN   (1 << 2)
+#define GROUND_EFFECT_FLAG_LONG_GRASS_ON_MOVE    (1 << 3)
+#define GROUND_EFFECT_FLAG_ICE_REFLECTION        (1 << 4)
+#define GROUND_EFFECT_FLAG_REFLECTION            (1 << 5)
+#define GROUND_EFFECT_FLAG_SHALLOW_FLOWING_WATER (1 << 6)
+#define GROUND_EFFECT_FLAG_SAND                  (1 << 7)
+#define GROUND_EFFECT_FLAG_DEEP_SAND             (1 << 8)
+#define GROUND_EFFECT_FLAG_RIPPLES               (1 << 9)
+#define GROUND_EFFECT_FLAG_PUDDLE                (1 << 10)
+#define GROUND_EFFECT_FLAG_SAND_PILE             (1 << 11)
+#define GROUND_EFFECT_FLAG_LAND_IN_TALL_GRASS    (1 << 12)
+#define GROUND_EFFECT_FLAG_LAND_IN_LONG_GRASS    (1 << 13)
+#define GROUND_EFFECT_FLAG_LAND_IN_SHALLOW_WATER (1 << 14)
+#define GROUND_EFFECT_FLAG_LAND_IN_DEEP_WATER    (1 << 15)
+#define GROUND_EFFECT_FLAG_LAND_ON_NORMAL_GROUND (1 << 16)
+#define GROUND_EFFECT_FLAG_SHORT_GRASS           (1 << 17)
+#define GROUND_EFFECT_FLAG_HOT_SPRINGS           (1 << 18)
+#define GROUND_EFFECT_FLAG_SEAWEED               (1 << 19)
+
+#define movement_type_def(setup, table) \
+static u8 setup##_callback(struct EventObject *, struct Sprite *);\
+void setup(struct Sprite *sprite)\
+{\
+    UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, setup##_callback);\
+}\
+static u8 setup##_callback(struct EventObject *eventObject, struct Sprite *sprite)\
+{\
+    return table[sprite->data[1]](eventObject, sprite);\
+}
+
+#define movement_type_empty_callback(setup) \
+static u8 setup##_callback(struct EventObject *, struct Sprite *);\
+void setup(struct Sprite *sprite)\
+{\
+    UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, setup##_callback);\
+}\
+static u8 setup##_callback(struct EventObject *eventObject, struct Sprite *sprite)\
+{\
+    return 0;\
+}
+
+struct PairedPalettes
+{
+    u16 tag;
+    const u16 *data;
+};
+
+struct LockedAnimEventObjects
+{
+    u8 eventObjectIds[NUM_EVENT_OBJECTS];
+    u8 count;
+};
+
+extern const struct SpriteFrameImage gEventObjectPicTable_PechaBerryTree[];
+
+void sub_808D438(void);
+u8 GetMoveDirectionAnimNum(u8);
+u8 GetEventObjectIdByLocalIdAndMap(u8, u8, u8);
+bool8 TryGetEventObjectIdByLocalIdAndMap(u8, u8, u8, u8 *);
+u8 GetEventObjectIdByXY(s16, s16);
+void SetEventObjectDirection(struct EventObject *, u8);
+u8 GetFirstInactiveEventObjectId(void);
+void RemoveEventObjectByLocalIdAndMap(u8, u8, u8);
+void npc_load_two_palettes__no_record(u16, u8);
+void npc_load_two_palettes__and_record(u16, u8);
+void sub_808EBA8(u8, u8, u8, s16, s16);
+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 GetFaceDirectionAnimNum(u8);
+void sub_80930E0(s16 *, s16 *, s16, s16);
+void EventObjectClearHeldMovement(struct EventObject *);
+void EventObjectClearHeldMovementIfActive(struct EventObject *);
+void TrySpawnEventObjects(s16, s16);
+u8 sprite_new(u8, u8, s16, s16, u8, u8);
+u8 AddPseudoEventObject(u16, void (*)(struct Sprite *), s16, s16, u8);
+u8 show_sprite(u8, u8, u8);
+u8 SpawnSpecialEventObjectParametrized(u8, u8, u8, s16, s16, u8);
+u8 SpawnSpecialEventObject(struct EventObjectTemplate *);
+void sub_8093038(s16, s16, s16 *, s16 *);
+void CameraObjectReset1(void);
+void EventObjectSetGraphicsId(struct EventObject *, u8);
+void EventObjectTurn(struct EventObject *, u8);
+void EventObjectTurnByLocalIdAndMap(u8, u8, u8, u8);
+const struct EventObjectGraphicsInfo *GetEventObjectGraphicsInfo(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_808E7E4(u8, u8, u8);
+void sub_808E78C(u8, u8, u8, u8);
+void sub_808E75C(s16, s16);
+void EventObjectGetLocalIdAndMap(struct EventObject *eventObject, void *localId, void *mapNum, void *mapGroup);
+void ShiftEventObjectCoords(struct EventObject *, s16, s16);
+void sub_808EB08(struct EventObject *, s16, s16);
+void sub_808F254(u8, u8, u8);
+void UpdateEventObjectCurrentMovement(struct EventObject *, struct Sprite *, bool8(struct EventObject *, struct Sprite *));
+u8 EventObjectFaceOppositeDirection(struct EventObject *, u8);
+u8 GetOppositeDirection(u8);
+u8 GetWalkInPlaceFastestMovementAction(u32);
+u8 GetWalkInPlaceFastMovementAction(u32);
+u8 GetWalkInPlaceNormalMovementAction(u32);
+u8 GetWalkInPlaceSlowMovementAction(u32);
+u8 GetCollisionAtCoords(struct EventObject *, s16, s16, u32);
+void MoveCoords(u8, s16 *, s16 *);
+bool8 EventObjectIsHeldMovementActive(struct EventObject *);
+u8 EventObjectClearHeldMovementIfFinished(struct EventObject *);
+u8 GetEventObjectIdByXYZ(u16 x, u16 y, u8 z);
+void SetTrainerMovementType(struct EventObject *eventObject, u8 movementType);
+u8 GetTrainerFacingDirectionMovementType(u8 direction);
+const u8 *GetEventObjectScriptPointerByEventObjectId(u8 eventObjectId);
+u8 GetCollisionFlagsAtCoords(struct EventObject *eventObject, s16 x, s16 y, u8 direction);
+u8 GetFaceDirectionMovementAction(u32);
+u8 GetWalkNormalMovementAction(u32);
+u8 GetWalkFastMovementAction(u32);
+u8 GetWalkFastestMovementAction(u32);
+u8 GetJumpInPlaceMovementAction(u32);
+bool8 EventObjectSetHeldMovement(struct EventObject *eventObject, u8 specialAnimId);
+bool8 EventObjectIsMovementOverridden(struct EventObject *eventObject);
+u8 EventObjectCheckHeldMovementStatus(struct EventObject *eventObject);
+void TryOverrideTemplateCoordsForEventObject(const struct EventObject *eventObject, u8 movementType);
+void OverrideTemplateCoordsForEventObject(const struct EventObject *eventObject);
+void ShiftStillEventObjectCoords(struct EventObject *pObject);
+void EventObjectMoveDestCoords(struct EventObject *pObject, u32 unk_19, s16 *pInt, s16 *pInt1);
+u8 AddCameraObject(u8 linkedSpriteId);
+void UpdateEventObjectsForCameraUpdate(s16 x, s16 y);
+u8 GetWalkSlowMovementAction(u32);
+u8 GetJumpMovementAction(u32);
+bool8 AreZCoordsCompatible(u8, u8);
+u8 ZCoordToPriority(u8);
+void EventObjectUpdateZCoord(struct EventObject *pObject);
+void SetObjectSubpriorityByZCoord(u8, struct Sprite *, u8);
+bool8 IsZCoordMismatchAt(u8, s16, s16);
+void UpdateEventObjectSpriteSubpriorityAndVisibility(struct Sprite *);
+void UnfreezeEventObject(struct EventObject *);
+void oamt_npc_ministep_reset(struct Sprite *, u8, u8);
+u8 FindLockedEventObjectIndex(struct EventObject *);
+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 EventObject *);
+u8 sub_809785C(struct Sprite *);
+u8 sub_80978E4(struct Sprite *);
+void SetAndStartSpriteAnim(struct Sprite *, u8, u8);
+bool8 SpriteAnimEnded(struct Sprite *);
+void sub_8097750(struct Sprite *);
+bool8 sub_8097758(struct Sprite *);
+void CreateLevitateMovementTask(struct EventObject *);
+void DestroyExtraMovementTask(u8);
+void UnfreezeEventObjects(void);
+void FreezeEventObjectsExceptOne(u8 eventObjectId);
+void sub_8097B78(u8, u8);
+void sub_8098074(u8 var1, u8 var2);
+void FreezeEventObjects(void);
+bool8 FreezeEventObject(struct EventObject *eventObject);
+u8 GetMoveDirectionFastAnimNum(u8);
+u8 GetMoveDirectionFasterAnimNum(u8);
+u8 GetMoveDirectionFastestAnimNum(u8);
+
+void MovementType_None(struct Sprite *);
+void MovementType_LookAround(struct Sprite *);
+void MovementType_WanderAround(struct Sprite *);
+void MovementType_WanderUpAndDown(struct Sprite *);
+void MovementType_WanderLeftAndRight(struct Sprite *);
+void MovementType_FaceDirection(struct Sprite *);
+void MovementType_Player(struct Sprite *);
+void MovementType_BerryTreeGrowth(struct Sprite *);
+void MovementType_FaceDownAndUp(struct Sprite *);
+void MovementType_FaceLeftAndRight(struct Sprite *);
+void MovementType_FaceUpAndLeft(struct Sprite *);
+void MovementType_FaceUpAndRight(struct Sprite *);
+void MovementType_FaceDownAndLeft(struct Sprite *);
+void MovementType_FaceDownAndRight(struct Sprite *);
+void MovementType_FaceDownUpAndLeft(struct Sprite *);
+void MovementType_FaceDownUpAndRight(struct Sprite *);
+void MovementType_FaceUpRightAndLeft(struct Sprite *);
+void MovementType_FaceDownRightAndLeft(struct Sprite *);
+void MovementType_RotateCounterclockwise(struct Sprite *);
+void MovementType_RotateClockwise(struct Sprite *);
+void MovementType_WalkBackAndForth(struct Sprite *);
+void MovementType_WalkSequenceUpRightLeftDown(struct Sprite *);
+void MovementType_WalkSequenceRightLeftDownUp(struct Sprite *);
+void MovementType_WalkSequenceDownUpRightLeft(struct Sprite *);
+void MovementType_WalkSequenceLeftDownUpRight(struct Sprite *);
+void MovementType_WalkSequenceUpLeftRightDown(struct Sprite *);
+void MovementType_WalkSequenceLeftRightDownUp(struct Sprite *);
+void MovementType_WalkSequenceDownUpLeftRight(struct Sprite *);
+void MovementType_WalkSequenceRightDownUpLeft(struct Sprite *);
+void MovementType_WalkSequenceLeftUpDownRight(struct Sprite *);
+void MovementType_WalkSequenceUpDownRightLeft(struct Sprite *);
+void MovementType_WalkSequenceRightLeftUpDown(struct Sprite *);
+void MovementType_WalkSequenceDownRightLeftUp(struct Sprite *);
+void MovementType_WalkSequenceRightUpDownLeft(struct Sprite *);
+void MovementType_WalkSequenceUpDownLeftRight(struct Sprite *);
+void MovementType_WalkSequenceLeftRightUpDown(struct Sprite *);
+void MovementType_WalkSequenceDownLeftRightUp(struct Sprite *);
+void MovementType_WalkSequenceUpLeftDownRight(struct Sprite *);
+void MovementType_WalkSequenceDownRightUpLeft(struct Sprite *);
+void MovementType_WalkSequenceLeftDownRightUp(struct Sprite *);
+void MovementType_WalkSequenceRightUpLeftDown(struct Sprite *);
+void MovementType_WalkSequenceUpRightDownLeft(struct Sprite *);
+void MovementType_WalkSequenceDownLeftUpRight(struct Sprite *);
+void MovementType_WalkSequenceLeftUpRightDown(struct Sprite *);
+void MovementType_WalkSequenceRightDownLeftUp(struct Sprite *);
+void MovementType_CopyPlayer(struct Sprite *);
+void MovementType_TreeDisguise(struct Sprite *);
+void MovementType_MountainDisguise(struct Sprite *);
+void MovementType_CopyPlayerInGrass(struct Sprite *);
+void MovementType_Hidden(struct Sprite *);
+void MovementType_WalkInPlace(struct Sprite *);
+void MovementType_JogInPlace(struct Sprite *);
+void MovementType_RunInPlace(struct Sprite *);
+void MovementType_Invisible(struct Sprite *);
+void MovementType_WalkSlowlyInPlace(struct Sprite *);
+u8 GetSlideMovementAction(u32);
+u8 GetJumpInPlaceMovementAction(u32);
+u8 GetJumpMovementAction(u32);
+u8 GetJump2MovementAction(u32);
+
+u8 MovementType_WanderAround_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderAround_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderAround_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderAround_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderAround_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderAround_Step5(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderAround_Step6(struct EventObject *, struct Sprite *);
+u8 GetVectorDirection(s16, s16, s16, s16);
+u8 GetLimitedVectorDirection_SouthNorth(s16, s16, s16, s16);
+u8 GetLimitedVectorDirection_WestEast(s16, s16, s16, s16);
+u8 GetLimitedVectorDirection_WestNorth(s16, s16, s16, s16);
+u8 GetLimitedVectorDirection_EastNorth(s16, s16, s16, s16);
+u8 GetLimitedVectorDirection_WestSouth(s16, s16, s16, s16);
+u8 GetLimitedVectorDirection_EastSouth(s16, s16, s16, s16);
+u8 GetLimitedVectorDirection_SouthNorthWest(s16, s16, s16, s16);
+u8 GetLimitedVectorDirection_SouthNorthEast(s16, s16, s16, s16);
+u8 GetLimitedVectorDirection_NorthWestEast(s16, s16, s16, s16);
+u8 GetLimitedVectorDirection_SouthWestEast(s16, s16, s16, s16);
+u8 MovementType_LookAround_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_LookAround_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_LookAround_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_LookAround_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_LookAround_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderUpAndDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderUpAndDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderUpAndDown_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderUpAndDown_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderUpAndDown_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderUpAndDown_Step5(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderUpAndDown_Step6(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderLeftAndRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderLeftAndRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderLeftAndRight_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderLeftAndRight_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderLeftAndRight_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderLeftAndRight_Step5(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderLeftAndRight_Step6(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDirection_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDirection_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDirection_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_BerryTreeGrowth_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_BerryTreeGrowth_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_BerryTreeGrowth_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_BerryTreeGrowth_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_BerryTreeGrowth_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndUp_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndUp_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndUp_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceLeftAndRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceLeftAndRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceLeftAndRight_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceLeftAndRight_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceLeftAndRight_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpAndLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpAndLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpAndLeft_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpAndLeft_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpAndLeft_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpAndRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpAndRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpAndRight_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpAndRight_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpAndRight_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndLeft_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndLeft_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndLeft_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndRight_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndRight_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndRight_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownUpAndLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownUpAndLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownUpAndLeft_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownUpAndLeft_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownUpAndLeft_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownUpAndRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownUpAndRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownUpAndRight_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownUpAndRight_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownUpAndRight_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpLeftAndRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpLeftAndRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpLeftAndRight_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpLeftAndRight_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpLeftAndRight_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownLeftAndRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownLeftAndRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownLeftAndRight_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownLeftAndRight_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownLeftAndRight_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_RotateCounterclockwise_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_RotateCounterclockwise_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_RotateCounterclockwise_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_RotateCounterclockwise_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_RotateClockwise_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_RotateClockwise_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_RotateClockwise_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_RotateClockwise_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkBackAndForth_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkBackAndForth_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkBackAndForth_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkBackAndForth_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceUpRightLeftDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceRightLeftDownUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceDownUpRightLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceLeftDownUpRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceUpLeftRightDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceLeftRightDownUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceDownUpLeftRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceRightDownUpLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceLeftUpDownRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceUpDownRightLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceRightLeftUpDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceDownRightLeftUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceRightUpDownLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceUpDownLeftRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceLeftRightUpDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceDownLeftRightUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceUpLeftDownRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceDownRightUpLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceLeftDownRightUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceRightUpLeftDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceUpRightDownLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceDownLeftUpRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceLeftUpRightDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceRightDownLeftUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_CopyPlayer_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_CopyPlayer_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_CopyPlayer_Step2(struct EventObject *, struct Sprite *);
+bool8 CopyablePlayerMovement_None(struct EventObject *, struct Sprite *, u8, bool8(u8));
+bool8 CopyablePlayerMovement_FaceDirection(struct EventObject *, struct Sprite *, u8, bool8(u8));
+bool8 CopyablePlayerMovement_GoSpeed0(struct EventObject *, struct Sprite *, u8, bool8(u8));
+bool8 CopyablePlayerMovement_GoSpeed1(struct EventObject *, struct Sprite *, u8, bool8(u8));
+bool8 CopyablePlayerMovement_GoSpeed2(struct EventObject *, struct Sprite *, u8, bool8(u8));
+bool8 CopyablePlayerMovement_Slide(struct EventObject *, struct Sprite *, u8, bool8(u8));
+bool8 cph_IM_DIFFERENT(struct EventObject *, struct Sprite *, u8, bool8(u8));
+bool8 CopyablePlayerMovement_GoSpeed4(struct EventObject *, struct Sprite *, u8, bool8(u8));
+bool8 CopyablePlayerMovement_Jump(struct EventObject *, struct Sprite *, u8, bool8(u8));
+u8 MovementType_CopyPlayerInGrass_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_Hidden_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkInPlace_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_MoveInPlace_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSlowlyInPlace_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_JogInPlace_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_RunInPlace_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_Invisible_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_Invisible_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_Invisible_Step2(struct EventObject *, struct Sprite *);
+
+#endif //GUARD_FIELD_EVENT_OBJ_H
diff --git a/include/field_control_avatar.h b/include/field_control_avatar.h
index b915d1419..3c4ad030f 100644
--- a/include/field_control_avatar.h
+++ b/include/field_control_avatar.h
@@ -30,7 +30,7 @@ u8 *sub_80682A8(struct MapPosition *, u8, u8);
 void overworld_poison_timer_set(void);
 void prev_quest_postbuffer_cursor_backup_reset(void);
 u8 *sub_8068E24(struct MapPosition *);
-u8 *GetFieldObjectScriptPointerPlayerFacing(void);
+u8 *GetEventObjectScriptPointerPlayerFacing(void);
 bool8 mapheader_trigger_activate_at__run_now(struct MapPosition *);
 bool8 sub_8068870(u16 a);
 bool8 sub_8068894(void);
diff --git a/include/field_effect.h b/include/field_effect.h
index 9cd26f6b8..800048605 100644
--- a/include/field_effect.h
+++ b/include/field_effect.h
@@ -11,7 +11,7 @@ extern const struct OamData gNewGameBirchOamAttributes;
 
 enum FieldEffectScriptIdx
 {
-    FLDEFF_EXCLAMATION_MARK_ICON_1,
+    FLDEFF_EXCLAMATION_MARK_ICON,
     FLDEFF_USE_CUT_ON_GRASS,
     FLDEFF_USE_CUT_ON_TREE,
     FLDEFF_SHADOW,
@@ -44,7 +44,7 @@ enum FieldEffectScriptIdx
     FLDEFF_NPCFLY_OUT,
     FLDEFF_USE_FLY,
     FLDEFF_FLY_IN,
-    FLDEFF_EXCLAMATION_MARK_ICON_2,
+    FLDEFF_QUESTION_MARK_ICON,
     FLDEFF_FEET_IN_FLOWING_WATER,
     FLDEFF_BIKE_TIRE_TRACKS,
     FLDEFF_SAND_DISGUISE,
@@ -148,33 +148,33 @@ bool8 sub_80B7270(struct Task *);
 bool8 sub_80B72D0(struct Task *);
 bool8 sub_80B72F4(struct Task *);
 
-bool8 sub_80B73D0(struct Task *, struct MapObject *);
-bool8 waterfall_1_do_anim_probably(struct Task *, struct MapObject *);
-bool8 waterfall_2_wait_anim_finish_probably(struct Task *, struct MapObject *);
-bool8 sub_80B7450(struct Task *, struct MapObject *);
-bool8 sub_80B7478(struct Task *, struct MapObject *);
+bool8 sub_80B73D0(struct Task *, struct EventObject *);
+bool8 waterfall_1_do_anim_probably(struct Task *, struct EventObject *);
+bool8 waterfall_2_wait_anim_finish_probably(struct Task *, struct EventObject *);
+bool8 sub_80B7450(struct Task *, struct EventObject *);
+bool8 sub_80B7478(struct Task *, struct EventObject *);
 
 bool8 dive_1_lock(struct Task *);
 bool8 dive_2_unknown(struct Task *);
 bool8 dive_3_unknown(struct Task *);
 
-bool8 sub_80B764C(struct Task *, struct MapObject *, struct Sprite *);
-bool8 sub_80B7684(struct Task *, struct MapObject *, struct Sprite *);
-bool8 sub_80B76B8(struct Task *, struct MapObject *, struct Sprite *);
-bool8 sub_80B7704(struct Task *, struct MapObject *, struct Sprite *);
-bool8 sub_80B77F8(struct Task *, struct MapObject *, struct Sprite *);
-bool8 sub_80B7814(struct Task *, struct MapObject *, struct Sprite *);
+bool8 sub_80B764C(struct Task *, struct EventObject *, struct Sprite *);
+bool8 sub_80B7684(struct Task *, struct EventObject *, struct Sprite *);
+bool8 sub_80B76B8(struct Task *, struct EventObject *, struct Sprite *);
+bool8 sub_80B7704(struct Task *, struct EventObject *, struct Sprite *);
+bool8 sub_80B77F8(struct Task *, struct EventObject *, struct Sprite *);
+bool8 sub_80B7814(struct Task *, struct EventObject *, struct Sprite *);
 
-bool8 sub_80B78EC(struct Task *, struct MapObject *, struct Sprite *);
-bool8 sub_80B791C(struct Task *, struct MapObject *, struct Sprite *);
-bool8 sub_80B7968(struct Task *, struct MapObject *, struct Sprite *);
-bool8 sub_80B79BC(struct Task *, struct MapObject *, struct Sprite *);
+bool8 sub_80B78EC(struct Task *, struct EventObject *, struct Sprite *);
+bool8 sub_80B791C(struct Task *, struct EventObject *, struct Sprite *);
+bool8 sub_80B7968(struct Task *, struct EventObject *, struct Sprite *);
+bool8 sub_80B79BC(struct Task *, struct EventObject *, struct Sprite *);
 
-bool8 sub_80B7AE8(struct Task *, struct MapObject *, struct Sprite *);
-bool8 sub_80B7B18(struct Task *, struct MapObject *, struct Sprite *);
-bool8 sub_80B7B94(struct Task *, struct MapObject *, struct Sprite *);
-bool8 sub_80B7BCC(struct Task *, struct MapObject *, struct Sprite *);
-bool8 sub_80B7BF4(struct Task *, struct MapObject *, struct Sprite *);
+bool8 sub_80B7AE8(struct Task *, struct EventObject *, struct Sprite *);
+bool8 sub_80B7B18(struct Task *, struct EventObject *, struct Sprite *);
+bool8 sub_80B7B94(struct Task *, struct EventObject *, struct Sprite *);
+bool8 sub_80B7BCC(struct Task *, struct EventObject *, struct Sprite *);
+bool8 sub_80B7BF4(struct Task *, struct EventObject *, struct Sprite *);
 
 void sub_80B7D14(struct Task *);
 void sub_80B7D34(struct Task *);
@@ -230,4 +230,7 @@ void sub_80B9C28(s16*, u8);
 void sub_80B9C54(s16*, u8);
 void sub_80B9CDC(s16*, u8);
 
+void sub_80B7CAC(struct Sprite*);
+void sub_80B7A58(struct Sprite*);
+
 #endif //GUARD_FIELD_EFFECTS_H
diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h
index 3c9e00b62..547f515eb 100644
--- a/include/field_effect_helpers.h
+++ b/include/field_effect_helpers.h
@@ -11,9 +11,28 @@
 
 // Exported ROM declarations
 u8 sub_8154228(void);
-bool8 sub_8155DA0(struct MapObject *);
-void sub_8155D78(struct MapObject *);
+bool8 sub_8155DA0(struct EventObject *);
+void sub_8155D78(struct EventObject *);
 void sub_81555AC(u8, u8);
 void ash(s16, s16, u16, s16);
+void SetUpReflection(struct EventObject*, struct Sprite*, u8);
+u32 StartFieldEffectForEventObject(u8, struct EventObject*);
+u8 sub_81546C8(u8, u8, u8, s16, s16);
+void sub_8155F80(struct Sprite*);
+void oamc_shadow(struct Sprite*);
+void unc_grass_normal(struct Sprite*);
+void sub_81561D0(struct Sprite*);
+void sub_8155460(struct Sprite*);
+void sub_8155658(struct Sprite*);
+void sub_8156194(struct Sprite*);
+void sub_8154C60(struct Sprite*);
+void sub_8154D90(struct Sprite*);
+void unc_grass_tall(struct Sprite*);
+void sub_81559BC(struct Sprite*);
+void sub_8155C88(struct Sprite*);
+void sub_8154A10(struct Sprite*);
+void sub_8155158(struct Sprite*);
+void sub_8155AEC(struct Sprite*);
+void sub_8155E50(struct Sprite*);
 
 #endif //GUARD_FIELD_EFFECT_HELPERS_H
diff --git a/include/field_ground_effect.h b/include/field_ground_effect.h
deleted file mode 100644
index 89b14aed1..000000000
--- a/include/field_ground_effect.h
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// Created by scott on 9/6/2017.
-//
-
-#ifndef GUARD_FIELD_GROUND_EFFECT_H
-#define GUARD_FIELD_GROUND_EFFECT_H
-
-// Exported type declarations
-
-// Exported RAM declarations
-
-// Exported ROM declarations
-u8 ZCoordToPriority(u8);
-void FieldObjectUpdateZCoord(struct MapObject *pObject);
-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 *);
-
-#endif //GUARD_FIELD_GROUND_EFFECT_H
diff --git a/include/field_map_obj.h b/include/field_map_obj.h
deleted file mode 100644
index 1bf3915e1..000000000
--- a/include/field_map_obj.h
+++ /dev/null
@@ -1,103 +0,0 @@
-#ifndef GUARD_FIELD_MAP_OBJ_H
-#define GUARD_FIELD_MAP_OBJ_H
-
-#define NUM_OBJECT_GRAPHICS_INFO 239
-#define SPRITE_VAR 240
-
-// Exported struct declarations
-
-enum SpinnerRunnerFollowPatterns {
-    RUNFOLLOW_ANY,
-    RUNFOLLOW_NORTH_SOUTH,
-    RUNFOLLOW_EAST_WEST,
-    RUNFOLLOW_NORTH_WEST,
-    RUNFOLLOW_NORTH_EAST,
-    RUNFOLLOW_SOUTH_WEST,
-    RUNFOLLOW_SOUTH_EAST,
-    RUNFOLLOW_NORTH_SOUTH_WEST,
-    RUNFOLLOW_NORTH_SOUTH_EAST,
-    RUNFOLLOW_NORTH_EAST_WEST,
-    RUNFOLLOW_SOUTH_EAST_WEST
-};
-
-// Exported RAM declarations
-
-// Exported ROM declarations
-
-void sub_808D438(void);
-u8 get_go_image_anim_num(u8);
-u8 GetFieldObjectIdByLocalIdAndMap(u8, u8, u8);
-bool8 TryGetFieldObjectIdByLocalIdAndMap(u8, u8, u8, u8 *);
-u8 GetFieldObjectIdByXY(s16, s16);
-void FieldObjectSetDirection(struct MapObject *, u8);
-u8 sub_808D4F4(void);
-void RemoveFieldObjectByLocalIdAndMap(u8, u8, u8);
-void npc_load_two_palettes__no_record(u16, u8);
-void npc_load_two_palettes__and_record(u16, u8);
-void sub_808EBA8(u8, u8, u8, s16, s16);
-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);
-void sub_80930E0(s16 *, s16 *, s16, s16);
-void FieldObjectClearAnim(struct MapObject *);
-void FieldObjectClearAnimIfSpecialAnimActive(struct MapObject *);
-void SpawnFieldObjectsInView(s16, s16);
-u8 sprite_new(u8, u8, s16, s16, u8, u8);
-u8 AddPseudoFieldObject(u16, void (*)(struct Sprite *), s16, s16, u8);
-u8 show_sprite(u8, u8, u8);
-u8 SpawnSpecialFieldObjectParametrized(u8, u8, u8, s16, s16, u8);
-u8 SpawnSpecialFieldObject(struct MapObjectTemplate *);
-void sub_8093038(s16, s16, s16 *, s16 *);
-void CameraObjectReset1(void);
-void FieldObjectSetGraphicsId(struct MapObject *, u8);
-void FieldObjectTurn(struct MapObject *, u8);
-void FieldObjectTurnByLocalIdAndMap(u8, u8, u8, u8);
-const struct MapObjectGraphicsInfo *GetFieldObjectGraphicsInfo(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_808E7E4(u8, u8, u8);
-void sub_808E78C(u8, u8, u8, u8);
-void sub_808E75C(s16, s16);
-void FieldObjectGetLocalIdAndMap(struct MapObject *mapObject, void *localId, void *mapNum, void *mapGroup);
-void npc_coords_shift(struct MapObject *, s16, s16);
-void sub_808EB08(struct MapObject *, s16, s16);
-void sub_808F254(u8, u8, u8);
-void FieldObjectStep(struct MapObject *, struct Sprite *, bool8(struct MapObject *, struct Sprite *));
-u8 FieldObjectFaceOppositeDirection(struct MapObject *, 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);
-void MoveCoords(u8, s16 *, s16 *);
-bool8 FieldObjectIsSpecialAnimActive(struct MapObject *);
-u8 FieldObjectClearAnimIfSpecialAnimFinished(struct MapObject *);
-u8 GetFieldObjectIdByXYZ(u16 x, u16 y, u8 z);
-void npc_set_running_behaviour_etc(struct MapObject *mapObject, u8 animPattern);
-u8 npc_running_behaviour_by_direction(u8 direction);
-const u8 *GetFieldObjectScriptPointerByFieldObjectId(u8 mapObjectId);
-u8 sub_8092C8C(struct MapObject *mapObject, s16 x, s16 y, u8 direction);
-u8 GetFaceDirectionAnimId(u32);
-u8 GetGoSpeed0AnimId(u32);
-u8 sub_80934BC(u32);
-bool8 FieldObjectSetSpecialAnim(struct MapObject *mapObject, u8 specialAnimId);
-bool8 FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(struct MapObject *mapObject);
-u8 FieldObjectCheckIfSpecialAnimFinishedOrInactive(struct MapObject *mapObject);
-void sub_808F23C(const struct MapObject *mapObject, u8 movementType);
-void sub_808F208(const struct MapObject *mapObject);
-void npc_coords_shift_still(struct MapObject *pObject);
-void FieldObjectMoveDestCoords(struct MapObject *pObject, u32 unk_19, s16 *pInt, s16 *pInt1);
-u8 AddCameraObject(u8 linkedSpriteId);
-void UpdateFieldObjectsForCameraUpdate(s16 x, s16 y);
-u8 GetSimpleGoAnimId(u32);
-u8 sub_8093514(u32);
-
-// Exported data declarations
-
-extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[];
-
-#endif //GUARD_FIELD_MAP_OBJ_H
diff --git a/include/field_map_obj_helpers.h b/include/field_map_obj_helpers.h
deleted file mode 100644
index 2e9f1d0cc..000000000
--- a/include/field_map_obj_helpers.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef GUARD_FIELD_MAP_OBJ_HELPERS_H
-#define GUARD_FIELD_MAP_OBJ_HELPERS_H
-
-// Exported type declarations
-
-// Exported RAM declarations
-extern u8 *gUnknown_020375B8;
-
-// Exported ROM declarations
-void sub_8097AC8(struct Sprite *);
-void npc_sync_anim_pause_bits(struct MapObject *);
-void oamt_npc_ministep_reset(struct Sprite *, u8, u8);
-u8 sub_8097F78(struct MapObject *);
-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 *);
-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_8098044(u8);
-void UnfreezeMapObjects(void);
-void FreezeMapObjectsExceptOne(u8 mapObjectId);
-void sub_8097B78(u8, u8);
-void sub_8098074(u8 var1, u8 var2);
-void FreezeMapObjects(void);
-bool8 FreezeMapObject(struct MapObject *mapObject);
-
-
-#endif //GUARD_FIELD_MAP_OBJ_HELPERS_H
diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h
index 0b9ea385c..8cd6c275b 100644
--- a/include/field_player_avatar.h
+++ b/include/field_player_avatar.h
@@ -8,9 +8,9 @@ u8 GetPlayerAvatarGenderByGraphicsId(u8);
 bool8 TestPlayerAvatarFlags(u8);
 u8 GetPlayerAvatarObjectId(void);
 void PlayerGetDestCoords(s16 *, s16 *);
-u8 player_get_direction_lower_nybble(void);
-u8 player_get_direction_upper_nybble(void);
-u8 player_get_x22(void);
+u8 GetPlayerFacingDirection(void);
+u8 GetPlayerMovementDirection(void);
+u8 PlayerGetCopyableMovement(void);
 void PlayerGoSpeed1(u8);
 void PlayerGoSpeed2(u8);
 void PlayerGoSpeed3(u8);
@@ -29,7 +29,7 @@ void PlayerAcroTurnJump(u8 a);
 void PlayerSetAnimId(u8 a, u8 b);
 bool8 IsPlayerCollidingWithFarawayIslandMew(u8 direction);
 void PlayerOnBikeCollideWithFarawayIslandMew(u8 direction);
-u8 CheckForFieldObjectCollision(struct MapObject *a, s16 b, s16 c, u8 d, u8 e);
+u8 CheckForEventObjectCollision(struct EventObject *a, s16 b, s16 c, u8 d, u8 e);
 u8 PlayerGetZCoord(void);
 void SetPlayerAvatarTransitionFlags(u16 a);
 void sub_808BCE8(void);
@@ -43,6 +43,6 @@ void sub_808C114(void);
 u8 GetPlayerAvatarGraphicsIdByCurrentState(void);
 void SetPlayerAvatarStateMask(u8 a);
 u8 GetPlayerAvatarGraphicsIdByStateId(u8 a);
-u8 sub_8093540(u32);
+u8 GetJumpSpecialMovementAction(u32);
 
 #endif // GUARD_FIELD_PLAYER_AVATAR_H
diff --git a/include/fieldmap.h b/include/fieldmap.h
index 699595580..01218493a 100644
--- a/include/fieldmap.h
+++ b/include/fieldmap.h
@@ -14,6 +14,7 @@ int CanCameraMoveInDirection(int direction);
 u16 GetBehaviorByMetatileId(u16 metatileId);
 void sav1_camera_get_focus_coords(u16 *x, u16 *y);
 u8 MapGridGetMetatileLayerTypeAt(s32 x, s32 y);
+u8 MapGridGetZCoordAt(int x, int y);
 u8 CameraMove(s32 deltaX, s32 deltaY);
 void mapheader_copy_mapdata_with_padding(struct MapHeader *mapHeader);
 void map_copy_with_padding(u16 *map, u16 width, u16 height);
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index 94127c554..7b38f9ddc 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -1,7 +1,7 @@
 #ifndef GUARD_GLOBAL_FIELDMAP_H
 #define GUARD_GLOBAL_FIELDMAP_H
 
-#define NUM_FIELD_OBJECTS 16
+#define NUM_EVENT_OBJECTS 16
 
 enum
 {
@@ -72,7 +72,7 @@ struct BackupMapData
     u16 *map;
 };
 
-struct MapObjectTemplate
+struct EventObjectTemplate
 {
     /*0x00*/ u8 localId;
     /*0x01*/ u8 graphicsId;
@@ -81,14 +81,12 @@ struct MapObjectTemplate
     /*0x06*/ s16 y;
     /*0x08*/ u8 elevation;
     /*0x09*/ u8 movementType;
-    /*0x0A*/ u8 unkA_0:4;
-             u8 unkA_4:4;
-    ///*0x0B*/ u8 fillerB[1];
-    /*0x0C*/ u16 unkC;
-    /*0x0E*/ u16 unkE;
+    /*0x0A*/ u8 movementRangeX:4;
+             u8 movementRangeY:4;
+    /*0x0C*/ u16 trainerType;
+    /*0x0E*/ u16 trainerRange_berryTreeId;
     /*0x10*/ const u8 *script;
     /*0x14*/ u16 flagId;
-    /*0x16*/ u8 filler_16[2];
 };  /*size = 0x18*/
 
 struct WarpEvent
@@ -135,12 +133,12 @@ struct BgEvent
 
 struct MapEvents
 {
-    u8 mapObjectCount;
+    u8 eventObjectCount;
     u8 warpCount;
     u8 coordEventCount;
     u8 bgEventCount;
 
-    struct MapObjectTemplate *mapObjects;
+    struct EventObjectTemplate *eventObjects;
     struct WarpEvent *warps;
     struct CoordEvent *coordEvents;
     struct BgEvent *bgEvents;
@@ -178,54 +176,50 @@ struct MapHeader
     /* 0x1B */ u8 battleType;
 };
 
-struct MapObject
+struct EventObject
 {
     /*0x00*/ u32 active:1;
-             u32 mapobj_bit_1:1;
-             u32 mapobj_bit_2:1;
-             u32 mapobj_bit_3:1;
-             u32 mapobj_bit_4:1;
-             u32 mapobj_bit_5:1;
-             u32 mapobj_bit_6:1;
-             u32 mapobj_bit_7:1;
-    /*0x01*/ u32 mapobj_bit_8:1;
-             u32 mapobj_bit_9:1;
-             u32 mapobj_bit_10:1;
-             u32 mapobj_bit_11:1;
-             u32 mapobj_bit_12:1;
-             u32 mapobj_bit_13:1;
-             u32 mapobj_bit_14:1;
-             u32 mapobj_bit_15:1;
-    /*0x02*/ u32 mapobj_bit_16:1;
-             u32 mapobj_bit_17:1;
-             u32 mapobj_bit_18:1;
-             u32 mapobj_bit_19:1;
-             u32 mapobj_bit_20:1;
-             u32 mapobj_bit_21:1;
-             u32 mapobj_bit_22:1;
-             u32 mapobj_bit_23:1;
-    /*0x03*/ u32 mapobj_bit_24:1;
-             u32 mapobj_bit_25:1;
-             u32 mapobj_bit_26:1;
-             u32 mapobj_bit_27:1;
-             u32 mapobj_bit_28:1;
-             u32 mapobj_bit_29:1;
-             u32 mapobj_bit_30:1;
-             u32 mapobj_bit_31:1;
+             u32 singleMovementActive:1;
+             u32 triggerGroundEffectsOnMove:1;
+             u32 triggerGroundEffectsOnStop:1;
+             u32 disableCoveringGroundEffects:1;
+             u32 landingJump:1;
+             u32 heldMovementActive:1;
+             u32 heldMovementFinished:1;
+    /*0x01*/ u32 frozen:1;
+             u32 facingDirectionLocked:1;
+             u32 disableAnim:1;
+             u32 enableAnim:1;
+             u32 inanimate:1;
+             u32 invisible:1;
+             u32 offScreen:1;
+             u32 trackedByCamera:1;
+    /*0x02*/ u32 isPlayer:1;
+             u32 hasReflection:1;
+             u32 inShortGrass:1;
+             u32 inShallowFlowingWater:1;
+             u32 inSandPile:1;
+             u32 inHotSprings:1;
+             u32 hasShadow:1;
+             u32 spriteAnimPausedBackup:1;
+    /*0x03*/ u32 spriteAffineAnimPausedBackup:1;
+             u32 disableJumpLandingGroundEffect:1;
+             u32 fixedPriority:1;
+             u32 unk3_3:1;
     /*0x04*/ u8 spriteId;
     /*0x05*/ u8 graphicsId;
-    /*0x06*/ u8 animPattern;
+    /*0x06*/ u8 movementType;
     /*0x07*/ u8 trainerType;
     /*0x08*/ u8 localId;
     /*0x09*/ u8 mapNum;
     /*0x0A*/ u8 mapGroup;
-    /*0x0B*/ u8 mapobj_unk_0B_0:4;
-             u8 elevation:4;
-    /*0x0C*/ struct Coords16 coords1;
-    /*0x10*/ struct Coords16 coords2;
-    /*0x14*/ struct Coords16 coords3;
-    /*0x18*/ u8 mapobj_unk_18:4;  // current direction?
-    /*0x18*/ u8 placeholder18:4;
+    /*0x0B*/ u8 currentElevation:4;
+             u8 previousElevation:4;
+    /*0x0C*/ struct Coords16 initialCoords;
+    /*0x10*/ struct Coords16 currentCoords;
+    /*0x14*/ struct Coords16 previousCoords;
+    /*0x18*/ u8 facingDirection:4;  // current direction?
+    /*0x18*/ u8 movementDirection:4;
     /*0x19*/ union __attribute__((packed)) {
         u8 as_byte;
         struct __attribute__((packed)) {
@@ -233,19 +227,19 @@ struct MapObject
             u8 y:4;
         } __attribute__((aligned (1))) as_nybbles;
     } __attribute__((aligned (1))) range;
-    /*0x1A*/ u8 mapobj_unk_1A;
-    /*0x1B*/ u8 mapobj_unk_1B;
-    /*0x1C*/ u8 mapobj_unk_1C;
+    /*0x1A*/ u8 fieldEffectSpriteId;
+    /*0x1B*/ u8 warpArrowSpriteId;
+    /*0x1C*/ u8 movementActionId;
     /*0x1D*/ u8 trainerRange_berryTreeId;
-    /*0x1E*/ u8 mapobj_unk_1E;
-    /*0x1F*/ u8 mapobj_unk_1F;
-    /*0x20*/ u8 mapobj_unk_20;
-    /*0x21*/ u8 mapobj_unk_21;
-    /*0x22*/ u8 animId;
+    /*0x1E*/ u8 currentMetatileBehavior;
+    /*0x1F*/ u8 previousMetatileBehavior;
+    /*0x20*/ u8 previousMovementDirection;
+    /*0x21*/ u8 directionSequenceIndex;
+    /*0x22*/ u8 playerCopyableMovement;
     /*size = 0x24*/
 };
 
-struct MapObjectGraphicsInfo
+struct EventObjectGraphicsInfo
 {
     /*0x00*/ u16 tileTag;
     /*0x02*/ u16 paletteTag1;
@@ -292,6 +286,10 @@ enum
     DIR_NORTH,
     DIR_WEST,
     DIR_EAST,
+    DIR_SOUTHWEST,
+    DIR_SOUTHEAST,
+    DIR_NORTHWEST,
+    DIR_NORTHEAST,
 };
 
 enum
@@ -322,7 +320,7 @@ struct PlayerAvatar
     /*0x02*/ u8 runningState; // this is a static running state. 00 is not moving, 01 is turn direction, 02 is moving.
     /*0x03*/ u8 tileTransitionState; // this is a transition running state: 00 is not moving, 01 is transition between tiles, 02 means you are on the frame in which you have centered on a tile but are about to keep moving, even if changing directions. 2 is also used for a ledge hop, since you are transitioning.
     /*0x04*/ u8 spriteId;
-    /*0x05*/ u8 mapObjectId;
+    /*0x05*/ u8 eventObjectId;
     /*0x06*/ bool8 preventStep;
     /*0x07*/ u8 gender;
     /*0x08*/ u8 acroBikeState; // 00 is normal, 01 is turning, 02 is standing wheelie, 03 is hopping wheelie
@@ -344,8 +342,8 @@ struct Camera
     s32 y;
 };
 
-extern struct MapObject gMapObjects[NUM_FIELD_OBJECTS];
-extern u8 gSelectedMapObject;
+extern struct EventObject gEventObjects[NUM_EVENT_OBJECTS];
+extern u8 gSelectedEventObject;
 extern struct MapHeader gMapHeader;
 extern struct PlayerAvatar gPlayerAvatar;
 extern struct Camera gCamera;
diff --git a/include/global.h b/include/global.h
index 4a0fdb70a..d26184270 100644
--- a/include/global.h
+++ b/include/global.h
@@ -101,7 +101,7 @@ enum LanguageId
 // capacities of various saveblock objects
 #define DAYCARE_MON_COUNT   2
 #define POKEBLOCKS_COUNT    40
-#define MAP_OBJECTS_COUNT   16
+#define EVENT_OBJECTS_COUNT   16
 #define BERRY_TREES_COUNT   128
 #define FLAGS_COUNT         300
 #define VARS_COUNT          256
@@ -796,8 +796,8 @@ struct SaveBlock1
     /*0x9C2*/ u8 field_9C2[6];
     /*0x9C8*/ u16 trainerRematchStepCounter;
     /*0x9CA*/ u8 trainerRematches[100];
-    /*0xA30*/ struct MapObject mapObjects[MAP_OBJECTS_COUNT];
-    /*0xC70*/ struct MapObjectTemplate mapObjectTemplates[64];
+    /*0xA30*/ struct EventObject eventObjects[EVENT_OBJECTS_COUNT];
+    /*0xC70*/ struct EventObjectTemplate eventObjectTemplates[64];
     /*0x1270*/ u8 flags[FLAGS_COUNT];
     /*0x139C*/ u16 vars[VARS_COUNT];
     /*0x159C*/ u32 gameStats[NUM_GAME_STATS];
diff --git a/include/load_save.h b/include/load_save.h
index 0868316c8..5fb5f6c42 100644
--- a/include/load_save.h
+++ b/include/load_save.h
@@ -22,8 +22,8 @@ void sub_8076D5C(void);
 void sav2_gender2_inplace_and_xFE(void);
 void SavePlayerParty(void);
 void LoadPlayerParty(void);
-void SaveMapObjects(void);
-void LoadMapObjects(void);
+void SaveEventObjects(void);
+void LoadEventObjects(void);
 void SaveSerializedGame(void);
 void LoadSerializedGame(void);
 void LoadPlayerBag(void);
diff --git a/include/map_obj_lock.h b/include/map_obj_lock.h
deleted file mode 100644
index a10648f2f..000000000
--- a/include/map_obj_lock.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef GUARD_MAP_OBJ_LOCK_H
-#define GUARD_MAP_OBJ_LOCK_H
-
-bool8 sub_80983C4(void);
-void ScriptFreezeMapObjects(void);
-bool8 sub_809847C(void);
-void LockSelectedMapObject(void);
-void sub_8098630(void);
-bool8 sub_8098734(void);
-
-#endif // GUARD_MAP_OBJ_LOCK_H
diff --git a/include/mauville_old_man.h b/include/mauville_old_man.h
index e318ac8bb..9d71e81aa 100644
--- a/include/mauville_old_man.h
+++ b/include/mauville_old_man.h
@@ -15,7 +15,7 @@ extern struct BardSong gBardSong;
 
 void SetMauvilleOldMan(void);
 u8 GetCurrentMauvilleOldMan(void);
-void ScrSpecial_SetMauvilleOldManMapObjGfx(void);
+void ScrSpecial_SetMauvilleOldManEventObjGfx(void);
 u8 sub_81201C8(void);
 void sub_8120B70(OldMan *dest);
 void sub_8120670(void);
diff --git a/include/metatile_behavior.h b/include/metatile_behavior.h
index d6743b788..4b9fd2488 100644
--- a/include/metatile_behavior.h
+++ b/include/metatile_behavior.h
@@ -1,7 +1,7 @@
 #ifndef GUARD_METATILE_BEHAVIOR
 #define GUARD_METATILE_BEHAVIOR
 
-bool8 ShouldDoJumpLandingDustEffect(u8);
+bool8 MetatileBehavior_IsATile(u8);
 bool8 MetatileBehavior_IsEncounterTile(u8);
 bool8 MetatileBehavior_IsJumpEast(u8);
 bool8 MetatileBehavior_IsJumpWest(u8);
diff --git a/include/overworld.h b/include/overworld.h
index 15d7bb362..a81f10b0d 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -7,17 +7,17 @@ struct UnkPlayerStruct
     u8 player_field_1;
 };
 
-struct LinkPlayerMapObject
+struct LinkPlayerEventObject
 {
     u8 active;
     u8 linkPlayerId;
-    u8 mapObjId;
+    u8 eventObjId;
     u8 mode;
 };
 
 // Exported RAM declarations
 extern struct WarpData gUnknown_020322DC;
-extern struct LinkPlayerMapObject gLinkPlayerMapObjects[4];
+extern struct LinkPlayerEventObject gLinkPlayerEventObjects[4];
 
 extern u16 *gBGTilemapBuffers1;
 extern u16 *gBGTilemapBuffers2;
@@ -37,10 +37,10 @@ void IncrementGameStat(u8 index);
 u32 GetGameStat(u8 index);
 void SetGameStat(u8 index, u32 value);
 void ApplyNewEncryptionKeyToGameStats(u32 newKey);
-void LoadMapObjTemplatesFromHeader(void);
-void LoadSaveblockMapObjScripts(void);
-void Overworld_SetMapObjTemplateCoords(u8 localId, s16 x, s16 y);
-void Overworld_SetMapObjTemplateMovementType(u8 localId, u8 movementType);
+void LoadEventObjTemplatesFromHeader(void);
+void LoadSaveblockEventObjScripts(void);
+void Overworld_SetEventObjTemplateCoords(u8 localId, s16 x, s16 y);
+void Overworld_SetEventObjTemplateMovementType(u8 localId, u8 movementType);
 const struct MapData *get_mapdata_header(void);
 void ApplyCurrentWarp(void);
 void set_warp2_warp3_to_neg_1(void);
@@ -141,6 +141,6 @@ bool32 sub_8087598(void);
 bool32 sub_80875C8(void);
 bool32 sub_8087634(void);
 bool32 sub_808766C(void);
-void ZeroAllLinkPlayerMapObjects(void);
+void ClearLinkPlayerEventObjects(void);
 
 #endif // GUARD_OVERWORLD_H
diff --git a/include/pokenav.h b/include/pokenav.h
index 42affc938..2bca4db94 100644
--- a/include/pokenav.h
+++ b/include/pokenav.h
@@ -21,6 +21,7 @@ void sub_81D1EC0(void);
 void sub_81D1D04(u8);
 bool8 sub_81D1C44(u8);
 void sub_81D5FB4(u16*);
+bool8 sub_81D4A58(struct EventObject*);
 
 
 #endif //GUARD_POKENAV_H
diff --git a/include/rom_81BE66C.h b/include/rom_81BE66C.h
index 5b4f80249..900daf4e7 100644
--- a/include/rom_81BE66C.h
+++ b/include/rom_81BE66C.h
@@ -6,7 +6,7 @@
 #define GUARD_ROM_81BE66C_H
 
 bool32 InTrainerHill(void);
-bool8 FieldObjectIsFarawayIslandMew(struct MapObject *);
+bool8 EventObjectIsFarawayIslandMew(struct EventObject *);
 u32 sub_81D427C(void);
 
 #endif //GUARD_ROM_81BE66C_H
diff --git a/include/trainer_see.h b/include/trainer_see.h
index 847380782..43f8b82d2 100644
--- a/include/trainer_see.h
+++ b/include/trainer_see.h
@@ -3,7 +3,7 @@
 
 struct ApproachingTrainer
 {
-    u8 mapObjectId;
+    u8 eventObjectId;
     u8 radius; // plus 1
     const u8 *trainerScriptPtr;
     u8 taskId;
@@ -17,14 +17,14 @@ extern u8 gUnknown_030060AC;
 extern u8 gApproachingTrainerId;
 
 bool8 CheckForTrainersWantingBattle(void);
-void sub_80B4578(struct MapObject *var);
+void sub_80B4578(struct EventObject *var);
 void EndTrainerApproach(void);
 void sub_80B45D0(void);
-u8 FldEff_ExclamationMarkIcon1(void);
-u8 FldEff_ExclamationMarkIcon2(void);
+u8 FldEff_ExclamationMarkIcon(void);
+u8 FldEff_QuestionMarkIcon(void);
 u8 FldEff_HeartIcon(void);
-u8 GetCurrentApproachingTrainerMapObjectId(void);
-u8 GetChosenApproachingTrainerMapObjectId(u8 arrayId);
+u8 GetCurrentApproachingTrainerEventObjectId(void);
+u8 GetChosenApproachingTrainerEventObjectId(u8 arrayId);
 void sub_80B4808(void);
 
 #endif // GUARD_TRAINER_SEE_H
diff --git a/ld_script.txt b/ld_script.txt
index f7e531fce..1949d0480 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -92,11 +92,9 @@ SECTIONS {
         src/field_camera.o(.text);
         src/field_door.o(.text);
         asm/field_player_avatar.o(.text);
-        src/field_map_obj.o(.text);
-        asm/field_ground_effect.o(.text);
-        src/field_map_obj_helpers.o(.text);
+        src/event_object_movement.o(.text);
         src/field_message_box.o(.text);
-        src/map_obj_lock.o(.text);
+        src/event_obj_lock.o(.text);
         src/text_window.o(.text);
         src/script.o(.text);
         src/scrcmd.o(.text);
@@ -397,9 +395,7 @@ SECTIONS {
         src/metatile_behavior.o(.rodata);
         src/field_door.o(.rodata);
         data/field_player_avatar.o(.rodata);
-        data/field_map_obj.o(.rodata);
-        data/field_ground_effect.o(.rodata);
-        data/map_obj_8097404.o(.rodata);
+        src/event_object_movement.o(.rodata);
         src/text_window.o(.rodata);
         src/scrcmd.o(.rodata);
         src/coord_event_weather.o(.rodata);
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 48a2ef257..ccc36b7c2 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -21,7 +21,7 @@
 #include "constants/items.h"
 #include "palette.h"
 #include "window.h"
-#include "field_map_obj.h"
+#include "event_object_movement.h"
 #include "event_scripts.h"
 #include "trainer_see.h"
 #include "field_message_box.h"
@@ -32,7 +32,6 @@
 #include "overworld.h"
 #include "field_weather.h"
 #include "gym_leader_rematch.h"
-#include "field_map_obj_helpers.h"
 
 enum
 {
@@ -63,8 +62,8 @@ extern void sub_80EECC8(void);
 extern void sub_80AF6F0(void);
 extern u16 sub_81A9AA8(u8 localId);
 extern u16 sub_81D6180(u8 localId);
-extern bool8 GetBattlePyramidTrainerFlag(u8 mapObjId);
-extern bool8 GetTrainerHillTrainerFlag(u8 mapObjId);
+extern bool8 GetBattlePyramidTrainerFlag(u8 eventObjId);
+extern bool8 GetTrainerHillTrainerFlag(u8 eventObjId);
 extern bool8 sub_81D5C18(void);
 extern void sub_816306C(u8 a0);
 extern void sub_8163048(u8 a0);
@@ -102,7 +101,7 @@ EWRAM_DATA static u16 sTrainerBattleMode = 0;
 EWRAM_DATA u16 gTrainerBattleOpponent_A = 0;
 EWRAM_DATA u16 gTrainerBattleOpponent_B = 0;
 EWRAM_DATA u16 gPartnerTrainerId = 0;
-EWRAM_DATA static u16 sTrainerMapObjectLocalId = 0;
+EWRAM_DATA static u16 sTrainerEventObjectLocalId = 0;
 EWRAM_DATA static u8 *sTrainerAIntroSpeech = NULL;
 EWRAM_DATA static u8 *sTrainerBIntroSpeech = NULL;
 EWRAM_DATA static u8 *sTrainerADefeatSpeech = NULL;
@@ -156,7 +155,7 @@ static const struct TrainerBattleParameter sOrdinaryBattleParams[] =
 {
     {&sTrainerBattleMode,           TRAINER_PARAM_LOAD_VAL_8BIT},
     {&gTrainerBattleOpponent_A,     TRAINER_PARAM_LOAD_VAL_16BIT},
-    {&sTrainerMapObjectLocalId,     TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerEventObjectLocalId,     TRAINER_PARAM_LOAD_VAL_16BIT},
     {&sTrainerAIntroSpeech,         TRAINER_PARAM_LOAD_VAL_32BIT},
     {&sTrainerADefeatSpeech,        TRAINER_PARAM_LOAD_VAL_32BIT},
     {&sTrainerVictorySpeech,        TRAINER_PARAM_CLEAR_VAL_32BIT},
@@ -169,7 +168,7 @@ static const struct TrainerBattleParameter sContinueScriptBattleParams[] =
 {
     {&sTrainerBattleMode,           TRAINER_PARAM_LOAD_VAL_8BIT},
     {&gTrainerBattleOpponent_A,     TRAINER_PARAM_LOAD_VAL_16BIT},
-    {&sTrainerMapObjectLocalId,     TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerEventObjectLocalId,     TRAINER_PARAM_LOAD_VAL_16BIT},
     {&sTrainerAIntroSpeech,         TRAINER_PARAM_LOAD_VAL_32BIT},
     {&sTrainerADefeatSpeech,        TRAINER_PARAM_LOAD_VAL_32BIT},
     {&sTrainerVictorySpeech,        TRAINER_PARAM_CLEAR_VAL_32BIT},
@@ -182,7 +181,7 @@ static const struct TrainerBattleParameter sDoubleBattleParams[] =
 {
     {&sTrainerBattleMode,           TRAINER_PARAM_LOAD_VAL_8BIT},
     {&gTrainerBattleOpponent_A,     TRAINER_PARAM_LOAD_VAL_16BIT},
-    {&sTrainerMapObjectLocalId,     TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerEventObjectLocalId,     TRAINER_PARAM_LOAD_VAL_16BIT},
     {&sTrainerAIntroSpeech,         TRAINER_PARAM_LOAD_VAL_32BIT},
     {&sTrainerADefeatSpeech,        TRAINER_PARAM_LOAD_VAL_32BIT},
     {&sTrainerVictorySpeech,        TRAINER_PARAM_CLEAR_VAL_32BIT},
@@ -195,7 +194,7 @@ static const struct TrainerBattleParameter sOrdinaryNoIntroBattleParams[] =
 {
     {&sTrainerBattleMode,           TRAINER_PARAM_LOAD_VAL_8BIT},
     {&gTrainerBattleOpponent_A,     TRAINER_PARAM_LOAD_VAL_16BIT},
-    {&sTrainerMapObjectLocalId,     TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerEventObjectLocalId,     TRAINER_PARAM_LOAD_VAL_16BIT},
     {&sTrainerAIntroSpeech,         TRAINER_PARAM_CLEAR_VAL_32BIT},
     {&sTrainerADefeatSpeech,        TRAINER_PARAM_LOAD_VAL_32BIT},
     {&sTrainerVictorySpeech,        TRAINER_PARAM_CLEAR_VAL_32BIT},
@@ -208,7 +207,7 @@ static const struct TrainerBattleParameter sContinueScriptDoubleBattleParams[] =
 {
     {&sTrainerBattleMode,           TRAINER_PARAM_LOAD_VAL_8BIT},
     {&gTrainerBattleOpponent_A,     TRAINER_PARAM_LOAD_VAL_16BIT},
-    {&sTrainerMapObjectLocalId,     TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerEventObjectLocalId,     TRAINER_PARAM_LOAD_VAL_16BIT},
     {&sTrainerAIntroSpeech,         TRAINER_PARAM_LOAD_VAL_32BIT},
     {&sTrainerADefeatSpeech,        TRAINER_PARAM_LOAD_VAL_32BIT},
     {&sTrainerVictorySpeech,        TRAINER_PARAM_CLEAR_VAL_32BIT},
@@ -221,7 +220,7 @@ static const struct TrainerBattleParameter sTrainerBOrdinaryBattleParams[] =
 {
     {&sTrainerBattleMode,           TRAINER_PARAM_LOAD_VAL_8BIT},
     {&gTrainerBattleOpponent_B,     TRAINER_PARAM_LOAD_VAL_16BIT},
-    {&sTrainerMapObjectLocalId,     TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerEventObjectLocalId,     TRAINER_PARAM_LOAD_VAL_16BIT},
     {&sTrainerBIntroSpeech,         TRAINER_PARAM_LOAD_VAL_32BIT},
     {&sTrainerBDefeatSpeech,        TRAINER_PARAM_LOAD_VAL_32BIT},
     {&sTrainerVictorySpeech,        TRAINER_PARAM_CLEAR_VAL_32BIT},
@@ -234,7 +233,7 @@ static const struct TrainerBattleParameter sTrainerBContinueScriptBattleParams[]
 {
     {&sTrainerBattleMode,           TRAINER_PARAM_LOAD_VAL_8BIT},
     {&gTrainerBattleOpponent_B,     TRAINER_PARAM_LOAD_VAL_16BIT},
-    {&sTrainerMapObjectLocalId,     TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerEventObjectLocalId,     TRAINER_PARAM_LOAD_VAL_16BIT},
     {&sTrainerBIntroSpeech,         TRAINER_PARAM_LOAD_VAL_32BIT},
     {&sTrainerBDefeatSpeech,        TRAINER_PARAM_LOAD_VAL_32BIT},
     {&sTrainerVictorySpeech,        TRAINER_PARAM_CLEAR_VAL_32BIT},
@@ -388,7 +387,7 @@ void BattleSetup_StartBattlePikeWildBattle(void)
 static void DoStandardWildBattle(void)
 {
     ScriptContext2_Enable();
-    FreezeMapObjects();
+    FreezeEventObjects();
     sub_808BCF4();
     gMain.savedCallback = CB2_EndWildBattle;
     gBattleTypeFlags = 0;
@@ -407,7 +406,7 @@ static void DoStandardWildBattle(void)
 void BattleSetup_StartRoamerBattle(void)
 {
     ScriptContext2_Enable();
-    FreezeMapObjects();
+    FreezeEventObjects();
     sub_808BCF4();
     gMain.savedCallback = CB2_EndWildBattle;
     gBattleTypeFlags = BATTLE_TYPE_ROAMER;
@@ -421,7 +420,7 @@ void BattleSetup_StartRoamerBattle(void)
 static void DoSafariBattle(void)
 {
     ScriptContext2_Enable();
-    FreezeMapObjects();
+    FreezeEventObjects();
     sub_808BCF4();
     gMain.savedCallback = CB2_EndSafariBattle;
     gBattleTypeFlags = BATTLE_TYPE_SAFARI;
@@ -431,7 +430,7 @@ static void DoSafariBattle(void)
 static void DoBattlePikeWildBattle(void)
 {
     ScriptContext2_Enable();
-    FreezeMapObjects();
+    FreezeEventObjects();
     sub_808BCF4();
     gMain.savedCallback = CB2_EndWildBattle;
     gBattleTypeFlags = BATTLE_TYPE_PIKE;
@@ -1012,7 +1011,7 @@ static void InitTrainerBattleVariables(void)
         sTrainerBDefeatSpeech = NULL;
         sTrainerBBattleScriptRetAddr = NULL;
     }
-    sTrainerMapObjectLocalId = 0;
+    sTrainerEventObjectLocalId = 0;
     sTrainerVictorySpeech = NULL;
     sTrainerCannotBattleSpeech = NULL;
     sTrainerBattleEndScript = NULL;
@@ -1075,10 +1074,10 @@ static void TrainerBattleLoadArgs(const struct TrainerBattleParameter *specs, co
 
 void SetMapVarsToTrainer(void)
 {
-    if (sTrainerMapObjectLocalId != 0)
+    if (sTrainerEventObjectLocalId != 0)
     {
-        gSpecialVar_LastTalked = sTrainerMapObjectLocalId;
-        gSelectedMapObject = GetFieldObjectIdByLocalIdAndMap(sTrainerMapObjectLocalId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
+        gSpecialVar_LastTalked = sTrainerEventObjectLocalId;
+        gSelectedEventObject = GetEventObjectIdByLocalIdAndMap(sTrainerEventObjectLocalId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
     }
 }
 
@@ -1172,19 +1171,19 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data)
     }
 }
 
-void ConfigureAndSetUpOneTrainerBattle(u8 trainerMapObjId, const u8 *trainerScript)
+void ConfigureAndSetUpOneTrainerBattle(u8 trainerEventObjId, const u8 *trainerScript)
 {
-    gSelectedMapObject = trainerMapObjId;
-    gSpecialVar_LastTalked = gMapObjects[trainerMapObjId].localId;
+    gSelectedEventObject = trainerEventObjId;
+    gSpecialVar_LastTalked = gEventObjects[trainerEventObjId].localId;
     BattleSetup_ConfigureTrainerBattle(trainerScript + 1);
     ScriptContext1_SetupScript(EventScript_271354);
     ScriptContext2_Enable();
 }
 
-void ConfigureTwoTrainersBattle(u8 trainerMapObjId, const u8 *trainerScript)
+void ConfigureTwoTrainersBattle(u8 trainerEventObjId, const u8 *trainerScript)
 {
-    gSelectedMapObject = trainerMapObjId;
-    gSpecialVar_LastTalked = gMapObjects[trainerMapObjId].localId;
+    gSelectedEventObject = trainerEventObjId;
+    gSpecialVar_LastTalked = gEventObjects[trainerEventObjId].localId;
     BattleSetup_ConfigureTrainerBattle(trainerScript + 1);
 }
 
@@ -1202,9 +1201,9 @@ bool32 GetTrainerFlagFromScriptPointer(const u8 *data)
 
 void sub_80B16D8(void)
 {
-    struct MapObject *mapObject = &gMapObjects[gSelectedMapObject];
+    struct EventObject *eventObject = &gEventObjects[gSelectedEventObject];
 
-    npc_set_running_behaviour_etc(mapObject, npc_running_behaviour_by_direction(mapObject->mapobj_unk_18));
+    SetTrainerMovementType(eventObject, GetTrainerFacingDirectionMovementType(eventObject->facingDirection));
 }
 
 u8 GetTrainerBattleMode(void)
@@ -1215,9 +1214,9 @@ u8 GetTrainerBattleMode(void)
 bool8 GetTrainerFlag(void)
 {
     if (InBattlePyramid())
-        return GetBattlePyramidTrainerFlag(gSelectedMapObject);
+        return GetBattlePyramidTrainerFlag(gSelectedEventObject);
     else if (InTrainerHill())
-        return GetTrainerHillTrainerFlag(gSelectedMapObject);
+        return GetTrainerHillTrainerFlag(gSelectedEventObject);
     else
         return FlagGet(GetTrainerAFlag());
 }
@@ -1362,7 +1361,7 @@ void ShowTrainerIntroSpeech(void)
         if (gNoOfApproachingTrainers == 0 || gNoOfApproachingTrainers == 1)
             sub_81A9EDC(sub_81A9AA8(gSpecialVar_LastTalked));
         else
-            sub_81A9EDC(sub_81A9AA8(gMapObjects[gApproachingTrainers[gApproachingTrainerId].mapObjectId].localId));
+            sub_81A9EDC(sub_81A9AA8(gEventObjects[gApproachingTrainers[gApproachingTrainerId].eventObjectId].localId));
 
         sub_80982B8();
     }
@@ -1371,7 +1370,7 @@ void ShowTrainerIntroSpeech(void)
         if (gNoOfApproachingTrainers == 0 || gNoOfApproachingTrainers == 1)
             sub_81D572C(2, sub_81D6180(gSpecialVar_LastTalked));
         else
-            sub_81D572C(2, sub_81D6180(gMapObjects[gApproachingTrainers[gApproachingTrainerId].mapObjectId].localId));
+            sub_81D572C(2, sub_81D6180(gEventObjects[gApproachingTrainers[gApproachingTrainerId].eventObjectId].localId));
 
         sub_80982B8();
     }
diff --git a/src/battle_transition.c b/src/battle_transition.c
index 8b9b50140..41729eec9 100644
--- a/src/battle_transition.c
+++ b/src/battle_transition.c
@@ -59,7 +59,7 @@ typedef bool8 (*TransitionSpriteCallback)(struct Sprite *sprite);
 extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG0_Y;
 
-extern const struct OamData gFieldObjectBaseOam_32x32;
+extern const struct OamData gEventObjectBaseOam_32x32;
 
 extern void sub_80AC3D0(void);
 
@@ -753,7 +753,7 @@ static const struct SpriteTemplate gUnknown_085C8E68 =
 {
     .tileTag = 0xFFFF,
     .paletteTag = 4105,
-    .oam = &gFieldObjectBaseOam_32x32,
+    .oam = &gEventObjectBaseOam_32x32,
     .anims = sSpriteAnimTable_85C8E3C,
     .images = sSpriteImageTable_85C8E2C,
     .affineAnims = sSpriteAffineAnimTable_85C8E60,
@@ -820,7 +820,7 @@ static const struct SpriteTemplate sSpriteTemplate_85C8EBC =
     .callback = sub_8148380
 };
 
-static const u16 gFieldEffectObjectPalette10[] = INCBIN_U16("graphics/map_objects/palettes/field_effect_object_palette_10.gbapal");
+static const u16 gFieldEffectObjectPalette10[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_10.gbapal");
 
 const struct SpritePalette gFieldEffectObjectPaletteInfo10 =
 {
diff --git a/src/berry.c b/src/berry.c
index e128eb0ec..f8a0204c4 100644
--- a/src/berry.c
+++ b/src/berry.c
@@ -8,11 +8,11 @@
 #include "event_data.h"
 #include "fieldmap.h"
 
-extern u8 FieldObjectGetBerryTreeId(u8 mapObjectId);
+extern u8 EventObjectGetBerryTreeId(u8 eventObjectId);
 extern void sub_8092EF0(u8 mapId, u8 mapNumber, u8 mapGroup);
 extern void CB2_ChooseBerry(void);
-extern const u8* GetFieldObjectScriptPointerForComparison(void);
-extern bool8 sub_8092E9C(u8, u8, u8);
+extern const u8* GetEventObjectScriptPointerForComparison(void);
+extern bool8 IsBerryTreeSparkling(u8, u8, u8);
 
 extern u16 gSpecialVar_ItemId;
 
@@ -904,9 +904,9 @@ struct BerryTree *GetBerryTreeInfo(u8 id)
     return &gSaveBlock1Ptr->berryTrees[id];
 }
 
-bool32 FieldObjectInteractionWaterBerryTree(void)
+bool32 EventObjectInteractionWaterBerryTree(void)
 {
-    struct BerryTree *tree = GetBerryTreeInfo(FieldObjectGetBerryTreeId(gSelectedMapObject));
+    struct BerryTree *tree = GetBerryTreeInfo(EventObjectGetBerryTreeId(gSelectedEventObject));
 
     switch (tree->stage)
     {
@@ -930,8 +930,8 @@ bool32 FieldObjectInteractionWaterBerryTree(void)
 
 bool8 IsPlayerFacingPlantedBerryTree(void)
 {
-    if (GetFieldObjectScriptPointerForComparison() == BerryTreeScript
-     && GetStageByBerryTreeId(FieldObjectGetBerryTreeId(gSelectedMapObject)) == 0)
+    if (GetEventObjectScriptPointerForComparison() == BerryTreeScript
+     && GetStageByBerryTreeId(EventObjectGetBerryTreeId(gSelectedEventObject)) == 0)
         return TRUE;
     else
         return FALSE;
@@ -939,10 +939,10 @@ bool8 IsPlayerFacingPlantedBerryTree(void)
 
 bool8 TryToWaterBerryTree(void)
 {
-    if (GetFieldObjectScriptPointerForComparison() != BerryTreeScript)
+    if (GetEventObjectScriptPointerForComparison() != BerryTreeScript)
         return FALSE;
     else
-        return FieldObjectInteractionWaterBerryTree();
+        return EventObjectInteractionWaterBerryTree();
 }
 
 void ClearBerryTrees(void)
@@ -1152,7 +1152,7 @@ u16 GetStageDurationByBerryType(u8 berry)
     return GetBerryInfo(berry)->stageDuration * 60;
 }
 
-void FieldObjectInteractionGetBerryTreeData(void)
+void EventObjectInteractionGetBerryTreeData(void)
 {
     u8 id;
     u8 berry;
@@ -1160,13 +1160,13 @@ void FieldObjectInteractionGetBerryTreeData(void)
     u8 group;
     u8 num;
 
-    id = FieldObjectGetBerryTreeId(gSelectedMapObject);
+    id = EventObjectGetBerryTreeId(gSelectedEventObject);
     berry = GetBerryTypeByBerryTreeId(id);
     ResetBerryTreeSparkleFlag(id);
     unk = gSpecialVar_LastTalked;
     num = gSaveBlock1Ptr->location.mapNum;
     group = gSaveBlock1Ptr->location.mapGroup;
-    if (sub_8092E9C(unk, num, group))
+    if (IsBerryTreeSparkling(unk, num, group))
         gSpecialVar_0x8004 = 0xFF;
     else
         gSpecialVar_0x8004 = GetStageByBerryTreeId(id);
@@ -1175,15 +1175,15 @@ void FieldObjectInteractionGetBerryTreeData(void)
     GetBerryCountStringByBerryType(berry, gStringVar1, gSpecialVar_0x8006);
 }
 
-void FieldObjectInteractionGetBerryName(void)
+void EventObjectInteractionGetBerryName(void)
 {
-    u8 berryType = GetBerryTypeByBerryTreeId(FieldObjectGetBerryTreeId(gSelectedMapObject));
+    u8 berryType = GetBerryTypeByBerryTreeId(EventObjectGetBerryTreeId(gSelectedEventObject));
     GetBerryNameByBerryType(berryType, gStringVar1);
 }
 
-void FieldObjectInteractionGetBerryCountString(void)
+void EventObjectInteractionGetBerryCountString(void)
 {
-    u8 treeId = FieldObjectGetBerryTreeId(gSelectedMapObject);
+    u8 treeId = EventObjectGetBerryTreeId(gSelectedEventObject);
     u8 berry = GetBerryTypeByBerryTreeId(treeId);
     u8 count = GetBerryCountByBerryTreeId(treeId);
     GetBerryCountStringByBerryType(berry, gStringVar1, count);
@@ -1194,25 +1194,25 @@ void Bag_ChooseBerry(void)
     SetMainCallback2(CB2_ChooseBerry);
 }
 
-void FieldObjectInteractionPlantBerryTree(void)
+void EventObjectInteractionPlantBerryTree(void)
 {
     u8 berry = ItemIdToBerryType(gSpecialVar_ItemId);
 
-    PlantBerryTree(FieldObjectGetBerryTreeId(gSelectedMapObject), berry, 1, TRUE);
-    FieldObjectInteractionGetBerryTreeData();
+    PlantBerryTree(EventObjectGetBerryTreeId(gSelectedEventObject), berry, 1, TRUE);
+    EventObjectInteractionGetBerryTreeData();
 }
 
-void FieldObjectInteractionPickBerryTree(void)
+void EventObjectInteractionPickBerryTree(void)
 {
-    u8 id = FieldObjectGetBerryTreeId(gSelectedMapObject);
+    u8 id = EventObjectGetBerryTreeId(gSelectedEventObject);
     u8 berry = GetBerryTypeByBerryTreeId(id);
 
     gSpecialVar_0x8004 = AddBagItem(BerryTypeToItemId(berry), GetBerryCountByBerryTreeId(id));
 }
 
-void FieldObjectInteractionRemoveBerryTree(void)
+void EventObjectInteractionRemoveBerryTree(void)
 {
-    RemoveBerryTree(FieldObjectGetBerryTreeId(gSelectedMapObject));
+    RemoveBerryTree(EventObjectGetBerryTreeId(gSelectedEventObject));
     sub_8092EF0(gSpecialVar_LastTalked, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
 }
 
@@ -1236,14 +1236,14 @@ void ResetBerryTreeSparkleFlags(void)
     top = cam_top + 3;
     right = cam_left + 14;
     bottom = top + 8;
-    for (i = 0; i < MAP_OBJECTS_COUNT; i++)
+    for (i = 0; i < EVENT_OBJECTS_COUNT; i++)
     {
-        if (gMapObjects[i].active && gMapObjects[i].animPattern == 12)
+        if (gEventObjects[i].active && gEventObjects[i].movementType == 12)
         {
-            cam_left = gMapObjects[i].coords2.x;
-            cam_top = gMapObjects[i].coords2.y;
+            cam_left = gEventObjects[i].currentCoords.x;
+            cam_top = gEventObjects[i].currentCoords.y;
             if (left <= cam_left && cam_left <= right && top <= cam_top && cam_top <= bottom)
-                ResetBerryTreeSparkleFlag(gMapObjects[i].trainerRange_berryTreeId);
+                ResetBerryTreeSparkleFlag(gEventObjects[i].trainerRange_berryTreeId);
         }
     }
 }
diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c
index 9a6e78c81..a755f4f44 100644
--- a/src/berry_tag_screen.c
+++ b/src/berry_tag_screen.c
@@ -2,7 +2,7 @@
 #include "berry_tag_screen.h"
 #include "berry.h"
 #include "decompress.h"
-#include "field_map_obj.h"
+#include "event_object_movement.h"
 #include "item_menu.h"
 #include "constants/items.h"
 #include "item.h"
diff --git a/src/bike.c b/src/bike.c
index e827707cd..87110b87b 100644
--- a/src/bike.c
+++ b/src/bike.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "bike.h"
-#include "field_map_obj.h"
+#include "event_object_movement.h"
 #include "field_player_avatar.h"
 #include "fieldmap.h"
 #include "constants/flags.h"
@@ -56,7 +56,7 @@ static void Bike_UpdateDirTimerHistory(u8);
 static void Bike_UpdateABStartSelectHistory(u8);
 static u8 Bike_DPadToDirection(u16);
 static u8 get_some_collision(u8);
-static u8 Bike_CheckCollisionTryAdvanceCollisionCount(struct MapObject *, s16, s16, u8, u8);
+static u8 Bike_CheckCollisionTryAdvanceCollisionCount(struct EventObject *, s16, s16, u8, u8);
 static bool8 IsRunningDisallowedByMetatile(u8);
 static void Bike_TryAdvanceCyclingRoadCollisions();
 static u8 CanBikeFaceDirOnMetatile(u8, u8);
@@ -152,7 +152,7 @@ static void MovePlayerOnMachBike(u8 direction, u16 newKeys, u16 heldKeys)
 static u8 GetMachBikeTransition(u8 *dirTraveling)
 {
     // if the dir updated before this function, get the relevent new direction to check later.
-    u8 direction = player_get_direction_upper_nybble();
+    u8 direction = GetPlayerMovementDirection();
 
     // is the player standing still?
     if (*dirTraveling == 0)
@@ -196,31 +196,31 @@ static void MachBikeTransition_FaceDirection(u8 direction)
 
 static void MachBikeTransition_TurnDirection(u8 direction)
 {
-    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
 
-    if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E))
+    if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior))
     {
         PlayerTurnInPlace(direction);
         Bike_SetBikeStill();
     }
     else
     {
-        MachBikeTransition_FaceDirection(playerMapObj->mapobj_unk_18);
+        MachBikeTransition_FaceDirection(playerEventObj->facingDirection);
     }
 }
 
 static void MachBikeTransition_TrySpeedUp(u8 direction)
 {
-    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
     u8 collision;
 
-    if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E) == FALSE)
+    if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == FALSE)
     {
         // we cannot go forward, so either slow down or, if we are stopped, idle face direction.
         if (gPlayerAvatar.bikeSpeed)
-            MachBikeTransition_TrySlowDown(playerMapObj->placeholder18);
+            MachBikeTransition_TrySlowDown(playerEventObj->movementDirection);
         else
-            MachBikeTransition_FaceDirection(playerMapObj->placeholder18);
+            MachBikeTransition_FaceDirection(playerEventObj->movementDirection);
     }
     else
     {
@@ -296,7 +296,7 @@ static u8 CheckMovementInputAcroBike(u8 *newDirection, u16 newKeys, u16 heldKeys
 
 static u8 AcroBikeHandleInputNormal(u8 *newDirection, u16 newKeys, u16 heldKeys)
 {
-    u8 direction = player_get_direction_upper_nybble();
+    u8 direction = GetPlayerMovementDirection();
 
     gPlayerAvatar.bikeFrameCounter = 0;
     if (*newDirection == DIR_NONE)
@@ -349,7 +349,7 @@ static u8 AcroBikeHandleInputTurning(u8 *newDirection, u16 newKeys, u16 heldKeys
         Bike_SetBikeStill();
         return ACRO_TRANS_TURN_DIRECTION;
     }
-    direction = player_get_direction_upper_nybble();
+    direction = GetPlayerMovementDirection();
     if (*newDirection == AcroBike_GetJumpDirection())
     {
         Bike_SetBikeStill(); // Bike_SetBikeStill sets speed to standing, but the next line immediately overrides it. could have just reset acroBikeState to 0 here instead of wasting a jump.
@@ -376,10 +376,10 @@ static u8 AcroBikeHandleInputTurning(u8 *newDirection, u16 newKeys, u16 heldKeys
 static u8 AcroBikeHandleInputWheelieStanding(u8 *newDirection, u16 newKeys, u16 heldKeys)
 {
     u8 direction;
-    struct MapObject *playerMapObj;
+    struct EventObject *playerEventObj;
 
-    direction = player_get_direction_upper_nybble();
-    playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    direction = GetPlayerMovementDirection();
+    playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
     gPlayerAvatar.runningState = NOT_MOVING;
 
     if (heldKeys & B_BUTTON)
@@ -388,7 +388,7 @@ static u8 AcroBikeHandleInputWheelieStanding(u8 *newDirection, u16 newKeys, u16
     {
         // B button was released.
         gPlayerAvatar.bikeFrameCounter = 0;
-        if (!MetatileBehavior_IsBumpySlope(playerMapObj->mapobj_unk_1E))
+        if (!MetatileBehavior_IsBumpySlope(playerEventObj->currentMetatileBehavior))
         {
             // Go back to normal on flat ground
             *newDirection = direction;
@@ -423,15 +423,15 @@ static u8 AcroBikeHandleInputWheelieStanding(u8 *newDirection, u16 newKeys, u16
 static u8 AcroBikeHandleInputBunnyHop(u8 *newDirection, u16 newKeys, u16 heldKeys)
 {
     u8 direction;
-    struct MapObject *playerMapObj;
+    struct EventObject *playerEventObj;
 
-    direction = player_get_direction_upper_nybble();
-    playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    direction = GetPlayerMovementDirection();
+    playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
     if (!(heldKeys & B_BUTTON))
     {
         // B button was released
         Bike_SetBikeStill();
-        if (MetatileBehavior_IsBumpySlope(playerMapObj->mapobj_unk_1E))
+        if (MetatileBehavior_IsBumpySlope(playerEventObj->currentMetatileBehavior))
         {
             // even though B was released, dont undo the wheelie on the bumpy slope.
             gPlayerAvatar.acroBikeState = ACRO_STATE_WHEELIE_STANDING;
@@ -470,15 +470,15 @@ static u8 AcroBikeHandleInputBunnyHop(u8 *newDirection, u16 newKeys, u16 heldKey
 static u8 AcroBikeHandleInputWheelieMoving(u8 *newDirection, u16 newKeys, u16 heldKeys)
 {
     u8 direction;
-    struct MapObject *playerMapObj;
+    struct EventObject *playerEventObj;
 
-    direction = player_get_direction_lower_nybble();
-    playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    direction = GetPlayerFacingDirection();
+    playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
     if (!(heldKeys & B_BUTTON))
     {
         // we were moving on a wheelie, but we let go while moving. reset bike still status
         Bike_SetBikeStill();
-        if (!MetatileBehavior_IsBumpySlope(playerMapObj->mapobj_unk_1E))
+        if (!MetatileBehavior_IsBumpySlope(playerEventObj->currentMetatileBehavior))
         {
             // we let go of B and arent on a bumpy slope, set state to normal because now we need to handle this
             gPlayerAvatar.acroBikeState = ACRO_STATE_NORMAL;
@@ -524,10 +524,10 @@ static u8 AcroBikeHandleInputWheelieMoving(u8 *newDirection, u16 newKeys, u16 he
 
 static u8 AcroBikeHandleInputSidewaysJump(u8 *ptr, u16 newKeys, u16 heldKeys)
 {
-    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
 
-    playerMapObj->mapobj_bit_9 = 0;
-    FieldObjectSetDirection(playerMapObj, playerMapObj->mapobj_unk_18);
+    playerEventObj->facingDirectionLocked = 0;
+    SetEventObjectDirection(playerEventObj, playerEventObj->facingDirection);
     gPlayerAvatar.acroBikeState = ACRO_STATE_NORMAL;
     return CheckMovementInputAcroBike(ptr, newKeys, heldKeys);
 }
@@ -545,21 +545,21 @@ static void AcroBikeTransition_FaceDirection(u8 direction)
 
 static void AcroBikeTransition_TurnDirection(u8 direction)
 {
-    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
 
-    if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E) == 0)
-        direction = playerMapObj->placeholder18;
+    if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0)
+        direction = playerEventObj->movementDirection;
     PlayerFaceDirection(direction);
 }
 
 static void AcroBikeTransition_Moving(u8 direction)
 {
     u8 collision;
-    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
 
-    if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E) == 0)
+    if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0)
     {
-        AcroBikeTransition_FaceDirection(playerMapObj->placeholder18);
+        AcroBikeTransition_FaceDirection(playerEventObj->movementDirection);
         return;
     }
     collision = get_some_collision(direction);
@@ -580,48 +580,48 @@ static void AcroBikeTransition_Moving(u8 direction)
 
 static void AcroBikeTransition_NormalToWheelie(u8 direction)
 {
-    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
 
-    if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E) == 0)
-        direction = playerMapObj->placeholder18;
+    if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0)
+        direction = playerEventObj->movementDirection;
     PlayerStartWheelie(direction);
 }
 
 static void AcroBikeTransition_WheelieToNormal(u8 direction)
 {
-    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
 
-    if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E) == 0)
-        direction = playerMapObj->placeholder18;
+    if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0)
+        direction = playerEventObj->movementDirection;
     PlayerEndWheelie(direction);
 }
 
 static void AcroBikeTransition_WheelieIdle(u8 direction)
 {
-    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
 
-    if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E) == 0)
-        direction = playerMapObj->placeholder18;
+    if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0)
+        direction = playerEventObj->movementDirection;
     PlayerIdleWheelie(direction);
 }
 
 static void AcroBikeTransition_WheelieHoppingStanding(u8 direction)
 {
-    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
 
-    if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E) == 0)
-        direction = playerMapObj->placeholder18;
+    if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0)
+        direction = playerEventObj->movementDirection;
     PlayerStandingHoppingWheelie(direction);
 }
 
 static void AcroBikeTransition_WheelieHoppingMoving(u8 direction)
 {
     u8 collision;
-    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
 
-    if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E) == 0)
+    if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0)
     {
-        AcroBikeTransition_WheelieHoppingStanding(playerMapObj->placeholder18);
+        AcroBikeTransition_WheelieHoppingStanding(playerEventObj->movementDirection);
         return;
     }
     collision = get_some_collision(direction);
@@ -651,7 +651,7 @@ static void AcroBikeTransition_WheelieHoppingMoving(u8 direction)
 static void AcroBikeTransition_SideJump(u8 direction)
 {
     u8 collision;
-    struct MapObject *playerMapObj;
+    struct EventObject *playerEventObj;
 
     collision = get_some_collision(direction);
     if (collision != 0)
@@ -669,10 +669,10 @@ static void AcroBikeTransition_SideJump(u8 direction)
             return;
         }
     }
-    playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
     PlaySE(SE_JITE_PYOKO);
-    playerMapObj->mapobj_bit_9 = 1;
-    PlayerSetAnimId(sub_8093514(direction), 2);
+    playerEventObj->facingDirectionLocked = 1;
+    PlayerSetAnimId(GetJumpMovementAction(direction), 2);
 }
 
 static void AcroBikeTransition_TurnJump(u8 direction)
@@ -683,11 +683,11 @@ static void AcroBikeTransition_TurnJump(u8 direction)
 static void AcroBikeTransition_WheelieMoving(u8 direction)
 {
     u8 collision;
-    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
 
-    if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E) == 0)
+    if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0)
     {
-        PlayerIdleWheelie(playerMapObj->placeholder18);
+        PlayerIdleWheelie(playerEventObj->movementDirection);
         return;
     }
     collision = get_some_collision(direction);
@@ -703,7 +703,7 @@ static void AcroBikeTransition_WheelieMoving(u8 direction)
         }
         else if (collision <= 4)
         {
-            if (MetatileBehavior_IsBumpySlope(playerMapObj->mapobj_unk_1E))
+            if (MetatileBehavior_IsBumpySlope(playerEventObj->currentMetatileBehavior))
                 PlayerIdleWheelie(direction);
             else
                 sub_808B980(direction);  //hit wall?
@@ -717,11 +717,11 @@ static void AcroBikeTransition_WheelieMoving(u8 direction)
 static void AcroBikeTransition_WheelieRisingMoving(u8 direction)
 {
     u8 collision;
-    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
 
-    if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E) == 0)
+    if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0)
     {
-        PlayerStartWheelie(playerMapObj->placeholder18);
+        PlayerStartWheelie(playerEventObj->movementDirection);
         return;
     }
     collision = get_some_collision(direction);
@@ -737,7 +737,7 @@ static void AcroBikeTransition_WheelieRisingMoving(u8 direction)
         }
         else if (collision <= 4)
         {
-            if (MetatileBehavior_IsBumpySlope(playerMapObj->mapobj_unk_1E))
+            if (MetatileBehavior_IsBumpySlope(playerEventObj->currentMetatileBehavior))
                 PlayerIdleWheelie(direction);
             else
                 sub_808B980(direction);  //hit wall?
@@ -751,11 +751,11 @@ static void AcroBikeTransition_WheelieRisingMoving(u8 direction)
 static void AcroBikeTransition_WheelieLoweringMoving(u8 direction)
 {
     u8 collision;
-    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
 
-    if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E) == 0)
+    if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0)
     {
-        PlayerEndWheelie(playerMapObj->placeholder18);
+        PlayerEndWheelie(playerEventObj->movementDirection);
         return;
     }
     collision = get_some_collision(direction);
@@ -880,18 +880,18 @@ static u8 get_some_collision(u8 direction)
     s16 x;
     s16 y;
     u8 metatitleBehavior;
-    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
 
-    x = playerMapObj->coords2.x;
-    y = playerMapObj->coords2.y;
+    x = playerEventObj->currentCoords.x;
+    y = playerEventObj->currentCoords.y;
     MoveCoords(direction, &x, &y);
     metatitleBehavior = MapGridGetMetatileBehaviorAt(x, y);
-    return Bike_CheckCollisionTryAdvanceCollisionCount(playerMapObj, x, y, direction, metatitleBehavior);
+    return Bike_CheckCollisionTryAdvanceCollisionCount(playerEventObj, x, y, direction, metatitleBehavior);
 }
 
-static u8 Bike_CheckCollisionTryAdvanceCollisionCount(struct MapObject *mapObject, s16 x, s16 y, u8 direction, u8 metatitleBehavior)
+static u8 Bike_CheckCollisionTryAdvanceCollisionCount(struct EventObject *eventObject, s16 x, s16 y, u8 direction, u8 metatitleBehavior)
 {
-    u8 collision = CheckForFieldObjectCollision(mapObject, x, y, direction, metatitleBehavior);
+    u8 collision = CheckForEventObjectCollision(eventObject, x, y, direction, metatitleBehavior);
 
     if (collision > 4)
         return collision;
@@ -979,7 +979,7 @@ bool8 IsBikingDisallowedByPlayer(void)
 
 bool8 player_should_look_direction_be_enforced_upon_movement(void)
 {
-    if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_ACRO_BIKE) != FALSE && MetatileBehavior_IsBumpySlope(gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1E) != FALSE)
+    if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_ACRO_BIKE) != FALSE && MetatileBehavior_IsBumpySlope(gEventObjects[gPlayerAvatar.eventObjectId].currentMetatileBehavior) != FALSE)
         return FALSE;
     else
         return TRUE;
@@ -1062,7 +1062,7 @@ void Bike_HandleBumpySlopeJump(void)
         if (MetatileBehavior_IsBumpySlope(tileBehavior))
         {
             gPlayerAvatar.acroBikeState = ACRO_STATE_WHEELIE_STANDING;
-            sub_808C1B4(player_get_direction_upper_nybble());
+            sub_808C1B4(GetPlayerMovementDirection());
         }
     }
 }
diff --git a/src/data/field_event_obj/base_oam.h b/src/data/field_event_obj/base_oam.h
new file mode 100755
index 000000000..1aa6987c3
--- /dev/null
+++ b/src/data/field_event_obj/base_oam.h
@@ -0,0 +1,52 @@
+#ifndef GUARD_BASE_OAM_H
+#define GUARD_BASE_OAM_H
+
+const struct OamData gEventObjectBaseOam_8x8 = {
+    .shape = 0,
+    .size = 0,
+    .priority = 2
+};
+
+const struct OamData gEventObjectBaseOam_16x8 = {
+    .shape = 1,
+    .size = 0,
+    .priority = 2
+};
+
+const struct OamData gEventObjectBaseOam_16x16 = {
+    .shape = 0,
+    .size = 1,
+    .priority = 2
+};
+
+const struct OamData gEventObjectBaseOam_32x8 = {
+    .shape = 1,
+    .size = 1,
+    .priority = 2
+};
+
+const struct OamData gEventObjectBaseOam_64x32 = {
+    .shape = 1,
+    .size = 3,
+    .priority = 2
+};
+
+const struct OamData gEventObjectBaseOam_16x32 = {
+    .shape = 2,
+    .size = 2,
+    .priority = 2
+};
+
+const struct OamData gEventObjectBaseOam_32x32 = {
+    .shape = 0,
+    .size = 2,
+    .priority = 2
+};
+
+const struct OamData gEventObjectBaseOam_64x64 = {
+    .shape = 0,
+    .size = 3,
+    .priority = 2
+};
+
+#endif //GUARD_BASE_OAM_H
diff --git a/src/data/field_event_obj/berry_tree_graphics_tables.h b/src/data/field_event_obj/berry_tree_graphics_tables.h
new file mode 100755
index 000000000..31d515a82
--- /dev/null
+++ b/src/data/field_event_obj/berry_tree_graphics_tables.h
@@ -0,0 +1,570 @@
+#ifndef GUARD_BERRY_TREE_GRAPHICS_TABLES_H
+#define GUARD_BERRY_TREE_GRAPHICS_TABLES_H
+
+const struct SpriteFrameImage gEventObjectPicTable_PechaBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_PechaBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_PechaBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_PechaBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_PechaBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_PechaBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_PechaBerryTree_5),
+};
+
+const u8 gBerryTreePaletteSlotTable_Pecha[] = {3, 4, 4, 4, 4};
+
+const struct SpriteFrameImage gEventObjectPicTable_KelpsyBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_5),
+};
+
+const u8 gBerryTreePaletteSlotTable_Kelpsy[] = {3, 4, 2, 2, 2};
+
+const struct SpriteFrameImage gEventObjectPicTable_WepearBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_WepearBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_WepearBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_WepearBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_WepearBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_WepearBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_WepearBerryTree_5),
+};
+
+const u8 gBerryTreePaletteSlotTable_Wepear[] = {3, 4, 2, 2, 2};
+
+const struct SpriteFrameImage gEventObjectPicTable_IapapaBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_IapapaBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_IapapaBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_IapapaBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_IapapaBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_IapapaBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_IapapaBerryTree_5),
+};
+
+const u8 gBerryTreePaletteSlotTable_Iapapa[] = {3, 4, 3, 3, 3};
+
+const struct SpriteFrameImage gEventObjectPicTable_CheriBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_CheriBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_CheriBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_CheriBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_CheriBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_CheriBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_CheriBerryTree_5),
+};
+
+const u8 gBerryTreePaletteSlotTable_Cheri[] = {3, 4, 4, 4, 4};
+
+const struct SpriteFrameImage gEventObjectPicTable_FigyBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_FigyBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_FigyBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_FigyBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_FigyBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_FigyBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_FigyBerryTree_5),
+};
+
+const u8 gBerryTreePaletteSlotTable_Figy[] = {3, 4, 3, 3, 3};
+
+const struct SpriteFrameImage gEventObjectPicTable_MagoBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_MagoBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_MagoBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_MagoBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_MagoBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_MagoBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_MagoBerryTree_5),
+};
+
+const u8 gBerryTreePaletteSlotTable_Mago[] = {3, 4, 3, 3, 3};
+
+const struct SpriteFrameImage gEventObjectPicTable_LumBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_LumBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_LumBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_LumBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_LumBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_LumBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_LumBerryTree_5),
+};
+
+const u8 gBerryTreePaletteSlotTable_Lum[] = {3, 4, 4, 4, 4};
+
+const struct SpriteFrameImage gEventObjectPicTable_RazzBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_RazzBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_RazzBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_RazzBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_RazzBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_RazzBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_RazzBerryTree_5),
+};
+
+const u8 gBerryTreePaletteSlotTable_Razz[] = {3, 4, 4, 4, 4};
+
+const struct SpriteFrameImage gEventObjectPicTable_GrepaBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_GrepaBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_GrepaBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_GrepaBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_GrepaBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_GrepaBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_GrepaBerryTree_5),
+};
+
+const u8 gBerryTreePaletteSlotTable_Grepa[] = {3, 4, 3, 3, 3};
+
+const struct SpriteFrameImage gEventObjectPicTable_RabutaBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_RabutaBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_RabutaBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_RabutaBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_RabutaBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_RabutaBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_RabutaBerryTree_5),
+};
+
+const u8 gBerryTreePaletteSlotTable_Rabuta[] = {3, 4, 4, 4, 4};
+
+const struct SpriteFrameImage gEventObjectPicTable_NomelBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_NomelBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_NomelBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_NomelBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_NomelBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_NomelBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_NomelBerryTree_5),
+};
+
+const u8 gBerryTreePaletteSlotTable_Nomel[] = {3, 4, 3, 3, 3};
+
+const struct SpriteFrameImage gEventObjectPicTable_LeppaBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_LeppaBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_LeppaBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_LeppaBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_LeppaBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_LeppaBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_LeppaBerryTree_5),
+};
+
+const u8 gBerryTreePaletteSlotTable_Leppa[] = {3, 4, 3, 3, 3};
+
+const struct SpriteFrameImage gEventObjectPicTable_LiechiBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_LiechiBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_LiechiBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_LiechiBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_LiechiBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_LiechiBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_LiechiBerryTree_5),
+};
+
+const u8 gBerryTreePaletteSlotTable_Liechi[] = {3, 4, 4, 4, 4};
+
+const struct SpriteFrameImage gEventObjectPicTable_HondewBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_HondewBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_HondewBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_HondewBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_HondewBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_HondewBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_HondewBerryTree_5),
+};
+
+const u8 gBerryTreePaletteSlotTable_Hondew[] = {3, 4, 5, 5, 5};
+
+const struct SpriteFrameImage gEventObjectPicTable_AguavBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_AguavBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_AguavBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_AguavBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_AguavBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_AguavBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_AguavBerryTree_5),
+};
+
+const u8 gBerryTreePaletteSlotTable_Aguav[] = {3, 4, 4, 4, 4};
+
+const struct SpriteFrameImage gEventObjectPicTable_WikiBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_WikiBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_WikiBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_WikiBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_WikiBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_WikiBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_WikiBerryTree_5),
+};
+
+const u8 gBerryTreePaletteSlotTable_Wiki[] = {3, 4, 3, 3, 3};
+
+const struct SpriteFrameImage gEventObjectPicTable_PomegBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_PomegBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_PomegBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_PomegBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_PomegBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_PomegBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_PomegBerryTree_5),
+};
+
+const u8 gBerryTreePaletteSlotTable_Pomeg[] = {3, 4, 3, 3, 3};
+
+const struct SpriteFrameImage gEventObjectPicTable_RawstBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_RawstBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_RawstBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_RawstBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_RawstBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_RawstBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_RawstBerryTree_5),
+};
+
+const u8 gBerryTreePaletteSlotTable_Rawst[] = {3, 4, 4, 4, 4};
+
+const struct SpriteFrameImage gEventObjectPicTable_SpelonBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_SpelonBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_SpelonBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_SpelonBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_SpelonBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_SpelonBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_SpelonBerryTree_5),
+};
+
+const u8 gBerryTreePaletteSlotTable_Spelon[] = {3, 4, 3, 3, 3};
+
+const struct SpriteFrameImage gEventObjectPicTable_ChestoBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_ChestoBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_ChestoBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_ChestoBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_ChestoBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_ChestoBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_ChestoBerryTree_5),
+};
+
+const u8 gBerryTreePaletteSlotTable_Chesto[] = {3, 4, 2, 2, 2};
+
+const struct SpriteFrameImage gEventObjectPicTable_OranBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_OranBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_OranBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_OranBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_OranBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_OranBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_OranBerryTree_5),
+};
+
+const u8 gBerryTreePaletteSlotTable_Oran[] = {3, 4, 2, 2, 2};
+
+const struct SpriteFrameImage gEventObjectPicTable_PersimBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_PersimBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_PersimBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_PersimBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_PersimBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_PersimBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_PersimBerryTree_5),
+};
+
+const u8 gBerryTreePaletteSlotTable_Persim[] = {3, 4, 2, 2, 2};
+
+const struct SpriteFrameImage gEventObjectPicTable_SitrusBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_SitrusBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_SitrusBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_SitrusBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_SitrusBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_SitrusBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_SitrusBerryTree_5),
+};
+
+const u8 gBerryTreePaletteSlotTable_Sitrus[] = {3, 4, 4, 4, 4};
+
+const struct SpriteFrameImage gEventObjectPicTable_AspearBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_AspearBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_AspearBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_AspearBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_AspearBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_AspearBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_AspearBerryTree_5),
+};
+
+const u8 gBerryTreePaletteSlotTable_Aspear[] = {3, 4, 3, 3, 3};
+
+const struct SpriteFrameImage gEventObjectPicTable_PamtreBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_PamtreBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_PamtreBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_PamtreBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_PamtreBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_PamtreBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_PamtreBerryTree_5),
+};
+
+const u8 gBerryTreePaletteSlotTable_Pamtre[] = {3, 4, 2, 2, 2};
+
+const struct SpriteFrameImage gEventObjectPicTable_CornnBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_CornnBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_CornnBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_CornnBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_CornnBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_CornnBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_CornnBerryTree_5),
+};
+
+const u8 gBerryTreePaletteSlotTable_Cornn[] = {3, 4, 2, 2, 2};
+
+const struct SpriteFrameImage gEventObjectPicTable_LansatBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_LansatBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_LansatBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_LansatBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_LansatBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_LansatBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_LansatBerryTree_5),
+};
+
+const u8 gBerryTreePaletteSlotTable_Lansat[] = {3, 4, 2, 2, 2};
+
+const struct SpriteFrameImage gEventObjectPicTable_DurinBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_DurinBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_DurinBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_DurinBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_DurinBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_DurinBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_DurinBerryTree_5),
+};
+
+const u8 gBerryTreePaletteSlotTable_Durin[] = {3, 4, 4, 4, 4};
+
+const struct SpriteFrameImage gEventObjectPicTable_TamatoBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_TamatoBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_TamatoBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_TamatoBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_TamatoBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_TamatoBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_TamatoBerryTree_5),
+};
+
+const u8 gBerryTreePaletteSlotTable_Tamato[] = {3, 4, 2, 2, 2};
+
+const u8 gDeadBerryTreeEventObjectGraphicsIdTable[] = {EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES};
+
+const u8 gBerryTreeEventObjectGraphicsIdTable[] = {EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES};
+
+const struct SpriteFrameImage *const gBerryTreePicTablePointers[] = {
+    gEventObjectPicTable_CheriBerryTree,
+    gEventObjectPicTable_ChestoBerryTree,
+    gEventObjectPicTable_PechaBerryTree,
+    gEventObjectPicTable_RawstBerryTree,
+    gEventObjectPicTable_AspearBerryTree,
+    gEventObjectPicTable_LeppaBerryTree,
+    gEventObjectPicTable_OranBerryTree,
+    gEventObjectPicTable_PersimBerryTree,
+    gEventObjectPicTable_LumBerryTree,
+    gEventObjectPicTable_SitrusBerryTree,
+    gEventObjectPicTable_FigyBerryTree,
+    gEventObjectPicTable_WikiBerryTree,
+    gEventObjectPicTable_MagoBerryTree,
+    gEventObjectPicTable_AguavBerryTree,
+    gEventObjectPicTable_IapapaBerryTree,
+    gEventObjectPicTable_RazzBerryTree,
+    gEventObjectPicTable_RazzBerryTree,
+    gEventObjectPicTable_MagoBerryTree,
+    gEventObjectPicTable_WepearBerryTree,
+    gEventObjectPicTable_IapapaBerryTree,
+    gEventObjectPicTable_PomegBerryTree,
+    gEventObjectPicTable_KelpsyBerryTree,
+    gEventObjectPicTable_WepearBerryTree,
+    gEventObjectPicTable_HondewBerryTree,
+    gEventObjectPicTable_GrepaBerryTree,
+    gEventObjectPicTable_TamatoBerryTree,
+    gEventObjectPicTable_CornnBerryTree,
+    gEventObjectPicTable_PomegBerryTree,
+    gEventObjectPicTable_RabutaBerryTree,
+    gEventObjectPicTable_NomelBerryTree,
+    gEventObjectPicTable_SpelonBerryTree,
+    gEventObjectPicTable_PamtreBerryTree,
+    gEventObjectPicTable_RabutaBerryTree,
+    gEventObjectPicTable_DurinBerryTree,
+    gEventObjectPicTable_HondewBerryTree,
+    gEventObjectPicTable_LiechiBerryTree,
+    gEventObjectPicTable_HondewBerryTree,
+    gEventObjectPicTable_AguavBerryTree,
+    gEventObjectPicTable_PomegBerryTree,
+    gEventObjectPicTable_GrepaBerryTree,
+    gEventObjectPicTable_LansatBerryTree,
+    gEventObjectPicTable_CornnBerryTree,
+    gEventObjectPicTable_DurinBerryTree,
+};
+
+const u8 *const gBerryTreePaletteSlotTablePointers[] = {
+    gBerryTreePaletteSlotTable_Cheri,
+    gBerryTreePaletteSlotTable_Chesto,
+    gBerryTreePaletteSlotTable_Pecha,
+    gBerryTreePaletteSlotTable_Rawst,
+    gBerryTreePaletteSlotTable_Aspear,
+    gBerryTreePaletteSlotTable_Leppa,
+    gBerryTreePaletteSlotTable_Oran,
+    gBerryTreePaletteSlotTable_Persim,
+    gBerryTreePaletteSlotTable_Lum,
+    gBerryTreePaletteSlotTable_Sitrus,
+    gBerryTreePaletteSlotTable_Figy,
+    gBerryTreePaletteSlotTable_Wiki,
+    gBerryTreePaletteSlotTable_Mago,
+    gBerryTreePaletteSlotTable_Aguav,
+    gBerryTreePaletteSlotTable_Iapapa,
+    gBerryTreePaletteSlotTable_Razz,
+    gBerryTreePaletteSlotTable_Razz,
+    gBerryTreePaletteSlotTable_Mago,
+    gBerryTreePaletteSlotTable_Wepear,
+    gBerryTreePaletteSlotTable_Iapapa,
+    gBerryTreePaletteSlotTable_Pomeg,
+    gBerryTreePaletteSlotTable_Kelpsy,
+    gBerryTreePaletteSlotTable_Wepear,
+    gBerryTreePaletteSlotTable_Hondew,
+    gBerryTreePaletteSlotTable_Grepa,
+    gBerryTreePaletteSlotTable_Tamato,
+    gBerryTreePaletteSlotTable_Cornn,
+    gBerryTreePaletteSlotTable_Pomeg,
+    gBerryTreePaletteSlotTable_Rabuta,
+    gBerryTreePaletteSlotTable_Nomel,
+    gBerryTreePaletteSlotTable_Spelon,
+    gBerryTreePaletteSlotTable_Pamtre,
+    gBerryTreePaletteSlotTable_Rabuta,
+    gBerryTreePaletteSlotTable_Durin,
+    gBerryTreePaletteSlotTable_Hondew,
+    gBerryTreePaletteSlotTable_Liechi,
+    gBerryTreePaletteSlotTable_Hondew,
+    gBerryTreePaletteSlotTable_Aguav,
+    gBerryTreePaletteSlotTable_Pomeg,
+    gBerryTreePaletteSlotTable_Grepa,
+    gBerryTreePaletteSlotTable_Lansat,
+    gBerryTreePaletteSlotTable_Cornn,
+    gBerryTreePaletteSlotTable_Durin,
+};
+
+const u8 *const gBerryTreeEventObjectGraphicsIdTablePointers[] = {
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+    gBerryTreeEventObjectGraphicsIdTable,
+};
+
+
+#endif //GUARD_BERRY_TREE_GRAPHICS_TABLES_H
diff --git a/src/data/field_event_obj/event_object_anims.h b/src/data/field_event_obj/event_object_anims.h
new file mode 100755
index 000000000..9b897651d
--- /dev/null
+++ b/src/data/field_event_obj/event_object_anims.h
@@ -0,0 +1,1176 @@
+#ifndef GUARD_EVENT_OBJECT_ANIMS_H
+#define GUARD_EVENT_OBJECT_ANIMS_H
+
+const union AnimCmd gEventObjectImageAnim_StayStill[] =
+{
+    ANIMCMD_FRAME(0, 8),
+    ANIMCMD_FRAME(0, 8),
+    ANIMCMD_FRAME(0, 8),
+    ANIMCMD_FRAME(0, 8),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_QuintyPlumpFaceSouth[] =
+{
+    ANIMCMD_FRAME(0, 16),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_QuintyPlumpFaceNorth[] =
+{
+    ANIMCMD_FRAME(1, 16),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_QuintyPlumpFaceWest[] =
+{
+    ANIMCMD_FRAME(2, 16),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_QuintyPlumpFaceEast[] =
+{
+    ANIMCMD_FRAME(2, 16, .hFlip = TRUE),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoSouth[] =
+{
+    ANIMCMD_FRAME(3, 8),
+    ANIMCMD_FRAME(0, 8),
+    ANIMCMD_FRAME(3, 8, .hFlip = TRUE),
+    ANIMCMD_FRAME(0, 8),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoNorth[] =
+{
+    ANIMCMD_FRAME(4, 8),
+    ANIMCMD_FRAME(1, 8),
+    ANIMCMD_FRAME(4, 8, .hFlip = TRUE),
+    ANIMCMD_FRAME(1, 8),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoWest[] =
+{
+    ANIMCMD_FRAME(5, 8),
+    ANIMCMD_FRAME(2, 8),
+    ANIMCMD_FRAME(6, 8),
+    ANIMCMD_FRAME(2, 8),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoEast[] =
+{
+    ANIMCMD_FRAME(5, 8, .hFlip = TRUE),
+    ANIMCMD_FRAME(2, 8, .hFlip = TRUE),
+    ANIMCMD_FRAME(6, 8, .hFlip = TRUE),
+    ANIMCMD_FRAME(2, 8, .hFlip = TRUE),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastSouth[] =
+{
+    ANIMCMD_FRAME(3, 4),
+    ANIMCMD_FRAME(0, 4),
+    ANIMCMD_FRAME(3, 4, .hFlip = TRUE),
+    ANIMCMD_FRAME(0, 4),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastNorth[] =
+{
+    ANIMCMD_FRAME(4, 4),
+    ANIMCMD_FRAME(1, 4),
+    ANIMCMD_FRAME(4, 4, .hFlip = TRUE),
+    ANIMCMD_FRAME(1, 4),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastWest[] =
+{
+    ANIMCMD_FRAME(5, 4),
+    ANIMCMD_FRAME(2, 4),
+    ANIMCMD_FRAME(6, 4),
+    ANIMCMD_FRAME(2, 4),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastEast[] =
+{
+    ANIMCMD_FRAME(5, 4, .hFlip = TRUE),
+    ANIMCMD_FRAME(2, 4, .hFlip = TRUE),
+    ANIMCMD_FRAME(6, 4, .hFlip = TRUE),
+    ANIMCMD_FRAME(2, 4, .hFlip = TRUE),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFasterSouth[] =
+{
+    ANIMCMD_FRAME(3, 2),
+    ANIMCMD_FRAME(0, 2),
+    ANIMCMD_FRAME(3, 2, .hFlip = TRUE),
+    ANIMCMD_FRAME(0, 2),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFasterNorth[] =
+{
+    ANIMCMD_FRAME(4, 2),
+    ANIMCMD_FRAME(1, 2),
+    ANIMCMD_FRAME(4, 2, .hFlip = TRUE),
+    ANIMCMD_FRAME(1, 2),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFasterWest[] =
+{
+    ANIMCMD_FRAME(5, 2),
+    ANIMCMD_FRAME(2, 2),
+    ANIMCMD_FRAME(6, 2),
+    ANIMCMD_FRAME(2, 2),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFasterEast[] =
+{
+    ANIMCMD_FRAME(5, 2, .hFlip = TRUE),
+    ANIMCMD_FRAME(2, 2, .hFlip = TRUE),
+    ANIMCMD_FRAME(6, 2, .hFlip = TRUE),
+    ANIMCMD_FRAME(2, 2, .hFlip = TRUE),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastestSouth[] =
+{
+    ANIMCMD_FRAME(3, 1),
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_FRAME(3, 1, .hFlip = TRUE),
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastestNorth[] =
+{
+    ANIMCMD_FRAME(4, 1),
+    ANIMCMD_FRAME(1, 1),
+    ANIMCMD_FRAME(4, 1, .hFlip = TRUE),
+    ANIMCMD_FRAME(1, 1),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastestWest[] =
+{
+    ANIMCMD_FRAME(5, 1),
+    ANIMCMD_FRAME(2, 1),
+    ANIMCMD_FRAME(6, 1),
+    ANIMCMD_FRAME(2, 1),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastestEast[] =
+{
+    ANIMCMD_FRAME(5, 1, .hFlip = TRUE),
+    ANIMCMD_FRAME(2, 1, .hFlip = TRUE),
+    ANIMCMD_FRAME(6, 1, .hFlip = TRUE),
+    ANIMCMD_FRAME(2, 1, .hFlip = TRUE),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_FaceSouth[] =
+{
+    ANIMCMD_FRAME(0, 16),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_FaceNorth[] =
+{
+    ANIMCMD_FRAME(1, 16),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_FaceWest[] =
+{
+    ANIMCMD_FRAME(2, 16),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_FaceEast[] =
+{
+    ANIMCMD_FRAME(2, 16, .hFlip = TRUE),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_GoSouth[] =
+{
+    ANIMCMD_FRAME(3, 8),
+    ANIMCMD_FRAME(0, 8),
+    ANIMCMD_FRAME(4, 8),
+    ANIMCMD_FRAME(0, 8),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_GoNorth[] =
+{
+    ANIMCMD_FRAME(5, 8),
+    ANIMCMD_FRAME(1, 8),
+    ANIMCMD_FRAME(6, 8),
+    ANIMCMD_FRAME(1, 8),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_GoWest[] =
+{
+    ANIMCMD_FRAME(7, 8),
+    ANIMCMD_FRAME(2, 8),
+    ANIMCMD_FRAME(8, 8),
+    ANIMCMD_FRAME(2, 8),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_GoEast[] =
+{
+    ANIMCMD_FRAME(7, 8, .hFlip = TRUE),
+    ANIMCMD_FRAME(2, 8, .hFlip = TRUE),
+    ANIMCMD_FRAME(8, 8, .hFlip = TRUE),
+    ANIMCMD_FRAME(2, 8, .hFlip = TRUE),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_GoFastSouth[] =
+{
+    ANIMCMD_FRAME(3, 4),
+    ANIMCMD_FRAME(0, 4),
+    ANIMCMD_FRAME(4, 4),
+    ANIMCMD_FRAME(0, 4),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_GoFastNorth[] =
+{
+    ANIMCMD_FRAME(5, 4),
+    ANIMCMD_FRAME(1, 4),
+    ANIMCMD_FRAME(6, 4),
+    ANIMCMD_FRAME(1, 4),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_GoFastWest[] =
+{
+    ANIMCMD_FRAME(7, 4),
+    ANIMCMD_FRAME(2, 4),
+    ANIMCMD_FRAME(8, 4),
+    ANIMCMD_FRAME(2, 4),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_GoFastEast[] =
+{
+    ANIMCMD_FRAME(7, 4, .hFlip = TRUE),
+    ANIMCMD_FRAME(2, 4, .hFlip = TRUE),
+    ANIMCMD_FRAME(8, 4, .hFlip = TRUE),
+    ANIMCMD_FRAME(2, 4, .hFlip = TRUE),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_GoFasterSouth[] =
+{
+    ANIMCMD_FRAME(3, 2),
+    ANIMCMD_FRAME(0, 2),
+    ANIMCMD_FRAME(4, 2),
+    ANIMCMD_FRAME(0, 2),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_GoFasterNorth[] =
+{
+    ANIMCMD_FRAME(5, 2),
+    ANIMCMD_FRAME(1, 2),
+    ANIMCMD_FRAME(6, 2),
+    ANIMCMD_FRAME(1, 2),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_GoFasterWest[] =
+{
+    ANIMCMD_FRAME(7, 2),
+    ANIMCMD_FRAME(2, 2),
+    ANIMCMD_FRAME(8, 2),
+    ANIMCMD_FRAME(2, 2),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_GoFasterEast[] =
+{
+    ANIMCMD_FRAME(7, 2, .hFlip = TRUE),
+    ANIMCMD_FRAME(2, 2, .hFlip = TRUE),
+    ANIMCMD_FRAME(8, 2, .hFlip = TRUE),
+    ANIMCMD_FRAME(2, 2, .hFlip = TRUE),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_GoFastestSouth[] =
+{
+    ANIMCMD_FRAME(3, 1),
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_FRAME(4, 1),
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_GoFastestNorth[] =
+{
+    ANIMCMD_FRAME(5, 1),
+    ANIMCMD_FRAME(1, 1),
+    ANIMCMD_FRAME(6, 1),
+    ANIMCMD_FRAME(1, 1),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_GoFastestWest[] =
+{
+    ANIMCMD_FRAME(7, 1),
+    ANIMCMD_FRAME(2, 1),
+    ANIMCMD_FRAME(8, 1),
+    ANIMCMD_FRAME(2, 1),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_GoFastestEast[] =
+{
+    ANIMCMD_FRAME(7, 1, .hFlip = TRUE),
+    ANIMCMD_FRAME(2, 1, .hFlip = TRUE),
+    ANIMCMD_FRAME(8, 1, .hFlip = TRUE),
+    ANIMCMD_FRAME(2, 1, .hFlip = TRUE),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_RunSouth[] =
+{
+    ANIMCMD_FRAME(12, 5),
+    ANIMCMD_FRAME(9, 3),
+    ANIMCMD_FRAME(13, 5),
+    ANIMCMD_FRAME(9, 3),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_RunNorth[] =
+{
+    ANIMCMD_FRAME(14, 5),
+    ANIMCMD_FRAME(10, 3),
+    ANIMCMD_FRAME(15, 5),
+    ANIMCMD_FRAME(10, 3),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_RunWest[] =
+{
+    ANIMCMD_FRAME(16, 5),
+    ANIMCMD_FRAME(11, 3),
+    ANIMCMD_FRAME(17, 5),
+    ANIMCMD_FRAME(11, 3),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_RunEast[] =
+{
+    ANIMCMD_FRAME(16, 5, .hFlip = TRUE),
+    ANIMCMD_FRAME(11, 3, .hFlip = TRUE),
+    ANIMCMD_FRAME(17, 5, .hFlip = TRUE),
+    ANIMCMD_FRAME(11, 3, .hFlip = TRUE),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_FieldMove[] =
+{
+    ANIMCMD_FRAME(0, 4),
+    ANIMCMD_FRAME(1, 4),
+    ANIMCMD_FRAME(2, 4),
+    ANIMCMD_FRAME(3, 4),
+    ANIMCMD_FRAME(4, 8),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gEventObjectImageAnim_GetOnOffSurfBlobSouth[] =
+{
+    ANIMCMD_FRAME(9, 32),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_GetOnOffSurfBlobNorth[] =
+{
+    ANIMCMD_FRAME(10, 32),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_GetOnOffSurfBlobWest[] =
+{
+    ANIMCMD_FRAME(11, 32),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_GetOnOffSurfBlobEast[] =
+{
+    ANIMCMD_FRAME(11, 32, .hFlip = TRUE),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_BunnyHoppyBackWheelSouth[] =
+{
+    ANIMCMD_FRAME(9, 4),
+    ANIMCMD_FRAME(10, 4),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gEventObjectImageAnim_BunnyHoppyBackWheelNorth[] =
+{
+    ANIMCMD_FRAME(13, 4),
+    ANIMCMD_FRAME(14, 4),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gEventObjectImageAnim_BunnyHoppyBackWheelWest[] =
+{
+    ANIMCMD_FRAME(17, 4),
+    ANIMCMD_FRAME(18, 4),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gEventObjectImageAnim_BunnyHoppyBackWheelEast[] =
+{
+    ANIMCMD_FRAME(17, 4, .hFlip = TRUE),
+    ANIMCMD_FRAME(18, 4, .hFlip = TRUE),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gEventObjectImageAnim_BunnyHoppyFrontWheelSouth[] =
+{
+    ANIMCMD_FRAME(11, 4),
+    ANIMCMD_FRAME(12, 4),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gEventObjectImageAnim_BunnyHoppyFrontWheelNorth[] =
+{
+    ANIMCMD_FRAME(15, 4),
+    ANIMCMD_FRAME(16, 4),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gEventObjectImageAnim_BunnyHoppyFrontWheelWest[] =
+{
+    ANIMCMD_FRAME(19, 4),
+    ANIMCMD_FRAME(20, 4),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gEventObjectImageAnim_BunnyHoppyFrontWheelEast[] =
+{
+    ANIMCMD_FRAME(19, 4, .hFlip = TRUE),
+    ANIMCMD_FRAME(20, 4, .hFlip = TRUE),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gEventObjectImageAnim_StandingWheelieBackWheelSouth[] =
+{
+    ANIMCMD_FRAME(9, 4),
+    ANIMCMD_FRAME(0, 4),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gEventObjectImageAnim_StandingWheelieBackWheelNorth[] =
+{
+    ANIMCMD_FRAME(13, 4),
+    ANIMCMD_FRAME(1, 4),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gEventObjectImageAnim_StandingWheelieBackWheelWest[] =
+{
+    ANIMCMD_FRAME(17, 4),
+    ANIMCMD_FRAME(2, 4),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gEventObjectImageAnim_StandingWheelieBackWheelEast[] =
+{
+    ANIMCMD_FRAME(17, 4, .hFlip = TRUE),
+    ANIMCMD_FRAME(2, 4, .hFlip = TRUE),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gEventObjectImageAnim_StandingWheelieFrontWheelSouth[] =
+{
+    ANIMCMD_FRAME(11, 4),
+    ANIMCMD_FRAME(0, 4),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gEventObjectImageAnim_StandingWheelieFrontWheelNorth[] =
+{
+    ANIMCMD_FRAME(15, 4),
+    ANIMCMD_FRAME(1, 4),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gEventObjectImageAnim_StandingWheelieFrontWheelWest[] =
+{
+    ANIMCMD_FRAME(19, 4),
+    ANIMCMD_FRAME(2, 4),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gEventObjectImageAnim_StandingWheelieFrontWheelEast[] =
+{
+    ANIMCMD_FRAME(19, 4, .hFlip = TRUE),
+    ANIMCMD_FRAME(2, 4, .hFlip = TRUE),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gEventObjectImageAnim_MovingWheelieSouth[] =
+{
+    ANIMCMD_FRAME(21, 4),
+    ANIMCMD_FRAME(10, 4),
+    ANIMCMD_FRAME(22, 4),
+    ANIMCMD_FRAME(10, 4),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_MovingWheelieNorth[] =
+{
+    ANIMCMD_FRAME(23, 4),
+    ANIMCMD_FRAME(14, 4),
+    ANIMCMD_FRAME(24, 4),
+    ANIMCMD_FRAME(14, 4),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_MovingWheelieWest[] =
+{
+    ANIMCMD_FRAME(25, 4),
+    ANIMCMD_FRAME(18, 4),
+    ANIMCMD_FRAME(26, 4),
+    ANIMCMD_FRAME(18, 4),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_MovingWheelieEast[] =
+{
+    ANIMCMD_FRAME(25, 4, .hFlip = TRUE),
+    ANIMCMD_FRAME(18, 4, .hFlip = TRUE),
+    ANIMCMD_FRAME(26, 4, .hFlip = TRUE),
+    ANIMCMD_FRAME(18, 4, .hFlip = TRUE),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_BerryTreeStage0[] =
+{
+    ANIMCMD_FRAME(0, 32),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gEventObjectImageAnim_BerryTreeStage1[] =
+{
+    ANIMCMD_FRAME(1, 32),
+    ANIMCMD_FRAME(2, 32),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gEventObjectImageAnim_BerryTreeStage2[] =
+{
+    ANIMCMD_FRAME(3, 48),
+    ANIMCMD_FRAME(4, 48),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gEventObjectImageAnim_BerryTreeStage3[] =
+{
+    ANIMCMD_FRAME(5, 32),
+    ANIMCMD_FRAME(5, 32),
+    ANIMCMD_FRAME(6, 32),
+    ANIMCMD_FRAME(6, 32),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gEventObjectImageAnim_BerryTreeStage4[] =
+{
+    ANIMCMD_FRAME(7, 48),
+    ANIMCMD_FRAME(7, 48),
+    ANIMCMD_FRAME(8, 48),
+    ANIMCMD_FRAME(8, 48),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gEventObjectImageAnim_NurseBow[] =
+{
+    ANIMCMD_FRAME(0, 8),
+    ANIMCMD_FRAME(9, 32),
+    ANIMCMD_FRAME(0, 8),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gEventObjectImageAnim_RockBreak[] =
+{
+    ANIMCMD_FRAME(0, 8),
+    ANIMCMD_FRAME(1, 8),
+    ANIMCMD_FRAME(2, 8),
+    ANIMCMD_FRAME(3, 8),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gEventObjectImageAnim_TreeCut[] =
+{
+    ANIMCMD_FRAME(0, 6),
+    ANIMCMD_FRAME(1, 6),
+    ANIMCMD_FRAME(2, 6),
+    ANIMCMD_FRAME(3, 6),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gEventObjectImageAnim_TakeOutRodSouth[] =
+{
+    ANIMCMD_FRAME(8, 4),
+    ANIMCMD_FRAME(9, 4),
+    ANIMCMD_FRAME(10, 4),
+    ANIMCMD_FRAME(11, 4),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gEventObjectImageAnim_TakeOutRodNorth[] =
+{
+    ANIMCMD_FRAME(4, 4),
+    ANIMCMD_FRAME(5, 4),
+    ANIMCMD_FRAME(6, 4),
+    ANIMCMD_FRAME(7, 4),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gEventObjectImageAnim_TakeOutRodWest[] =
+{
+    ANIMCMD_FRAME(0, 4),
+    ANIMCMD_FRAME(1, 4),
+    ANIMCMD_FRAME(2, 4),
+    ANIMCMD_FRAME(3, 4),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gEventObjectImageAnim_TakeOutRodEast[] =
+{
+    ANIMCMD_FRAME(0, 4, .hFlip = TRUE),
+    ANIMCMD_FRAME(1, 4, .hFlip = TRUE),
+    ANIMCMD_FRAME(2, 4, .hFlip = TRUE),
+    ANIMCMD_FRAME(3, 4, .hFlip = TRUE),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gEventObjectImageAnim_PutAwayRodSouth[] =
+{
+    ANIMCMD_FRAME(11, 4),
+    ANIMCMD_FRAME(10, 6),
+    ANIMCMD_FRAME(9, 6),
+    ANIMCMD_FRAME(8, 6),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gEventObjectImageAnim_PutAwayRodNorth[] =
+{
+    ANIMCMD_FRAME(7, 4),
+    ANIMCMD_FRAME(6, 6),
+    ANIMCMD_FRAME(5, 6),
+    ANIMCMD_FRAME(4, 6),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gEventObjectImageAnim_PutAwayRodWest[] =
+{
+    ANIMCMD_FRAME(3, 4),
+    ANIMCMD_FRAME(2, 4),
+    ANIMCMD_FRAME(1, 4),
+    ANIMCMD_FRAME(0, 4),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gEventObjectImageAnim_PutAwayRodEast[] =
+{
+    ANIMCMD_FRAME(3, 4, .hFlip = TRUE),
+    ANIMCMD_FRAME(2, 4, .hFlip = TRUE),
+    ANIMCMD_FRAME(1, 4, .hFlip = TRUE),
+    ANIMCMD_FRAME(0, 4, .hFlip = TRUE),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gEventObjectImageAnim_HookedPokemonSouth[] =
+{
+    ANIMCMD_FRAME(10, 6),
+    ANIMCMD_FRAME(11, 6),
+    ANIMCMD_LOOP(1),
+    ANIMCMD_FRAME(11, 30),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_HookedPokemonNorth[] =
+{
+    ANIMCMD_FRAME(6, 6),
+    ANIMCMD_FRAME(7, 6),
+    ANIMCMD_LOOP(1),
+    ANIMCMD_FRAME(7, 30),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_HookedPokemonWest[] =
+{
+    ANIMCMD_FRAME(2, 6),
+    ANIMCMD_FRAME(3, 6),
+    ANIMCMD_LOOP(1),
+    ANIMCMD_FRAME(3, 30),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_HookedPokemonEast[] =
+{
+    ANIMCMD_FRAME(2, 6, .hFlip = TRUE),
+    ANIMCMD_FRAME(3, 6, .hFlip = TRUE),
+    ANIMCMD_LOOP(1),
+    ANIMCMD_FRAME(3, 30, .hFlip = TRUE),
+    ANIMCMD_JUMP(0),
+};
+
+const union AffineAnimCmd gEventObjectRotScalAnim_8508FD8[] =
+{
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 1),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1),
+    AFFINEANIMCMD_LOOP(7),
+    AFFINEANIMCMD_JUMP(0),
+};
+
+const union AffineAnimCmd gEventObjectRotScalAnim_8509008[] =
+{
+    AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 1),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1),
+    AFFINEANIMCMD_LOOP(15),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 1),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1),
+    AFFINEANIMCMD_LOOP(15),
+    AFFINEANIMCMD_JUMP(0),
+};
+
+const union AffineAnimCmd gEventObjectRotScalAnim_8509040[] =
+{
+    AFFINEANIMCMD_FRAME(0x100, 0x100, 10, 0),
+    AFFINEANIMCMD_END,
+};
+
+const union AffineAnimCmd gEventObjectRotScalAnim_8509050[] =
+{
+    AFFINEANIMCMD_FRAME(0x100, 0x100, 10, 0),
+    AFFINEANIMCMD_END,
+};
+
+const union AffineAnimCmd gEventObjectRotScalAnim_8509060[] =
+{
+    AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 1),
+    AFFINEANIMCMD_LOOP(8),
+    AFFINEANIMCMD_END,
+};
+
+const union AffineAnimCmd gEventObjectRotScalAnim_8509078[] =
+{
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 1),
+    AFFINEANIMCMD_LOOP(8),
+    AFFINEANIMCMD_END,
+};
+
+const union AnimCmd gEventObjectImageAnim_HoOhFlapWings[] =
+{
+    ANIMCMD_FRAME(3, 8),
+    ANIMCMD_FRAME(4, 8),
+    ANIMCMD_FRAME(3, 8),
+    ANIMCMD_FRAME(4, 8),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_HoOhStayStill[] =
+{
+    ANIMCMD_FRAME(3, 16),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd *const gEventObjectImageAnimTable_Inanimate[] = {
+    gEventObjectImageAnim_StayStill,
+};
+
+const union AnimCmd *const gEventObjectImageAnimTable_QuintyPlump[] = {
+    gEventObjectImageAnim_QuintyPlumpFaceSouth,
+    gEventObjectImageAnim_QuintyPlumpFaceNorth,
+    gEventObjectImageAnim_QuintyPlumpFaceWest,
+    gEventObjectImageAnim_QuintyPlumpFaceEast,
+    gEventObjectImageAnim_QuintyPlumpGoSouth,
+    gEventObjectImageAnim_QuintyPlumpGoNorth,
+    gEventObjectImageAnim_QuintyPlumpGoWest,
+    gEventObjectImageAnim_QuintyPlumpGoEast,
+    gEventObjectImageAnim_QuintyPlumpGoFastSouth,
+    gEventObjectImageAnim_QuintyPlumpGoFastNorth,
+    gEventObjectImageAnim_QuintyPlumpGoFastWest,
+    gEventObjectImageAnim_QuintyPlumpGoFastEast,
+    gEventObjectImageAnim_QuintyPlumpGoFasterSouth,
+    gEventObjectImageAnim_QuintyPlumpGoFasterNorth,
+    gEventObjectImageAnim_QuintyPlumpGoFasterWest,
+    gEventObjectImageAnim_QuintyPlumpGoFasterEast,
+    gEventObjectImageAnim_QuintyPlumpGoFastestSouth,
+    gEventObjectImageAnim_QuintyPlumpGoFastestNorth,
+    gEventObjectImageAnim_QuintyPlumpGoFastestWest,
+    gEventObjectImageAnim_QuintyPlumpGoFastestEast,
+};
+
+const union AnimCmd *const gEventObjectImageAnimTable_Standard[] = {
+    gEventObjectImageAnim_FaceSouth,
+    gEventObjectImageAnim_FaceNorth,
+    gEventObjectImageAnim_FaceWest,
+    gEventObjectImageAnim_FaceEast,
+    gEventObjectImageAnim_GoSouth,
+    gEventObjectImageAnim_GoNorth,
+    gEventObjectImageAnim_GoWest,
+    gEventObjectImageAnim_GoEast,
+    gEventObjectImageAnim_GoFastSouth,
+    gEventObjectImageAnim_GoFastNorth,
+    gEventObjectImageAnim_GoFastWest,
+    gEventObjectImageAnim_GoFastEast,
+    gEventObjectImageAnim_GoFasterSouth,
+    gEventObjectImageAnim_GoFasterNorth,
+    gEventObjectImageAnim_GoFasterWest,
+    gEventObjectImageAnim_GoFasterEast,
+    gEventObjectImageAnim_GoFastestSouth,
+    gEventObjectImageAnim_GoFastestNorth,
+    gEventObjectImageAnim_GoFastestWest,
+    gEventObjectImageAnim_GoFastestEast,
+};
+
+const union AnimCmd *const gEventObjectImageAnimTable_HoOh[] = {
+    gEventObjectImageAnim_FaceSouth,
+    gEventObjectImageAnim_FaceNorth,
+    gEventObjectImageAnim_FaceWest,
+    gEventObjectImageAnim_FaceEast,
+    gEventObjectImageAnim_HoOhFlapWings,
+    gEventObjectImageAnim_HoOhStayStill,
+    gEventObjectImageAnim_GoWest,
+    gEventObjectImageAnim_GoEast,
+    gEventObjectImageAnim_GoFastSouth,
+    gEventObjectImageAnim_GoFastNorth,
+    gEventObjectImageAnim_GoFastWest,
+    gEventObjectImageAnim_GoFastEast,
+    gEventObjectImageAnim_GoFasterSouth,
+    gEventObjectImageAnim_GoFasterNorth,
+    gEventObjectImageAnim_GoFasterWest,
+    gEventObjectImageAnim_GoFasterEast,
+    gEventObjectImageAnim_GoFastestSouth,
+    gEventObjectImageAnim_GoFastestNorth,
+    gEventObjectImageAnim_GoFastestWest,
+    gEventObjectImageAnim_GoFastestEast,
+};
+
+const union AnimCmd *const gEventObjectImageAnimTable_Groudon3[] = {
+    gEventObjectImageAnim_FaceSouth,
+    gEventObjectImageAnim_FaceNorth,
+    gEventObjectImageAnim_FaceWest,
+    gEventObjectImageAnim_FaceEast,
+    gEventObjectImageAnim_GoSouth,
+    gEventObjectImageAnim_GoEast,
+    gEventObjectImageAnim_GoWest,
+    gEventObjectImageAnim_GoEast,
+    gEventObjectImageAnim_GoFastSouth,
+    gEventObjectImageAnim_GoFastEast,
+    gEventObjectImageAnim_GoFastWest,
+    gEventObjectImageAnim_GoFastEast,
+    gEventObjectImageAnim_GoFasterSouth,
+    gEventObjectImageAnim_GoFasterEast,
+    gEventObjectImageAnim_GoFasterWest,
+    gEventObjectImageAnim_GoFasterEast,
+    gEventObjectImageAnim_GoFastestSouth,
+    gEventObjectImageAnim_GoFastestEast,
+    gEventObjectImageAnim_GoFastestWest,
+    gEventObjectImageAnim_GoFastestEast,
+};
+
+const union AnimCmd gEventObjectImageAnim_85091F0[] =
+{
+    ANIMCMD_FRAME(1, 1),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_85091F8[] =
+{
+    ANIMCMD_FRAME(4, 1),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_8509200[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_8509208[] =
+{
+    ANIMCMD_FRAME(2, 1),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_8509210[] =
+{
+    ANIMCMD_FRAME(3, 1),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_8509218[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_8509220[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_8509228[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gEventObjectImageAnim_8509230[] =
+{
+    ANIMCMD_FRAME(3, 1),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd *const gEventObjectImageAnimTable_Rayquaza2[] = {
+    gEventObjectImageAnim_8509218,
+    gEventObjectImageAnim_8509220,
+    gEventObjectImageAnim_8509228,
+    gEventObjectImageAnim_8509230,
+    gEventObjectImageAnim_8509200,
+    gEventObjectImageAnim_85091F8,
+    gEventObjectImageAnim_8509208,
+    gEventObjectImageAnim_8509210,
+    gEventObjectImageAnim_8509200,
+    gEventObjectImageAnim_85091F8,
+    gEventObjectImageAnim_85091F0,
+    gEventObjectImageAnim_8509210,
+    gEventObjectImageAnim_8509200,
+    gEventObjectImageAnim_85091F8,
+    gEventObjectImageAnim_8509208,
+    gEventObjectImageAnim_8509210,
+    gEventObjectImageAnim_8509200,
+    gEventObjectImageAnim_85091F8,
+    gEventObjectImageAnim_8509208,
+    gEventObjectImageAnim_8509210,
+};
+
+const union AnimCmd *const gEventObjectImageAnimTable_BrendanMayNormal[] = {
+    gEventObjectImageAnim_FaceSouth,
+    gEventObjectImageAnim_FaceNorth,
+    gEventObjectImageAnim_FaceWest,
+    gEventObjectImageAnim_FaceEast,
+    gEventObjectImageAnim_GoSouth,
+    gEventObjectImageAnim_GoNorth,
+    gEventObjectImageAnim_GoWest,
+    gEventObjectImageAnim_GoEast,
+    gEventObjectImageAnim_GoFastSouth,
+    gEventObjectImageAnim_GoFastNorth,
+    gEventObjectImageAnim_GoFastWest,
+    gEventObjectImageAnim_GoFastEast,
+    gEventObjectImageAnim_GoFasterSouth,
+    gEventObjectImageAnim_GoFasterNorth,
+    gEventObjectImageAnim_GoFasterWest,
+    gEventObjectImageAnim_GoFasterEast,
+    gEventObjectImageAnim_GoFastestSouth,
+    gEventObjectImageAnim_GoFastestNorth,
+    gEventObjectImageAnim_GoFastestWest,
+    gEventObjectImageAnim_GoFastestEast,
+    gEventObjectImageAnim_RunSouth,
+    gEventObjectImageAnim_RunNorth,
+    gEventObjectImageAnim_RunWest,
+    gEventObjectImageAnim_RunEast,
+};
+
+const union AnimCmd *const gEventObjectImageAnimTable_AcroBike[] = {
+    gEventObjectImageAnim_FaceSouth,
+    gEventObjectImageAnim_FaceNorth,
+    gEventObjectImageAnim_FaceWest,
+    gEventObjectImageAnim_FaceEast,
+    gEventObjectImageAnim_GoSouth,
+    gEventObjectImageAnim_GoNorth,
+    gEventObjectImageAnim_GoWest,
+    gEventObjectImageAnim_GoEast,
+    gEventObjectImageAnim_GoFastSouth,
+    gEventObjectImageAnim_GoFastNorth,
+    gEventObjectImageAnim_GoFastWest,
+    gEventObjectImageAnim_GoFastEast,
+    gEventObjectImageAnim_GoFasterSouth,
+    gEventObjectImageAnim_GoFasterNorth,
+    gEventObjectImageAnim_GoFasterWest,
+    gEventObjectImageAnim_GoFasterEast,
+    gEventObjectImageAnim_GoFastestSouth,
+    gEventObjectImageAnim_GoFastestNorth,
+    gEventObjectImageAnim_GoFastestWest,
+    gEventObjectImageAnim_GoFastestEast,
+    gEventObjectImageAnim_BunnyHoppyBackWheelSouth,
+    gEventObjectImageAnim_BunnyHoppyBackWheelNorth,
+    gEventObjectImageAnim_BunnyHoppyBackWheelWest,
+    gEventObjectImageAnim_BunnyHoppyBackWheelEast,
+    gEventObjectImageAnim_BunnyHoppyFrontWheelSouth,
+    gEventObjectImageAnim_BunnyHoppyFrontWheelNorth,
+    gEventObjectImageAnim_BunnyHoppyFrontWheelWest,
+    gEventObjectImageAnim_BunnyHoppyFrontWheelEast,
+    gEventObjectImageAnim_StandingWheelieBackWheelSouth,
+    gEventObjectImageAnim_StandingWheelieBackWheelNorth,
+    gEventObjectImageAnim_StandingWheelieBackWheelWest,
+    gEventObjectImageAnim_StandingWheelieBackWheelEast,
+    gEventObjectImageAnim_StandingWheelieFrontWheelSouth,
+    gEventObjectImageAnim_StandingWheelieFrontWheelNorth,
+    gEventObjectImageAnim_StandingWheelieFrontWheelWest,
+    gEventObjectImageAnim_StandingWheelieFrontWheelEast,
+    gEventObjectImageAnim_MovingWheelieSouth,
+    gEventObjectImageAnim_MovingWheelieNorth,
+    gEventObjectImageAnim_MovingWheelieWest,
+    gEventObjectImageAnim_MovingWheelieEast,
+};
+
+const union AnimCmd *const gEventObjectImageAnimTable_Surfing[] = {
+    gEventObjectImageAnim_FaceSouth,
+    gEventObjectImageAnim_FaceNorth,
+    gEventObjectImageAnim_FaceWest,
+    gEventObjectImageAnim_FaceEast,
+    gEventObjectImageAnim_GoSouth,
+    gEventObjectImageAnim_GoNorth,
+    gEventObjectImageAnim_GoWest,
+    gEventObjectImageAnim_GoEast,
+    gEventObjectImageAnim_GoFastSouth,
+    gEventObjectImageAnim_GoFastNorth,
+    gEventObjectImageAnim_GoFastWest,
+    gEventObjectImageAnim_GoFastEast,
+    gEventObjectImageAnim_GoFasterSouth,
+    gEventObjectImageAnim_GoFasterNorth,
+    gEventObjectImageAnim_GoFasterWest,
+    gEventObjectImageAnim_GoFasterEast,
+    gEventObjectImageAnim_GoFastestSouth,
+    gEventObjectImageAnim_GoFastestNorth,
+    gEventObjectImageAnim_GoFastestWest,
+    gEventObjectImageAnim_GoFastestEast,
+    gEventObjectImageAnim_GetOnOffSurfBlobSouth,
+    gEventObjectImageAnim_GetOnOffSurfBlobNorth,
+    gEventObjectImageAnim_GetOnOffSurfBlobWest,
+    gEventObjectImageAnim_GetOnOffSurfBlobEast,
+};
+
+const union AnimCmd *const gEventObjectImageAnimTable_Nurse[] = {
+    gEventObjectImageAnim_FaceSouth,
+    gEventObjectImageAnim_FaceNorth,
+    gEventObjectImageAnim_FaceWest,
+    gEventObjectImageAnim_FaceEast,
+    gEventObjectImageAnim_GoSouth,
+    gEventObjectImageAnim_GoNorth,
+    gEventObjectImageAnim_GoWest,
+    gEventObjectImageAnim_GoEast,
+    gEventObjectImageAnim_GoFastSouth,
+    gEventObjectImageAnim_GoFastNorth,
+    gEventObjectImageAnim_GoFastWest,
+    gEventObjectImageAnim_GoFastEast,
+    gEventObjectImageAnim_GoFasterSouth,
+    gEventObjectImageAnim_GoFasterNorth,
+    gEventObjectImageAnim_GoFasterWest,
+    gEventObjectImageAnim_GoFasterEast,
+    gEventObjectImageAnim_GoFastestSouth,
+    gEventObjectImageAnim_GoFastestNorth,
+    gEventObjectImageAnim_GoFastestWest,
+    gEventObjectImageAnim_GoFastestEast,
+    gEventObjectImageAnim_NurseBow,
+};
+
+const union AnimCmd *const gEventObjectImageAnimTable_FieldMove[] = {
+    gEventObjectImageAnim_FieldMove,
+};
+
+const union AnimCmd *const gEventObjectImageAnimTable_BerryTree[] = {
+    gEventObjectImageAnim_BerryTreeStage0,
+    gEventObjectImageAnim_BerryTreeStage1,
+    gEventObjectImageAnim_BerryTreeStage2,
+    gEventObjectImageAnim_BerryTreeStage3,
+    gEventObjectImageAnim_BerryTreeStage4,
+};
+
+const union AnimCmd *const gEventObjectImageAnimTable_BreakableRock[] = {
+    gEventObjectImageAnim_StayStill,
+    gEventObjectImageAnim_RockBreak,
+};
+
+const union AnimCmd *const gEventObjectImageAnimTable_CuttableTree[] = {
+    gEventObjectImageAnim_StayStill,
+    gEventObjectImageAnim_TreeCut,
+};
+
+const union AnimCmd *const gEventObjectImageAnimTable_Fishing[] = {
+    gEventObjectImageAnim_TakeOutRodSouth,
+    gEventObjectImageAnim_TakeOutRodNorth,
+    gEventObjectImageAnim_TakeOutRodWest,
+    gEventObjectImageAnim_TakeOutRodEast,
+    gEventObjectImageAnim_PutAwayRodSouth,
+    gEventObjectImageAnim_PutAwayRodNorth,
+    gEventObjectImageAnim_PutAwayRodWest,
+    gEventObjectImageAnim_PutAwayRodEast,
+    gEventObjectImageAnim_HookedPokemonSouth,
+    gEventObjectImageAnim_HookedPokemonNorth,
+    gEventObjectImageAnim_HookedPokemonWest,
+    gEventObjectImageAnim_HookedPokemonEast,
+};
+
+const union AffineAnimCmd *const gEventObjectRotScalAnimTable_KyogreGroudon[] = {
+    gEventObjectRotScalAnim_8508FD8,
+    gEventObjectRotScalAnim_8509008,
+    gEventObjectRotScalAnim_8509050,
+    gEventObjectRotScalAnim_8509040,
+    gEventObjectRotScalAnim_8509078,
+    gEventObjectRotScalAnim_8509060,
+};
+
+const struct UnkStruct_085094AC gUnknown_085094AC[] = {
+    {
+        .anims = gEventObjectImageAnimTable_QuintyPlump,
+        .animPos = {1, 3, 0, 2},
+    },
+    {
+        .anims = gEventObjectImageAnimTable_Standard,
+        .animPos = {1, 3, 0, 2},
+    },
+    {
+        .anims = gEventObjectImageAnimTable_BrendanMayNormal,
+        .animPos = {1, 3, 0, 2},
+    },
+    {
+        .anims = gEventObjectImageAnimTable_AcroBike,
+        .animPos = {1, 3, 0, 2},
+    },
+    {
+        .anims = gEventObjectImageAnimTable_Surfing,
+        .animPos = {1, 3, 0, 2},
+    },
+    {
+        .anims = gEventObjectImageAnimTable_Nurse,
+        .animPos = {1, 3, 0, 2},
+    },
+    {
+        .anims = gEventObjectImageAnimTable_Fishing,
+        .animPos = {1, 3, 0, 2},
+    },
+    {
+        NULL,
+        {0, 0, 0, 0},
+    },
+};
+
+#endif //GUARD_EVENT_OBJECT_ANIMS_H
diff --git a/src/data/field_event_obj/event_object_graphics.h b/src/data/field_event_obj/event_object_graphics.h
new file mode 100755
index 000000000..3d4303189
--- /dev/null
+++ b/src/data/field_event_obj/event_object_graphics.h
@@ -0,0 +1,1667 @@
+#ifndef GUARD_EVENT_OBJECT_GFX_H
+#define GUARD_EVENT_OBJECT_GFX_H
+
+const u32 gEventObjectPic_BrendanNormal_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/00.4bpp");
+const u32 gEventObjectPic_BrendanNormal_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/01.4bpp");
+const u32 gEventObjectPic_BrendanNormal_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/02.4bpp");
+const u32 gEventObjectPic_BrendanNormal_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/03.4bpp");
+const u32 gEventObjectPic_BrendanNormal_4[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/04.4bpp");
+const u32 gEventObjectPic_BrendanNormal_5[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/05.4bpp");
+const u32 gEventObjectPic_BrendanNormal_6[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/06.4bpp");
+const u32 gEventObjectPic_BrendanNormal_7[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/07.4bpp");
+const u32 gEventObjectPic_BrendanNormal_8[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/08.4bpp");
+const u32 gEventObjectPic_BrendanNormal_9[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/09.4bpp");
+const u32 gEventObjectPic_BrendanNormal_10[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/10.4bpp");
+const u32 gEventObjectPic_BrendanNormal_11[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/11.4bpp");
+const u32 gEventObjectPic_BrendanNormal_12[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/12.4bpp");
+const u32 gEventObjectPic_BrendanNormal_13[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/13.4bpp");
+const u32 gEventObjectPic_BrendanNormal_14[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/14.4bpp");
+const u32 gEventObjectPic_BrendanNormal_15[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/15.4bpp");
+const u32 gEventObjectPic_BrendanNormal_16[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/16.4bpp");
+const u32 gEventObjectPic_BrendanNormal_17[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/17.4bpp");
+const u16 gEventObjectPalette8[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_08.gbapal");
+const u32 gEventObjectPic_RubySapphireBrendan_0[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/00.4bpp");
+const u32 gEventObjectPic_RubySapphireBrendan_1[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/01.4bpp");
+const u32 gEventObjectPic_RubySapphireBrendan_2[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/02.4bpp");
+const u32 gEventObjectPic_RubySapphireBrendan_3[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/03.4bpp");
+const u32 gEventObjectPic_RubySapphireBrendan_4[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/04.4bpp");
+const u32 gEventObjectPic_RubySapphireBrendan_5[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/05.4bpp");
+const u32 gEventObjectPic_RubySapphireBrendan_6[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/06.4bpp");
+const u32 gEventObjectPic_RubySapphireBrendan_7[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/07.4bpp");
+const u32 gEventObjectPic_RubySapphireBrendan_8[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/08.4bpp");
+const u32 gEventObjectPic_RubySapphireBrendan_9[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/09.4bpp");
+const u32 gEventObjectPic_RubySapphireBrendan_10[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/10.4bpp");
+const u32 gEventObjectPic_RubySapphireBrendan_11[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/11.4bpp");
+const u32 gEventObjectPic_RubySapphireBrendan_12[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/12.4bpp");
+const u32 gEventObjectPic_RubySapphireBrendan_13[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/13.4bpp");
+const u32 gEventObjectPic_RubySapphireBrendan_14[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/14.4bpp");
+const u32 gEventObjectPic_RubySapphireBrendan_15[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/15.4bpp");
+const u32 gEventObjectPic_RubySapphireBrendan_16[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/16.4bpp");
+const u32 gEventObjectPic_RubySapphireBrendan_17[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/17.4bpp");
+const u16 gEventObjectPalette33[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_33.gbapal");
+const u16 NullPalette_8499A38[16] = {};
+const u16 NullPalette_8499A58[16] = {};
+const u16 NullPalette_8499A78[16] = {};
+const u16 NullPalette_8499A98[16] = {};
+const u16 NullPalette_8499AB8[16] = {};
+const u16 NullPalette_8499AD8[16] = {};
+const u16 NullPalette_8499AF8[16] = {};
+const u16 NullPalette_8499B18[16] = {};
+const u16 NullPalette_8499B38[16] = {};
+const u16 NullPalette_8499B58[16] = {};
+const u16 NullPalette_8499B78[16] = {};
+const u16 NullPalette_8499B98[16] = {};
+const u16 NullPalette_8499BB8[16] = {};
+const u16 NullPalette_8499BD8[16] = {};
+const u16 NullPalette_8499BF8[16] = {};
+const u16 gEventObjectPalette9[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_09.gbapal");
+const u16 gEventObjectPalette10[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_10.gbapal");
+const u32 gEventObjectPic_BrendanFieldMove_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move/0.4bpp");
+const u32 gEventObjectPic_BrendanFieldMove_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move/1.4bpp");
+const u32 gEventObjectPic_BrendanFieldMove_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move/2.4bpp");
+const u32 gEventObjectPic_BrendanFieldMove_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move/3.4bpp");
+const u32 gEventObjectPic_BrendanFieldMove_4[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move/4.4bpp");
+const u32 gEventObjectPic_BrendanSurfing_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing/0.4bpp");
+const u32 gEventObjectPic_BrendanSurfing_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing/3.4bpp");
+const u32 gEventObjectPic_BrendanSurfing_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing/1.4bpp");
+const u32 gEventObjectPic_BrendanSurfing_4[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing/4.4bpp");
+const u32 gEventObjectPic_BrendanSurfing_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing/2.4bpp");
+const u32 gEventObjectPic_BrendanSurfing_5[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing/5.4bpp");
+const u32 gEventObjectPic_BrendanMachBike_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/0.4bpp");
+const u32 gEventObjectPic_BrendanMachBike_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/1.4bpp");
+const u32 gEventObjectPic_BrendanMachBike_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/2.4bpp");
+const u32 gEventObjectPic_BrendanMachBike_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/3.4bpp");
+const u32 gEventObjectPic_BrendanMachBike_4[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/4.4bpp");
+const u32 gEventObjectPic_BrendanMachBike_5[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/5.4bpp");
+const u32 gEventObjectPic_BrendanMachBike_6[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/6.4bpp");
+const u32 gEventObjectPic_BrendanMachBike_7[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/7.4bpp");
+const u32 gEventObjectPic_BrendanMachBike_8[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/8.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/00.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/01.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/02.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/03.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_4[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/04.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_5[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/05.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_6[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/06.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_7[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/07.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_8[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/08.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_9[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/09.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_10[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/10.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_11[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/11.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_12[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/12.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_13[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/13.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_14[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/14.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_15[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/15.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_16[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/16.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_17[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/17.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_18[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/18.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_19[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/19.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_20[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/20.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_21[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/21.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_22[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/22.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_23[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/23.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_24[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/24.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_25[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/25.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_26[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/26.4bpp");
+const u32 gEventObjectPic_BrendanFishing_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/00.4bpp");
+const u32 gEventObjectPic_BrendanFishing_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/01.4bpp");
+const u32 gEventObjectPic_BrendanFishing_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/02.4bpp");
+const u32 gEventObjectPic_BrendanFishing_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/03.4bpp");
+const u32 gEventObjectPic_BrendanFishing_4[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/04.4bpp");
+const u32 gEventObjectPic_BrendanFishing_5[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/05.4bpp");
+const u32 gEventObjectPic_BrendanFishing_6[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/06.4bpp");
+const u32 gEventObjectPic_BrendanFishing_7[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/07.4bpp");
+const u32 gEventObjectPic_BrendanFishing_8[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/08.4bpp");
+const u32 gEventObjectPic_BrendanFishing_9[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/09.4bpp");
+const u32 gEventObjectPic_BrendanFishing_10[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/10.4bpp");
+const u32 gEventObjectPic_BrendanFishing_11[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/11.4bpp");
+const u32 gEventObjectPic_BrendanWatering_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering/0.4bpp");
+const u32 gEventObjectPic_BrendanWatering_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering/3.4bpp");
+const u32 gEventObjectPic_BrendanWatering_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering/1.4bpp");
+const u32 gEventObjectPic_BrendanWatering_4[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering/4.4bpp");
+const u32 gEventObjectPic_BrendanWatering_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering/2.4bpp");
+const u32 gEventObjectPic_BrendanWatering_5[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering/5.4bpp");
+const u32 gEventObjectPic_BrendanDecorating[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/decorating.4bpp");
+const u32 gEventObjectPic_MayDecorating[] = INCBIN_U32("graphics/event_objects/pics/people/may/decorating.4bpp");
+const u32 gEventObjectPic_BrendanUnderwater_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/underwater/0.4bpp");
+const u32 gEventObjectPic_BrendanUnderwater_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/underwater/1.4bpp");
+const u32 gEventObjectPic_BrendanUnderwater_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/underwater/2.4bpp");
+const u32 gEventObjectPic_BrendanUnderwater_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/underwater/3.4bpp");
+const u32 gEventObjectPic_MayUnderwater_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/underwater/0.4bpp");
+const u32 gEventObjectPic_MayUnderwater_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/underwater/1.4bpp");
+const u32 gEventObjectPic_MayUnderwater_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/underwater/2.4bpp");
+const u32 gEventObjectPic_MayUnderwater_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/underwater/3.4bpp");
+const u16 gEventObjectPalette11[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_11.gbapal");
+const u32 gEventObjectPic_MayNormal_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/00.4bpp");
+const u32 gEventObjectPic_MayNormal_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/01.4bpp");
+const u32 gEventObjectPic_MayNormal_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/02.4bpp");
+const u32 gEventObjectPic_MayNormal_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/03.4bpp");
+const u32 gEventObjectPic_MayNormal_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/04.4bpp");
+const u32 gEventObjectPic_MayNormal_5[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/05.4bpp");
+const u32 gEventObjectPic_MayNormal_6[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/06.4bpp");
+const u32 gEventObjectPic_MayNormal_7[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/07.4bpp");
+const u32 gEventObjectPic_MayNormal_8[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/08.4bpp");
+const u32 gEventObjectPic_MayNormal_9[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/09.4bpp");
+const u32 gEventObjectPic_MayNormal_10[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/10.4bpp");
+const u32 gEventObjectPic_MayNormal_11[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/11.4bpp");
+const u32 gEventObjectPic_MayNormal_12[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/12.4bpp");
+const u32 gEventObjectPic_MayNormal_13[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/13.4bpp");
+const u32 gEventObjectPic_MayNormal_14[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/14.4bpp");
+const u32 gEventObjectPic_MayNormal_15[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/15.4bpp");
+const u32 gEventObjectPic_MayNormal_16[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/16.4bpp");
+const u32 gEventObjectPic_MayNormal_17[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/17.4bpp");
+const u16 gEventObjectPalette17[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_17.gbapal");
+const u16 gEventObjectPalette18[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_18.gbapal");
+const u32 gEventObjectPic_RubySapphireMay_0[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/00.4bpp");
+const u32 gEventObjectPic_RubySapphireMay_1[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/01.4bpp");
+const u32 gEventObjectPic_RubySapphireMay_2[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/02.4bpp");
+const u32 gEventObjectPic_RubySapphireMay_3[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/03.4bpp");
+const u32 gEventObjectPic_RubySapphireMay_4[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/04.4bpp");
+const u32 gEventObjectPic_RubySapphireMay_5[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/05.4bpp");
+const u32 gEventObjectPic_RubySapphireMay_6[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/06.4bpp");
+const u32 gEventObjectPic_RubySapphireMay_7[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/07.4bpp");
+const u32 gEventObjectPic_RubySapphireMay_8[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/08.4bpp");
+const u32 gEventObjectPic_RubySapphireMay_9[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/09.4bpp");
+const u32 gEventObjectPic_RubySapphireMay_10[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/10.4bpp");
+const u32 gEventObjectPic_RubySapphireMay_11[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/11.4bpp");
+const u32 gEventObjectPic_RubySapphireMay_12[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/12.4bpp");
+const u32 gEventObjectPic_RubySapphireMay_13[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/13.4bpp");
+const u32 gEventObjectPic_RubySapphireMay_14[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/14.4bpp");
+const u32 gEventObjectPic_RubySapphireMay_15[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/15.4bpp");
+const u32 gEventObjectPic_RubySapphireMay_16[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/16.4bpp");
+const u32 gEventObjectPic_RubySapphireMay_17[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/17.4bpp");
+const u16 gEventObjectPalette34[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_34.gbapal");
+const u16 gUnusedEventObjectPalette[] = INCBIN_U16("graphics/event_objects/palettes/unused_palette.gbapal");
+const u16 NullPalette_84A54F8[16] = {};
+const u16 NullPalette_84A5518[16] = {};
+const u16 NullPalette_84A5538[16] = {};
+const u16 NullPalette_84A5558[16] = {};
+const u16 NullPalette_84A5578[16] = {};
+const u16 NullPalette_84A5598[16] = {};
+const u16 NullPalette_84A55B8[16] = {};
+const u16 NullPalette_84A55D8[16] = {};
+const u16 NullPalette_84A55F8[16] = {};
+const u16 NullPalette_84A5618[16] = {};
+const u16 NullPalette_84A5638[16] = {};
+const u16 NullPalette_84A5658[16] = {};
+const u16 NullPalette_84A5678[16] = {};
+const u16 NullPalette_84A5698[16] = {};
+const u32 gEventObjectPic_MayMachBike_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/0.4bpp");
+const u32 gEventObjectPic_MayMachBike_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/1.4bpp");
+const u32 gEventObjectPic_MayMachBike_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/2.4bpp");
+const u32 gEventObjectPic_MayMachBike_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/3.4bpp");
+const u32 gEventObjectPic_MayMachBike_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/4.4bpp");
+const u32 gEventObjectPic_MayMachBike_5[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/5.4bpp");
+const u32 gEventObjectPic_MayMachBike_6[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/6.4bpp");
+const u32 gEventObjectPic_MayMachBike_7[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/7.4bpp");
+const u32 gEventObjectPic_MayMachBike_8[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/8.4bpp");
+const u32 gEventObjectPic_MayAcroBike_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/00.4bpp");
+const u32 gEventObjectPic_MayAcroBike_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/01.4bpp");
+const u32 gEventObjectPic_MayAcroBike_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/02.4bpp");
+const u32 gEventObjectPic_MayAcroBike_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/03.4bpp");
+const u32 gEventObjectPic_MayAcroBike_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/04.4bpp");
+const u32 gEventObjectPic_MayAcroBike_5[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/05.4bpp");
+const u32 gEventObjectPic_MayAcroBike_6[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/06.4bpp");
+const u32 gEventObjectPic_MayAcroBike_7[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/07.4bpp");
+const u32 gEventObjectPic_MayAcroBike_8[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/08.4bpp");
+const u32 gEventObjectPic_MayAcroBike_9[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/09.4bpp");
+const u32 gEventObjectPic_MayAcroBike_10[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/10.4bpp");
+const u32 gEventObjectPic_MayAcroBike_11[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/11.4bpp");
+const u32 gEventObjectPic_MayAcroBike_12[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/12.4bpp");
+const u32 gEventObjectPic_MayAcroBike_13[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/13.4bpp");
+const u32 gEventObjectPic_MayAcroBike_14[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/14.4bpp");
+const u32 gEventObjectPic_MayAcroBike_15[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/15.4bpp");
+const u32 gEventObjectPic_MayAcroBike_16[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/16.4bpp");
+const u32 gEventObjectPic_MayAcroBike_17[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/17.4bpp");
+const u32 gEventObjectPic_MayAcroBike_18[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/18.4bpp");
+const u32 gEventObjectPic_MayAcroBike_19[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/19.4bpp");
+const u32 gEventObjectPic_MayAcroBike_20[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/20.4bpp");
+const u32 gEventObjectPic_MayAcroBike_21[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/21.4bpp");
+const u32 gEventObjectPic_MayAcroBike_22[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/22.4bpp");
+const u32 gEventObjectPic_MayAcroBike_23[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/23.4bpp");
+const u32 gEventObjectPic_MayAcroBike_24[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/24.4bpp");
+const u32 gEventObjectPic_MayAcroBike_25[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/25.4bpp");
+const u32 gEventObjectPic_MayAcroBike_26[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/26.4bpp");
+const u32 gEventObjectPic_MaySurfing_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing/0.4bpp");
+const u32 gEventObjectPic_MaySurfing_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing/3.4bpp");
+const u32 gEventObjectPic_MaySurfing_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing/1.4bpp");
+const u32 gEventObjectPic_MaySurfing_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing/4.4bpp");
+const u32 gEventObjectPic_MaySurfing_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing/2.4bpp");
+const u32 gEventObjectPic_MaySurfing_5[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing/5.4bpp");
+const u32 gEventObjectPic_MayFieldMove_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move/0.4bpp");
+const u32 gEventObjectPic_MayFieldMove_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move/1.4bpp");
+const u32 gEventObjectPic_MayFieldMove_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move/2.4bpp");
+const u32 gEventObjectPic_MayFieldMove_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move/3.4bpp");
+const u32 gEventObjectPic_MayFieldMove_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move/4.4bpp");
+const u32 gEventObjectPic_MayFishing_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/00.4bpp");
+const u32 gEventObjectPic_MayFishing_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/01.4bpp");
+const u32 gEventObjectPic_MayFishing_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/02.4bpp");
+const u32 gEventObjectPic_MayFishing_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/03.4bpp");
+const u32 gEventObjectPic_MayFishing_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/04.4bpp");
+const u32 gEventObjectPic_MayFishing_5[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/05.4bpp");
+const u32 gEventObjectPic_MayFishing_6[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/06.4bpp");
+const u32 gEventObjectPic_MayFishing_7[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/07.4bpp");
+const u32 gEventObjectPic_MayFishing_8[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/08.4bpp");
+const u32 gEventObjectPic_MayFishing_9[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/09.4bpp");
+const u32 gEventObjectPic_MayFishing_10[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/10.4bpp");
+const u32 gEventObjectPic_MayFishing_11[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/11.4bpp");
+const u32 gEventObjectPic_MayWatering_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering/0.4bpp");
+const u32 gEventObjectPic_MayWatering_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering/3.4bpp");
+const u32 gEventObjectPic_MayWatering_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering/1.4bpp");
+const u32 gEventObjectPic_MayWatering_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering/4.4bpp");
+const u32 gEventObjectPic_MayWatering_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering/2.4bpp");
+const u32 gEventObjectPic_MayWatering_5[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering/5.4bpp");
+const u16 gEventObjectPalette0[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_00.gbapal");
+const u16 gEventObjectPalette1[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_01.gbapal");
+const u16 gEventObjectPalette2[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_02.gbapal");
+const u16 gEventObjectPalette3[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_03.gbapal");
+const u16 gEventObjectPalette4[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_04.gbapal");
+const u16 gEventObjectPalette5[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_05.gbapal");
+const u16 gEventObjectPalette6[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_06.gbapal");
+const u16 gEventObjectPalette7[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_07.gbapal");
+const u32 gEventObjectPic_LittleBoy1_0[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/0.4bpp");
+const u32 gEventObjectPic_LittleBoy1_1[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/1.4bpp");
+const u32 gEventObjectPic_LittleBoy1_2[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/2.4bpp");
+const u32 gEventObjectPic_LittleBoy1_3[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/3.4bpp");
+const u32 gEventObjectPic_LittleBoy1_4[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/4.4bpp");
+const u32 gEventObjectPic_LittleBoy1_5[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/5.4bpp");
+const u32 gEventObjectPic_LittleBoy1_6[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/6.4bpp");
+const u32 gEventObjectPic_LittleBoy1_7[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/7.4bpp");
+const u32 gEventObjectPic_LittleBoy1_8[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/8.4bpp");
+const u32 gEventObjectPic_LittleGirl1_0[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/0.4bpp");
+const u32 gEventObjectPic_LittleGirl1_1[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/1.4bpp");
+const u32 gEventObjectPic_LittleGirl1_2[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/2.4bpp");
+const u32 gEventObjectPic_LittleGirl1_3[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/3.4bpp");
+const u32 gEventObjectPic_LittleGirl1_4[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/4.4bpp");
+const u32 gEventObjectPic_LittleGirl1_5[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/5.4bpp");
+const u32 gEventObjectPic_LittleGirl1_6[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/6.4bpp");
+const u32 gEventObjectPic_LittleGirl1_7[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/7.4bpp");
+const u32 gEventObjectPic_LittleGirl1_8[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/8.4bpp");
+const u32 gEventObjectPic_Boy1_0[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/0.4bpp");
+const u32 gEventObjectPic_Boy1_1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/1.4bpp");
+const u32 gEventObjectPic_Boy1_2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/2.4bpp");
+const u32 gEventObjectPic_Boy1_3[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/3.4bpp");
+const u32 gEventObjectPic_Boy1_4[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/4.4bpp");
+const u32 gEventObjectPic_Boy1_5[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/5.4bpp");
+const u32 gEventObjectPic_Boy1_6[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/6.4bpp");
+const u32 gEventObjectPic_Boy1_7[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/7.4bpp");
+const u32 gEventObjectPic_Boy1_8[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/8.4bpp");
+const u32 gEventObjectPic_Girl1_0[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/0.4bpp");
+const u32 gEventObjectPic_Girl1_1[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/1.4bpp");
+const u32 gEventObjectPic_Girl1_2[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/2.4bpp");
+const u32 gEventObjectPic_Girl1_3[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/3.4bpp");
+const u32 gEventObjectPic_Girl1_4[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/4.4bpp");
+const u32 gEventObjectPic_Girl1_5[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/5.4bpp");
+const u32 gEventObjectPic_Girl1_6[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/6.4bpp");
+const u32 gEventObjectPic_Girl1_7[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/7.4bpp");
+const u32 gEventObjectPic_Girl1_8[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/8.4bpp");
+const u32 gEventObjectPic_Boy2_0[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/0.4bpp");
+const u32 gEventObjectPic_Boy2_1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/1.4bpp");
+const u32 gEventObjectPic_Boy2_2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/2.4bpp");
+const u32 gEventObjectPic_Boy2_3[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/3.4bpp");
+const u32 gEventObjectPic_Boy2_4[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/4.4bpp");
+const u32 gEventObjectPic_Boy2_5[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/5.4bpp");
+const u32 gEventObjectPic_Boy2_6[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/6.4bpp");
+const u32 gEventObjectPic_Boy2_7[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/7.4bpp");
+const u32 gEventObjectPic_Boy2_8[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/8.4bpp");
+const u32 gEventObjectPic_Girl2_0[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/0.4bpp");
+const u32 gEventObjectPic_Girl2_1[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/1.4bpp");
+const u32 gEventObjectPic_Girl2_2[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/2.4bpp");
+const u32 gEventObjectPic_Girl2_3[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/3.4bpp");
+const u32 gEventObjectPic_Girl2_4[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/4.4bpp");
+const u32 gEventObjectPic_Girl2_5[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/5.4bpp");
+const u32 gEventObjectPic_Girl2_6[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/6.4bpp");
+const u32 gEventObjectPic_Girl2_7[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/7.4bpp");
+const u32 gEventObjectPic_Girl2_8[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/8.4bpp");
+const u32 gEventObjectPic_LittleBoy2_0[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/0.4bpp");
+const u32 gEventObjectPic_LittleBoy2_1[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/1.4bpp");
+const u32 gEventObjectPic_LittleBoy2_2[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/2.4bpp");
+const u32 gEventObjectPic_LittleBoy2_3[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/3.4bpp");
+const u32 gEventObjectPic_LittleBoy2_4[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/4.4bpp");
+const u32 gEventObjectPic_LittleBoy2_5[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/5.4bpp");
+const u32 gEventObjectPic_LittleBoy2_6[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/6.4bpp");
+const u32 gEventObjectPic_LittleBoy2_7[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/7.4bpp");
+const u32 gEventObjectPic_LittleBoy2_8[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/8.4bpp");
+const u32 gEventObjectPic_LittleGirl2_0[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/0.4bpp");
+const u32 gEventObjectPic_LittleGirl2_1[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/1.4bpp");
+const u32 gEventObjectPic_LittleGirl2_2[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/2.4bpp");
+const u32 gEventObjectPic_LittleGirl2_3[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/3.4bpp");
+const u32 gEventObjectPic_LittleGirl2_4[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/4.4bpp");
+const u32 gEventObjectPic_LittleGirl2_5[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/5.4bpp");
+const u32 gEventObjectPic_LittleGirl2_6[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/6.4bpp");
+const u32 gEventObjectPic_LittleGirl2_7[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/7.4bpp");
+const u32 gEventObjectPic_LittleGirl2_8[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/8.4bpp");
+const u32 gEventObjectPic_Boy3_0[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/0.4bpp");
+const u32 gEventObjectPic_Boy3_1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/1.4bpp");
+const u32 gEventObjectPic_Boy3_2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/2.4bpp");
+const u32 gEventObjectPic_Boy3_3[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/3.4bpp");
+const u32 gEventObjectPic_Boy3_4[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/4.4bpp");
+const u32 gEventObjectPic_Boy3_5[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/5.4bpp");
+const u32 gEventObjectPic_Boy3_6[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/6.4bpp");
+const u32 gEventObjectPic_Boy3_7[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/7.4bpp");
+const u32 gEventObjectPic_Boy3_8[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/8.4bpp");
+const u32 gEventObjectPic_Girl3_0[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/0.4bpp");
+const u32 gEventObjectPic_Girl3_1[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/1.4bpp");
+const u32 gEventObjectPic_Girl3_2[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/2.4bpp");
+const u32 gEventObjectPic_Girl3_3[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/3.4bpp");
+const u32 gEventObjectPic_Girl3_4[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/4.4bpp");
+const u32 gEventObjectPic_Girl3_5[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/5.4bpp");
+const u32 gEventObjectPic_Girl3_6[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/6.4bpp");
+const u32 gEventObjectPic_Girl3_7[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/7.4bpp");
+const u32 gEventObjectPic_Girl3_8[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/8.4bpp");
+const u32 gEventObjectPic_Boy4_0[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/0.4bpp");
+const u32 gEventObjectPic_Boy4_1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/1.4bpp");
+const u32 gEventObjectPic_Boy4_2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/2.4bpp");
+const u32 gEventObjectPic_Boy4_3[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/3.4bpp");
+const u32 gEventObjectPic_Boy4_4[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/4.4bpp");
+const u32 gEventObjectPic_Boy4_5[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/5.4bpp");
+const u32 gEventObjectPic_Boy4_6[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/6.4bpp");
+const u32 gEventObjectPic_Boy4_7[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/7.4bpp");
+const u32 gEventObjectPic_Boy4_8[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/8.4bpp");
+const u32 gEventObjectPic_Woman1_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/0.4bpp");
+const u32 gEventObjectPic_Woman1_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/1.4bpp");
+const u32 gEventObjectPic_Woman1_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/2.4bpp");
+const u32 gEventObjectPic_Woman1_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/3.4bpp");
+const u32 gEventObjectPic_Woman1_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/4.4bpp");
+const u32 gEventObjectPic_Woman1_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/5.4bpp");
+const u32 gEventObjectPic_Woman1_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/6.4bpp");
+const u32 gEventObjectPic_Woman1_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/7.4bpp");
+const u32 gEventObjectPic_Woman1_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/8.4bpp");
+const u32 gEventObjectPic_FatMan_0[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/0.4bpp");
+const u32 gEventObjectPic_FatMan_1[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/1.4bpp");
+const u32 gEventObjectPic_FatMan_2[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/2.4bpp");
+const u32 gEventObjectPic_FatMan_3[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/3.4bpp");
+const u32 gEventObjectPic_FatMan_4[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/4.4bpp");
+const u32 gEventObjectPic_FatMan_5[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/5.4bpp");
+const u32 gEventObjectPic_FatMan_6[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/6.4bpp");
+const u32 gEventObjectPic_FatMan_7[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/7.4bpp");
+const u32 gEventObjectPic_FatMan_8[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/8.4bpp");
+const u32 gEventObjectPic_Woman2_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/0.4bpp");
+const u32 gEventObjectPic_Woman2_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/1.4bpp");
+const u32 gEventObjectPic_Woman2_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/2.4bpp");
+const u32 gEventObjectPic_Woman2_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/3.4bpp");
+const u32 gEventObjectPic_Woman2_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/4.4bpp");
+const u32 gEventObjectPic_Woman2_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/5.4bpp");
+const u32 gEventObjectPic_Woman2_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/6.4bpp");
+const u32 gEventObjectPic_Woman2_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/7.4bpp");
+const u32 gEventObjectPic_Woman2_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/8.4bpp");
+const u32 gEventObjectPic_Man1_0[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/0.4bpp");
+const u32 gEventObjectPic_Man1_1[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/1.4bpp");
+const u32 gEventObjectPic_Man1_2[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/2.4bpp");
+const u32 gEventObjectPic_Man1_3[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/3.4bpp");
+const u32 gEventObjectPic_Man1_4[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/4.4bpp");
+const u32 gEventObjectPic_Man1_5[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/5.4bpp");
+const u32 gEventObjectPic_Man1_6[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/6.4bpp");
+const u32 gEventObjectPic_Man1_7[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/7.4bpp");
+const u32 gEventObjectPic_Man1_8[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/8.4bpp");
+const u32 gEventObjectPic_Woman3_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/0.4bpp");
+const u32 gEventObjectPic_Woman3_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/1.4bpp");
+const u32 gEventObjectPic_Woman3_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/2.4bpp");
+const u32 gEventObjectPic_Woman3_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/3.4bpp");
+const u32 gEventObjectPic_Woman3_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/4.4bpp");
+const u32 gEventObjectPic_Woman3_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/5.4bpp");
+const u32 gEventObjectPic_Woman3_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/6.4bpp");
+const u32 gEventObjectPic_Woman3_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/7.4bpp");
+const u32 gEventObjectPic_Woman3_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/8.4bpp");
+const u32 gEventObjectPic_OldMan1_0[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/0.4bpp");
+const u32 gEventObjectPic_OldMan1_1[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/1.4bpp");
+const u32 gEventObjectPic_OldMan1_2[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/2.4bpp");
+const u32 gEventObjectPic_OldMan1_3[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/3.4bpp");
+const u32 gEventObjectPic_OldMan1_4[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/4.4bpp");
+const u32 gEventObjectPic_OldMan1_5[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/5.4bpp");
+const u32 gEventObjectPic_OldMan1_6[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/6.4bpp");
+const u32 gEventObjectPic_OldMan1_7[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/7.4bpp");
+const u32 gEventObjectPic_OldMan1_8[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/8.4bpp");
+const u32 gEventObjectPic_OldWoman1_0[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/0.4bpp");
+const u32 gEventObjectPic_OldWoman1_1[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/1.4bpp");
+const u32 gEventObjectPic_OldWoman1_2[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/2.4bpp");
+const u32 gEventObjectPic_OldWoman1_3[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/3.4bpp");
+const u32 gEventObjectPic_OldWoman1_4[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/4.4bpp");
+const u32 gEventObjectPic_OldWoman1_5[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/5.4bpp");
+const u32 gEventObjectPic_OldWoman1_6[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/6.4bpp");
+const u32 gEventObjectPic_OldWoman1_7[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/7.4bpp");
+const u32 gEventObjectPic_OldWoman1_8[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/8.4bpp");
+const u32 gEventObjectPic_Man2_0[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/0.4bpp");
+const u32 gEventObjectPic_Man2_1[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/1.4bpp");
+const u32 gEventObjectPic_Man2_2[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/2.4bpp");
+const u32 gEventObjectPic_Man2_3[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/3.4bpp");
+const u32 gEventObjectPic_Man2_4[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/4.4bpp");
+const u32 gEventObjectPic_Man2_5[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/5.4bpp");
+const u32 gEventObjectPic_Man2_6[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/6.4bpp");
+const u32 gEventObjectPic_Man2_7[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/7.4bpp");
+const u32 gEventObjectPic_Man2_8[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/8.4bpp");
+const u32 gEventObjectPic_Woman4_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/0.4bpp");
+const u32 gEventObjectPic_Woman4_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/1.4bpp");
+const u32 gEventObjectPic_Woman4_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/2.4bpp");
+const u32 gEventObjectPic_Woman4_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/3.4bpp");
+const u32 gEventObjectPic_Woman4_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/4.4bpp");
+const u32 gEventObjectPic_Woman4_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/5.4bpp");
+const u32 gEventObjectPic_Woman4_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/6.4bpp");
+const u32 gEventObjectPic_Woman4_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/7.4bpp");
+const u32 gEventObjectPic_Woman4_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/8.4bpp");
+const u32 gEventObjectPic_Man3_0[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/0.4bpp");
+const u32 gEventObjectPic_Man3_1[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/1.4bpp");
+const u32 gEventObjectPic_Man3_2[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/2.4bpp");
+const u32 gEventObjectPic_Man3_3[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/3.4bpp");
+const u32 gEventObjectPic_Man3_4[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/4.4bpp");
+const u32 gEventObjectPic_Man3_5[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/5.4bpp");
+const u32 gEventObjectPic_Man3_6[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/6.4bpp");
+const u32 gEventObjectPic_Man3_7[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/7.4bpp");
+const u32 gEventObjectPic_Man3_8[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/8.4bpp");
+const u32 gEventObjectPic_Woman5_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/0.4bpp");
+const u32 gEventObjectPic_Woman5_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/1.4bpp");
+const u32 gEventObjectPic_Woman5_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/2.4bpp");
+const u32 gEventObjectPic_Woman5_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/3.4bpp");
+const u32 gEventObjectPic_Woman5_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/4.4bpp");
+const u32 gEventObjectPic_Woman5_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/5.4bpp");
+const u32 gEventObjectPic_Woman5_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/6.4bpp");
+const u32 gEventObjectPic_Woman5_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/7.4bpp");
+const u32 gEventObjectPic_Woman5_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/8.4bpp");
+const u32 gEventObjectPic_Cook_0[] = INCBIN_U32("graphics/event_objects/pics/people/cook/0.4bpp");
+const u32 gEventObjectPic_Cook_1[] = INCBIN_U32("graphics/event_objects/pics/people/cook/1.4bpp");
+const u32 gEventObjectPic_Cook_2[] = INCBIN_U32("graphics/event_objects/pics/people/cook/2.4bpp");
+const u32 gEventObjectPic_Woman6_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/0.4bpp");
+const u32 gEventObjectPic_Woman6_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/1.4bpp");
+const u32 gEventObjectPic_Woman6_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/2.4bpp");
+const u32 gEventObjectPic_Woman6_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/3.4bpp");
+const u32 gEventObjectPic_Woman6_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/4.4bpp");
+const u32 gEventObjectPic_Woman6_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/5.4bpp");
+const u32 gEventObjectPic_Woman6_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/6.4bpp");
+const u32 gEventObjectPic_Woman6_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/7.4bpp");
+const u32 gEventObjectPic_Woman6_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/8.4bpp");
+const u32 gEventObjectPic_OldMan2_0[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_2/0.4bpp");
+const u32 gEventObjectPic_OldMan2_1[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_2/1.4bpp");
+const u32 gEventObjectPic_OldMan2_2[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_2/2.4bpp");
+const u32 gEventObjectPic_OldWoman2_0[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_2/0.4bpp");
+const u32 gEventObjectPic_OldWoman2_1[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_2/1.4bpp");
+const u32 gEventObjectPic_OldWoman2_2[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_2/2.4bpp");
+const u32 gEventObjectPic_OldWoman2_3[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_2/3.4bpp");
+const u32 gEventObjectPic_OldWoman2_4[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_2/4.4bpp");
+const u32 gEventObjectPic_OldWoman2_5[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_2/5.4bpp");
+const u32 gEventObjectPic_OldWoman2_6[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_2/6.4bpp");
+const u32 gEventObjectPic_OldWoman2_7[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_2/7.4bpp");
+const u32 gEventObjectPic_OldWoman2_8[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_2/8.4bpp");
+const u32 gEventObjectPic_Camper_0[] = INCBIN_U32("graphics/event_objects/pics/people/camper/0.4bpp");
+const u32 gEventObjectPic_Camper_1[] = INCBIN_U32("graphics/event_objects/pics/people/camper/1.4bpp");
+const u32 gEventObjectPic_Camper_2[] = INCBIN_U32("graphics/event_objects/pics/people/camper/2.4bpp");
+const u32 gEventObjectPic_Camper_3[] = INCBIN_U32("graphics/event_objects/pics/people/camper/3.4bpp");
+const u32 gEventObjectPic_Camper_4[] = INCBIN_U32("graphics/event_objects/pics/people/camper/4.4bpp");
+const u32 gEventObjectPic_Camper_5[] = INCBIN_U32("graphics/event_objects/pics/people/camper/5.4bpp");
+const u32 gEventObjectPic_Camper_6[] = INCBIN_U32("graphics/event_objects/pics/people/camper/6.4bpp");
+const u32 gEventObjectPic_Camper_7[] = INCBIN_U32("graphics/event_objects/pics/people/camper/7.4bpp");
+const u32 gEventObjectPic_Camper_8[] = INCBIN_U32("graphics/event_objects/pics/people/camper/8.4bpp");
+const u32 gEventObjectPic_Picnicker_0[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/0.4bpp");
+const u32 gEventObjectPic_Picnicker_1[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/1.4bpp");
+const u32 gEventObjectPic_Picnicker_2[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/2.4bpp");
+const u32 gEventObjectPic_Picnicker_3[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/3.4bpp");
+const u32 gEventObjectPic_Picnicker_4[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/4.4bpp");
+const u32 gEventObjectPic_Picnicker_5[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/5.4bpp");
+const u32 gEventObjectPic_Picnicker_6[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/6.4bpp");
+const u32 gEventObjectPic_Picnicker_7[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/7.4bpp");
+const u32 gEventObjectPic_Picnicker_8[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/8.4bpp");
+const u32 gEventObjectPic_Man4_0[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/0.4bpp");
+const u32 gEventObjectPic_Man4_1[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/1.4bpp");
+const u32 gEventObjectPic_Man4_2[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/2.4bpp");
+const u32 gEventObjectPic_Man4_3[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/3.4bpp");
+const u32 gEventObjectPic_Man4_4[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/4.4bpp");
+const u32 gEventObjectPic_Man4_5[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/5.4bpp");
+const u32 gEventObjectPic_Man4_6[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/6.4bpp");
+const u32 gEventObjectPic_Man4_7[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/7.4bpp");
+const u32 gEventObjectPic_Man4_8[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/8.4bpp");
+const u32 gEventObjectPic_Woman7_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/0.4bpp");
+const u32 gEventObjectPic_Woman7_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/1.4bpp");
+const u32 gEventObjectPic_Woman7_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/2.4bpp");
+const u32 gEventObjectPic_Woman7_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/3.4bpp");
+const u32 gEventObjectPic_Woman7_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/4.4bpp");
+const u32 gEventObjectPic_Woman7_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/5.4bpp");
+const u32 gEventObjectPic_Woman7_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/6.4bpp");
+const u32 gEventObjectPic_Woman7_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/7.4bpp");
+const u32 gEventObjectPic_Woman7_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/8.4bpp");
+const u32 gEventObjectPic_Youngster_0[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/0.4bpp");
+const u32 gEventObjectPic_Youngster_1[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/1.4bpp");
+const u32 gEventObjectPic_Youngster_2[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/2.4bpp");
+const u32 gEventObjectPic_Youngster_3[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/3.4bpp");
+const u32 gEventObjectPic_Youngster_4[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/4.4bpp");
+const u32 gEventObjectPic_Youngster_5[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/5.4bpp");
+const u32 gEventObjectPic_Youngster_6[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/6.4bpp");
+const u32 gEventObjectPic_Youngster_7[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/7.4bpp");
+const u32 gEventObjectPic_Youngster_8[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/8.4bpp");
+const u32 gEventObjectPic_BugCatcher_0[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/0.4bpp");
+const u32 gEventObjectPic_BugCatcher_1[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/1.4bpp");
+const u32 gEventObjectPic_BugCatcher_2[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/2.4bpp");
+const u32 gEventObjectPic_BugCatcher_3[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/3.4bpp");
+const u32 gEventObjectPic_BugCatcher_4[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/4.4bpp");
+const u32 gEventObjectPic_BugCatcher_5[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/5.4bpp");
+const u32 gEventObjectPic_BugCatcher_6[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/6.4bpp");
+const u32 gEventObjectPic_BugCatcher_7[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/7.4bpp");
+const u32 gEventObjectPic_BugCatcher_8[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/8.4bpp");
+const u32 gEventObjectPic_PsychicM_0[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/0.4bpp");
+const u32 gEventObjectPic_PsychicM_1[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/1.4bpp");
+const u32 gEventObjectPic_PsychicM_2[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/2.4bpp");
+const u32 gEventObjectPic_PsychicM_3[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/3.4bpp");
+const u32 gEventObjectPic_PsychicM_4[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/4.4bpp");
+const u32 gEventObjectPic_PsychicM_5[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/5.4bpp");
+const u32 gEventObjectPic_PsychicM_6[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/6.4bpp");
+const u32 gEventObjectPic_PsychicM_7[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/7.4bpp");
+const u32 gEventObjectPic_PsychicM_8[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/8.4bpp");
+const u32 gEventObjectPic_SchoolKidM_0[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/0.4bpp");
+const u32 gEventObjectPic_SchoolKidM_1[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/1.4bpp");
+const u32 gEventObjectPic_SchoolKidM_2[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/2.4bpp");
+const u32 gEventObjectPic_SchoolKidM_3[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/3.4bpp");
+const u32 gEventObjectPic_SchoolKidM_4[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/4.4bpp");
+const u32 gEventObjectPic_SchoolKidM_5[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/5.4bpp");
+const u32 gEventObjectPic_SchoolKidM_6[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/6.4bpp");
+const u32 gEventObjectPic_SchoolKidM_7[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/7.4bpp");
+const u32 gEventObjectPic_SchoolKidM_8[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/8.4bpp");
+const u32 gEventObjectPic_Maniac_0[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/0.4bpp");
+const u32 gEventObjectPic_Maniac_1[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/1.4bpp");
+const u32 gEventObjectPic_Maniac_2[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/2.4bpp");
+const u32 gEventObjectPic_Maniac_3[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/3.4bpp");
+const u32 gEventObjectPic_Maniac_4[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/4.4bpp");
+const u32 gEventObjectPic_Maniac_5[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/5.4bpp");
+const u32 gEventObjectPic_Maniac_6[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/6.4bpp");
+const u32 gEventObjectPic_Maniac_7[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/7.4bpp");
+const u32 gEventObjectPic_Maniac_8[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/8.4bpp");
+const u32 gEventObjectPic_HexManiac_0[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/0.4bpp");
+const u32 gEventObjectPic_HexManiac_1[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/1.4bpp");
+const u32 gEventObjectPic_HexManiac_2[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/2.4bpp");
+const u32 gEventObjectPic_HexManiac_3[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/3.4bpp");
+const u32 gEventObjectPic_HexManiac_4[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/4.4bpp");
+const u32 gEventObjectPic_HexManiac_5[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/5.4bpp");
+const u32 gEventObjectPic_HexManiac_6[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/6.4bpp");
+const u32 gEventObjectPic_HexManiac_7[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/7.4bpp");
+const u32 gEventObjectPic_HexManiac_8[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/8.4bpp");
+const u32 gEventObjectPic_UnusedWoman_0[] = INCBIN_U32("graphics/event_objects/pics/people/unused_woman/0.4bpp");
+const u32 gEventObjectPic_UnusedWoman_1[] = INCBIN_U32("graphics/event_objects/pics/people/unused_woman/1.4bpp");
+const u32 gEventObjectPic_UnusedWoman_2[] = INCBIN_U32("graphics/event_objects/pics/people/unused_woman/2.4bpp");
+const u32 gEventObjectPic_UnusedWoman_3[] = INCBIN_U32("graphics/event_objects/pics/people/unused_woman/3.4bpp");
+const u32 gEventObjectPic_UnusedWoman_4[] = INCBIN_U32("graphics/event_objects/pics/people/unused_woman/4.4bpp");
+const u32 gEventObjectPic_UnusedWoman_5[] = INCBIN_U32("graphics/event_objects/pics/people/unused_woman/5.4bpp");
+const u32 gEventObjectPic_UnusedWoman_6[] = INCBIN_U32("graphics/event_objects/pics/people/unused_woman/6.4bpp");
+const u32 gEventObjectPic_UnusedWoman_7[] = INCBIN_U32("graphics/event_objects/pics/people/unused_woman/7.4bpp");
+const u32 gEventObjectPic_UnusedWoman_8[] = INCBIN_U32("graphics/event_objects/pics/people/unused_woman/8.4bpp");
+const u32 gEventObjectPic_SwimmerM_0[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/0.4bpp");
+const u32 gEventObjectPic_SwimmerM_1[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/1.4bpp");
+const u32 gEventObjectPic_SwimmerM_2[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/2.4bpp");
+const u32 gEventObjectPic_SwimmerM_3[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/3.4bpp");
+const u32 gEventObjectPic_SwimmerM_4[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/4.4bpp");
+const u32 gEventObjectPic_SwimmerM_5[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/5.4bpp");
+const u32 gEventObjectPic_SwimmerM_6[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/6.4bpp");
+const u32 gEventObjectPic_SwimmerM_7[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/7.4bpp");
+const u32 gEventObjectPic_SwimmerM_8[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/8.4bpp");
+const u32 gEventObjectPic_SwimmerF_0[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/0.4bpp");
+const u32 gEventObjectPic_SwimmerF_1[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/1.4bpp");
+const u32 gEventObjectPic_SwimmerF_2[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/2.4bpp");
+const u32 gEventObjectPic_SwimmerF_3[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/3.4bpp");
+const u32 gEventObjectPic_SwimmerF_4[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/4.4bpp");
+const u32 gEventObjectPic_SwimmerF_5[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/5.4bpp");
+const u32 gEventObjectPic_SwimmerF_6[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/6.4bpp");
+const u32 gEventObjectPic_SwimmerF_7[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/7.4bpp");
+const u32 gEventObjectPic_SwimmerF_8[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/8.4bpp");
+const u32 gEventObjectPic_BlackBelt_0[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/0.4bpp");
+const u32 gEventObjectPic_BlackBelt_1[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/1.4bpp");
+const u32 gEventObjectPic_BlackBelt_2[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/2.4bpp");
+const u32 gEventObjectPic_BlackBelt_3[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/3.4bpp");
+const u32 gEventObjectPic_BlackBelt_4[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/4.4bpp");
+const u32 gEventObjectPic_BlackBelt_5[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/5.4bpp");
+const u32 gEventObjectPic_BlackBelt_6[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/6.4bpp");
+const u32 gEventObjectPic_BlackBelt_7[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/7.4bpp");
+const u32 gEventObjectPic_BlackBelt_8[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/8.4bpp");
+const u32 gEventObjectPic_Beauty_0[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/0.4bpp");
+const u32 gEventObjectPic_Beauty_1[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/1.4bpp");
+const u32 gEventObjectPic_Beauty_2[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/2.4bpp");
+const u32 gEventObjectPic_Beauty_3[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/3.4bpp");
+const u32 gEventObjectPic_Beauty_4[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/4.4bpp");
+const u32 gEventObjectPic_Beauty_5[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/5.4bpp");
+const u32 gEventObjectPic_Beauty_6[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/6.4bpp");
+const u32 gEventObjectPic_Beauty_7[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/7.4bpp");
+const u32 gEventObjectPic_Beauty_8[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/8.4bpp");
+const u32 gEventObjectPic_Scientist1_0[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/0.4bpp");
+const u32 gEventObjectPic_Scientist1_1[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/1.4bpp");
+const u32 gEventObjectPic_Scientist1_2[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/2.4bpp");
+const u32 gEventObjectPic_Scientist1_3[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/3.4bpp");
+const u32 gEventObjectPic_Scientist1_4[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/4.4bpp");
+const u32 gEventObjectPic_Scientist1_5[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/5.4bpp");
+const u32 gEventObjectPic_Scientist1_6[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/6.4bpp");
+const u32 gEventObjectPic_Scientist1_7[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/7.4bpp");
+const u32 gEventObjectPic_Scientist1_8[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/8.4bpp");
+const u32 gEventObjectPic_Lass_0[] = INCBIN_U32("graphics/event_objects/pics/people/lass/0.4bpp");
+const u32 gEventObjectPic_Lass_1[] = INCBIN_U32("graphics/event_objects/pics/people/lass/1.4bpp");
+const u32 gEventObjectPic_Lass_2[] = INCBIN_U32("graphics/event_objects/pics/people/lass/2.4bpp");
+const u32 gEventObjectPic_Lass_3[] = INCBIN_U32("graphics/event_objects/pics/people/lass/3.4bpp");
+const u32 gEventObjectPic_Lass_4[] = INCBIN_U32("graphics/event_objects/pics/people/lass/4.4bpp");
+const u32 gEventObjectPic_Lass_5[] = INCBIN_U32("graphics/event_objects/pics/people/lass/5.4bpp");
+const u32 gEventObjectPic_Lass_6[] = INCBIN_U32("graphics/event_objects/pics/people/lass/6.4bpp");
+const u32 gEventObjectPic_Lass_7[] = INCBIN_U32("graphics/event_objects/pics/people/lass/7.4bpp");
+const u32 gEventObjectPic_Lass_8[] = INCBIN_U32("graphics/event_objects/pics/people/lass/8.4bpp");
+const u32 gEventObjectPic_Gentleman_0[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/0.4bpp");
+const u32 gEventObjectPic_Gentleman_1[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/1.4bpp");
+const u32 gEventObjectPic_Gentleman_2[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/2.4bpp");
+const u32 gEventObjectPic_Gentleman_3[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/3.4bpp");
+const u32 gEventObjectPic_Gentleman_4[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/4.4bpp");
+const u32 gEventObjectPic_Gentleman_5[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/5.4bpp");
+const u32 gEventObjectPic_Gentleman_6[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/6.4bpp");
+const u32 gEventObjectPic_Gentleman_7[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/7.4bpp");
+const u32 gEventObjectPic_Gentleman_8[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/8.4bpp");
+const u32 gEventObjectPic_Sailor_0[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/0.4bpp");
+const u32 gEventObjectPic_Sailor_1[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/1.4bpp");
+const u32 gEventObjectPic_Sailor_2[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/2.4bpp");
+const u32 gEventObjectPic_Sailor_3[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/3.4bpp");
+const u32 gEventObjectPic_Sailor_4[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/4.4bpp");
+const u32 gEventObjectPic_Sailor_5[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/5.4bpp");
+const u32 gEventObjectPic_Sailor_6[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/6.4bpp");
+const u32 gEventObjectPic_Sailor_7[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/7.4bpp");
+const u32 gEventObjectPic_Sailor_8[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/8.4bpp");
+const u32 gEventObjectPic_Fisherman_0[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/0.4bpp");
+const u32 gEventObjectPic_Fisherman_1[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/1.4bpp");
+const u32 gEventObjectPic_Fisherman_2[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/2.4bpp");
+const u32 gEventObjectPic_Fisherman_3[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/3.4bpp");
+const u32 gEventObjectPic_Fisherman_4[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/4.4bpp");
+const u32 gEventObjectPic_Fisherman_5[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/5.4bpp");
+const u32 gEventObjectPic_Fisherman_6[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/6.4bpp");
+const u32 gEventObjectPic_Fisherman_7[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/7.4bpp");
+const u32 gEventObjectPic_Fisherman_8[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/8.4bpp");
+const u32 gEventObjectPic_RunningTriathleteM_0[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/0.4bpp");
+const u32 gEventObjectPic_RunningTriathleteM_1[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/1.4bpp");
+const u32 gEventObjectPic_RunningTriathleteM_2[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/2.4bpp");
+const u32 gEventObjectPic_RunningTriathleteM_3[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/3.4bpp");
+const u32 gEventObjectPic_RunningTriathleteM_4[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/4.4bpp");
+const u32 gEventObjectPic_RunningTriathleteM_5[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/5.4bpp");
+const u32 gEventObjectPic_RunningTriathleteM_6[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/6.4bpp");
+const u32 gEventObjectPic_RunningTriathleteM_7[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/7.4bpp");
+const u32 gEventObjectPic_RunningTriathleteM_8[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/8.4bpp");
+const u32 gEventObjectPic_RunningTriathleteF_0[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/0.4bpp");
+const u32 gEventObjectPic_RunningTriathleteF_1[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/1.4bpp");
+const u32 gEventObjectPic_RunningTriathleteF_2[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/2.4bpp");
+const u32 gEventObjectPic_RunningTriathleteF_3[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/3.4bpp");
+const u32 gEventObjectPic_RunningTriathleteF_4[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/4.4bpp");
+const u32 gEventObjectPic_RunningTriathleteF_5[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/5.4bpp");
+const u32 gEventObjectPic_RunningTriathleteF_6[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/6.4bpp");
+const u32 gEventObjectPic_RunningTriathleteF_7[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/7.4bpp");
+const u32 gEventObjectPic_RunningTriathleteF_8[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/8.4bpp");
+const u32 gEventObjectPic_TuberF_0[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/0.4bpp");
+const u32 gEventObjectPic_TuberF_1[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/1.4bpp");
+const u32 gEventObjectPic_TuberF_2[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/2.4bpp");
+const u32 gEventObjectPic_TuberF_3[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/3.4bpp");
+const u32 gEventObjectPic_TuberF_4[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/4.4bpp");
+const u32 gEventObjectPic_TuberF_5[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/5.4bpp");
+const u32 gEventObjectPic_TuberF_6[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/6.4bpp");
+const u32 gEventObjectPic_TuberF_7[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/7.4bpp");
+const u32 gEventObjectPic_TuberF_8[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/8.4bpp");
+const u32 gEventObjectPic_TuberM_0[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/0.4bpp");
+const u32 gEventObjectPic_TuberM_1[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/1.4bpp");
+const u32 gEventObjectPic_TuberM_2[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/2.4bpp");
+const u32 gEventObjectPic_TuberM_3[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/3.4bpp");
+const u32 gEventObjectPic_TuberM_4[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/4.4bpp");
+const u32 gEventObjectPic_TuberM_5[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/5.4bpp");
+const u32 gEventObjectPic_TuberM_6[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/6.4bpp");
+const u32 gEventObjectPic_TuberM_7[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/7.4bpp");
+const u32 gEventObjectPic_TuberM_8[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/8.4bpp");
+const u32 gEventObjectPic_Hiker_0[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/0.4bpp");
+const u32 gEventObjectPic_Hiker_1[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/1.4bpp");
+const u32 gEventObjectPic_Hiker_2[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/2.4bpp");
+const u32 gEventObjectPic_Hiker_3[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/3.4bpp");
+const u32 gEventObjectPic_Hiker_4[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/4.4bpp");
+const u32 gEventObjectPic_Hiker_5[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/5.4bpp");
+const u32 gEventObjectPic_Hiker_6[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/6.4bpp");
+const u32 gEventObjectPic_Hiker_7[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/7.4bpp");
+const u32 gEventObjectPic_Hiker_8[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/8.4bpp");
+const u32 gEventObjectPic_CyclingTriathleteM_0[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/0.4bpp");
+const u32 gEventObjectPic_CyclingTriathleteM_1[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/1.4bpp");
+const u32 gEventObjectPic_CyclingTriathleteM_2[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/2.4bpp");
+const u32 gEventObjectPic_CyclingTriathleteM_3[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/3.4bpp");
+const u32 gEventObjectPic_CyclingTriathleteM_4[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/4.4bpp");
+const u32 gEventObjectPic_CyclingTriathleteM_5[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/5.4bpp");
+const u32 gEventObjectPic_CyclingTriathleteM_6[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/6.4bpp");
+const u32 gEventObjectPic_CyclingTriathleteM_7[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/7.4bpp");
+const u32 gEventObjectPic_CyclingTriathleteM_8[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/8.4bpp");
+const u32 gEventObjectPic_CyclingTriathleteF_0[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/0.4bpp");
+const u32 gEventObjectPic_CyclingTriathleteF_1[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/1.4bpp");
+const u32 gEventObjectPic_CyclingTriathleteF_2[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/2.4bpp");
+const u32 gEventObjectPic_CyclingTriathleteF_3[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/3.4bpp");
+const u32 gEventObjectPic_CyclingTriathleteF_4[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/4.4bpp");
+const u32 gEventObjectPic_CyclingTriathleteF_5[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/5.4bpp");
+const u32 gEventObjectPic_CyclingTriathleteF_6[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/6.4bpp");
+const u32 gEventObjectPic_CyclingTriathleteF_7[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/7.4bpp");
+const u32 gEventObjectPic_CyclingTriathleteF_8[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/8.4bpp");
+const u32 gEventObjectPic_Man5_0[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/0.4bpp");
+const u32 gEventObjectPic_Man5_1[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/1.4bpp");
+const u32 gEventObjectPic_Man5_2[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/2.4bpp");
+const u32 gEventObjectPic_Man5_3[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/3.4bpp");
+const u32 gEventObjectPic_Man5_4[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/4.4bpp");
+const u32 gEventObjectPic_Man5_5[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/5.4bpp");
+const u32 gEventObjectPic_Man5_6[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/6.4bpp");
+const u32 gEventObjectPic_Man5_7[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/7.4bpp");
+const u32 gEventObjectPic_Man5_8[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/8.4bpp");
+const u32 gEventObjectPic_Man6_0[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/0.4bpp");
+const u32 gEventObjectPic_Man6_1[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/1.4bpp");
+const u32 gEventObjectPic_Man6_2[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/2.4bpp");
+const u32 gEventObjectPic_Man6_3[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/3.4bpp");
+const u32 gEventObjectPic_Man6_4[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/4.4bpp");
+const u32 gEventObjectPic_Man6_5[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/5.4bpp");
+const u32 gEventObjectPic_Man6_6[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/6.4bpp");
+const u32 gEventObjectPic_Man6_7[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/7.4bpp");
+const u32 gEventObjectPic_Man6_8[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/8.4bpp");
+const u32 gEventObjectPic_Nurse_0[] = INCBIN_U32("graphics/event_objects/pics/people/nurse/0.4bpp");
+const u32 gEventObjectPic_Nurse_1[] = INCBIN_U32("graphics/event_objects/pics/people/nurse/1.4bpp");
+const u32 gEventObjectPic_Nurse_2[] = INCBIN_U32("graphics/event_objects/pics/people/nurse/2.4bpp");
+const u32 gEventObjectPic_Nurse_3[] = INCBIN_U32("graphics/event_objects/pics/people/nurse/3.4bpp");
+const u32 gEventObjectPic_ItemBall[] = INCBIN_U32("graphics/event_objects/pics/misc/item_ball.4bpp");
+const u32 gEventObjectPic_ProfBirch_0[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/0.4bpp");
+const u32 gEventObjectPic_ProfBirch_1[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/1.4bpp");
+const u32 gEventObjectPic_ProfBirch_2[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/2.4bpp");
+const u32 gEventObjectPic_ProfBirch_3[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/3.4bpp");
+const u32 gEventObjectPic_ProfBirch_4[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/4.4bpp");
+const u32 gEventObjectPic_ProfBirch_5[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/5.4bpp");
+const u32 gEventObjectPic_ProfBirch_6[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/6.4bpp");
+const u32 gEventObjectPic_ProfBirch_7[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/7.4bpp");
+const u32 gEventObjectPic_ProfBirch_8[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/8.4bpp");
+const u32 gEventObjectPic_ReporterM_0[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/0.4bpp");
+const u32 gEventObjectPic_ReporterM_1[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/1.4bpp");
+const u32 gEventObjectPic_ReporterM_2[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/2.4bpp");
+const u32 gEventObjectPic_ReporterM_3[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/3.4bpp");
+const u32 gEventObjectPic_ReporterM_4[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/4.4bpp");
+const u32 gEventObjectPic_ReporterM_5[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/5.4bpp");
+const u32 gEventObjectPic_ReporterM_6[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/6.4bpp");
+const u32 gEventObjectPic_ReporterM_7[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/7.4bpp");
+const u32 gEventObjectPic_ReporterM_8[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/8.4bpp");
+const u32 gEventObjectPic_ReporterF_0[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/0.4bpp");
+const u32 gEventObjectPic_ReporterF_1[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/1.4bpp");
+const u32 gEventObjectPic_ReporterF_2[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/2.4bpp");
+const u32 gEventObjectPic_ReporterF_3[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/3.4bpp");
+const u32 gEventObjectPic_ReporterF_4[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/4.4bpp");
+const u32 gEventObjectPic_ReporterF_5[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/5.4bpp");
+const u32 gEventObjectPic_ReporterF_6[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/6.4bpp");
+const u32 gEventObjectPic_ReporterF_7[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/7.4bpp");
+const u32 gEventObjectPic_ReporterF_8[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/8.4bpp");
+const u32 gEventObjectPic_MauvilleOldMan1_0[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/0.4bpp");
+const u32 gEventObjectPic_MauvilleOldMan1_1[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/1.4bpp");
+const u32 gEventObjectPic_MauvilleOldMan1_2[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/2.4bpp");
+const u32 gEventObjectPic_MauvilleOldMan1_3[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/3.4bpp");
+const u32 gEventObjectPic_MauvilleOldMan1_4[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/4.4bpp");
+const u32 gEventObjectPic_MauvilleOldMan1_5[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/5.4bpp");
+const u32 gEventObjectPic_MauvilleOldMan1_6[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/6.4bpp");
+const u32 gEventObjectPic_MauvilleOldMan1_7[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/7.4bpp");
+const u32 gEventObjectPic_MauvilleOldMan1_8[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/8.4bpp");
+const u32 gEventObjectPic_MauvilleOldMan2_0[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/0.4bpp");
+const u32 gEventObjectPic_MauvilleOldMan2_1[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/1.4bpp");
+const u32 gEventObjectPic_MauvilleOldMan2_2[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/2.4bpp");
+const u32 gEventObjectPic_MauvilleOldMan2_3[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/3.4bpp");
+const u32 gEventObjectPic_MauvilleOldMan2_4[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/4.4bpp");
+const u32 gEventObjectPic_MauvilleOldMan2_5[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/5.4bpp");
+const u32 gEventObjectPic_MauvilleOldMan2_6[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/6.4bpp");
+const u32 gEventObjectPic_MauvilleOldMan2_7[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/7.4bpp");
+const u32 gEventObjectPic_MauvilleOldMan2_8[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/8.4bpp");
+const u32 gEventObjectPic_MartEmployee_0[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/0.4bpp");
+const u32 gEventObjectPic_MartEmployee_1[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/1.4bpp");
+const u32 gEventObjectPic_MartEmployee_2[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/2.4bpp");
+const u32 gEventObjectPic_MartEmployee_3[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/3.4bpp");
+const u32 gEventObjectPic_MartEmployee_4[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/4.4bpp");
+const u32 gEventObjectPic_MartEmployee_5[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/5.4bpp");
+const u32 gEventObjectPic_MartEmployee_6[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/6.4bpp");
+const u32 gEventObjectPic_MartEmployee_7[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/7.4bpp");
+const u32 gEventObjectPic_MartEmployee_8[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/8.4bpp");
+const u32 gEventObjectPic_RooftopSaleWoman_0[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/0.4bpp");
+const u32 gEventObjectPic_RooftopSaleWoman_1[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/1.4bpp");
+const u32 gEventObjectPic_RooftopSaleWoman_2[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/2.4bpp");
+const u32 gEventObjectPic_RooftopSaleWoman_3[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/3.4bpp");
+const u32 gEventObjectPic_RooftopSaleWoman_4[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/4.4bpp");
+const u32 gEventObjectPic_RooftopSaleWoman_5[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/5.4bpp");
+const u32 gEventObjectPic_RooftopSaleWoman_6[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/6.4bpp");
+const u32 gEventObjectPic_RooftopSaleWoman_7[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/7.4bpp");
+const u32 gEventObjectPic_RooftopSaleWoman_8[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/8.4bpp");
+const u32 gEventObjectPic_Teala_0[] = INCBIN_U32("graphics/event_objects/pics/people/teala/0.4bpp");
+const u32 gEventObjectPic_Teala_1[] = INCBIN_U32("graphics/event_objects/pics/people/teala/1.4bpp");
+const u32 gEventObjectPic_Teala_2[] = INCBIN_U32("graphics/event_objects/pics/people/teala/2.4bpp");
+const u32 gEventObjectPic_Teala_3[] = INCBIN_U32("graphics/event_objects/pics/people/teala/3.4bpp");
+const u32 gEventObjectPic_Teala_4[] = INCBIN_U32("graphics/event_objects/pics/people/teala/4.4bpp");
+const u32 gEventObjectPic_Teala_5[] = INCBIN_U32("graphics/event_objects/pics/people/teala/5.4bpp");
+const u32 gEventObjectPic_Teala_6[] = INCBIN_U32("graphics/event_objects/pics/people/teala/6.4bpp");
+const u32 gEventObjectPic_Teala_7[] = INCBIN_U32("graphics/event_objects/pics/people/teala/7.4bpp");
+const u32 gEventObjectPic_Teala_8[] = INCBIN_U32("graphics/event_objects/pics/people/teala/8.4bpp");
+const u32 gEventObjectPic_Artist_0[] = INCBIN_U32("graphics/event_objects/pics/people/artist/0.4bpp");
+const u32 gEventObjectPic_Artist_1[] = INCBIN_U32("graphics/event_objects/pics/people/artist/1.4bpp");
+const u32 gEventObjectPic_Artist_2[] = INCBIN_U32("graphics/event_objects/pics/people/artist/2.4bpp");
+const u32 gEventObjectPic_Artist_3[] = INCBIN_U32("graphics/event_objects/pics/people/artist/3.4bpp");
+const u32 gEventObjectPic_Artist_4[] = INCBIN_U32("graphics/event_objects/pics/people/artist/4.4bpp");
+const u32 gEventObjectPic_Artist_5[] = INCBIN_U32("graphics/event_objects/pics/people/artist/5.4bpp");
+const u32 gEventObjectPic_Artist_6[] = INCBIN_U32("graphics/event_objects/pics/people/artist/6.4bpp");
+const u32 gEventObjectPic_Artist_7[] = INCBIN_U32("graphics/event_objects/pics/people/artist/7.4bpp");
+const u32 gEventObjectPic_Artist_8[] = INCBIN_U32("graphics/event_objects/pics/people/artist/8.4bpp");
+const u32 gEventObjectPic_Cameraman_0[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/0.4bpp");
+const u32 gEventObjectPic_Cameraman_1[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/1.4bpp");
+const u32 gEventObjectPic_Cameraman_2[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/2.4bpp");
+const u32 gEventObjectPic_Cameraman_3[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/3.4bpp");
+const u32 gEventObjectPic_Cameraman_4[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/4.4bpp");
+const u32 gEventObjectPic_Cameraman_5[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/5.4bpp");
+const u32 gEventObjectPic_Cameraman_6[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/6.4bpp");
+const u32 gEventObjectPic_Cameraman_7[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/7.4bpp");
+const u32 gEventObjectPic_Cameraman_8[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/8.4bpp");
+const u32 gEventObjectPic_Scientist2_0[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/0.4bpp");
+const u32 gEventObjectPic_Scientist2_1[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/1.4bpp");
+const u32 gEventObjectPic_Scientist2_2[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/2.4bpp");
+const u32 gEventObjectPic_Scientist2_3[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/3.4bpp");
+const u32 gEventObjectPic_Scientist2_4[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/4.4bpp");
+const u32 gEventObjectPic_Scientist2_5[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/5.4bpp");
+const u32 gEventObjectPic_Scientist2_6[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/6.4bpp");
+const u32 gEventObjectPic_Scientist2_7[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/7.4bpp");
+const u32 gEventObjectPic_Scientist2_8[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/8.4bpp");
+const u32 gEventObjectPic_Man7_0[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/0.4bpp");
+const u32 gEventObjectPic_Man7_1[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/1.4bpp");
+const u32 gEventObjectPic_Man7_2[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/2.4bpp");
+const u32 gEventObjectPic_Man7_3[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/3.4bpp");
+const u32 gEventObjectPic_Man7_4[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/4.4bpp");
+const u32 gEventObjectPic_Man7_5[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/5.4bpp");
+const u32 gEventObjectPic_Man7_6[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/6.4bpp");
+const u32 gEventObjectPic_Man7_7[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/7.4bpp");
+const u32 gEventObjectPic_Man7_8[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/8.4bpp");
+const u32 gEventObjectPic_AquaMemberM_0[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/0.4bpp");
+const u32 gEventObjectPic_AquaMemberM_1[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/1.4bpp");
+const u32 gEventObjectPic_AquaMemberM_2[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/2.4bpp");
+const u32 gEventObjectPic_AquaMemberM_3[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/3.4bpp");
+const u32 gEventObjectPic_AquaMemberM_4[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/4.4bpp");
+const u32 gEventObjectPic_AquaMemberM_5[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/5.4bpp");
+const u32 gEventObjectPic_AquaMemberM_6[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/6.4bpp");
+const u32 gEventObjectPic_AquaMemberM_7[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/7.4bpp");
+const u32 gEventObjectPic_AquaMemberM_8[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/8.4bpp");
+const u32 gEventObjectPic_AquaMemberF_0[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/0.4bpp");
+const u32 gEventObjectPic_AquaMemberF_1[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/1.4bpp");
+const u32 gEventObjectPic_AquaMemberF_2[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/2.4bpp");
+const u32 gEventObjectPic_AquaMemberF_3[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/3.4bpp");
+const u32 gEventObjectPic_AquaMemberF_4[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/4.4bpp");
+const u32 gEventObjectPic_AquaMemberF_5[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/5.4bpp");
+const u32 gEventObjectPic_AquaMemberF_6[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/6.4bpp");
+const u32 gEventObjectPic_AquaMemberF_7[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/7.4bpp");
+const u32 gEventObjectPic_AquaMemberF_8[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/8.4bpp");
+const u32 gEventObjectPic_MagmaMemberM_0[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/0.4bpp");
+const u32 gEventObjectPic_MagmaMemberM_1[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/1.4bpp");
+const u32 gEventObjectPic_MagmaMemberM_2[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/2.4bpp");
+const u32 gEventObjectPic_MagmaMemberM_3[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/3.4bpp");
+const u32 gEventObjectPic_MagmaMemberM_4[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/4.4bpp");
+const u32 gEventObjectPic_MagmaMemberM_5[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/5.4bpp");
+const u32 gEventObjectPic_MagmaMemberM_6[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/6.4bpp");
+const u32 gEventObjectPic_MagmaMemberM_7[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/7.4bpp");
+const u32 gEventObjectPic_MagmaMemberM_8[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/8.4bpp");
+const u32 gEventObjectPic_MagmaMemberF_0[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/0.4bpp");
+const u32 gEventObjectPic_MagmaMemberF_1[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/1.4bpp");
+const u32 gEventObjectPic_MagmaMemberF_2[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/2.4bpp");
+const u32 gEventObjectPic_MagmaMemberF_3[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/3.4bpp");
+const u32 gEventObjectPic_MagmaMemberF_4[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/4.4bpp");
+const u32 gEventObjectPic_MagmaMemberF_5[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/5.4bpp");
+const u32 gEventObjectPic_MagmaMemberF_6[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/6.4bpp");
+const u32 gEventObjectPic_MagmaMemberF_7[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/7.4bpp");
+const u32 gEventObjectPic_MagmaMemberF_8[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/8.4bpp");
+const u32 gEventObjectPic_Sidney_0[] = INCBIN_U32("graphics/event_objects/pics/people/sidney/0.4bpp");
+const u32 gEventObjectPic_Sidney_1[] = INCBIN_U32("graphics/event_objects/pics/people/sidney/1.4bpp");
+const u32 gEventObjectPic_Sidney_2[] = INCBIN_U32("graphics/event_objects/pics/people/sidney/2.4bpp");
+const u32 gEventObjectPic_Phoebe_0[] = INCBIN_U32("graphics/event_objects/pics/people/phoebe/0.4bpp");
+const u32 gEventObjectPic_Phoebe_1[] = INCBIN_U32("graphics/event_objects/pics/people/phoebe/1.4bpp");
+const u32 gEventObjectPic_Phoebe_2[] = INCBIN_U32("graphics/event_objects/pics/people/phoebe/2.4bpp");
+const u32 gEventObjectPic_Glacia_0[] = INCBIN_U32("graphics/event_objects/pics/people/glacia/0.4bpp");
+const u32 gEventObjectPic_Glacia_1[] = INCBIN_U32("graphics/event_objects/pics/people/glacia/1.4bpp");
+const u32 gEventObjectPic_Glacia_2[] = INCBIN_U32("graphics/event_objects/pics/people/glacia/2.4bpp");
+const u32 gEventObjectPic_Drake_0[] = INCBIN_U32("graphics/event_objects/pics/people/drake/0.4bpp");
+const u32 gEventObjectPic_Drake_1[] = INCBIN_U32("graphics/event_objects/pics/people/drake/1.4bpp");
+const u32 gEventObjectPic_Drake_2[] = INCBIN_U32("graphics/event_objects/pics/people/drake/2.4bpp");
+const u32 gEventObjectPic_Roxanne_0[] = INCBIN_U32("graphics/event_objects/pics/people/roxanne/0.4bpp");
+const u32 gEventObjectPic_Roxanne_1[] = INCBIN_U32("graphics/event_objects/pics/people/roxanne/1.4bpp");
+const u32 gEventObjectPic_Roxanne_2[] = INCBIN_U32("graphics/event_objects/pics/people/roxanne/2.4bpp");
+const u32 gEventObjectPic_Brawly_0[] = INCBIN_U32("graphics/event_objects/pics/people/brawly/0.4bpp");
+const u32 gEventObjectPic_Brawly_1[] = INCBIN_U32("graphics/event_objects/pics/people/brawly/1.4bpp");
+const u32 gEventObjectPic_Brawly_2[] = INCBIN_U32("graphics/event_objects/pics/people/brawly/2.4bpp");
+const u32 gEventObjectPic_Wattson_0[] = INCBIN_U32("graphics/event_objects/pics/people/wattson/0.4bpp");
+const u32 gEventObjectPic_Wattson_1[] = INCBIN_U32("graphics/event_objects/pics/people/wattson/1.4bpp");
+const u32 gEventObjectPic_Wattson_2[] = INCBIN_U32("graphics/event_objects/pics/people/wattson/2.4bpp");
+const u32 gEventObjectPic_Flannery_0[] = INCBIN_U32("graphics/event_objects/pics/people/flannery/0.4bpp");
+const u32 gEventObjectPic_Flannery_1[] = INCBIN_U32("graphics/event_objects/pics/people/flannery/1.4bpp");
+const u32 gEventObjectPic_Flannery_2[] = INCBIN_U32("graphics/event_objects/pics/people/flannery/2.4bpp");
+const u32 gEventObjectPic_Norman_0[] = INCBIN_U32("graphics/event_objects/pics/people/norman/0.4bpp");
+const u32 gEventObjectPic_Norman_1[] = INCBIN_U32("graphics/event_objects/pics/people/norman/1.4bpp");
+const u32 gEventObjectPic_Norman_2[] = INCBIN_U32("graphics/event_objects/pics/people/norman/2.4bpp");
+const u32 gEventObjectPic_Norman_3[] = INCBIN_U32("graphics/event_objects/pics/people/norman/3.4bpp");
+const u32 gEventObjectPic_Norman_4[] = INCBIN_U32("graphics/event_objects/pics/people/norman/4.4bpp");
+const u32 gEventObjectPic_Norman_5[] = INCBIN_U32("graphics/event_objects/pics/people/norman/5.4bpp");
+const u32 gEventObjectPic_Norman_6[] = INCBIN_U32("graphics/event_objects/pics/people/norman/6.4bpp");
+const u32 gEventObjectPic_Norman_7[] = INCBIN_U32("graphics/event_objects/pics/people/norman/7.4bpp");
+const u32 gEventObjectPic_Norman_8[] = INCBIN_U32("graphics/event_objects/pics/people/norman/8.4bpp");
+const u32 gEventObjectPic_Winona_0[] = INCBIN_U32("graphics/event_objects/pics/people/winona/0.4bpp");
+const u32 gEventObjectPic_Winona_1[] = INCBIN_U32("graphics/event_objects/pics/people/winona/1.4bpp");
+const u32 gEventObjectPic_Winona_2[] = INCBIN_U32("graphics/event_objects/pics/people/winona/2.4bpp");
+const u32 gEventObjectPic_Liza_0[] = INCBIN_U32("graphics/event_objects/pics/people/liza/0.4bpp");
+const u32 gEventObjectPic_Liza_1[] = INCBIN_U32("graphics/event_objects/pics/people/liza/1.4bpp");
+const u32 gEventObjectPic_Liza_2[] = INCBIN_U32("graphics/event_objects/pics/people/liza/2.4bpp");
+const u32 gEventObjectPic_Tate_0[] = INCBIN_U32("graphics/event_objects/pics/people/tate/0.4bpp");
+const u32 gEventObjectPic_Tate_1[] = INCBIN_U32("graphics/event_objects/pics/people/tate/1.4bpp");
+const u32 gEventObjectPic_Tate_2[] = INCBIN_U32("graphics/event_objects/pics/people/tate/2.4bpp");
+const u32 gEventObjectPic_Wallace_0[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/0.4bpp");
+const u32 gEventObjectPic_Wallace_1[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/1.4bpp");
+const u32 gEventObjectPic_Wallace_2[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/2.4bpp");
+const u32 gEventObjectPic_Wallace_3[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/3.4bpp");
+const u32 gEventObjectPic_Wallace_4[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/4.4bpp");
+const u32 gEventObjectPic_Wallace_5[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/5.4bpp");
+const u32 gEventObjectPic_Wallace_6[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/6.4bpp");
+const u32 gEventObjectPic_Wallace_7[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/7.4bpp");
+const u32 gEventObjectPic_Wallace_8[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/8.4bpp");
+const u32 gEventObjectPic_Steven_0[] = INCBIN_U32("graphics/event_objects/pics/people/steven/0.4bpp");
+const u32 gEventObjectPic_Steven_1[] = INCBIN_U32("graphics/event_objects/pics/people/steven/1.4bpp");
+const u32 gEventObjectPic_Steven_2[] = INCBIN_U32("graphics/event_objects/pics/people/steven/2.4bpp");
+const u32 gEventObjectPic_Steven_3[] = INCBIN_U32("graphics/event_objects/pics/people/steven/3.4bpp");
+const u32 gEventObjectPic_Steven_4[] = INCBIN_U32("graphics/event_objects/pics/people/steven/4.4bpp");
+const u32 gEventObjectPic_Steven_5[] = INCBIN_U32("graphics/event_objects/pics/people/steven/5.4bpp");
+const u32 gEventObjectPic_Steven_6[] = INCBIN_U32("graphics/event_objects/pics/people/steven/6.4bpp");
+const u32 gEventObjectPic_Steven_7[] = INCBIN_U32("graphics/event_objects/pics/people/steven/7.4bpp");
+const u32 gEventObjectPic_Steven_8[] = INCBIN_U32("graphics/event_objects/pics/people/steven/8.4bpp");
+const u32 gEventObjectPic_Wally_0[] = INCBIN_U32("graphics/event_objects/pics/people/wally/0.4bpp");
+const u32 gEventObjectPic_Wally_1[] = INCBIN_U32("graphics/event_objects/pics/people/wally/1.4bpp");
+const u32 gEventObjectPic_Wally_2[] = INCBIN_U32("graphics/event_objects/pics/people/wally/2.4bpp");
+const u32 gEventObjectPic_Wally_3[] = INCBIN_U32("graphics/event_objects/pics/people/wally/3.4bpp");
+const u32 gEventObjectPic_Wally_4[] = INCBIN_U32("graphics/event_objects/pics/people/wally/4.4bpp");
+const u32 gEventObjectPic_Wally_5[] = INCBIN_U32("graphics/event_objects/pics/people/wally/5.4bpp");
+const u32 gEventObjectPic_Wally_6[] = INCBIN_U32("graphics/event_objects/pics/people/wally/6.4bpp");
+const u32 gEventObjectPic_Wally_7[] = INCBIN_U32("graphics/event_objects/pics/people/wally/7.4bpp");
+const u32 gEventObjectPic_Wally_8[] = INCBIN_U32("graphics/event_objects/pics/people/wally/8.4bpp");
+const u32 gEventObjectPic_RubySapphireLittleBoy_0[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_little_boy/0.4bpp");
+const u32 gEventObjectPic_RubySapphireLittleBoy_1[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_little_boy/1.4bpp");
+const u32 gEventObjectPic_RubySapphireLittleBoy_2[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_little_boy/2.4bpp");
+const u32 gEventObjectPic_RubySapphireLittleBoy_3[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_little_boy/3.4bpp");
+const u32 gEventObjectPic_RubySapphireLittleBoy_4[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_little_boy/4.4bpp");
+const u32 gEventObjectPic_RubySapphireLittleBoy_5[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_little_boy/5.4bpp");
+const u32 gEventObjectPic_RubySapphireLittleBoy_6[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_little_boy/6.4bpp");
+const u32 gEventObjectPic_RubySapphireLittleBoy_7[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_little_boy/7.4bpp");
+const u32 gEventObjectPic_RubySapphireLittleBoy_8[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_little_boy/8.4bpp");
+const u32 gEventObjectPic_HotSpringsOldWoman_0[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/0.4bpp");
+const u32 gEventObjectPic_HotSpringsOldWoman_1[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/1.4bpp");
+const u32 gEventObjectPic_HotSpringsOldWoman_2[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/2.4bpp");
+const u32 gEventObjectPic_HotSpringsOldWoman_3[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/3.4bpp");
+const u32 gEventObjectPic_HotSpringsOldWoman_4[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/4.4bpp");
+const u32 gEventObjectPic_HotSpringsOldWoman_5[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/5.4bpp");
+const u32 gEventObjectPic_HotSpringsOldWoman_6[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/6.4bpp");
+const u32 gEventObjectPic_HotSpringsOldWoman_7[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/7.4bpp");
+const u32 gEventObjectPic_HotSpringsOldWoman_8[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/8.4bpp");
+const u32 gEventObjectPic_LatiasLatios_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/latias_latios/0.4bpp");
+const u32 gEventObjectPic_LatiasLatios_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/latias_latios/1.4bpp");
+const u32 gEventObjectPic_LatiasLatios_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/latias_latios/2.4bpp");
+const u32 gEventObjectPic_Boy5_0[] = INCBIN_U32("graphics/event_objects/pics/people/boy_5/0.4bpp");
+const u32 gEventObjectPic_Boy5_1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_5/1.4bpp");
+const u32 gEventObjectPic_Boy5_2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_5/2.4bpp");
+const u32 gEventObjectPic_ContestOldMan_0[] = INCBIN_U32("graphics/event_objects/pics/people/contest_old_man/0.4bpp");
+const u32 gEventObjectPic_ContestOldMan_1[] = INCBIN_U32("graphics/event_objects/pics/people/contest_old_man/1.4bpp");
+const u32 gEventObjectPic_ContestOldMan_2[] = INCBIN_U32("graphics/event_objects/pics/people/contest_old_man/2.4bpp");
+const u32 gEventObjectPic_ContestOldMan_3[] = INCBIN_U32("graphics/event_objects/pics/people/contest_old_man/3.4bpp");
+const u32 gEventObjectPic_ContestOldMan_4[] = INCBIN_U32("graphics/event_objects/pics/people/contest_old_man/4.4bpp");
+const u32 gEventObjectPic_ContestOldMan_5[] = INCBIN_U32("graphics/event_objects/pics/people/contest_old_man/5.4bpp");
+const u32 gEventObjectPic_ContestOldMan_6[] = INCBIN_U32("graphics/event_objects/pics/people/contest_old_man/6.4bpp");
+const u32 gEventObjectPic_ContestOldMan_7[] = INCBIN_U32("graphics/event_objects/pics/people/contest_old_man/7.4bpp");
+const u32 gEventObjectPic_ContestOldMan_8[] = INCBIN_U32("graphics/event_objects/pics/people/contest_old_man/8.4bpp");
+const u32 gEventObjectPic_Archie_0[] = INCBIN_U32("graphics/event_objects/pics/people/archie/0.4bpp");
+const u32 gEventObjectPic_Archie_1[] = INCBIN_U32("graphics/event_objects/pics/people/archie/1.4bpp");
+const u32 gEventObjectPic_Archie_2[] = INCBIN_U32("graphics/event_objects/pics/people/archie/2.4bpp");
+const u32 gEventObjectPic_Archie_3[] = INCBIN_U32("graphics/event_objects/pics/people/archie/3.4bpp");
+const u32 gEventObjectPic_Archie_4[] = INCBIN_U32("graphics/event_objects/pics/people/archie/4.4bpp");
+const u32 gEventObjectPic_Archie_5[] = INCBIN_U32("graphics/event_objects/pics/people/archie/5.4bpp");
+const u32 gEventObjectPic_Archie_6[] = INCBIN_U32("graphics/event_objects/pics/people/archie/6.4bpp");
+const u32 gEventObjectPic_Archie_7[] = INCBIN_U32("graphics/event_objects/pics/people/archie/7.4bpp");
+const u32 gEventObjectPic_Archie_8[] = INCBIN_U32("graphics/event_objects/pics/people/archie/8.4bpp");
+const u32 gEventObjectPic_Maxie_0[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/0.4bpp");
+const u32 gEventObjectPic_Maxie_1[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/1.4bpp");
+const u32 gEventObjectPic_Maxie_2[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/2.4bpp");
+const u32 gEventObjectPic_Maxie_3[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/3.4bpp");
+const u32 gEventObjectPic_Maxie_4[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/4.4bpp");
+const u32 gEventObjectPic_Maxie_5[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/5.4bpp");
+const u32 gEventObjectPic_Maxie_6[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/6.4bpp");
+const u32 gEventObjectPic_Maxie_7[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/7.4bpp");
+const u32 gEventObjectPic_Maxie_8[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/8.4bpp");
+const u32 gEventObjectPic_KyogreFront_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kyogre_front/0.4bpp");
+const u32 gEventObjectPic_KyogreFront_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kyogre_front/1.4bpp");
+const u32 gEventObjectPic_KyogreSide_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kyogre_side/0.4bpp");
+const u32 gEventObjectPic_KyogreSide_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kyogre_side/1.4bpp");
+const u32 gEventObjectPic_GroudonFront_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/groudon_front/0.4bpp");
+const u32 gEventObjectPic_GroudonFront_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/groudon_front/1.4bpp");
+const u32 gEventObjectPic_GroudonSide_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/groudon_side/0.4bpp");
+const u32 gEventObjectPic_GroudonSide_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/groudon_side/1.4bpp");
+const u32 gEventObjectPic_Regi[] = INCBIN_U32("graphics/event_objects/pics/pokemon/regi.4bpp");
+const u32 gEventObjectPic_Skitty_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/skitty/0.4bpp");
+const u32 gEventObjectPic_Skitty_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/skitty/1.4bpp");
+const u32 gEventObjectPic_Skitty_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/skitty/2.4bpp");
+const u32 gEventObjectPic_Kecleon_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kecleon/0.4bpp");
+const u32 gEventObjectPic_Kecleon_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kecleon/1.4bpp");
+const u32 gEventObjectPic_Kecleon_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kecleon/2.4bpp");
+const u32 gEventObjectPic_Rayquaza_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza/0.4bpp");
+const u32 gEventObjectPic_Rayquaza_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza/1.4bpp");
+const u32 gEventObjectPic_Rayquaza_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza/2.4bpp");
+const u32 gEventObjectPic_Rayquaza_3[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza/3.4bpp");
+const u32 gEventObjectPic_Rayquaza_4[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza/4.4bpp");
+const u32 gEventObjectPic_RayquazaStill[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza_still.4bpp");
+const u32 gEventObjectPic_Zigzagoon_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/zigzagoon/0.4bpp");
+const u32 gEventObjectPic_Zigzagoon_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/zigzagoon/1.4bpp");
+const u32 gEventObjectPic_Zigzagoon_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/zigzagoon/2.4bpp");
+const u32 gEventObjectPic_Pikachu_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/pikachu/0.4bpp");
+const u32 gEventObjectPic_Pikachu_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/pikachu/1.4bpp");
+const u32 gEventObjectPic_Pikachu_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/pikachu/2.4bpp");
+const u32 gEventObjectPic_Azumarill_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azumarill/0.4bpp");
+const u32 gEventObjectPic_Azumarill_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azumarill/1.4bpp");
+const u32 gEventObjectPic_Azumarill_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azumarill/2.4bpp");
+const u32 gEventObjectPic_Wingull_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull/0.4bpp");
+const u32 gEventObjectPic_Wingull_3[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull/3.4bpp");
+const u32 gEventObjectPic_Wingull_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull/1.4bpp");
+const u32 gEventObjectPic_Wingull_4[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull/4.4bpp");
+const u32 gEventObjectPic_Wingull_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull/2.4bpp");
+const u32 gEventObjectPic_Wingull_5[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull/5.4bpp");
+const u32 gEventObjectPic_TuberMSwimming_0[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/0.4bpp");
+const u32 gEventObjectPic_TuberMSwimming_1[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/1.4bpp");
+const u32 gEventObjectPic_TuberMSwimming_2[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/2.4bpp");
+const u32 gEventObjectPic_TuberMSwimming_3[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/3.4bpp");
+const u32 gEventObjectPic_TuberMSwimming_4[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/4.4bpp");
+const u32 gEventObjectPic_TuberMSwimming_5[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/5.4bpp");
+const u32 gEventObjectPic_TuberMSwimming_6[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/6.4bpp");
+const u32 gEventObjectPic_TuberMSwimming_7[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/7.4bpp");
+const u32 gEventObjectPic_TuberMSwimming_8[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/8.4bpp");
+const u32 gEventObjectPic_Azurill_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azurill/0.4bpp");
+const u32 gEventObjectPic_Azurill_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azurill/1.4bpp");
+const u32 gEventObjectPic_Azurill_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azurill/2.4bpp");
+const u32 gEventObjectPic_Mom_0[] = INCBIN_U32("graphics/event_objects/pics/people/mom/0.4bpp");
+const u32 gEventObjectPic_Mom_1[] = INCBIN_U32("graphics/event_objects/pics/people/mom/1.4bpp");
+const u32 gEventObjectPic_Mom_2[] = INCBIN_U32("graphics/event_objects/pics/people/mom/2.4bpp");
+const u32 gEventObjectPic_Mom_3[] = INCBIN_U32("graphics/event_objects/pics/people/mom/3.4bpp");
+const u32 gEventObjectPic_Mom_4[] = INCBIN_U32("graphics/event_objects/pics/people/mom/4.4bpp");
+const u32 gEventObjectPic_Mom_5[] = INCBIN_U32("graphics/event_objects/pics/people/mom/5.4bpp");
+const u32 gEventObjectPic_Mom_6[] = INCBIN_U32("graphics/event_objects/pics/people/mom/6.4bpp");
+const u32 gEventObjectPic_Mom_7[] = INCBIN_U32("graphics/event_objects/pics/people/mom/7.4bpp");
+const u32 gEventObjectPic_Mom_8[] = INCBIN_U32("graphics/event_objects/pics/people/mom/8.4bpp");
+const u16 gEventObjectPalette22[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_22.gbapal");
+const u16 gEventObjectPalette23[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_23.gbapal");
+const u16 gEventObjectPalette24[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_24.gbapal");
+const u16 gEventObjectPalette25[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_25.gbapal");
+const u32 gEventObjectPic_UnusedNatuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_natu_doll.4bpp");
+const u32 gEventObjectPic_UnusedMagnemiteDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_magnemite_doll.4bpp");
+const u32 gEventObjectPic_UnusedSquirtleDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_squirtle_doll.4bpp");
+const u32 gEventObjectPic_UnusedWooperDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_wooper_doll.4bpp");
+const u32 gEventObjectPic_UnusedPikachuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_pikachu_doll.4bpp");
+const u32 gEventObjectPic_UnusedPorygon2Doll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_porygon2_doll.4bpp");
+const u32 gEventObjectPic_PichuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/pichu_doll.4bpp");
+const u32 gEventObjectPic_PikachuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/pikachu_doll.4bpp");
+const u32 gEventObjectPic_MarillDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/marill_doll.4bpp");
+const u32 gEventObjectPic_TogepiDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/togepi_doll.4bpp");
+const u32 gEventObjectPic_CyndaquilDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/cyndaquil_doll.4bpp");
+const u32 gEventObjectPic_ChikoritaDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/chikorita_doll.4bpp");
+const u32 gEventObjectPic_TotodileDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/totodile_doll.4bpp");
+const u32 gEventObjectPic_JigglypuffDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/jigglypuff_doll.4bpp");
+const u32 gEventObjectPic_MeowthDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/meowth_doll.4bpp");
+const u32 gEventObjectPic_ClefairyDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/clefairy_doll.4bpp");
+const u32 gEventObjectPic_DittoDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/ditto_doll.4bpp");
+const u32 gEventObjectPic_SmoochumDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/smoochum_doll.4bpp");
+const u32 gEventObjectPic_TreeckoDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/treecko_doll.4bpp");
+const u32 gEventObjectPic_TorchicDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/torchic_doll.4bpp");
+const u32 gEventObjectPic_MudkipDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/mudkip_doll.4bpp");
+const u32 gEventObjectPic_DuskullDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/duskull_doll.4bpp");
+const u32 gEventObjectPic_WynautDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/wynaut_doll.4bpp");
+const u32 gEventObjectPic_BaltoyDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/baltoy_doll.4bpp");
+const u32 gEventObjectPic_KecleonDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/kecleon_doll.4bpp");
+const u32 gEventObjectPic_AzurillDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/azurill_doll.4bpp");
+const u32 gEventObjectPic_SkittyDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/skitty_doll.4bpp");
+const u32 gEventObjectPic_SwabluDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/swablu_doll.4bpp");
+const u32 gEventObjectPic_GulpinDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/gulpin_doll.4bpp");
+const u32 gEventObjectPic_LotadDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/lotad_doll.4bpp");
+const u32 gEventObjectPic_SeedotDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/seedot_doll.4bpp");
+const u32 gEventObjectPic_PikaCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/pika_cushion.4bpp");
+const u32 gEventObjectPic_RoundCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/round_cushion.4bpp");
+const u32 gEventObjectPic_KissCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/kiss_cushion.4bpp");
+const u32 gEventObjectPic_ZigzagCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/zigzag_cushion.4bpp");
+const u32 gEventObjectPic_SpinCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/spin_cushion.4bpp");
+const u32 gEventObjectPic_DiamondCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/diamond_cushion.4bpp");
+const u32 gEventObjectPic_BallCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/ball_cushion.4bpp");
+const u32 gEventObjectPic_GrassCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/grass_cushion.4bpp");
+const u32 gEventObjectPic_FireCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/fire_cushion.4bpp");
+const u32 gEventObjectPic_WaterCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/water_cushion.4bpp");
+const u32 gEventObjectPic_BigSnorlaxDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_snorlax_doll.4bpp");
+const u32 gEventObjectPic_BigRhydonDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_rhydon_doll.4bpp");
+const u32 gEventObjectPic_BigLaprasDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_lapras_doll.4bpp");
+const u32 gEventObjectPic_BigVenusaurDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_venusaur_doll.4bpp");
+const u32 gEventObjectPic_BigCharizardDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_charizard_doll.4bpp");
+const u32 gEventObjectPic_BigBlastoiseDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_blastoise_doll.4bpp");
+const u32 gEventObjectPic_BigWailmerDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_wailmer_doll.4bpp");
+const u32 gEventObjectPic_BigRegirockDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_regirock_doll.4bpp");
+const u32 gEventObjectPic_BigRegiceDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_regice_doll.4bpp");
+const u32 gEventObjectPic_BigRegisteelDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_registeel_doll.4bpp");
+const u32 gEventObjectPic_CuttableTree_0[] = INCBIN_U32("graphics/event_objects/pics/misc/cuttable_tree/0.4bpp");
+const u32 gEventObjectPic_CuttableTree_1[] = INCBIN_U32("graphics/event_objects/pics/misc/cuttable_tree/1.4bpp");
+const u32 gEventObjectPic_CuttableTree_2[] = INCBIN_U32("graphics/event_objects/pics/misc/cuttable_tree/2.4bpp");
+const u32 gEventObjectPic_CuttableTree_3[] = INCBIN_U32("graphics/event_objects/pics/misc/cuttable_tree/3.4bpp");
+const u32 gEventObjectPic_BreakableRock_0[] = INCBIN_U32("graphics/event_objects/pics/misc/breakable_rock/0.4bpp");
+const u32 gEventObjectPic_BreakableRock_1[] = INCBIN_U32("graphics/event_objects/pics/misc/breakable_rock/1.4bpp");
+const u32 gEventObjectPic_BreakableRock_2[] = INCBIN_U32("graphics/event_objects/pics/misc/breakable_rock/2.4bpp");
+const u32 gEventObjectPic_BreakableRock_3[] = INCBIN_U32("graphics/event_objects/pics/misc/breakable_rock/3.4bpp");
+const u32 gEventObjectPic_PushableBoulder[] = INCBIN_U32("graphics/event_objects/pics/misc/pushable_boulder.4bpp");
+const u32 gEventObjectPic_MrBrineysBoat_0[] = INCBIN_U32("graphics/event_objects/pics/misc/mr_brineys_boat/0.4bpp");
+const u32 gEventObjectPic_MrBrineysBoat_1[] = INCBIN_U32("graphics/event_objects/pics/misc/mr_brineys_boat/1.4bpp");
+const u32 gEventObjectPic_MrBrineysBoat_2[] = INCBIN_U32("graphics/event_objects/pics/misc/mr_brineys_boat/2.4bpp");
+const u32 gEventObjectPic_Fossil[] = INCBIN_U32("graphics/event_objects/pics/misc/fossil.4bpp");
+const u32 gEventObjectPic_SubmarineShadow[] = INCBIN_U32("graphics/event_objects/pics/misc/submarine_shadow.4bpp");
+const u16 gEventObjectPalette26[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_26.gbapal");
+const u32 gEventObjectPic_Truck[] = INCBIN_U32("graphics/event_objects/pics/misc/truck.4bpp");
+const u16 gEventObjectPalette14[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_14.gbapal");
+const u32 gEventObjectPic_VigorothCarryingBox_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/vigoroth_carrying_box/0.4bpp");
+const u32 gEventObjectPic_VigorothCarryingBox_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/vigoroth_carrying_box/1.4bpp");
+const u32 gEventObjectPic_VigorothCarryingBox_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/vigoroth_carrying_box/2.4bpp");
+const u32 gEventObjectPic_VigorothFacingAway_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/vigoroth_facing_away/0.4bpp");
+const u32 gEventObjectPic_VigorothFacingAway_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/vigoroth_facing_away/1.4bpp");
+const u16 gEventObjectPalette15[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_15.gbapal");
+const u32 gEventObjectPic_BirchsBag[] = INCBIN_U32("graphics/event_objects/pics/misc/birchs_bag.4bpp");
+const u32 gEventObjectPic_EnemyZigzagoon_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon/0.4bpp");
+const u32 gEventObjectPic_EnemyZigzagoon_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon/1.4bpp");
+const u32 gEventObjectPic_EnemyZigzagoon_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon/2.4bpp");
+const u32 gEventObjectPic_EnemyZigzagoon_3[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon/3.4bpp");
+const u32 gEventObjectPic_EnemyZigzagoon_4[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon/4.4bpp");
+const u32 gEventObjectPic_EnemyZigzagoon_5[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon/5.4bpp");
+const u32 gEventObjectPic_EnemyZigzagoon_6[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon/6.4bpp");
+const u32 gEventObjectPic_EnemyZigzagoon_7[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon/7.4bpp");
+const u32 gEventObjectPic_EnemyZigzagoon_8[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon/8.4bpp");
+const u16 gEventObjectPalette16[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_16.gbapal");
+const u32 gEventObjectPic_Poochyena_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/0.4bpp");
+const u32 gEventObjectPic_Poochyena_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/1.4bpp");
+const u32 gEventObjectPic_Poochyena_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/2.4bpp");
+const u32 gEventObjectPic_Poochyena_3[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/3.4bpp");
+const u32 gEventObjectPic_Poochyena_4[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/4.4bpp");
+const u32 gEventObjectPic_Poochyena_5[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/5.4bpp");
+const u32 gEventObjectPic_Poochyena_6[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/6.4bpp");
+const u32 gEventObjectPic_Poochyena_7[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/7.4bpp");
+const u32 gEventObjectPic_Poochyena_8[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/8.4bpp");
+const u16 gEventObjectPalette27[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_27.gbapal");
+const u32 gEventObjectPic_CableCar[] = INCBIN_U32("graphics/event_objects/pics/misc/cable_car.4bpp");
+const u16 gEventObjectPalette20[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_20.gbapal");
+const u32 gEventObjectPic_SSTidal[] = INCBIN_U32("graphics/event_objects/pics/misc/ss_tidal.4bpp");
+const u16 gEventObjectPalette21[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_21.gbapal");
+const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle_0[] = INCBIN_U32("graphics/event_objects/pics/effects/berry_tree_growth_sparkle/0.4bpp");
+const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle_1[] = INCBIN_U32("graphics/event_objects/pics/effects/berry_tree_growth_sparkle/1.4bpp");
+const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle_2[] = INCBIN_U32("graphics/event_objects/pics/effects/berry_tree_growth_sparkle/2.4bpp");
+const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle_3[] = INCBIN_U32("graphics/event_objects/pics/effects/berry_tree_growth_sparkle/3.4bpp");
+const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle_4[] = INCBIN_U32("graphics/event_objects/pics/effects/berry_tree_growth_sparkle/4.4bpp");
+const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle_5[] = INCBIN_U32("graphics/event_objects/pics/effects/berry_tree_growth_sparkle/5.4bpp");
+const u32 gEventObjectPic_BerryTreeDirtPile[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/dirt_pile.4bpp");
+const u32 gEventObjectPic_BerryTreeSprout_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sprout/0.4bpp");
+const u32 gEventObjectPic_BerryTreeSprout_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sprout/1.4bpp");
+const u32 gEventObjectPic_PechaBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha/0.4bpp");
+const u32 gEventObjectPic_PechaBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha/1.4bpp");
+const u32 gEventObjectPic_PechaBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha/2.4bpp");
+const u32 gEventObjectPic_PechaBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha/3.4bpp");
+const u32 gEventObjectPic_PechaBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha/4.4bpp");
+const u32 gEventObjectPic_PechaBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha/5.4bpp");
+const u32 gEventObjectPic_KelpsyBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy/0.4bpp");
+const u32 gEventObjectPic_KelpsyBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy/1.4bpp");
+const u32 gEventObjectPic_KelpsyBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy/2.4bpp");
+const u32 gEventObjectPic_KelpsyBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy/3.4bpp");
+const u32 gEventObjectPic_KelpsyBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy/4.4bpp");
+const u32 gEventObjectPic_KelpsyBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy/5.4bpp");
+const u32 gEventObjectPic_WepearBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear/0.4bpp");
+const u32 gEventObjectPic_WepearBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear/1.4bpp");
+const u32 gEventObjectPic_WepearBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear/2.4bpp");
+const u32 gEventObjectPic_WepearBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear/3.4bpp");
+const u32 gEventObjectPic_WepearBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear/4.4bpp");
+const u32 gEventObjectPic_WepearBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear/5.4bpp");
+const u32 gEventObjectPic_IapapaBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa/0.4bpp");
+const u32 gEventObjectPic_IapapaBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa/1.4bpp");
+const u32 gEventObjectPic_IapapaBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa/2.4bpp");
+const u32 gEventObjectPic_IapapaBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa/3.4bpp");
+const u32 gEventObjectPic_IapapaBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa/4.4bpp");
+const u32 gEventObjectPic_IapapaBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa/5.4bpp");
+const u32 gEventObjectPic_CheriBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri/0.4bpp");
+const u32 gEventObjectPic_CheriBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri/1.4bpp");
+const u32 gEventObjectPic_CheriBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri/2.4bpp");
+const u32 gEventObjectPic_CheriBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri/3.4bpp");
+const u32 gEventObjectPic_CheriBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri/4.4bpp");
+const u32 gEventObjectPic_CheriBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri/5.4bpp");
+const u32 gEventObjectPic_FigyBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy/0.4bpp");
+const u32 gEventObjectPic_FigyBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy/1.4bpp");
+const u32 gEventObjectPic_FigyBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy/2.4bpp");
+const u32 gEventObjectPic_FigyBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy/3.4bpp");
+const u32 gEventObjectPic_FigyBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy/4.4bpp");
+const u32 gEventObjectPic_FigyBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy/5.4bpp");
+const u32 gEventObjectPic_MagoBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago/0.4bpp");
+const u32 gEventObjectPic_MagoBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago/1.4bpp");
+const u32 gEventObjectPic_MagoBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago/2.4bpp");
+const u32 gEventObjectPic_MagoBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago/3.4bpp");
+const u32 gEventObjectPic_MagoBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago/4.4bpp");
+const u32 gEventObjectPic_MagoBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago/5.4bpp");
+const u32 gEventObjectPic_LumBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum/0.4bpp");
+const u32 gEventObjectPic_LumBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum/1.4bpp");
+const u32 gEventObjectPic_LumBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum/2.4bpp");
+const u32 gEventObjectPic_LumBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum/3.4bpp");
+const u32 gEventObjectPic_LumBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum/4.4bpp");
+const u32 gEventObjectPic_LumBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum/5.4bpp");
+const u32 gEventObjectPic_RazzBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz/0.4bpp");
+const u32 gEventObjectPic_RazzBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz/1.4bpp");
+const u32 gEventObjectPic_RazzBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz/2.4bpp");
+const u32 gEventObjectPic_RazzBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz/3.4bpp");
+const u32 gEventObjectPic_RazzBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz/4.4bpp");
+const u32 gEventObjectPic_RazzBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz/5.4bpp");
+const u32 gEventObjectPic_GrepaBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa/0.4bpp");
+const u32 gEventObjectPic_GrepaBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa/1.4bpp");
+const u32 gEventObjectPic_GrepaBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa/2.4bpp");
+const u32 gEventObjectPic_GrepaBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa/3.4bpp");
+const u32 gEventObjectPic_GrepaBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa/4.4bpp");
+const u32 gEventObjectPic_GrepaBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa/5.4bpp");
+const u32 gEventObjectPic_RabutaBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta/0.4bpp");
+const u32 gEventObjectPic_RabutaBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta/1.4bpp");
+const u32 gEventObjectPic_RabutaBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta/2.4bpp");
+const u32 gEventObjectPic_RabutaBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta/3.4bpp");
+const u32 gEventObjectPic_RabutaBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta/4.4bpp");
+const u32 gEventObjectPic_RabutaBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta/5.4bpp");
+const u32 gEventObjectPic_NomelBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel/0.4bpp");
+const u32 gEventObjectPic_NomelBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel/1.4bpp");
+const u32 gEventObjectPic_NomelBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel/2.4bpp");
+const u32 gEventObjectPic_NomelBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel/3.4bpp");
+const u32 gEventObjectPic_NomelBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel/4.4bpp");
+const u32 gEventObjectPic_NomelBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel/5.4bpp");
+const u32 gEventObjectPic_LeppaBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa/0.4bpp");
+const u32 gEventObjectPic_LeppaBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa/1.4bpp");
+const u32 gEventObjectPic_LeppaBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa/2.4bpp");
+const u32 gEventObjectPic_LeppaBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa/3.4bpp");
+const u32 gEventObjectPic_LeppaBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa/4.4bpp");
+const u32 gEventObjectPic_LeppaBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa/5.4bpp");
+const u32 gEventObjectPic_LiechiBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi/0.4bpp");
+const u32 gEventObjectPic_LiechiBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi/1.4bpp");
+const u32 gEventObjectPic_LiechiBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi/2.4bpp");
+const u32 gEventObjectPic_LiechiBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi/3.4bpp");
+const u32 gEventObjectPic_LiechiBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi/4.4bpp");
+const u32 gEventObjectPic_LiechiBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi/5.4bpp");
+const u32 gEventObjectPic_HondewBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew/0.4bpp");
+const u32 gEventObjectPic_HondewBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew/1.4bpp");
+const u32 gEventObjectPic_HondewBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew/2.4bpp");
+const u32 gEventObjectPic_HondewBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew/3.4bpp");
+const u32 gEventObjectPic_HondewBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew/4.4bpp");
+const u32 gEventObjectPic_HondewBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew/5.4bpp");
+const u32 gEventObjectPic_AguavBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav/0.4bpp");
+const u32 gEventObjectPic_AguavBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav/1.4bpp");
+const u32 gEventObjectPic_AguavBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav/2.4bpp");
+const u32 gEventObjectPic_AguavBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav/3.4bpp");
+const u32 gEventObjectPic_AguavBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav/4.4bpp");
+const u32 gEventObjectPic_AguavBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav/5.4bpp");
+const u32 gEventObjectPic_WikiBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki/0.4bpp");
+const u32 gEventObjectPic_WikiBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki/1.4bpp");
+const u32 gEventObjectPic_WikiBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki/2.4bpp");
+const u32 gEventObjectPic_WikiBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki/3.4bpp");
+const u32 gEventObjectPic_WikiBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki/4.4bpp");
+const u32 gEventObjectPic_WikiBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki/5.4bpp");
+const u32 gEventObjectPic_PomegBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg/0.4bpp");
+const u32 gEventObjectPic_PomegBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg/1.4bpp");
+const u32 gEventObjectPic_PomegBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg/2.4bpp");
+const u32 gEventObjectPic_PomegBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg/3.4bpp");
+const u32 gEventObjectPic_PomegBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg/4.4bpp");
+const u32 gEventObjectPic_PomegBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg/5.4bpp");
+const u32 gEventObjectPic_RawstBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst/0.4bpp");
+const u32 gEventObjectPic_RawstBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst/1.4bpp");
+const u32 gEventObjectPic_RawstBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst/2.4bpp");
+const u32 gEventObjectPic_RawstBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst/3.4bpp");
+const u32 gEventObjectPic_RawstBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst/4.4bpp");
+const u32 gEventObjectPic_RawstBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst/5.4bpp");
+const u32 gEventObjectPic_SpelonBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon/0.4bpp");
+const u32 gEventObjectPic_SpelonBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon/1.4bpp");
+const u32 gEventObjectPic_SpelonBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon/2.4bpp");
+const u32 gEventObjectPic_SpelonBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon/3.4bpp");
+const u32 gEventObjectPic_SpelonBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon/4.4bpp");
+const u32 gEventObjectPic_SpelonBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon/5.4bpp");
+const u32 gEventObjectPic_ChestoBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto/0.4bpp");
+const u32 gEventObjectPic_ChestoBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto/1.4bpp");
+const u32 gEventObjectPic_ChestoBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto/2.4bpp");
+const u32 gEventObjectPic_ChestoBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto/3.4bpp");
+const u32 gEventObjectPic_ChestoBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto/4.4bpp");
+const u32 gEventObjectPic_ChestoBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto/5.4bpp");
+const u32 gEventObjectPic_OranBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran/0.4bpp");
+const u32 gEventObjectPic_OranBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran/1.4bpp");
+const u32 gEventObjectPic_OranBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran/2.4bpp");
+const u32 gEventObjectPic_OranBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran/3.4bpp");
+const u32 gEventObjectPic_OranBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran/4.4bpp");
+const u32 gEventObjectPic_OranBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran/5.4bpp");
+const u32 gEventObjectPic_PersimBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim/0.4bpp");
+const u32 gEventObjectPic_PersimBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim/1.4bpp");
+const u32 gEventObjectPic_PersimBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim/2.4bpp");
+const u32 gEventObjectPic_PersimBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim/3.4bpp");
+const u32 gEventObjectPic_PersimBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim/4.4bpp");
+const u32 gEventObjectPic_PersimBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim/5.4bpp");
+const u32 gEventObjectPic_SitrusBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus/0.4bpp");
+const u32 gEventObjectPic_SitrusBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus/1.4bpp");
+const u32 gEventObjectPic_SitrusBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus/2.4bpp");
+const u32 gEventObjectPic_SitrusBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus/3.4bpp");
+const u32 gEventObjectPic_SitrusBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus/4.4bpp");
+const u32 gEventObjectPic_SitrusBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus/5.4bpp");
+const u32 gEventObjectPic_AspearBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear/0.4bpp");
+const u32 gEventObjectPic_AspearBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear/1.4bpp");
+const u32 gEventObjectPic_AspearBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear/2.4bpp");
+const u32 gEventObjectPic_AspearBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear/3.4bpp");
+const u32 gEventObjectPic_AspearBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear/4.4bpp");
+const u32 gEventObjectPic_AspearBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear/5.4bpp");
+const u32 gEventObjectPic_PamtreBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre/0.4bpp");
+const u32 gEventObjectPic_PamtreBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre/1.4bpp");
+const u32 gEventObjectPic_PamtreBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre/2.4bpp");
+const u32 gEventObjectPic_PamtreBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre/3.4bpp");
+const u32 gEventObjectPic_PamtreBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre/4.4bpp");
+const u32 gEventObjectPic_PamtreBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre/5.4bpp");
+const u32 gEventObjectPic_CornnBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn/0.4bpp");
+const u32 gEventObjectPic_CornnBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn/1.4bpp");
+const u32 gEventObjectPic_CornnBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn/2.4bpp");
+const u32 gEventObjectPic_CornnBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn/3.4bpp");
+const u32 gEventObjectPic_CornnBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn/4.4bpp");
+const u32 gEventObjectPic_CornnBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn/5.4bpp");
+const u32 gEventObjectPic_LansatBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat/0.4bpp");
+const u32 gEventObjectPic_LansatBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat/1.4bpp");
+const u32 gEventObjectPic_LansatBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat/2.4bpp");
+const u32 gEventObjectPic_LansatBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat/3.4bpp");
+const u32 gEventObjectPic_LansatBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat/4.4bpp");
+const u32 gEventObjectPic_LansatBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat/5.4bpp");
+const u32 gEventObjectPic_DurinBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin/0.4bpp");
+const u32 gEventObjectPic_DurinBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin/1.4bpp");
+const u32 gEventObjectPic_DurinBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin/2.4bpp");
+const u32 gEventObjectPic_DurinBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin/3.4bpp");
+const u32 gEventObjectPic_DurinBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin/4.4bpp");
+const u32 gEventObjectPic_DurinBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin/5.4bpp");
+const u32 gEventObjectPic_TamatoBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato/0.4bpp");
+const u32 gEventObjectPic_TamatoBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato/1.4bpp");
+const u32 gEventObjectPic_TamatoBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato/2.4bpp");
+const u32 gEventObjectPic_TamatoBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato/3.4bpp");
+const u32 gEventObjectPic_TamatoBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato/4.4bpp");
+const u32 gEventObjectPic_TamatoBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato/5.4bpp");
+const u32 gFieldEffectObjectPic_SurfBlob_0[] = INCBIN_U32("graphics/event_objects/pics/effects/surf_blob/0.4bpp");
+const u32 gFieldEffectObjectPic_SurfBlob_1[] = INCBIN_U32("graphics/event_objects/pics/effects/surf_blob/1.4bpp");
+const u32 gFieldEffectObjectPic_SurfBlob_2[] = INCBIN_U32("graphics/event_objects/pics/effects/surf_blob/2.4bpp");
+const u32 gEventObjectPic_QuintyPlump_0[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump/0.4bpp");
+const u32 gEventObjectPic_QuintyPlump_1[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump/1.4bpp");
+const u32 gEventObjectPic_QuintyPlump_2[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump/2.4bpp");
+const u32 gEventObjectPic_QuintyPlump_3[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump/3.4bpp");
+const u32 gEventObjectPic_QuintyPlump_4[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump/4.4bpp");
+const u32 gEventObjectPic_QuintyPlump_5[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump/5.4bpp");
+const u32 gEventObjectPic_QuintyPlump_6[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump/6.4bpp");
+const u16 gEventObjectPalette12[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_12.gbapal");
+const u16 gEventObjectPalette13[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_13.gbapal");
+const u32 gFieldEffectObjectPic_ShadowSmall[] = INCBIN_U32("graphics/event_objects/pics/effects/shadow_small.4bpp");
+const u32 gFieldEffectObjectPic_ShadowMedium[] = INCBIN_U32("graphics/event_objects/pics/effects/shadow_medium.4bpp");
+const u32 gFieldEffectObjectPic_ShadowLarge[] = INCBIN_U32("graphics/event_objects/pics/effects/shadow_large.4bpp");
+const u32 gFieldEffectObjectPic_ShadowExtraLarge[] = INCBIN_U32("graphics/event_objects/pics/effects/shadow_extra_large.4bpp");
+const u32 gUnknown_084F6D38[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_4F6D38/0.4bpp");
+const u16 gFieldEffectObjectPalette6[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_06.gbapal");
+const u32 gFieldEffectObjectPic_Ripple_0[] = INCBIN_U32("graphics/event_objects/pics/effects/ripple/0.4bpp");
+const u32 gFieldEffectObjectPic_Ripple_1[] = INCBIN_U32("graphics/event_objects/pics/effects/ripple/1.4bpp");
+const u32 gFieldEffectObjectPic_Ripple_2[] = INCBIN_U32("graphics/event_objects/pics/effects/ripple/2.4bpp");
+const u32 gFieldEffectObjectPic_Ripple_3[] = INCBIN_U32("graphics/event_objects/pics/effects/ripple/3.4bpp");
+const u32 gFieldEffectObjectPic_Ripple_4[] = INCBIN_U32("graphics/event_objects/pics/effects/ripple/4.4bpp");
+const u32 gFieldEffectObjectPic_Ash_0[] = INCBIN_U32("graphics/event_objects/pics/effects/ash/0.4bpp");
+const u32 gFieldEffectObjectPic_Ash_1[] = INCBIN_U32("graphics/event_objects/pics/effects/ash/1.4bpp");
+const u32 gFieldEffectObjectPic_Ash_2[] = INCBIN_U32("graphics/event_objects/pics/effects/ash/2.4bpp");
+const u32 gFieldEffectObjectPic_Ash_3[] = INCBIN_U32("graphics/event_objects/pics/effects/ash/3.4bpp");
+const u32 gFieldEffectObjectPic_Ash_4[] = INCBIN_U32("graphics/event_objects/pics/effects/ash/4.4bpp");
+const u32 gFieldEffectObjectPic_Arrow_0[] = INCBIN_U32("graphics/event_objects/pics/effects/arrow/0.4bpp");
+const u32 gFieldEffectObjectPic_Arrow_1[] = INCBIN_U32("graphics/event_objects/pics/effects/arrow/1.4bpp");
+const u32 gFieldEffectObjectPic_Arrow_2[] = INCBIN_U32("graphics/event_objects/pics/effects/arrow/2.4bpp");
+const u32 gFieldEffectObjectPic_Arrow_3[] = INCBIN_U32("graphics/event_objects/pics/effects/arrow/3.4bpp");
+const u32 gFieldEffectObjectPic_Arrow_4[] = INCBIN_U32("graphics/event_objects/pics/effects/arrow/4.4bpp");
+const u32 gFieldEffectObjectPic_Arrow_5[] = INCBIN_U32("graphics/event_objects/pics/effects/arrow/5.4bpp");
+const u32 gFieldEffectObjectPic_Arrow_6[] = INCBIN_U32("graphics/event_objects/pics/effects/arrow/6.4bpp");
+const u32 gFieldEffectObjectPic_Arrow_7[] = INCBIN_U32("graphics/event_objects/pics/effects/arrow/7.4bpp");
+const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_00.gbapal");
+const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_01.gbapal");
+const u32 gFieldEffectObjectPic_GroundImpactDust_0[] = INCBIN_U32("graphics/event_objects/pics/effects/ground_impact_dust/0.4bpp");
+const u32 gFieldEffectObjectPic_GroundImpactDust_1[] = INCBIN_U32("graphics/event_objects/pics/effects/ground_impact_dust/1.4bpp");
+const u32 gFieldEffectObjectPic_GroundImpactDust_2[] = INCBIN_U32("graphics/event_objects/pics/effects/ground_impact_dust/2.4bpp");
+const u32 gFieldEffectObjectPic_BikeHopTallGrass_0[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_tall_grass/0.4bpp");
+const u32 gFieldEffectObjectPic_BikeHopTallGrass_1[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_tall_grass/1.4bpp");
+const u32 gFieldEffectObjectPic_BikeHopTallGrass_2[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_tall_grass/2.4bpp");
+const u32 gFieldEffectObjectPic_BikeHopTallGrass_3[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_tall_grass/3.4bpp");
+const u32 gUnusedGrass_0[] = INCBIN_U32("graphics/event_objects/pics/effects/unused_grass/0.4bpp");	
+const u32 gUnusedGrass_1[] = INCBIN_U32("graphics/event_objects/pics/effects/unused_grass/1.4bpp");	
+const u32 gUnusedGrass_2[] = INCBIN_U32("graphics/event_objects/pics/effects/unused_grass/2.4bpp");	
+const u32 gUnusedGrass_3[] = INCBIN_U32("graphics/event_objects/pics/effects/unused_grass/3.4bpp");
+const u32 gFieldEffectObjectPic_Unknown16_0[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_16/0.4bpp");
+const u32 gFieldEffectObjectPic_Unknown16_1[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_16/1.4bpp");
+const u32 gFieldEffectObjectPic_Unknown16_2[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_16/2.4bpp");
+const u32 gFieldEffectObjectPic_Unknown16_3[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_16/3.4bpp");
+const u32 gFieldEffectObjectPic_Unknown16_4[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_16/4.4bpp");
+const u32 gUnknown_084F7E38[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_4F7E38/0.4bpp");
+const u32 gFieldEffectObjectPic_Unknown16_5[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_16/5.4bpp");
+const u32 gFieldEffectObjectPic_Unknown17_0[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_17/0.4bpp");
+const u32 gFieldEffectObjectPic_Unknown17_1[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_17/1.4bpp");
+const u32 gFieldEffectObjectPic_Unknown17_2[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_17/2.4bpp");
+const u32 gFieldEffectObjectPic_Unknown17_3[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_17/3.4bpp");
+const u32 gFieldEffectObjectPic_Unknown17_4[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_17/4.4bpp");
+const u32 gFieldEffectObjectPic_Unknown17_5[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_17/5.4bpp");
+const u32 gFieldEffectObjectPic_Unknown17_6[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_17/6.4bpp");
+const u32 gFieldEffectObjectPic_Unknown17_7[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_17/7.4bpp");
+const u32 gFieldEffectObjectPic_Unknown18_0[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_18/0.4bpp");
+const u32 gFieldEffectObjectPic_Unknown18_1[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_18/1.4bpp");
+const u32 gFieldEffectObjectPic_Unknown18_2[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_18/2.4bpp");
+const u32 gFieldEffectObjectPic_Unknown18_3[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_18/3.4bpp");
+const u32 gFieldEffectObjectPic_LongGrass_0[] = INCBIN_U32("graphics/event_objects/pics/effects/long_grass/0.4bpp");
+const u32 gFieldEffectObjectPic_LongGrass_1[] = INCBIN_U32("graphics/event_objects/pics/effects/long_grass/1.4bpp");
+const u32 gFieldEffectObjectPic_LongGrass_2[] = INCBIN_U32("graphics/event_objects/pics/effects/long_grass/2.4bpp");
+const u32 gFieldEffectObjectPic_LongGrass_3[] = INCBIN_U32("graphics/event_objects/pics/effects/long_grass/3.4bpp");
+const u32 gFieldEffectObjectPic_TallGrass_0[] = INCBIN_U32("graphics/event_objects/pics/effects/tall_grass/0.4bpp");
+const u32 gFieldEffectObjectPic_TallGrass_1[] = INCBIN_U32("graphics/event_objects/pics/effects/tall_grass/1.4bpp");
+const u32 gFieldEffectObjectPic_TallGrass_2[] = INCBIN_U32("graphics/event_objects/pics/effects/tall_grass/2.4bpp");
+const u32 gFieldEffectObjectPic_TallGrass_3[] = INCBIN_U32("graphics/event_objects/pics/effects/tall_grass/3.4bpp");
+const u32 gFieldEffectObjectPic_TallGrass_4[] = INCBIN_U32("graphics/event_objects/pics/effects/tall_grass/4.4bpp");
+const u32 gFieldEffectObjectPic_ShortGrass_0[] = INCBIN_U32("graphics/event_objects/pics/effects/short_grass/0.4bpp");
+const u32 gFieldEffectObjectPic_ShortGrass_1[] = INCBIN_U32("graphics/event_objects/pics/effects/short_grass/1.4bpp");
+const u32 gFieldEffectObjectPic_SandFootprints_0[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_footprints/0.4bpp");
+const u32 gFieldEffectObjectPic_SandFootprints_1[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_footprints/1.4bpp");
+const u32 gFieldEffectObjectPic_DeepSandFootprints_0[] = INCBIN_U32("graphics/event_objects/pics/effects/deep_sand_footprints/0.4bpp");
+const u32 gFieldEffectObjectPic_DeepSandFootprints_1[] = INCBIN_U32("graphics/event_objects/pics/effects/deep_sand_footprints/1.4bpp");
+const u32 gFieldEffectObjectPic_BikeTireTracks_0[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_tire_tracks/0.4bpp");
+const u32 gFieldEffectObjectPic_BikeTireTracks_1[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_tire_tracks/1.4bpp");
+const u32 gFieldEffectObjectPic_BikeTireTracks_2[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_tire_tracks/2.4bpp");
+const u32 gFieldEffectObjectPic_BikeTireTracks_3[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_tire_tracks/3.4bpp");
+const u32 gFieldEffectObjectPic_Unknown19_0[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_19/0.4bpp");
+const u32 gFieldEffectObjectPic_Unknown19_1[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_19/1.4bpp");
+const u32 gFieldEffectObjectPic_Unknown19_2[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_19/2.4bpp");
+const u32 gFieldEffectObjectPic_Unknown19_3[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_19/3.4bpp");
+const u32 gFieldEffectObjectPic_Unknown29_0[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_29/0.4bpp");
+const u32 gFieldEffectObjectPic_Unknown29_1[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_29/1.4bpp");
+const u32 gFieldEffectObjectPic_Unknown29_2[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_29/2.4bpp");
+const u32 gFieldEffectObjectPic_BikeHopBigSplash_0[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_big_splash/0.4bpp");
+const u32 gFieldEffectObjectPic_BikeHopBigSplash_1[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_big_splash/1.4bpp");
+const u32 gFieldEffectObjectPic_BikeHopBigSplash_2[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_big_splash/2.4bpp");
+const u32 gFieldEffectObjectPic_BikeHopBigSplash_3[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_big_splash/3.4bpp");
+const u32 gFieldEffectObjectPic_Splash_0[] = INCBIN_U32("graphics/event_objects/pics/effects/splash/0.4bpp");
+const u32 gFieldEffectObjectPic_Splash_1[] = INCBIN_U32("graphics/event_objects/pics/effects/splash/1.4bpp");
+const u32 gFieldEffectObjectPic_BikeHopSmallSplash_0[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_small_splash/0.4bpp");
+const u32 gFieldEffectObjectPic_BikeHopSmallSplash_1[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_small_splash/1.4bpp");
+const u32 gFieldEffectObjectPic_BikeHopSmallSplash_2[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_small_splash/2.4bpp");
+const u32 gFieldEffectObjectPic_Unknown20_0[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_20/0.4bpp");
+const u32 gFieldEffectObjectPic_Unknown20_1[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_20/1.4bpp");
+const u32 gFieldEffectObjectPic_Unknown20_2[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_20/2.4bpp");
+const u32 gFieldEffectObjectPic_Unknown20_3[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_20/3.4bpp");
+const u32 gFieldEffectObjectPic_Unknown20_4[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_20/4.4bpp");
+const u32 gFieldEffectObjectPic_TreeDisguise_0[] = INCBIN_U32("graphics/event_objects/pics/effects/tree_disguise/0.4bpp");
+const u32 gFieldEffectObjectPic_TreeDisguise_1[] = INCBIN_U32("graphics/event_objects/pics/effects/tree_disguise/1.4bpp");
+const u32 gFieldEffectObjectPic_TreeDisguise_2[] = INCBIN_U32("graphics/event_objects/pics/effects/tree_disguise/2.4bpp");
+const u32 gFieldEffectObjectPic_TreeDisguise_3[] = INCBIN_U32("graphics/event_objects/pics/effects/tree_disguise/3.4bpp");
+const u32 gFieldEffectObjectPic_TreeDisguise_4[] = INCBIN_U32("graphics/event_objects/pics/effects/tree_disguise/4.4bpp");
+const u32 gFieldEffectObjectPic_TreeDisguise_5[] = INCBIN_U32("graphics/event_objects/pics/effects/tree_disguise/5.4bpp");
+const u32 gFieldEffectObjectPic_TreeDisguise_6[] = INCBIN_U32("graphics/event_objects/pics/effects/tree_disguise/6.4bpp");
+const u32 gFieldEffectObjectPic_MountainDisguise_0[] = INCBIN_U32("graphics/event_objects/pics/effects/mountain_disguise/0.4bpp");
+const u32 gFieldEffectObjectPic_MountainDisguise_1[] = INCBIN_U32("graphics/event_objects/pics/effects/mountain_disguise/1.4bpp");
+const u32 gFieldEffectObjectPic_MountainDisguise_2[] = INCBIN_U32("graphics/event_objects/pics/effects/mountain_disguise/2.4bpp");
+const u32 gFieldEffectObjectPic_MountainDisguise_3[] = INCBIN_U32("graphics/event_objects/pics/effects/mountain_disguise/3.4bpp");
+const u32 gFieldEffectObjectPic_MountainDisguise_4[] = INCBIN_U32("graphics/event_objects/pics/effects/mountain_disguise/4.4bpp");
+const u32 gFieldEffectObjectPic_MountainDisguise_5[] = INCBIN_U32("graphics/event_objects/pics/effects/mountain_disguise/5.4bpp");
+const u32 gFieldEffectObjectPic_MountainDisguise_6[] = INCBIN_U32("graphics/event_objects/pics/effects/mountain_disguise/6.4bpp");
+const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_0[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_disguise_placeholder/0.4bpp");
+const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_1[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_disguise_placeholder/1.4bpp");
+const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_2[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_disguise_placeholder/2.4bpp");
+const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_3[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_disguise_placeholder/3.4bpp");
+const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_4[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_disguise_placeholder/4.4bpp");
+const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_5[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_disguise_placeholder/5.4bpp");
+const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_6[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_disguise_placeholder/6.4bpp");
+const u32 gFieldEffectObjectPic_HotSpringsWater[] = INCBIN_U32("graphics/event_objects/pics/effects/hot_springs_water.4bpp");
+const u16 gFieldEffectObjectPalette2[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_02.gbapal");
+const u32 gFieldEffectObjectPic_JumpOutOfAsh_0[] = INCBIN_U32("graphics/event_objects/pics/effects/jump_out_of_ash/0.4bpp");
+const u32 gFieldEffectObjectPic_JumpOutOfAsh_1[] = INCBIN_U32("graphics/event_objects/pics/effects/jump_out_of_ash/1.4bpp");
+const u32 gFieldEffectObjectPic_JumpOutOfAsh_2[] = INCBIN_U32("graphics/event_objects/pics/effects/jump_out_of_ash/2.4bpp");
+const u32 gFieldEffectObjectPic_JumpOutOfAsh_3[] = INCBIN_U32("graphics/event_objects/pics/effects/jump_out_of_ash/3.4bpp");
+const u32 gFieldEffectObjectPic_JumpOutOfAsh_4[] = INCBIN_U32("graphics/event_objects/pics/effects/jump_out_of_ash/4.4bpp");
+const u32 gFieldEffectObjectPic_Unknown33_0[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_33/0.4bpp");
+const u32 gFieldEffectObjectPic_Unknown33_1[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_33/1.4bpp");
+const u32 gFieldEffectObjectPic_Unknown33_2[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_33/2.4bpp");
+const u32 gFieldEffectObjectPic_Unknown33_3[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_33/3.4bpp");
+const u32 gFieldEffectObjectPic_Unknown33_4[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_33/4.4bpp");
+const u32 gFieldEffectObjectPic_Bubbles_0[] = INCBIN_U32("graphics/event_objects/pics/effects/bubbles/0.4bpp");
+const u32 gFieldEffectObjectPic_Bubbles_1[] = INCBIN_U32("graphics/event_objects/pics/effects/bubbles/1.4bpp");
+const u32 gFieldEffectObjectPic_Bubbles_2[] = INCBIN_U32("graphics/event_objects/pics/effects/bubbles/2.4bpp");
+const u32 gFieldEffectObjectPic_Bubbles_3[] = INCBIN_U32("graphics/event_objects/pics/effects/bubbles/3.4bpp");
+const u32 gFieldEffectObjectPic_Bubbles_4[] = INCBIN_U32("graphics/event_objects/pics/effects/bubbles/4.4bpp");
+const u32 gFieldEffectObjectPic_Bubbles_5[] = INCBIN_U32("graphics/event_objects/pics/effects/bubbles/5.4bpp");
+const u32 gFieldEffectObjectPic_Bubbles_6[] = INCBIN_U32("graphics/event_objects/pics/effects/bubbles/6.4bpp");
+const u32 gFieldEffectObjectPic_Bubbles_7[] = INCBIN_U32("graphics/event_objects/pics/effects/bubbles/7.4bpp");
+const u32 gFieldEffectObjectPic_Unknown35_0[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_35/0.4bpp");
+const u32 gFieldEffectObjectPic_Unknown35_1[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_35/1.4bpp");
+const u16 gFieldEffectObjectPalette3[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_03.gbapal");
+const u32 gFieldEffectObjectPic_Bird[] = INCBIN_U32("graphics/event_objects/pics/effects/bird.4bpp");
+const u32 gEventObjectPic_Juan_0[] = INCBIN_U32("graphics/event_objects/pics/people/juan/0.4bpp");
+const u32 gEventObjectPic_Juan_1[] = INCBIN_U32("graphics/event_objects/pics/people/juan/1.4bpp");
+const u32 gEventObjectPic_Juan_2[] = INCBIN_U32("graphics/event_objects/pics/people/juan/2.4bpp");
+const u32 gEventObjectPic_Juan_3[] = INCBIN_U32("graphics/event_objects/pics/people/juan/3.4bpp");
+const u32 gEventObjectPic_Juan_4[] = INCBIN_U32("graphics/event_objects/pics/people/juan/4.4bpp");
+const u32 gEventObjectPic_Juan_5[] = INCBIN_U32("graphics/event_objects/pics/people/juan/5.4bpp");
+const u32 gEventObjectPic_Juan_6[] = INCBIN_U32("graphics/event_objects/pics/people/juan/6.4bpp");
+const u32 gEventObjectPic_Juan_7[] = INCBIN_U32("graphics/event_objects/pics/people/juan/7.4bpp");
+const u32 gEventObjectPic_Juan_8[] = INCBIN_U32("graphics/event_objects/pics/people/juan/8.4bpp");
+const u32 gEventObjectPic_Scott_0[] = INCBIN_U32("graphics/event_objects/pics/people/scott/0.4bpp");
+const u32 gEventObjectPic_Scott_1[] = INCBIN_U32("graphics/event_objects/pics/people/scott/1.4bpp");
+const u32 gEventObjectPic_Scott_2[] = INCBIN_U32("graphics/event_objects/pics/people/scott/2.4bpp");
+const u32 gEventObjectPic_Scott_3[] = INCBIN_U32("graphics/event_objects/pics/people/scott/3.4bpp");
+const u32 gEventObjectPic_Scott_4[] = INCBIN_U32("graphics/event_objects/pics/people/scott/4.4bpp");
+const u32 gEventObjectPic_Scott_5[] = INCBIN_U32("graphics/event_objects/pics/people/scott/5.4bpp");
+const u32 gEventObjectPic_Scott_6[] = INCBIN_U32("graphics/event_objects/pics/people/scott/6.4bpp");
+const u32 gEventObjectPic_Scott_7[] = INCBIN_U32("graphics/event_objects/pics/people/scott/7.4bpp");
+const u32 gEventObjectPic_Scott_8[] = INCBIN_U32("graphics/event_objects/pics/people/scott/8.4bpp");
+const u32 gEventObjectPic_Statue[] = INCBIN_U32("graphics/event_objects/pics/misc/statue.4bpp");
+const u32 gEventObjectPic_Kirlia_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia/0.4bpp");
+const u32 gEventObjectPic_Kirlia_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia/1.4bpp");
+const u32 gEventObjectPic_Kirlia_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia/2.4bpp");
+const u32 gEventObjectPic_Kirlia_3[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia/3.4bpp");
+const u32 gEventObjectPic_Kirlia_4[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia/4.4bpp");
+const u32 gEventObjectPic_Kirlia_5[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia/5.4bpp");
+const u32 gEventObjectPic_Kirlia_6[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia/6.4bpp");
+const u32 gEventObjectPic_Kirlia_7[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia/7.4bpp");
+const u32 gEventObjectPic_Kirlia_8[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia/8.4bpp");
+const u32 gEventObjectPic_Dusclops_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops/0.4bpp");
+const u32 gEventObjectPic_Dusclops_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops/1.4bpp");
+const u32 gEventObjectPic_Dusclops_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops/2.4bpp");
+const u32 gEventObjectPic_Dusclops_3[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops/3.4bpp");
+const u32 gEventObjectPic_Dusclops_4[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops/4.4bpp");
+const u32 gEventObjectPic_Dusclops_5[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops/5.4bpp");
+const u32 gEventObjectPic_Dusclops_6[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops/6.4bpp");
+const u32 gEventObjectPic_Dusclops_7[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops/7.4bpp");
+const u32 gEventObjectPic_Dusclops_8[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops/8.4bpp");
+const u32 gEventObjectPic_MysteryEventDeliveryman_0[] = INCBIN_U32("graphics/event_objects/pics/people/mystery_event_deliveryman/0.4bpp");
+const u32 gEventObjectPic_MysteryEventDeliveryman_1[] = INCBIN_U32("graphics/event_objects/pics/people/mystery_event_deliveryman/1.4bpp");
+const u32 gEventObjectPic_MysteryEventDeliveryman_2[] = INCBIN_U32("graphics/event_objects/pics/people/mystery_event_deliveryman/2.4bpp");
+const u32 gEventObjectPic_UnionRoomAttendant_0[] = INCBIN_U32("graphics/event_objects/pics/people/union_room_attendant/0.4bpp");
+const u32 gEventObjectPic_UnionRoomAttendant_1[] = INCBIN_U32("graphics/event_objects/pics/people/union_room_attendant/1.4bpp");
+const u32 gEventObjectPic_UnionRoomAttendant_2[] = INCBIN_U32("graphics/event_objects/pics/people/union_room_attendant/2.4bpp");
+const u32 gEventObjectPic_MovingBox[] = INCBIN_U32("graphics/event_objects/pics/misc/moving_box.4bpp");
+const u16 gEventObjectPalette19[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_19.gbapal");
+const u32 gEventObjectPic_Sudowoodo_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/sudowoodo/0.4bpp");
+const u32 gEventObjectPic_Sudowoodo_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/sudowoodo/1.4bpp");
+const u32 gEventObjectPic_Sudowoodo_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/sudowoodo/2.4bpp");
+const u32 gEventObjectPic_Mew_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew/0.4bpp");
+const u32 gEventObjectPic_Mew_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew/1.4bpp");
+const u32 gEventObjectPic_Mew_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew/2.4bpp");
+const u32 gEventObjectPic_Mew_3[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew/3.4bpp");
+const u32 gEventObjectPic_Mew_4[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew/4.4bpp");
+const u32 gEventObjectPic_Mew_5[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew/5.4bpp");
+const u32 gEventObjectPic_Mew_6[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew/6.4bpp");
+const u32 gEventObjectPic_Mew_7[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew/7.4bpp");
+const u32 gEventObjectPic_Mew_8[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew/8.4bpp");
+const u16 gEventObjectPalette28[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_28.gbapal");
+const u32 gEventObjectPic_Red_0[] = INCBIN_U32("graphics/event_objects/pics/people/red/0.4bpp");
+const u32 gEventObjectPic_Red_1[] = INCBIN_U32("graphics/event_objects/pics/people/red/1.4bpp");
+const u32 gEventObjectPic_Red_2[] = INCBIN_U32("graphics/event_objects/pics/people/red/2.4bpp");
+const u32 gEventObjectPic_Red_3[] = INCBIN_U32("graphics/event_objects/pics/people/red/3.4bpp");
+const u32 gEventObjectPic_Red_4[] = INCBIN_U32("graphics/event_objects/pics/people/red/4.4bpp");
+const u32 gEventObjectPic_Red_5[] = INCBIN_U32("graphics/event_objects/pics/people/red/5.4bpp");
+const u32 gEventObjectPic_Red_6[] = INCBIN_U32("graphics/event_objects/pics/people/red/6.4bpp");
+const u32 gEventObjectPic_Red_7[] = INCBIN_U32("graphics/event_objects/pics/people/red/7.4bpp");
+const u32 gEventObjectPic_Red_8[] = INCBIN_U32("graphics/event_objects/pics/people/red/8.4bpp");
+const u32 gEventObjectPic_Leaf_0[] = INCBIN_U32("graphics/event_objects/pics/people/leaf/0.4bpp");
+const u32 gEventObjectPic_Leaf_1[] = INCBIN_U32("graphics/event_objects/pics/people/leaf/1.4bpp");
+const u32 gEventObjectPic_Leaf_2[] = INCBIN_U32("graphics/event_objects/pics/people/leaf/2.4bpp");
+const u32 gEventObjectPic_Leaf_3[] = INCBIN_U32("graphics/event_objects/pics/people/leaf/3.4bpp");
+const u32 gEventObjectPic_Leaf_4[] = INCBIN_U32("graphics/event_objects/pics/people/leaf/4.4bpp");
+const u32 gEventObjectPic_Leaf_5[] = INCBIN_U32("graphics/event_objects/pics/people/leaf/5.4bpp");
+const u32 gEventObjectPic_Leaf_6[] = INCBIN_U32("graphics/event_objects/pics/people/leaf/6.4bpp");
+const u32 gEventObjectPic_Leaf_7[] = INCBIN_U32("graphics/event_objects/pics/people/leaf/7.4bpp");
+const u32 gEventObjectPic_Leaf_8[] = INCBIN_U32("graphics/event_objects/pics/people/leaf/8.4bpp");
+const u16 gEventObjectPalette30[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_30.gbapal");
+const u32 gEventObjectPic_BirthIslandStone[] = INCBIN_U32("graphics/event_objects/pics/misc/birth_island_stone.4bpp");
+const u16 gEventObjectPalette29[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_29.gbapal");
+const u32 gEventObjectPic_Deoxys_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/deoxys/0.4bpp");
+const u32 gEventObjectPic_Deoxys_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/deoxys/1.4bpp");
+const u32 gEventObjectPic_Anabel_0[] = INCBIN_U32("graphics/event_objects/pics/people/anabel/0.4bpp");
+const u32 gEventObjectPic_Anabel_1[] = INCBIN_U32("graphics/event_objects/pics/people/anabel/1.4bpp");
+const u32 gEventObjectPic_Anabel_2[] = INCBIN_U32("graphics/event_objects/pics/people/anabel/2.4bpp");
+const u32 gEventObjectPic_Anabel_3[] = INCBIN_U32("graphics/event_objects/pics/people/anabel/3.4bpp");
+const u32 gEventObjectPic_Anabel_4[] = INCBIN_U32("graphics/event_objects/pics/people/anabel/4.4bpp");
+const u32 gEventObjectPic_Anabel_5[] = INCBIN_U32("graphics/event_objects/pics/people/anabel/5.4bpp");
+const u32 gEventObjectPic_Anabel_6[] = INCBIN_U32("graphics/event_objects/pics/people/anabel/6.4bpp");
+const u32 gEventObjectPic_Anabel_7[] = INCBIN_U32("graphics/event_objects/pics/people/anabel/7.4bpp");
+const u32 gEventObjectPic_Anabel_8[] = INCBIN_U32("graphics/event_objects/pics/people/anabel/8.4bpp");
+const u32 gEventObjectPic_Tucker_0[] = INCBIN_U32("graphics/event_objects/pics/people/tucker/0.4bpp");
+const u32 gEventObjectPic_Tucker_1[] = INCBIN_U32("graphics/event_objects/pics/people/tucker/1.4bpp");
+const u32 gEventObjectPic_Tucker_2[] = INCBIN_U32("graphics/event_objects/pics/people/tucker/2.4bpp");
+const u32 gEventObjectPic_Tucker_3[] = INCBIN_U32("graphics/event_objects/pics/people/tucker/3.4bpp");
+const u32 gEventObjectPic_Tucker_4[] = INCBIN_U32("graphics/event_objects/pics/people/tucker/4.4bpp");
+const u32 gEventObjectPic_Tucker_5[] = INCBIN_U32("graphics/event_objects/pics/people/tucker/5.4bpp");
+const u32 gEventObjectPic_Tucker_6[] = INCBIN_U32("graphics/event_objects/pics/people/tucker/6.4bpp");
+const u32 gEventObjectPic_Tucker_7[] = INCBIN_U32("graphics/event_objects/pics/people/tucker/7.4bpp");
+const u32 gEventObjectPic_Tucker_8[] = INCBIN_U32("graphics/event_objects/pics/people/tucker/8.4bpp");
+const u32 gEventObjectPic_Spenser_0[] = INCBIN_U32("graphics/event_objects/pics/people/spenser/0.4bpp");
+const u32 gEventObjectPic_Spenser_1[] = INCBIN_U32("graphics/event_objects/pics/people/spenser/1.4bpp");
+const u32 gEventObjectPic_Spenser_2[] = INCBIN_U32("graphics/event_objects/pics/people/spenser/2.4bpp");
+const u32 gEventObjectPic_Spenser_3[] = INCBIN_U32("graphics/event_objects/pics/people/spenser/3.4bpp");
+const u32 gEventObjectPic_Spenser_4[] = INCBIN_U32("graphics/event_objects/pics/people/spenser/4.4bpp");
+const u32 gEventObjectPic_Spenser_5[] = INCBIN_U32("graphics/event_objects/pics/people/spenser/5.4bpp");
+const u32 gEventObjectPic_Spenser_6[] = INCBIN_U32("graphics/event_objects/pics/people/spenser/6.4bpp");
+const u32 gEventObjectPic_Spenser_7[] = INCBIN_U32("graphics/event_objects/pics/people/spenser/7.4bpp");
+const u32 gEventObjectPic_Spenser_8[] = INCBIN_U32("graphics/event_objects/pics/people/spenser/8.4bpp");
+const u32 gEventObjectPic_Greta_0[] = INCBIN_U32("graphics/event_objects/pics/people/greta/0.4bpp");
+const u32 gEventObjectPic_Greta_1[] = INCBIN_U32("graphics/event_objects/pics/people/greta/1.4bpp");
+const u32 gEventObjectPic_Greta_2[] = INCBIN_U32("graphics/event_objects/pics/people/greta/2.4bpp");
+const u32 gEventObjectPic_Greta_3[] = INCBIN_U32("graphics/event_objects/pics/people/greta/3.4bpp");
+const u32 gEventObjectPic_Greta_4[] = INCBIN_U32("graphics/event_objects/pics/people/greta/4.4bpp");
+const u32 gEventObjectPic_Greta_5[] = INCBIN_U32("graphics/event_objects/pics/people/greta/5.4bpp");
+const u32 gEventObjectPic_Greta_6[] = INCBIN_U32("graphics/event_objects/pics/people/greta/6.4bpp");
+const u32 gEventObjectPic_Greta_7[] = INCBIN_U32("graphics/event_objects/pics/people/greta/7.4bpp");
+const u32 gEventObjectPic_Greta_8[] = INCBIN_U32("graphics/event_objects/pics/people/greta/8.4bpp");
+const u32 gEventObjectPic_Noland_0[] = INCBIN_U32("graphics/event_objects/pics/people/noland/0.4bpp");
+const u32 gEventObjectPic_Noland_1[] = INCBIN_U32("graphics/event_objects/pics/people/noland/1.4bpp");
+const u32 gEventObjectPic_Noland_2[] = INCBIN_U32("graphics/event_objects/pics/people/noland/2.4bpp");
+const u32 gEventObjectPic_Noland_3[] = INCBIN_U32("graphics/event_objects/pics/people/noland/3.4bpp");
+const u32 gEventObjectPic_Noland_4[] = INCBIN_U32("graphics/event_objects/pics/people/noland/4.4bpp");
+const u32 gEventObjectPic_Noland_5[] = INCBIN_U32("graphics/event_objects/pics/people/noland/5.4bpp");
+const u32 gEventObjectPic_Noland_6[] = INCBIN_U32("graphics/event_objects/pics/people/noland/6.4bpp");
+const u32 gEventObjectPic_Noland_7[] = INCBIN_U32("graphics/event_objects/pics/people/noland/7.4bpp");
+const u32 gEventObjectPic_Noland_8[] = INCBIN_U32("graphics/event_objects/pics/people/noland/8.4bpp");
+const u32 gEventObjectPic_Lucy_0[] = INCBIN_U32("graphics/event_objects/pics/people/lucy/0.4bpp");
+const u32 gEventObjectPic_Lucy_1[] = INCBIN_U32("graphics/event_objects/pics/people/lucy/1.4bpp");
+const u32 gEventObjectPic_Lucy_2[] = INCBIN_U32("graphics/event_objects/pics/people/lucy/2.4bpp");
+const u32 gEventObjectPic_Lucy_3[] = INCBIN_U32("graphics/event_objects/pics/people/lucy/3.4bpp");
+const u32 gEventObjectPic_Lucy_4[] = INCBIN_U32("graphics/event_objects/pics/people/lucy/4.4bpp");
+const u32 gEventObjectPic_Lucy_5[] = INCBIN_U32("graphics/event_objects/pics/people/lucy/5.4bpp");
+const u32 gEventObjectPic_Lucy_6[] = INCBIN_U32("graphics/event_objects/pics/people/lucy/6.4bpp");
+const u32 gEventObjectPic_Lucy_7[] = INCBIN_U32("graphics/event_objects/pics/people/lucy/7.4bpp");
+const u32 gEventObjectPic_Lucy_8[] = INCBIN_U32("graphics/event_objects/pics/people/lucy/8.4bpp");
+const u32 gEventObjectPic_Brandon_0[] = INCBIN_U32("graphics/event_objects/pics/people/brandon/0.4bpp");
+const u32 gEventObjectPic_Brandon_1[] = INCBIN_U32("graphics/event_objects/pics/people/brandon/1.4bpp");
+const u32 gEventObjectPic_Brandon_2[] = INCBIN_U32("graphics/event_objects/pics/people/brandon/2.4bpp");
+const u32 gEventObjectPic_Brandon_3[] = INCBIN_U32("graphics/event_objects/pics/people/brandon/3.4bpp");
+const u32 gEventObjectPic_Brandon_4[] = INCBIN_U32("graphics/event_objects/pics/people/brandon/4.4bpp");
+const u32 gEventObjectPic_Brandon_5[] = INCBIN_U32("graphics/event_objects/pics/people/brandon/5.4bpp");
+const u32 gEventObjectPic_Brandon_6[] = INCBIN_U32("graphics/event_objects/pics/people/brandon/6.4bpp");
+const u32 gEventObjectPic_Brandon_7[] = INCBIN_U32("graphics/event_objects/pics/people/brandon/7.4bpp");
+const u32 gEventObjectPic_Brandon_8[] = INCBIN_U32("graphics/event_objects/pics/people/brandon/8.4bpp");
+const u32 gEventObjectPic_Lugia_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/lugia/0.4bpp");
+const u32 gEventObjectPic_Lugia_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/lugia/1.4bpp");
+const u16 gEventObjectPalette32[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_32.gbapal");
+const u32 gEventObjectPic_HoOh_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/ho_oh/0.4bpp");
+const u32 gEventObjectPic_HoOh_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/ho_oh/1.4bpp");
+const u16 gEventObjectPalette31[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_31.gbapal");
+
+#endif //GUARD_EVENT_OBJECT_GFX_H
diff --git a/src/data/field_event_obj/event_object_graphics_info.h b/src/data/field_event_obj/event_object_graphics_info.h
new file mode 100755
index 000000000..14ef4983d
--- /dev/null
+++ b/src/data/field_event_obj/event_object_graphics_info.h
@@ -0,0 +1,250 @@
+#ifndef GUARD_EVENT_OBJECT_GRAPHICS_INFO_H
+#define GUARD_EVENT_OBJECT_GRAPHICS_INFO_H
+
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanNormal = {0xFFFF, 0x1100, 0x1102, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_BrendanNormal, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanMachBike = {0xFFFF, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BrendanMachBike, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanAcroBike = {0xFFFF, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanSurfing = {0xFFFF, 0x1100, 0x11FF, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Surfing, gEventObjectPicTable_BrendanSurfing, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanFieldMove = {0xFFFF, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_FieldMove, gEventObjectPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_QuintyPlump = {0xFFFF, 0x110B, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_L, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_QuintyPlump, gEventObjectPicTable_QuintyPlump, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy1 = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleBoy1, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl1 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleGirl1, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy1 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy1, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl1 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Girl1, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy2 = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy2, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl2 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Girl2, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy2 = {0xFFFF, 0x1106, 0x11FF, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleBoy2, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl2 = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleGirl2, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy3 = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy3, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl3 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Girl3, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy4 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy4, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman1 = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman1, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FatMan = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_FatMan, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman2 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman2, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man1 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man1, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman3 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman3, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldMan1 = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_OldMan1, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldWoman1 = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_OldWoman1, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man2 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man2, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman4 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman4, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man3 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man3, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman5 = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman5, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Cook = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Cook, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman6 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman6, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldMan2 = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_OldMan2, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldWoman2 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_OldWoman2, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Camper = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Camper, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Picnicker = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Picnicker, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man4 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man4, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman7 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman7, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Youngster = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Youngster, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BugCatcher = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BugCatcher, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PsychicM = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_PsychicM, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SchoolKidM = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SchoolKidM, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Maniac = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Maniac, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HexManiac = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_HexManiac, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Rayquaza1 = {0xFFFF, 0x1105, 0x11FF, 2048, 64, 64, 4, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_64x64, gEventObjectSpriteOamTables_64x64, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RayquazaStill, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwimmerM = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SwimmerM, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwimmerF = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SwimmerF, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BlackBelt = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BlackBelt, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Beauty = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Beauty, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scientist1 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Scientist1, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Lass = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Lass, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Gentleman = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Gentleman, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sailor = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Sailor, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Fisherman = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Fisherman, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RunningTriathleteM = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RunningTriathleteM, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RunningTriathleteF = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RunningTriathleteF, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberF = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_TuberF, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberM = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_TuberM, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Hiker = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Hiker, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyclingTriathleteM = {0xFFFF, 0x1105, 0x11FF, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_CyclingTriathleteM, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyclingTriathleteF = {0xFFFF, 0x1103, 0x11FF, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_CyclingTriathleteF, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Nurse = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Nurse, gEventObjectPicTable_Nurse, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ItemBall = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_ItemBall, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTree = {0xFFFF, 0x1103, 0x11FF, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, NULL, gEventObjectImageAnimTable_BerryTree, gEventObjectPicTable_PechaBerryTree, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTreeEarlyStages = {0xFFFF, 0x1103, 0x11FF, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_BerryTree, gEventObjectPicTable_PechaBerryTree, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTreeLateStages = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BerryTree, gEventObjectPicTable_PechaBerryTree, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ProfBirch = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ProfBirch, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man5 = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man5, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man6 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man6, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ReporterM = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ReporterM, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ReporterF = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ReporterF, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Bard = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Hipster = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Trader = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Storyteller = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Giddy = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMauvilleOldMan1 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMauvilleOldMan2 = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedNatuDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedNatuDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMagnemiteDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedMagnemiteDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedSquirtleDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedSquirtleDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedWooperDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedWooperDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedPikachuDoll = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedPikachuDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedPorygon2Doll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedPorygon2Doll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CuttableTree = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_CuttableTree, gEventObjectPicTable_CuttableTree, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MartEmployee = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MartEmployee, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RooftopSaleWoman = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RooftopSaleWoman, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Teala = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Teala, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BreakableRock = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_BreakableRock, gEventObjectPicTable_BreakableRock, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PushableBoulder = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_PushableBoulder, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MrBrineysBoat = {0xFFFF, 0x1105, 0x11FF, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MrBrineysBoat, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayNormal = {0xFFFF, 0x1110, 0x1102, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_MayNormal, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayMachBike = {0xFFFF, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MayMachBike, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayAcroBike = {0xFFFF, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_MayAcroBike, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MaySurfing = {0xFFFF, 0x1110, 0x11FF, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Surfing, gEventObjectPicTable_MaySurfing, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayFieldMove = {0xFFFF, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_FieldMove, gEventObjectPicTable_MayFieldMove, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Truck = {0xFFFF, 0x110D, 0x11FF, 1152, 48, 48, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_Truck, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_Truck, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_VigorothCarryingBox = {0xFFFF, 0x110E, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_VigorothCarryingBox, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_VigorothFacingAway = {0xFFFF, 0x110E, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_VigorothFacingAway, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BirchsBag = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BirchsBag, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_EnemyZigzagoon = {0xFFFF, 0x110F, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_EnemyZigzagoon, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Poochyena = {0xFFFF, 0x111C, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Poochyena, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Artist = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Artist, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanNormal = {0xFFFF, 0x1100, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_BrendanNormal, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanMachBike = {0xFFFF, 0x1100, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BrendanMachBike, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanAcroBike = {0xFFFF, 0x1100, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanSurfing = {0xFFFF, 0x1100, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Surfing, gEventObjectPicTable_BrendanSurfing, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanFieldMove = {0xFFFF, 0x1100, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_FieldMove, gEventObjectPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayNormal = {0xFFFF, 0x1110, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_MayNormal, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayMachBike = {0xFFFF, 0x1110, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MayMachBike, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayAcroBike = {0xFFFF, 0x1110, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_MayAcroBike, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMaySurfing = {0xFFFF, 0x1110, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Surfing, gEventObjectPicTable_MaySurfing, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayFieldMove = {0xFFFF, 0x1110, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_FieldMove, gEventObjectPicTable_MayFieldMove, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Cameraman = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Cameraman, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanUnderwater = {0xFFFF, 0x1115, 0x11FF, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BrendanUnderwater, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayUnderwater = {0xFFFF, 0x1115, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MayUnderwater, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MovingBox = {0xFFFF, 0x1112, 0x11FF, 128, 16, 16, 10, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MovingBox, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CableCar = {0xFFFF, 0x1113, 0x11FF, 2048, 64, 64, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_64x64, gEventObjectSpriteOamTables_64x64, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_CableCar, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scientist2 = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Scientist2, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man7 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man7, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AquaMemberM = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_AquaMemberM, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AquaMemberF = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_AquaMemberF, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MagmaMemberM = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MagmaMemberM, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MagmaMemberF = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MagmaMemberF, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sidney = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Sidney, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Phoebe = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Phoebe, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Glacia = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Glacia, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Drake = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Drake, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Roxanne = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Roxanne, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Brawly = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Brawly, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wattson = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Wattson, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Flannery = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Flannery, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Norman = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Norman, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Winona = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Winona, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Liza = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Liza, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Tate = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Tate, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wallace = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Wallace, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Steven = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Steven, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wally = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Wally, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RubySapphireLittleBoy = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RubySapphireLittleBoy, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanFishing = {0xFFFF, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Fishing, gEventObjectPicTable_BrendanFishing, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayFishing = {0xFFFF, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Fishing, gEventObjectPicTable_MayFishing, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HotSpringsOldWoman = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_HotSpringsOldWoman, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SSTidal = {0xFFFF, 0x1114, 0x11FF, 1920, 96, 40, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_8x8, gEventObjectSpriteOamTables_SSTidal, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SSTidal, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SubmarineShadow = {0xFFFF, 0x111B, 0x11FF, 1408, 88, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_8x8, gEventObjectSpriteOamTables_SubmarineShadow, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SubmarineShadow, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PichuDoll = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_PichuDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PikachuDoll = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_PikachuDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MarillDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MarillDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TogepiDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_TogepiDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyndaquilDoll = {0xFFFF, 0x1106, 0x11FF, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_CyndaquilDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ChikoritaDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_ChikoritaDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TotodileDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_TotodileDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_JigglypuffDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_JigglypuffDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MeowthDoll = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MeowthDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ClefairyDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_ClefairyDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DittoDoll = {0xFFFF, 0x1106, 0x11FF, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_DittoDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SmoochumDoll = {0xFFFF, 0x1106, 0x11FF, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SmoochumDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TreeckoDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_TreeckoDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TorchicDoll = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_TorchicDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MudkipDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MudkipDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DuskullDoll = {0xFFFF, 0x1106, 0x11FF, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_DuskullDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_WynautDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_WynautDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BaltoyDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BaltoyDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_KecleonDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_KecleonDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AzurillDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_AzurillDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SkittyDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SkittyDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwabluDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SwabluDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GulpinDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_GulpinDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LotadDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_LotadDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SeedotDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SeedotDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PikaCushion = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_PikaCushion, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RoundCushion = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_RoundCushion, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_KissCushion = {0xFFFF, 0x1106, 0x11FF, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_KissCushion, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ZigzagCushion = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_ZigzagCushion, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SpinCushion = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SpinCushion, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DiamondCushion = {0xFFFF, 0x1106, 0x11FF, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_DiamondCushion, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BallCushion = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BallCushion, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GrassCushion = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_GrassCushion, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FireCushion = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_FireCushion, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_WaterCushion = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_WaterCushion, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigSnorlaxDoll = {0xFFFF, 0x1106, 0x11FF, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigSnorlaxDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRhydonDoll = {0xFFFF, 0x1106, 0x11FF, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigRhydonDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigLaprasDoll = {0xFFFF, 0x1103, 0x11FF, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigLaprasDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigVenusaurDoll = {0xFFFF, 0x1105, 0x11FF, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigVenusaurDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigCharizardDoll = {0xFFFF, 0x1104, 0x11FF, 512, 32, 32, 3, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigCharizardDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigBlastoiseDoll = {0xFFFF, 0x1103, 0x11FF, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigBlastoiseDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigWailmerDoll = {0xFFFF, 0x1106, 0x11FF, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigWailmerDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegirockDoll = {0xFFFF, 0x1103, 0x11FF, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigRegirockDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegiceDoll = {0xFFFF, 0x1105, 0x11FF, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigRegiceDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegisteelDoll = {0xFFFF, 0x1106, 0x11FF, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigRegisteelDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Latias = {0xFFFF, 0x1104, 0x11FF, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LatiasLatios, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Latios = {0xFFFF, 0x1103, 0x11FF, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LatiasLatios, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy5 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy5, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ContestOldMan = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ContestOldMan, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanWatering = {0xFFFF, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BrendanWatering, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayWatering = {0xFFFF, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MayWatering, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanDecorating = {0xFFFF, 0x1100, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BrendanDecorating, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayDecorating = {0xFFFF, 0x1110, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MayDecorating, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Archie = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Archie, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Maxie = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Maxie, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre1 = {0xFFFF, 0x1106, 0x11FF, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_KyogreFront, gEventObjectRotScalAnimTable_KyogreGroudon};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon1 = {0xFFFF, 0x1105, 0x11FF, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_GroudonFront, gEventObjectRotScalAnimTable_KyogreGroudon};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre3 = {0xFFFF, 0x1106, 0x11FF, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_KyogreSide, gEventObjectRotScalAnimTable_KyogreGroudon};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon3 = {0xFFFF, 0x1105, 0x11FF, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Groudon3, gEventObjectPicTable_GroudonSide, gEventObjectRotScalAnimTable_KyogreGroudon};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Fossil = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_Fossil, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Regirock = {0xFFFF, 0x1104, 0x11FF, 512, 32, 32, 3, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Regi, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Regice = {0xFFFF, 0x1105, 0x11FF, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Regi, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Registeel = {0xFFFF, 0x1106, 0x11FF, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Regi, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Skitty = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Skitty, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kecleon1 = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Kecleon, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre2 = {0xFFFF, 0x1116, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_KyogreFront, gEventObjectRotScalAnimTable_KyogreGroudon};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon2 = {0xFFFF, 0x1118, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_GroudonFront, gEventObjectRotScalAnimTable_KyogreGroudon};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Rayquaza2 = {0xFFFF, 0x1105, 0x11FF, 2048, 64, 64, 4, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_64x64, gEventObjectSpriteOamTables_64x64, gEventObjectImageAnimTable_Rayquaza2, gEventObjectPicTable_Rayquaza, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Zigzagoon = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Zigzagoon, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Pikachu = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Pikachu, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Azumarill = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Azumarill, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wingull = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Wingull, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kecleon2 = {0xFFFF, 0x1105, 0x1102, 128, 16, 16, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Kecleon, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberMSwimming = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_TuberMSwimming, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Azurill = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Azurill, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Mom = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Mom, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkBrendan = {0xFFFF, 0x1110, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_BrendanNormal, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkMay = {0xFFFF, 0x1110, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_MayNormal, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Juan = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Juan, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scott = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Scott, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MysteryEventDeliveryman = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MysteryEventDeliveryman, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Statue = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_Statue, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kirlia = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_S, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Kirlia, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Dusclops = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Dusclops, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnionRoomAttendant = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_UnionRoomAttendant, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Red = {0xFFFF, 0x111D, 0x11FF, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Red, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Leaf = {0xFFFF, 0x111D, 0x11FF, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Leaf, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sudowoodo = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Sudowoodo, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Mew = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Mew, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Deoxys = {0xFFFF, 0x111E, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Deoxys, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BirthIslandStone = {0xFFFF, 0x111F, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BirthIslandStone, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Anabel = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Anabel, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Tucker = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Tucker, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Greta = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Greta, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Spenser = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Spenser, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Noland = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Noland, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Lucy = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Lucy, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Brandon = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Brandon, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RubySapphireBrendan = {0xFFFF, 0x1122, 0x11FF, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RubySapphireBrendan, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RubySapphireMay = {0xFFFF, 0x1123, 0x11FF, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RubySapphireMay, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Lugia = {0xFFFF, 0x1121, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Lugia, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HoOh = {0xFFFF, 0x1120, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_HoOh, gEventObjectPicTable_HoOh, gDummySpriteAffineAnimTable};
+
+#endif //GUARD_EVENT_OBJECT_GRAPHICS_INFO_H
diff --git a/src/data/field_event_obj/event_object_graphics_info_pointers.h b/src/data/field_event_obj/event_object_graphics_info_pointers.h
new file mode 100755
index 000000000..c0ca57b60
--- /dev/null
+++ b/src/data/field_event_obj/event_object_graphics_info_pointers.h
@@ -0,0 +1,504 @@
+#ifndef GUARD_EVENT_OBJECT_GRAPHICS_INFO_POINTERS_H
+#define GUARD_EVENT_OBJECT_GRAPHICS_INFO_POINTERS_H
+
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanNormal;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanMachBike;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanSurfing;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanFieldMove;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_QuintyPlump;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy1;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl1;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy1;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl1;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy2;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl2;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy2;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl2;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy3;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl3;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy4;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman1;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FatMan;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman2;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man1;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman3;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldMan1;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldWoman1;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man2;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman4;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man3;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman5;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Cook;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman6;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldMan2;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldWoman2;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Camper;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Picnicker;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man4;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman7;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Youngster;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BugCatcher;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PsychicM;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SchoolKidM;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Maniac;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HexManiac;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Rayquaza1;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwimmerM;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwimmerF;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BlackBelt;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Beauty;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scientist1;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Lass;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Gentleman;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sailor;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Fisherman;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RunningTriathleteM;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RunningTriathleteF;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberF;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberM;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Hiker;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyclingTriathleteM;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyclingTriathleteF;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Nurse;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ItemBall;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTree;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTreeEarlyStages;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTreeLateStages;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanAcroBike;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ProfBirch;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man5;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man6;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ReporterM;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ReporterF;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Bard;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Anabel;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Tucker;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Greta;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Spenser;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Noland;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Lucy;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedNatuDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMagnemiteDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedSquirtleDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedWooperDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedPikachuDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedPorygon2Doll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CuttableTree;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MartEmployee;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RooftopSaleWoman;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Teala;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BreakableRock;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PushableBoulder;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MrBrineysBoat;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayNormal;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayMachBike;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayAcroBike;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MaySurfing;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayFieldMove;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Truck;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_VigorothCarryingBox;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_VigorothFacingAway;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BirchsBag;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_EnemyZigzagoon;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Artist;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanNormal;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanMachBike;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanAcroBike;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanSurfing;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanFieldMove;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayNormal;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayMachBike;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayAcroBike;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMaySurfing;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayFieldMove;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Cameraman;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanUnderwater;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayUnderwater;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MovingBox;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CableCar;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scientist2;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man7;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AquaMemberM;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AquaMemberF;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MagmaMemberM;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MagmaMemberF;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sidney;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Phoebe;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Glacia;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Drake;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Roxanne;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Brawly;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wattson;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Flannery;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Norman;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Winona;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Liza;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Tate;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wallace;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Steven;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wally;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RubySapphireLittleBoy;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanFishing;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayFishing;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HotSpringsOldWoman;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SSTidal;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SubmarineShadow;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PichuDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PikachuDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MarillDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TogepiDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyndaquilDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ChikoritaDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TotodileDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_JigglypuffDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MeowthDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ClefairyDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DittoDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SmoochumDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TreeckoDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TorchicDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MudkipDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DuskullDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_WynautDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BaltoyDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_KecleonDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AzurillDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SkittyDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwabluDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GulpinDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LotadDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SeedotDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PikaCushion;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RoundCushion;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_KissCushion;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ZigzagCushion;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SpinCushion;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DiamondCushion;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BallCushion;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GrassCushion;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FireCushion;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_WaterCushion;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigSnorlaxDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRhydonDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigLaprasDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigVenusaurDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigCharizardDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigBlastoiseDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigWailmerDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegirockDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegiceDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegisteelDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Latias;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Latios;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy5;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ContestOldMan;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanWatering;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayWatering;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanDecorating;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayDecorating;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Archie;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Maxie;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre1;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon1;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Fossil;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Regirock;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Regice;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Registeel;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Skitty;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kecleon1;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre2;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon2;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Rayquaza2;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Zigzagoon;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Pikachu;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Azumarill;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wingull;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kecleon2;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberMSwimming;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Azurill;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Mom;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkBrendan;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkMay;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Juan;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scott;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Poochyena;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre3;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon3;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MysteryEventDeliveryman;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Statue;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kirlia;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Dusclops;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnionRoomAttendant;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sudowoodo;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Mew;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Red;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Leaf;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Deoxys;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BirthIslandStone;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Brandon;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RubySapphireBrendan;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RubySapphireMay;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Lugia;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HoOh;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Bard;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Hipster;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Trader;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Storyteller;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Giddy;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMauvilleOldMan1;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMauvilleOldMan2;
+
+
+const struct EventObjectGraphicsInfo *const gEventObjectGraphicsInfoPointers[] = {
+	&gEventObjectGraphicsInfo_BrendanNormal,
+	&gEventObjectGraphicsInfo_BrendanMachBike,
+	&gEventObjectGraphicsInfo_BrendanSurfing,
+	&gEventObjectGraphicsInfo_BrendanFieldMove,
+	&gEventObjectGraphicsInfo_QuintyPlump,
+	&gEventObjectGraphicsInfo_LittleBoy1,
+	&gEventObjectGraphicsInfo_LittleGirl1,
+	&gEventObjectGraphicsInfo_Boy1,
+	&gEventObjectGraphicsInfo_Girl1,
+	&gEventObjectGraphicsInfo_Boy2,
+	&gEventObjectGraphicsInfo_Girl2,
+	&gEventObjectGraphicsInfo_LittleBoy2,
+	&gEventObjectGraphicsInfo_LittleGirl2,
+	&gEventObjectGraphicsInfo_Boy3,
+	&gEventObjectGraphicsInfo_Girl3,
+	&gEventObjectGraphicsInfo_Boy4,
+	&gEventObjectGraphicsInfo_Woman1,
+	&gEventObjectGraphicsInfo_FatMan,
+	&gEventObjectGraphicsInfo_Woman2,
+	&gEventObjectGraphicsInfo_Man1,
+	&gEventObjectGraphicsInfo_Woman3,
+	&gEventObjectGraphicsInfo_OldMan1,
+	&gEventObjectGraphicsInfo_OldWoman1,
+	&gEventObjectGraphicsInfo_Man2,
+	&gEventObjectGraphicsInfo_Woman4,
+	&gEventObjectGraphicsInfo_Man3,
+	&gEventObjectGraphicsInfo_Woman5,
+	&gEventObjectGraphicsInfo_Cook,
+	&gEventObjectGraphicsInfo_Woman6,
+	&gEventObjectGraphicsInfo_OldMan2,
+	&gEventObjectGraphicsInfo_OldWoman2,
+	&gEventObjectGraphicsInfo_Camper,
+	&gEventObjectGraphicsInfo_Picnicker,
+	&gEventObjectGraphicsInfo_Man4,
+	&gEventObjectGraphicsInfo_Woman7,
+	&gEventObjectGraphicsInfo_Youngster,
+	&gEventObjectGraphicsInfo_BugCatcher,
+	&gEventObjectGraphicsInfo_PsychicM,
+	&gEventObjectGraphicsInfo_SchoolKidM,
+	&gEventObjectGraphicsInfo_Maniac,
+	&gEventObjectGraphicsInfo_HexManiac,
+	&gEventObjectGraphicsInfo_Rayquaza1,
+	&gEventObjectGraphicsInfo_SwimmerM,
+	&gEventObjectGraphicsInfo_SwimmerF,
+	&gEventObjectGraphicsInfo_BlackBelt,
+	&gEventObjectGraphicsInfo_Beauty,
+	&gEventObjectGraphicsInfo_Scientist1,
+	&gEventObjectGraphicsInfo_Lass,
+	&gEventObjectGraphicsInfo_Gentleman,
+	&gEventObjectGraphicsInfo_Sailor,
+	&gEventObjectGraphicsInfo_Fisherman,
+	&gEventObjectGraphicsInfo_RunningTriathleteM,
+	&gEventObjectGraphicsInfo_RunningTriathleteF,
+	&gEventObjectGraphicsInfo_TuberF,
+	&gEventObjectGraphicsInfo_TuberM,
+	&gEventObjectGraphicsInfo_Hiker,
+	&gEventObjectGraphicsInfo_CyclingTriathleteM,
+	&gEventObjectGraphicsInfo_CyclingTriathleteF,
+	&gEventObjectGraphicsInfo_Nurse,
+	&gEventObjectGraphicsInfo_ItemBall,
+	&gEventObjectGraphicsInfo_BerryTree,
+	&gEventObjectGraphicsInfo_BerryTreeEarlyStages,
+	&gEventObjectGraphicsInfo_BerryTreeLateStages,
+	&gEventObjectGraphicsInfo_BrendanAcroBike,
+	&gEventObjectGraphicsInfo_ProfBirch,
+	&gEventObjectGraphicsInfo_Man5,
+	&gEventObjectGraphicsInfo_Man6,
+	&gEventObjectGraphicsInfo_ReporterM,
+	&gEventObjectGraphicsInfo_ReporterF,
+	&gEventObjectGraphicsInfo_Bard,
+	&gEventObjectGraphicsInfo_Anabel,
+	&gEventObjectGraphicsInfo_Tucker,
+	&gEventObjectGraphicsInfo_Greta,
+	&gEventObjectGraphicsInfo_Spenser,
+	&gEventObjectGraphicsInfo_Noland,
+	&gEventObjectGraphicsInfo_Lucy,
+	&gEventObjectGraphicsInfo_UnusedNatuDoll,
+	&gEventObjectGraphicsInfo_UnusedMagnemiteDoll,
+	&gEventObjectGraphicsInfo_UnusedSquirtleDoll,
+	&gEventObjectGraphicsInfo_UnusedWooperDoll,
+	&gEventObjectGraphicsInfo_UnusedPikachuDoll,
+	&gEventObjectGraphicsInfo_UnusedPorygon2Doll,
+	&gEventObjectGraphicsInfo_CuttableTree,
+	&gEventObjectGraphicsInfo_MartEmployee,
+	&gEventObjectGraphicsInfo_RooftopSaleWoman,
+	&gEventObjectGraphicsInfo_Teala,
+	&gEventObjectGraphicsInfo_BreakableRock,
+	&gEventObjectGraphicsInfo_PushableBoulder,
+	&gEventObjectGraphicsInfo_MrBrineysBoat,
+	&gEventObjectGraphicsInfo_MayNormal,
+	&gEventObjectGraphicsInfo_MayMachBike,
+	&gEventObjectGraphicsInfo_MayAcroBike,
+	&gEventObjectGraphicsInfo_MaySurfing,
+	&gEventObjectGraphicsInfo_MayFieldMove,
+	&gEventObjectGraphicsInfo_Truck,
+	&gEventObjectGraphicsInfo_VigorothCarryingBox,
+	&gEventObjectGraphicsInfo_VigorothFacingAway,
+	&gEventObjectGraphicsInfo_BirchsBag,
+	&gEventObjectGraphicsInfo_EnemyZigzagoon,
+	&gEventObjectGraphicsInfo_Artist,
+	&gEventObjectGraphicsInfo_RivalBrendanNormal,
+	&gEventObjectGraphicsInfo_RivalBrendanMachBike,
+	&gEventObjectGraphicsInfo_RivalBrendanAcroBike,
+	&gEventObjectGraphicsInfo_RivalBrendanSurfing,
+	&gEventObjectGraphicsInfo_RivalBrendanFieldMove,
+	&gEventObjectGraphicsInfo_RivalMayNormal,
+	&gEventObjectGraphicsInfo_RivalMayMachBike,
+	&gEventObjectGraphicsInfo_RivalMayAcroBike,
+	&gEventObjectGraphicsInfo_RivalMaySurfing,
+	&gEventObjectGraphicsInfo_RivalMayFieldMove,
+	&gEventObjectGraphicsInfo_Cameraman,
+	&gEventObjectGraphicsInfo_BrendanUnderwater,
+	&gEventObjectGraphicsInfo_MayUnderwater,
+	&gEventObjectGraphicsInfo_MovingBox,
+	&gEventObjectGraphicsInfo_CableCar,
+	&gEventObjectGraphicsInfo_Scientist2,
+	&gEventObjectGraphicsInfo_Man7,
+	&gEventObjectGraphicsInfo_AquaMemberM,
+	&gEventObjectGraphicsInfo_AquaMemberF,
+	&gEventObjectGraphicsInfo_MagmaMemberM,
+	&gEventObjectGraphicsInfo_MagmaMemberF,
+	&gEventObjectGraphicsInfo_Sidney,
+	&gEventObjectGraphicsInfo_Phoebe,
+	&gEventObjectGraphicsInfo_Glacia,
+	&gEventObjectGraphicsInfo_Drake,
+	&gEventObjectGraphicsInfo_Roxanne,
+	&gEventObjectGraphicsInfo_Brawly,
+	&gEventObjectGraphicsInfo_Wattson,
+	&gEventObjectGraphicsInfo_Flannery,
+	&gEventObjectGraphicsInfo_Norman,
+	&gEventObjectGraphicsInfo_Winona,
+	&gEventObjectGraphicsInfo_Liza,
+	&gEventObjectGraphicsInfo_Tate,
+	&gEventObjectGraphicsInfo_Wallace,
+	&gEventObjectGraphicsInfo_Steven,
+	&gEventObjectGraphicsInfo_Wally,
+	&gEventObjectGraphicsInfo_RubySapphireLittleBoy,
+	&gEventObjectGraphicsInfo_BrendanFishing,
+	&gEventObjectGraphicsInfo_MayFishing,
+	&gEventObjectGraphicsInfo_HotSpringsOldWoman,
+	&gEventObjectGraphicsInfo_SSTidal,
+	&gEventObjectGraphicsInfo_SubmarineShadow,
+	&gEventObjectGraphicsInfo_PichuDoll,
+	&gEventObjectGraphicsInfo_PikachuDoll,
+	&gEventObjectGraphicsInfo_MarillDoll,
+	&gEventObjectGraphicsInfo_TogepiDoll,
+	&gEventObjectGraphicsInfo_CyndaquilDoll,
+	&gEventObjectGraphicsInfo_ChikoritaDoll,
+	&gEventObjectGraphicsInfo_TotodileDoll,
+	&gEventObjectGraphicsInfo_JigglypuffDoll,
+	&gEventObjectGraphicsInfo_MeowthDoll,
+	&gEventObjectGraphicsInfo_ClefairyDoll,
+	&gEventObjectGraphicsInfo_DittoDoll,
+	&gEventObjectGraphicsInfo_SmoochumDoll,
+	&gEventObjectGraphicsInfo_TreeckoDoll,
+	&gEventObjectGraphicsInfo_TorchicDoll,
+	&gEventObjectGraphicsInfo_MudkipDoll,
+	&gEventObjectGraphicsInfo_DuskullDoll,
+	&gEventObjectGraphicsInfo_WynautDoll,
+	&gEventObjectGraphicsInfo_BaltoyDoll,
+	&gEventObjectGraphicsInfo_KecleonDoll,
+	&gEventObjectGraphicsInfo_AzurillDoll,
+	&gEventObjectGraphicsInfo_SkittyDoll,
+	&gEventObjectGraphicsInfo_SwabluDoll,
+	&gEventObjectGraphicsInfo_GulpinDoll,
+	&gEventObjectGraphicsInfo_LotadDoll,
+	&gEventObjectGraphicsInfo_SeedotDoll,
+	&gEventObjectGraphicsInfo_PikaCushion,
+	&gEventObjectGraphicsInfo_RoundCushion,
+	&gEventObjectGraphicsInfo_KissCushion,
+	&gEventObjectGraphicsInfo_ZigzagCushion,
+	&gEventObjectGraphicsInfo_SpinCushion,
+	&gEventObjectGraphicsInfo_DiamondCushion,
+	&gEventObjectGraphicsInfo_BallCushion,
+	&gEventObjectGraphicsInfo_GrassCushion,
+	&gEventObjectGraphicsInfo_FireCushion,
+	&gEventObjectGraphicsInfo_WaterCushion,
+	&gEventObjectGraphicsInfo_BigSnorlaxDoll,
+	&gEventObjectGraphicsInfo_BigRhydonDoll,
+	&gEventObjectGraphicsInfo_BigLaprasDoll,
+	&gEventObjectGraphicsInfo_BigVenusaurDoll,
+	&gEventObjectGraphicsInfo_BigCharizardDoll,
+	&gEventObjectGraphicsInfo_BigBlastoiseDoll,
+	&gEventObjectGraphicsInfo_BigWailmerDoll,
+	&gEventObjectGraphicsInfo_BigRegirockDoll,
+	&gEventObjectGraphicsInfo_BigRegiceDoll,
+	&gEventObjectGraphicsInfo_BigRegisteelDoll,
+	&gEventObjectGraphicsInfo_Latias,
+	&gEventObjectGraphicsInfo_Latios,
+	&gEventObjectGraphicsInfo_Boy5,
+	&gEventObjectGraphicsInfo_ContestOldMan,
+	&gEventObjectGraphicsInfo_BrendanWatering,
+	&gEventObjectGraphicsInfo_MayWatering,
+	&gEventObjectGraphicsInfo_BrendanDecorating,
+	&gEventObjectGraphicsInfo_MayDecorating,
+	&gEventObjectGraphicsInfo_Archie,
+	&gEventObjectGraphicsInfo_Maxie,
+	&gEventObjectGraphicsInfo_Kyogre1,
+	&gEventObjectGraphicsInfo_Groudon1,
+	&gEventObjectGraphicsInfo_Fossil,
+	&gEventObjectGraphicsInfo_Regirock,
+	&gEventObjectGraphicsInfo_Regice,
+	&gEventObjectGraphicsInfo_Registeel,
+	&gEventObjectGraphicsInfo_Skitty,
+	&gEventObjectGraphicsInfo_Kecleon1,
+	&gEventObjectGraphicsInfo_Kyogre2,
+	&gEventObjectGraphicsInfo_Groudon2,
+	&gEventObjectGraphicsInfo_Rayquaza2,
+	&gEventObjectGraphicsInfo_Zigzagoon,
+	&gEventObjectGraphicsInfo_Pikachu,
+	&gEventObjectGraphicsInfo_Azumarill,
+	&gEventObjectGraphicsInfo_Wingull,
+	&gEventObjectGraphicsInfo_Kecleon2,
+	&gEventObjectGraphicsInfo_TuberMSwimming,
+	&gEventObjectGraphicsInfo_Azurill,
+	&gEventObjectGraphicsInfo_Mom,
+	&gEventObjectGraphicsInfo_LinkBrendan,
+	&gEventObjectGraphicsInfo_LinkMay,
+	&gEventObjectGraphicsInfo_Juan,
+	&gEventObjectGraphicsInfo_Scott,
+	&gEventObjectGraphicsInfo_Poochyena,
+	&gEventObjectGraphicsInfo_Kyogre3,
+	&gEventObjectGraphicsInfo_Groudon3,
+	&gEventObjectGraphicsInfo_MysteryEventDeliveryman,
+	&gEventObjectGraphicsInfo_Statue,
+	&gEventObjectGraphicsInfo_Kirlia,
+	&gEventObjectGraphicsInfo_Dusclops,
+	&gEventObjectGraphicsInfo_UnionRoomAttendant,
+	&gEventObjectGraphicsInfo_Sudowoodo,
+	&gEventObjectGraphicsInfo_Mew,
+	&gEventObjectGraphicsInfo_Red,
+	&gEventObjectGraphicsInfo_Leaf,
+	&gEventObjectGraphicsInfo_Deoxys,
+	&gEventObjectGraphicsInfo_BirthIslandStone,
+	&gEventObjectGraphicsInfo_Brandon,
+	&gEventObjectGraphicsInfo_RubySapphireBrendan,
+	&gEventObjectGraphicsInfo_RubySapphireMay,
+	&gEventObjectGraphicsInfo_Lugia,
+	&gEventObjectGraphicsInfo_HoOh,
+};
+
+const struct EventObjectGraphicsInfo *const gMauvilleOldManGraphicsInfoPointers[] = {
+	&gEventObjectGraphicsInfo_Bard,
+	&gEventObjectGraphicsInfo_Hipster,
+	&gEventObjectGraphicsInfo_Trader,
+	&gEventObjectGraphicsInfo_Storyteller,
+	&gEventObjectGraphicsInfo_Giddy,
+	&gEventObjectGraphicsInfo_UnusedMauvilleOldMan1,
+	&gEventObjectGraphicsInfo_UnusedMauvilleOldMan2,
+};
+
+#endif //GUARD_EVENT_OBJECT_GRAPHICS_INFO_POINTERS_H
diff --git a/src/data/field_event_obj/event_object_pic_tables.h b/src/data/field_event_obj/event_object_pic_tables.h
new file mode 100755
index 000000000..892af7e9b
--- /dev/null
+++ b/src/data/field_event_obj/event_object_pic_tables.h
@@ -0,0 +1,2179 @@
+#ifndef GUARD_EVENT_OBJECT_PIC_TABLES_H
+#define GUARD_EVENT_OBJECT_PIC_TABLES_H
+
+const struct SpriteFrameImage gEventObjectPicTable_BrendanNormal[] = {
+    obj_frame_tiles(gEventObjectPic_BrendanNormal_0),
+    obj_frame_tiles(gEventObjectPic_BrendanNormal_1),
+    obj_frame_tiles(gEventObjectPic_BrendanNormal_2),
+    obj_frame_tiles(gEventObjectPic_BrendanNormal_3),
+    obj_frame_tiles(gEventObjectPic_BrendanNormal_4),
+    obj_frame_tiles(gEventObjectPic_BrendanNormal_5),
+    obj_frame_tiles(gEventObjectPic_BrendanNormal_6),
+    obj_frame_tiles(gEventObjectPic_BrendanNormal_7),
+    obj_frame_tiles(gEventObjectPic_BrendanNormal_8),
+    obj_frame_tiles(gEventObjectPic_BrendanNormal_9),
+    obj_frame_tiles(gEventObjectPic_BrendanNormal_10),
+    obj_frame_tiles(gEventObjectPic_BrendanNormal_11),
+    obj_frame_tiles(gEventObjectPic_BrendanNormal_12),
+    obj_frame_tiles(gEventObjectPic_BrendanNormal_13),
+    obj_frame_tiles(gEventObjectPic_BrendanNormal_14),
+    obj_frame_tiles(gEventObjectPic_BrendanNormal_15),
+    obj_frame_tiles(gEventObjectPic_BrendanNormal_16),
+    obj_frame_tiles(gEventObjectPic_BrendanNormal_17),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BrendanMachBike[] = {
+    obj_frame_tiles(gEventObjectPic_BrendanMachBike_0),
+    obj_frame_tiles(gEventObjectPic_BrendanMachBike_1),
+    obj_frame_tiles(gEventObjectPic_BrendanMachBike_2),
+    obj_frame_tiles(gEventObjectPic_BrendanMachBike_3),
+    obj_frame_tiles(gEventObjectPic_BrendanMachBike_4),
+    obj_frame_tiles(gEventObjectPic_BrendanMachBike_5),
+    obj_frame_tiles(gEventObjectPic_BrendanMachBike_6),
+    obj_frame_tiles(gEventObjectPic_BrendanMachBike_7),
+    obj_frame_tiles(gEventObjectPic_BrendanMachBike_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BrendanAcroBike[] = {
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_0),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_1),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_2),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_3),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_4),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_5),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_6),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_7),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_8),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_9),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_10),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_11),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_12),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_13),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_14),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_15),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_16),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_17),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_18),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_19),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_20),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_21),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_22),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_23),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_24),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_25),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_26),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BrendanSurfing[] = {
+    obj_frame_tiles(gEventObjectPic_BrendanSurfing_0),
+    obj_frame_tiles(gEventObjectPic_BrendanSurfing_1),
+    obj_frame_tiles(gEventObjectPic_BrendanSurfing_2),
+    obj_frame_tiles(gEventObjectPic_BrendanSurfing_0),
+    obj_frame_tiles(gEventObjectPic_BrendanSurfing_0),
+    obj_frame_tiles(gEventObjectPic_BrendanSurfing_1),
+    obj_frame_tiles(gEventObjectPic_BrendanSurfing_1),
+    obj_frame_tiles(gEventObjectPic_BrendanSurfing_2),
+    obj_frame_tiles(gEventObjectPic_BrendanSurfing_2),
+    obj_frame_tiles(gEventObjectPic_BrendanSurfing_3),
+    obj_frame_tiles(gEventObjectPic_BrendanSurfing_4),
+    obj_frame_tiles(gEventObjectPic_BrendanSurfing_5),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BrendanUnderwater[] = {
+    obj_frame_tiles(gEventObjectPic_BrendanUnderwater_0),
+    obj_frame_tiles(gEventObjectPic_BrendanUnderwater_1),
+    obj_frame_tiles(gEventObjectPic_BrendanUnderwater_2),
+    obj_frame_tiles(gEventObjectPic_BrendanUnderwater_0),
+    obj_frame_tiles(gEventObjectPic_BrendanUnderwater_0),
+    obj_frame_tiles(gEventObjectPic_BrendanUnderwater_1),
+    obj_frame_tiles(gEventObjectPic_BrendanUnderwater_1),
+    obj_frame_tiles(gEventObjectPic_BrendanUnderwater_2),
+    obj_frame_tiles(gEventObjectPic_BrendanUnderwater_2),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BrendanFieldMove[] = {
+    obj_frame_tiles(gEventObjectPic_BrendanFieldMove_0),
+    obj_frame_tiles(gEventObjectPic_BrendanFieldMove_1),
+    obj_frame_tiles(gEventObjectPic_BrendanFieldMove_2),
+    obj_frame_tiles(gEventObjectPic_BrendanFieldMove_3),
+    obj_frame_tiles(gEventObjectPic_BrendanFieldMove_4),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_QuintyPlump[] = {
+    obj_frame_tiles(gEventObjectPic_QuintyPlump_0),
+    obj_frame_tiles(gEventObjectPic_QuintyPlump_1),
+    obj_frame_tiles(gEventObjectPic_QuintyPlump_2),
+    obj_frame_tiles(gEventObjectPic_QuintyPlump_3),
+    obj_frame_tiles(gEventObjectPic_QuintyPlump_4),
+    obj_frame_tiles(gEventObjectPic_QuintyPlump_5),
+    obj_frame_tiles(gEventObjectPic_QuintyPlump_6),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_LittleBoy1[] = {
+    obj_frame_tiles(gEventObjectPic_LittleBoy1_0),
+    obj_frame_tiles(gEventObjectPic_LittleBoy1_1),
+    obj_frame_tiles(gEventObjectPic_LittleBoy1_2),
+    obj_frame_tiles(gEventObjectPic_LittleBoy1_3),
+    obj_frame_tiles(gEventObjectPic_LittleBoy1_4),
+    obj_frame_tiles(gEventObjectPic_LittleBoy1_5),
+    obj_frame_tiles(gEventObjectPic_LittleBoy1_6),
+    obj_frame_tiles(gEventObjectPic_LittleBoy1_7),
+    obj_frame_tiles(gEventObjectPic_LittleBoy1_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_LittleGirl1[] = {
+    obj_frame_tiles(gEventObjectPic_LittleGirl1_0),
+    obj_frame_tiles(gEventObjectPic_LittleGirl1_1),
+    obj_frame_tiles(gEventObjectPic_LittleGirl1_2),
+    obj_frame_tiles(gEventObjectPic_LittleGirl1_3),
+    obj_frame_tiles(gEventObjectPic_LittleGirl1_4),
+    obj_frame_tiles(gEventObjectPic_LittleGirl1_5),
+    obj_frame_tiles(gEventObjectPic_LittleGirl1_6),
+    obj_frame_tiles(gEventObjectPic_LittleGirl1_7),
+    obj_frame_tiles(gEventObjectPic_LittleGirl1_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Boy1[] = {
+    obj_frame_tiles(gEventObjectPic_Boy1_0),
+    obj_frame_tiles(gEventObjectPic_Boy1_1),
+    obj_frame_tiles(gEventObjectPic_Boy1_2),
+    obj_frame_tiles(gEventObjectPic_Boy1_3),
+    obj_frame_tiles(gEventObjectPic_Boy1_4),
+    obj_frame_tiles(gEventObjectPic_Boy1_5),
+    obj_frame_tiles(gEventObjectPic_Boy1_6),
+    obj_frame_tiles(gEventObjectPic_Boy1_7),
+    obj_frame_tiles(gEventObjectPic_Boy1_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Girl1[] = {
+    obj_frame_tiles(gEventObjectPic_Girl1_0),
+    obj_frame_tiles(gEventObjectPic_Girl1_1),
+    obj_frame_tiles(gEventObjectPic_Girl1_2),
+    obj_frame_tiles(gEventObjectPic_Girl1_3),
+    obj_frame_tiles(gEventObjectPic_Girl1_4),
+    obj_frame_tiles(gEventObjectPic_Girl1_5),
+    obj_frame_tiles(gEventObjectPic_Girl1_6),
+    obj_frame_tiles(gEventObjectPic_Girl1_7),
+    obj_frame_tiles(gEventObjectPic_Girl1_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Boy2[] = {
+    obj_frame_tiles(gEventObjectPic_Boy2_0),
+    obj_frame_tiles(gEventObjectPic_Boy2_1),
+    obj_frame_tiles(gEventObjectPic_Boy2_2),
+    obj_frame_tiles(gEventObjectPic_Boy2_3),
+    obj_frame_tiles(gEventObjectPic_Boy2_4),
+    obj_frame_tiles(gEventObjectPic_Boy2_5),
+    obj_frame_tiles(gEventObjectPic_Boy2_6),
+    obj_frame_tiles(gEventObjectPic_Boy2_7),
+    obj_frame_tiles(gEventObjectPic_Boy2_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Girl2[] = {
+    obj_frame_tiles(gEventObjectPic_Girl2_0),
+    obj_frame_tiles(gEventObjectPic_Girl2_1),
+    obj_frame_tiles(gEventObjectPic_Girl2_2),
+    obj_frame_tiles(gEventObjectPic_Girl2_3),
+    obj_frame_tiles(gEventObjectPic_Girl2_4),
+    obj_frame_tiles(gEventObjectPic_Girl2_5),
+    obj_frame_tiles(gEventObjectPic_Girl2_6),
+    obj_frame_tiles(gEventObjectPic_Girl2_7),
+    obj_frame_tiles(gEventObjectPic_Girl2_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_LittleBoy2[] = {
+    obj_frame_tiles(gEventObjectPic_LittleBoy2_0),
+    obj_frame_tiles(gEventObjectPic_LittleBoy2_1),
+    obj_frame_tiles(gEventObjectPic_LittleBoy2_2),
+    obj_frame_tiles(gEventObjectPic_LittleBoy2_3),
+    obj_frame_tiles(gEventObjectPic_LittleBoy2_4),
+    obj_frame_tiles(gEventObjectPic_LittleBoy2_5),
+    obj_frame_tiles(gEventObjectPic_LittleBoy2_6),
+    obj_frame_tiles(gEventObjectPic_LittleBoy2_7),
+    obj_frame_tiles(gEventObjectPic_LittleBoy2_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_LittleGirl2[] = {
+    obj_frame_tiles(gEventObjectPic_LittleGirl2_0),
+    obj_frame_tiles(gEventObjectPic_LittleGirl2_1),
+    obj_frame_tiles(gEventObjectPic_LittleGirl2_2),
+    obj_frame_tiles(gEventObjectPic_LittleGirl2_3),
+    obj_frame_tiles(gEventObjectPic_LittleGirl2_4),
+    obj_frame_tiles(gEventObjectPic_LittleGirl2_5),
+    obj_frame_tiles(gEventObjectPic_LittleGirl2_6),
+    obj_frame_tiles(gEventObjectPic_LittleGirl2_7),
+    obj_frame_tiles(gEventObjectPic_LittleGirl2_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Boy3[] = {
+    obj_frame_tiles(gEventObjectPic_Boy3_0),
+    obj_frame_tiles(gEventObjectPic_Boy3_1),
+    obj_frame_tiles(gEventObjectPic_Boy3_2),
+    obj_frame_tiles(gEventObjectPic_Boy3_3),
+    obj_frame_tiles(gEventObjectPic_Boy3_4),
+    obj_frame_tiles(gEventObjectPic_Boy3_5),
+    obj_frame_tiles(gEventObjectPic_Boy3_6),
+    obj_frame_tiles(gEventObjectPic_Boy3_7),
+    obj_frame_tiles(gEventObjectPic_Boy3_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Girl3[] = {
+    obj_frame_tiles(gEventObjectPic_Girl3_0),
+    obj_frame_tiles(gEventObjectPic_Girl3_1),
+    obj_frame_tiles(gEventObjectPic_Girl3_2),
+    obj_frame_tiles(gEventObjectPic_Girl3_3),
+    obj_frame_tiles(gEventObjectPic_Girl3_4),
+    obj_frame_tiles(gEventObjectPic_Girl3_5),
+    obj_frame_tiles(gEventObjectPic_Girl3_6),
+    obj_frame_tiles(gEventObjectPic_Girl3_7),
+    obj_frame_tiles(gEventObjectPic_Girl3_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Boy4[] = {
+    obj_frame_tiles(gEventObjectPic_Boy4_0),
+    obj_frame_tiles(gEventObjectPic_Boy4_1),
+    obj_frame_tiles(gEventObjectPic_Boy4_2),
+    obj_frame_tiles(gEventObjectPic_Boy4_3),
+    obj_frame_tiles(gEventObjectPic_Boy4_4),
+    obj_frame_tiles(gEventObjectPic_Boy4_5),
+    obj_frame_tiles(gEventObjectPic_Boy4_6),
+    obj_frame_tiles(gEventObjectPic_Boy4_7),
+    obj_frame_tiles(gEventObjectPic_Boy4_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Woman1[] = {
+    obj_frame_tiles(gEventObjectPic_Woman1_0),
+    obj_frame_tiles(gEventObjectPic_Woman1_1),
+    obj_frame_tiles(gEventObjectPic_Woman1_2),
+    obj_frame_tiles(gEventObjectPic_Woman1_3),
+    obj_frame_tiles(gEventObjectPic_Woman1_4),
+    obj_frame_tiles(gEventObjectPic_Woman1_5),
+    obj_frame_tiles(gEventObjectPic_Woman1_6),
+    obj_frame_tiles(gEventObjectPic_Woman1_7),
+    obj_frame_tiles(gEventObjectPic_Woman1_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_FatMan[] = {
+    obj_frame_tiles(gEventObjectPic_FatMan_0),
+    obj_frame_tiles(gEventObjectPic_FatMan_1),
+    obj_frame_tiles(gEventObjectPic_FatMan_2),
+    obj_frame_tiles(gEventObjectPic_FatMan_3),
+    obj_frame_tiles(gEventObjectPic_FatMan_4),
+    obj_frame_tiles(gEventObjectPic_FatMan_5),
+    obj_frame_tiles(gEventObjectPic_FatMan_6),
+    obj_frame_tiles(gEventObjectPic_FatMan_7),
+    obj_frame_tiles(gEventObjectPic_FatMan_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Woman2[] = {
+    obj_frame_tiles(gEventObjectPic_Woman2_0),
+    obj_frame_tiles(gEventObjectPic_Woman2_1),
+    obj_frame_tiles(gEventObjectPic_Woman2_2),
+    obj_frame_tiles(gEventObjectPic_Woman2_3),
+    obj_frame_tiles(gEventObjectPic_Woman2_4),
+    obj_frame_tiles(gEventObjectPic_Woman2_5),
+    obj_frame_tiles(gEventObjectPic_Woman2_6),
+    obj_frame_tiles(gEventObjectPic_Woman2_7),
+    obj_frame_tiles(gEventObjectPic_Woman2_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Man1[] = {
+    obj_frame_tiles(gEventObjectPic_Man1_0),
+    obj_frame_tiles(gEventObjectPic_Man1_1),
+    obj_frame_tiles(gEventObjectPic_Man1_2),
+    obj_frame_tiles(gEventObjectPic_Man1_3),
+    obj_frame_tiles(gEventObjectPic_Man1_4),
+    obj_frame_tiles(gEventObjectPic_Man1_5),
+    obj_frame_tiles(gEventObjectPic_Man1_6),
+    obj_frame_tiles(gEventObjectPic_Man1_7),
+    obj_frame_tiles(gEventObjectPic_Man1_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Woman3[] = {
+    obj_frame_tiles(gEventObjectPic_Woman3_0),
+    obj_frame_tiles(gEventObjectPic_Woman3_1),
+    obj_frame_tiles(gEventObjectPic_Woman3_2),
+    obj_frame_tiles(gEventObjectPic_Woman3_3),
+    obj_frame_tiles(gEventObjectPic_Woman3_4),
+    obj_frame_tiles(gEventObjectPic_Woman3_5),
+    obj_frame_tiles(gEventObjectPic_Woman3_6),
+    obj_frame_tiles(gEventObjectPic_Woman3_7),
+    obj_frame_tiles(gEventObjectPic_Woman3_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_OldMan1[] = {
+    obj_frame_tiles(gEventObjectPic_OldMan1_0),
+    obj_frame_tiles(gEventObjectPic_OldMan1_1),
+    obj_frame_tiles(gEventObjectPic_OldMan1_2),
+    obj_frame_tiles(gEventObjectPic_OldMan1_3),
+    obj_frame_tiles(gEventObjectPic_OldMan1_4),
+    obj_frame_tiles(gEventObjectPic_OldMan1_5),
+    obj_frame_tiles(gEventObjectPic_OldMan1_6),
+    obj_frame_tiles(gEventObjectPic_OldMan1_7),
+    obj_frame_tiles(gEventObjectPic_OldMan1_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_OldWoman1[] = {
+    obj_frame_tiles(gEventObjectPic_OldWoman1_0),
+    obj_frame_tiles(gEventObjectPic_OldWoman1_1),
+    obj_frame_tiles(gEventObjectPic_OldWoman1_2),
+    obj_frame_tiles(gEventObjectPic_OldWoman1_3),
+    obj_frame_tiles(gEventObjectPic_OldWoman1_4),
+    obj_frame_tiles(gEventObjectPic_OldWoman1_5),
+    obj_frame_tiles(gEventObjectPic_OldWoman1_6),
+    obj_frame_tiles(gEventObjectPic_OldWoman1_7),
+    obj_frame_tiles(gEventObjectPic_OldWoman1_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Man2[] = {
+    obj_frame_tiles(gEventObjectPic_Man2_0),
+    obj_frame_tiles(gEventObjectPic_Man2_1),
+    obj_frame_tiles(gEventObjectPic_Man2_2),
+    obj_frame_tiles(gEventObjectPic_Man2_3),
+    obj_frame_tiles(gEventObjectPic_Man2_4),
+    obj_frame_tiles(gEventObjectPic_Man2_5),
+    obj_frame_tiles(gEventObjectPic_Man2_6),
+    obj_frame_tiles(gEventObjectPic_Man2_7),
+    obj_frame_tiles(gEventObjectPic_Man2_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Woman4[] = {
+    obj_frame_tiles(gEventObjectPic_Woman4_0),
+    obj_frame_tiles(gEventObjectPic_Woman4_1),
+    obj_frame_tiles(gEventObjectPic_Woman4_2),
+    obj_frame_tiles(gEventObjectPic_Woman4_3),
+    obj_frame_tiles(gEventObjectPic_Woman4_4),
+    obj_frame_tiles(gEventObjectPic_Woman4_5),
+    obj_frame_tiles(gEventObjectPic_Woman4_6),
+    obj_frame_tiles(gEventObjectPic_Woman4_7),
+    obj_frame_tiles(gEventObjectPic_Woman4_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Man3[] = {
+    obj_frame_tiles(gEventObjectPic_Man3_0),
+    obj_frame_tiles(gEventObjectPic_Man3_1),
+    obj_frame_tiles(gEventObjectPic_Man3_2),
+    obj_frame_tiles(gEventObjectPic_Man3_3),
+    obj_frame_tiles(gEventObjectPic_Man3_4),
+    obj_frame_tiles(gEventObjectPic_Man3_5),
+    obj_frame_tiles(gEventObjectPic_Man3_6),
+    obj_frame_tiles(gEventObjectPic_Man3_7),
+    obj_frame_tiles(gEventObjectPic_Man3_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Woman5[] = {
+    obj_frame_tiles(gEventObjectPic_Woman5_0),
+    obj_frame_tiles(gEventObjectPic_Woman5_1),
+    obj_frame_tiles(gEventObjectPic_Woman5_2),
+    obj_frame_tiles(gEventObjectPic_Woman5_3),
+    obj_frame_tiles(gEventObjectPic_Woman5_4),
+    obj_frame_tiles(gEventObjectPic_Woman5_5),
+    obj_frame_tiles(gEventObjectPic_Woman5_6),
+    obj_frame_tiles(gEventObjectPic_Woman5_7),
+    obj_frame_tiles(gEventObjectPic_Woman5_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Cook[] = {
+    obj_frame_tiles(gEventObjectPic_Cook_0),
+    obj_frame_tiles(gEventObjectPic_Cook_1),
+    obj_frame_tiles(gEventObjectPic_Cook_2),
+    obj_frame_tiles(gEventObjectPic_Cook_0),
+    obj_frame_tiles(gEventObjectPic_Cook_0),
+    obj_frame_tiles(gEventObjectPic_Cook_1),
+    obj_frame_tiles(gEventObjectPic_Cook_1),
+    obj_frame_tiles(gEventObjectPic_Cook_2),
+    obj_frame_tiles(gEventObjectPic_Cook_2),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Woman6[] = {
+    obj_frame_tiles(gEventObjectPic_Woman6_0),
+    obj_frame_tiles(gEventObjectPic_Woman6_1),
+    obj_frame_tiles(gEventObjectPic_Woman6_2),
+    obj_frame_tiles(gEventObjectPic_Woman6_3),
+    obj_frame_tiles(gEventObjectPic_Woman6_4),
+    obj_frame_tiles(gEventObjectPic_Woman6_5),
+    obj_frame_tiles(gEventObjectPic_Woman6_6),
+    obj_frame_tiles(gEventObjectPic_Woman6_7),
+    obj_frame_tiles(gEventObjectPic_Woman6_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_OldMan2[] = {
+    obj_frame_tiles(gEventObjectPic_OldMan2_0),
+    obj_frame_tiles(gEventObjectPic_OldMan2_1),
+    obj_frame_tiles(gEventObjectPic_OldMan2_2),
+    obj_frame_tiles(gEventObjectPic_OldMan2_0),
+    obj_frame_tiles(gEventObjectPic_OldMan2_0),
+    obj_frame_tiles(gEventObjectPic_OldMan2_1),
+    obj_frame_tiles(gEventObjectPic_OldMan2_1),
+    obj_frame_tiles(gEventObjectPic_OldMan2_2),
+    obj_frame_tiles(gEventObjectPic_OldMan2_2),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_OldWoman2[] = {
+    obj_frame_tiles(gEventObjectPic_OldWoman2_0),
+    obj_frame_tiles(gEventObjectPic_OldWoman2_1),
+    obj_frame_tiles(gEventObjectPic_OldWoman2_2),
+    obj_frame_tiles(gEventObjectPic_OldWoman2_3),
+    obj_frame_tiles(gEventObjectPic_OldWoman2_4),
+    obj_frame_tiles(gEventObjectPic_OldWoman2_5),
+    obj_frame_tiles(gEventObjectPic_OldWoman2_6),
+    obj_frame_tiles(gEventObjectPic_OldWoman2_7),
+    obj_frame_tiles(gEventObjectPic_OldWoman2_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Camper[] = {
+    obj_frame_tiles(gEventObjectPic_Camper_0),
+    obj_frame_tiles(gEventObjectPic_Camper_1),
+    obj_frame_tiles(gEventObjectPic_Camper_2),
+    obj_frame_tiles(gEventObjectPic_Camper_3),
+    obj_frame_tiles(gEventObjectPic_Camper_4),
+    obj_frame_tiles(gEventObjectPic_Camper_5),
+    obj_frame_tiles(gEventObjectPic_Camper_6),
+    obj_frame_tiles(gEventObjectPic_Camper_7),
+    obj_frame_tiles(gEventObjectPic_Camper_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Picnicker[] = {
+    obj_frame_tiles(gEventObjectPic_Picnicker_0),
+    obj_frame_tiles(gEventObjectPic_Picnicker_1),
+    obj_frame_tiles(gEventObjectPic_Picnicker_2),
+    obj_frame_tiles(gEventObjectPic_Picnicker_3),
+    obj_frame_tiles(gEventObjectPic_Picnicker_4),
+    obj_frame_tiles(gEventObjectPic_Picnicker_5),
+    obj_frame_tiles(gEventObjectPic_Picnicker_6),
+    obj_frame_tiles(gEventObjectPic_Picnicker_7),
+    obj_frame_tiles(gEventObjectPic_Picnicker_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Man4[] = {
+    obj_frame_tiles(gEventObjectPic_Man4_0),
+    obj_frame_tiles(gEventObjectPic_Man4_1),
+    obj_frame_tiles(gEventObjectPic_Man4_2),
+    obj_frame_tiles(gEventObjectPic_Man4_3),
+    obj_frame_tiles(gEventObjectPic_Man4_4),
+    obj_frame_tiles(gEventObjectPic_Man4_5),
+    obj_frame_tiles(gEventObjectPic_Man4_6),
+    obj_frame_tiles(gEventObjectPic_Man4_7),
+    obj_frame_tiles(gEventObjectPic_Man4_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Woman7[] = {
+    obj_frame_tiles(gEventObjectPic_Woman7_0),
+    obj_frame_tiles(gEventObjectPic_Woman7_1),
+    obj_frame_tiles(gEventObjectPic_Woman7_2),
+    obj_frame_tiles(gEventObjectPic_Woman7_3),
+    obj_frame_tiles(gEventObjectPic_Woman7_4),
+    obj_frame_tiles(gEventObjectPic_Woman7_5),
+    obj_frame_tiles(gEventObjectPic_Woman7_6),
+    obj_frame_tiles(gEventObjectPic_Woman7_7),
+    obj_frame_tiles(gEventObjectPic_Woman7_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Youngster[] = {
+    obj_frame_tiles(gEventObjectPic_Youngster_0),
+    obj_frame_tiles(gEventObjectPic_Youngster_1),
+    obj_frame_tiles(gEventObjectPic_Youngster_2),
+    obj_frame_tiles(gEventObjectPic_Youngster_3),
+    obj_frame_tiles(gEventObjectPic_Youngster_4),
+    obj_frame_tiles(gEventObjectPic_Youngster_5),
+    obj_frame_tiles(gEventObjectPic_Youngster_6),
+    obj_frame_tiles(gEventObjectPic_Youngster_7),
+    obj_frame_tiles(gEventObjectPic_Youngster_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BugCatcher[] = {
+    obj_frame_tiles(gEventObjectPic_BugCatcher_0),
+    obj_frame_tiles(gEventObjectPic_BugCatcher_1),
+    obj_frame_tiles(gEventObjectPic_BugCatcher_2),
+    obj_frame_tiles(gEventObjectPic_BugCatcher_3),
+    obj_frame_tiles(gEventObjectPic_BugCatcher_4),
+    obj_frame_tiles(gEventObjectPic_BugCatcher_5),
+    obj_frame_tiles(gEventObjectPic_BugCatcher_6),
+    obj_frame_tiles(gEventObjectPic_BugCatcher_7),
+    obj_frame_tiles(gEventObjectPic_BugCatcher_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_PsychicM[] = {
+    obj_frame_tiles(gEventObjectPic_PsychicM_0),
+    obj_frame_tiles(gEventObjectPic_PsychicM_1),
+    obj_frame_tiles(gEventObjectPic_PsychicM_2),
+    obj_frame_tiles(gEventObjectPic_PsychicM_3),
+    obj_frame_tiles(gEventObjectPic_PsychicM_4),
+    obj_frame_tiles(gEventObjectPic_PsychicM_5),
+    obj_frame_tiles(gEventObjectPic_PsychicM_6),
+    obj_frame_tiles(gEventObjectPic_PsychicM_7),
+    obj_frame_tiles(gEventObjectPic_PsychicM_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_SchoolKidM[] = {
+    obj_frame_tiles(gEventObjectPic_SchoolKidM_0),
+    obj_frame_tiles(gEventObjectPic_SchoolKidM_1),
+    obj_frame_tiles(gEventObjectPic_SchoolKidM_2),
+    obj_frame_tiles(gEventObjectPic_SchoolKidM_3),
+    obj_frame_tiles(gEventObjectPic_SchoolKidM_4),
+    obj_frame_tiles(gEventObjectPic_SchoolKidM_5),
+    obj_frame_tiles(gEventObjectPic_SchoolKidM_6),
+    obj_frame_tiles(gEventObjectPic_SchoolKidM_7),
+    obj_frame_tiles(gEventObjectPic_SchoolKidM_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Maniac[] = {
+    obj_frame_tiles(gEventObjectPic_Maniac_0),
+    obj_frame_tiles(gEventObjectPic_Maniac_1),
+    obj_frame_tiles(gEventObjectPic_Maniac_2),
+    obj_frame_tiles(gEventObjectPic_Maniac_3),
+    obj_frame_tiles(gEventObjectPic_Maniac_4),
+    obj_frame_tiles(gEventObjectPic_Maniac_5),
+    obj_frame_tiles(gEventObjectPic_Maniac_6),
+    obj_frame_tiles(gEventObjectPic_Maniac_7),
+    obj_frame_tiles(gEventObjectPic_Maniac_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_HexManiac[] = {
+    obj_frame_tiles(gEventObjectPic_HexManiac_0),
+    obj_frame_tiles(gEventObjectPic_HexManiac_1),
+    obj_frame_tiles(gEventObjectPic_HexManiac_2),
+    obj_frame_tiles(gEventObjectPic_HexManiac_3),
+    obj_frame_tiles(gEventObjectPic_HexManiac_4),
+    obj_frame_tiles(gEventObjectPic_HexManiac_5),
+    obj_frame_tiles(gEventObjectPic_HexManiac_6),
+    obj_frame_tiles(gEventObjectPic_HexManiac_7),
+    obj_frame_tiles(gEventObjectPic_HexManiac_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_SwimmerM[] = {
+    obj_frame_tiles(gEventObjectPic_SwimmerM_0),
+    obj_frame_tiles(gEventObjectPic_SwimmerM_1),
+    obj_frame_tiles(gEventObjectPic_SwimmerM_2),
+    obj_frame_tiles(gEventObjectPic_SwimmerM_3),
+    obj_frame_tiles(gEventObjectPic_SwimmerM_4),
+    obj_frame_tiles(gEventObjectPic_SwimmerM_5),
+    obj_frame_tiles(gEventObjectPic_SwimmerM_6),
+    obj_frame_tiles(gEventObjectPic_SwimmerM_7),
+    obj_frame_tiles(gEventObjectPic_SwimmerM_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_SwimmerF[] = {
+    obj_frame_tiles(gEventObjectPic_SwimmerF_0),
+    obj_frame_tiles(gEventObjectPic_SwimmerF_1),
+    obj_frame_tiles(gEventObjectPic_SwimmerF_2),
+    obj_frame_tiles(gEventObjectPic_SwimmerF_3),
+    obj_frame_tiles(gEventObjectPic_SwimmerF_4),
+    obj_frame_tiles(gEventObjectPic_SwimmerF_5),
+    obj_frame_tiles(gEventObjectPic_SwimmerF_6),
+    obj_frame_tiles(gEventObjectPic_SwimmerF_7),
+    obj_frame_tiles(gEventObjectPic_SwimmerF_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BlackBelt[] = {
+    obj_frame_tiles(gEventObjectPic_BlackBelt_0),
+    obj_frame_tiles(gEventObjectPic_BlackBelt_1),
+    obj_frame_tiles(gEventObjectPic_BlackBelt_2),
+    obj_frame_tiles(gEventObjectPic_BlackBelt_3),
+    obj_frame_tiles(gEventObjectPic_BlackBelt_4),
+    obj_frame_tiles(gEventObjectPic_BlackBelt_5),
+    obj_frame_tiles(gEventObjectPic_BlackBelt_6),
+    obj_frame_tiles(gEventObjectPic_BlackBelt_7),
+    obj_frame_tiles(gEventObjectPic_BlackBelt_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Beauty[] = {
+    obj_frame_tiles(gEventObjectPic_Beauty_0),
+    obj_frame_tiles(gEventObjectPic_Beauty_1),
+    obj_frame_tiles(gEventObjectPic_Beauty_2),
+    obj_frame_tiles(gEventObjectPic_Beauty_3),
+    obj_frame_tiles(gEventObjectPic_Beauty_4),
+    obj_frame_tiles(gEventObjectPic_Beauty_5),
+    obj_frame_tiles(gEventObjectPic_Beauty_6),
+    obj_frame_tiles(gEventObjectPic_Beauty_7),
+    obj_frame_tiles(gEventObjectPic_Beauty_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Scientist1[] = {
+    obj_frame_tiles(gEventObjectPic_Scientist1_0),
+    obj_frame_tiles(gEventObjectPic_Scientist1_1),
+    obj_frame_tiles(gEventObjectPic_Scientist1_2),
+    obj_frame_tiles(gEventObjectPic_Scientist1_3),
+    obj_frame_tiles(gEventObjectPic_Scientist1_4),
+    obj_frame_tiles(gEventObjectPic_Scientist1_5),
+    obj_frame_tiles(gEventObjectPic_Scientist1_6),
+    obj_frame_tiles(gEventObjectPic_Scientist1_7),
+    obj_frame_tiles(gEventObjectPic_Scientist1_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Lass[] = {
+    obj_frame_tiles(gEventObjectPic_Lass_0),
+    obj_frame_tiles(gEventObjectPic_Lass_1),
+    obj_frame_tiles(gEventObjectPic_Lass_2),
+    obj_frame_tiles(gEventObjectPic_Lass_3),
+    obj_frame_tiles(gEventObjectPic_Lass_4),
+    obj_frame_tiles(gEventObjectPic_Lass_5),
+    obj_frame_tiles(gEventObjectPic_Lass_6),
+    obj_frame_tiles(gEventObjectPic_Lass_7),
+    obj_frame_tiles(gEventObjectPic_Lass_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Gentleman[] = {
+    obj_frame_tiles(gEventObjectPic_Gentleman_0),
+    obj_frame_tiles(gEventObjectPic_Gentleman_1),
+    obj_frame_tiles(gEventObjectPic_Gentleman_2),
+    obj_frame_tiles(gEventObjectPic_Gentleman_3),
+    obj_frame_tiles(gEventObjectPic_Gentleman_4),
+    obj_frame_tiles(gEventObjectPic_Gentleman_5),
+    obj_frame_tiles(gEventObjectPic_Gentleman_6),
+    obj_frame_tiles(gEventObjectPic_Gentleman_7),
+    obj_frame_tiles(gEventObjectPic_Gentleman_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Sailor[] = {
+    obj_frame_tiles(gEventObjectPic_Sailor_0),
+    obj_frame_tiles(gEventObjectPic_Sailor_1),
+    obj_frame_tiles(gEventObjectPic_Sailor_2),
+    obj_frame_tiles(gEventObjectPic_Sailor_3),
+    obj_frame_tiles(gEventObjectPic_Sailor_4),
+    obj_frame_tiles(gEventObjectPic_Sailor_5),
+    obj_frame_tiles(gEventObjectPic_Sailor_6),
+    obj_frame_tiles(gEventObjectPic_Sailor_7),
+    obj_frame_tiles(gEventObjectPic_Sailor_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Fisherman[] = {
+    obj_frame_tiles(gEventObjectPic_Fisherman_0),
+    obj_frame_tiles(gEventObjectPic_Fisherman_1),
+    obj_frame_tiles(gEventObjectPic_Fisherman_2),
+    obj_frame_tiles(gEventObjectPic_Fisherman_3),
+    obj_frame_tiles(gEventObjectPic_Fisherman_4),
+    obj_frame_tiles(gEventObjectPic_Fisherman_5),
+    obj_frame_tiles(gEventObjectPic_Fisherman_6),
+    obj_frame_tiles(gEventObjectPic_Fisherman_7),
+    obj_frame_tiles(gEventObjectPic_Fisherman_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_RunningTriathleteM[] = {
+    obj_frame_tiles(gEventObjectPic_RunningTriathleteM_0),
+    obj_frame_tiles(gEventObjectPic_RunningTriathleteM_1),
+    obj_frame_tiles(gEventObjectPic_RunningTriathleteM_2),
+    obj_frame_tiles(gEventObjectPic_RunningTriathleteM_3),
+    obj_frame_tiles(gEventObjectPic_RunningTriathleteM_4),
+    obj_frame_tiles(gEventObjectPic_RunningTriathleteM_5),
+    obj_frame_tiles(gEventObjectPic_RunningTriathleteM_6),
+    obj_frame_tiles(gEventObjectPic_RunningTriathleteM_7),
+    obj_frame_tiles(gEventObjectPic_RunningTriathleteM_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_RunningTriathleteF[] = {
+    obj_frame_tiles(gEventObjectPic_RunningTriathleteF_0),
+    obj_frame_tiles(gEventObjectPic_RunningTriathleteF_1),
+    obj_frame_tiles(gEventObjectPic_RunningTriathleteF_2),
+    obj_frame_tiles(gEventObjectPic_RunningTriathleteF_3),
+    obj_frame_tiles(gEventObjectPic_RunningTriathleteF_4),
+    obj_frame_tiles(gEventObjectPic_RunningTriathleteF_5),
+    obj_frame_tiles(gEventObjectPic_RunningTriathleteF_6),
+    obj_frame_tiles(gEventObjectPic_RunningTriathleteF_7),
+    obj_frame_tiles(gEventObjectPic_RunningTriathleteF_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_TuberF[] = {
+    obj_frame_tiles(gEventObjectPic_TuberF_0),
+    obj_frame_tiles(gEventObjectPic_TuberF_1),
+    obj_frame_tiles(gEventObjectPic_TuberF_2),
+    obj_frame_tiles(gEventObjectPic_TuberF_3),
+    obj_frame_tiles(gEventObjectPic_TuberF_4),
+    obj_frame_tiles(gEventObjectPic_TuberF_5),
+    obj_frame_tiles(gEventObjectPic_TuberF_6),
+    obj_frame_tiles(gEventObjectPic_TuberF_7),
+    obj_frame_tiles(gEventObjectPic_TuberF_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_TuberM[] = {
+    obj_frame_tiles(gEventObjectPic_TuberM_0),
+    obj_frame_tiles(gEventObjectPic_TuberM_1),
+    obj_frame_tiles(gEventObjectPic_TuberM_2),
+    obj_frame_tiles(gEventObjectPic_TuberM_3),
+    obj_frame_tiles(gEventObjectPic_TuberM_4),
+    obj_frame_tiles(gEventObjectPic_TuberM_5),
+    obj_frame_tiles(gEventObjectPic_TuberM_6),
+    obj_frame_tiles(gEventObjectPic_TuberM_7),
+    obj_frame_tiles(gEventObjectPic_TuberM_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Hiker[] = {
+    obj_frame_tiles(gEventObjectPic_Hiker_0),
+    obj_frame_tiles(gEventObjectPic_Hiker_1),
+    obj_frame_tiles(gEventObjectPic_Hiker_2),
+    obj_frame_tiles(gEventObjectPic_Hiker_3),
+    obj_frame_tiles(gEventObjectPic_Hiker_4),
+    obj_frame_tiles(gEventObjectPic_Hiker_5),
+    obj_frame_tiles(gEventObjectPic_Hiker_6),
+    obj_frame_tiles(gEventObjectPic_Hiker_7),
+    obj_frame_tiles(gEventObjectPic_Hiker_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_CyclingTriathleteM[] = {
+    obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_0),
+    obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_1),
+    obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_2),
+    obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_3),
+    obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_4),
+    obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_5),
+    obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_6),
+    obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_7),
+    obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_CyclingTriathleteF[] = {
+    obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_0),
+    obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_1),
+    obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_2),
+    obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_3),
+    obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_4),
+    obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_5),
+    obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_6),
+    obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_7),
+    obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Nurse[] = {
+    obj_frame_tiles(gEventObjectPic_Nurse_0),
+    obj_frame_tiles(gEventObjectPic_Nurse_1),
+    obj_frame_tiles(gEventObjectPic_Nurse_2),
+    obj_frame_tiles(gEventObjectPic_Nurse_0),
+    obj_frame_tiles(gEventObjectPic_Nurse_0),
+    obj_frame_tiles(gEventObjectPic_Nurse_1),
+    obj_frame_tiles(gEventObjectPic_Nurse_1),
+    obj_frame_tiles(gEventObjectPic_Nurse_2),
+    obj_frame_tiles(gEventObjectPic_Nurse_2),
+    obj_frame_tiles(gEventObjectPic_Nurse_3),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_ItemBall[] = {
+    obj_frame_tiles(gEventObjectPic_ItemBall),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_ProfBirch[] = {
+    obj_frame_tiles(gEventObjectPic_ProfBirch_0),
+    obj_frame_tiles(gEventObjectPic_ProfBirch_1),
+    obj_frame_tiles(gEventObjectPic_ProfBirch_2),
+    obj_frame_tiles(gEventObjectPic_ProfBirch_3),
+    obj_frame_tiles(gEventObjectPic_ProfBirch_4),
+    obj_frame_tiles(gEventObjectPic_ProfBirch_5),
+    obj_frame_tiles(gEventObjectPic_ProfBirch_6),
+    obj_frame_tiles(gEventObjectPic_ProfBirch_7),
+    obj_frame_tiles(gEventObjectPic_ProfBirch_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Man5[] = {
+    obj_frame_tiles(gEventObjectPic_Man5_0),
+    obj_frame_tiles(gEventObjectPic_Man5_1),
+    obj_frame_tiles(gEventObjectPic_Man5_2),
+    obj_frame_tiles(gEventObjectPic_Man5_3),
+    obj_frame_tiles(gEventObjectPic_Man5_4),
+    obj_frame_tiles(gEventObjectPic_Man5_5),
+    obj_frame_tiles(gEventObjectPic_Man5_6),
+    obj_frame_tiles(gEventObjectPic_Man5_7),
+    obj_frame_tiles(gEventObjectPic_Man5_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Man6[] = {
+    obj_frame_tiles(gEventObjectPic_Man6_0),
+    obj_frame_tiles(gEventObjectPic_Man6_1),
+    obj_frame_tiles(gEventObjectPic_Man6_2),
+    obj_frame_tiles(gEventObjectPic_Man6_3),
+    obj_frame_tiles(gEventObjectPic_Man6_4),
+    obj_frame_tiles(gEventObjectPic_Man6_5),
+    obj_frame_tiles(gEventObjectPic_Man6_6),
+    obj_frame_tiles(gEventObjectPic_Man6_7),
+    obj_frame_tiles(gEventObjectPic_Man6_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_ReporterM[] = {
+    obj_frame_tiles(gEventObjectPic_ReporterM_0),
+    obj_frame_tiles(gEventObjectPic_ReporterM_1),
+    obj_frame_tiles(gEventObjectPic_ReporterM_2),
+    obj_frame_tiles(gEventObjectPic_ReporterM_3),
+    obj_frame_tiles(gEventObjectPic_ReporterM_4),
+    obj_frame_tiles(gEventObjectPic_ReporterM_5),
+    obj_frame_tiles(gEventObjectPic_ReporterM_6),
+    obj_frame_tiles(gEventObjectPic_ReporterM_7),
+    obj_frame_tiles(gEventObjectPic_ReporterM_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_ReporterF[] = {
+    obj_frame_tiles(gEventObjectPic_ReporterF_0),
+    obj_frame_tiles(gEventObjectPic_ReporterF_1),
+    obj_frame_tiles(gEventObjectPic_ReporterF_2),
+    obj_frame_tiles(gEventObjectPic_ReporterF_3),
+    obj_frame_tiles(gEventObjectPic_ReporterF_4),
+    obj_frame_tiles(gEventObjectPic_ReporterF_5),
+    obj_frame_tiles(gEventObjectPic_ReporterF_6),
+    obj_frame_tiles(gEventObjectPic_ReporterF_7),
+    obj_frame_tiles(gEventObjectPic_ReporterF_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_MauvilleOldMan1[] = {
+    obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_0),
+    obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_1),
+    obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_2),
+    obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_3),
+    obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_4),
+    obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_5),
+    obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_6),
+    obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_7),
+    obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_MauvilleOldMan2[] = {
+    obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_0),
+    obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_1),
+    obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_2),
+    obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_3),
+    obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_4),
+    obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_5),
+    obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_6),
+    obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_7),
+    obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_UnusedNatuDoll[] = {
+    obj_frame_tiles(gEventObjectPic_UnusedNatuDoll),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_UnusedMagnemiteDoll[] = {
+    obj_frame_tiles(gEventObjectPic_UnusedMagnemiteDoll),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_UnusedSquirtleDoll[] = {
+    obj_frame_tiles(gEventObjectPic_UnusedSquirtleDoll),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_UnusedWooperDoll[] = {
+    obj_frame_tiles(gEventObjectPic_UnusedWooperDoll),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_UnusedPikachuDoll[] = {
+    obj_frame_tiles(gEventObjectPic_UnusedPikachuDoll),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_UnusedPorygon2Doll[] = {
+    obj_frame_tiles(gEventObjectPic_UnusedPorygon2Doll),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_CuttableTree[] = {
+    obj_frame_tiles(gEventObjectPic_CuttableTree_0),
+    obj_frame_tiles(gEventObjectPic_CuttableTree_1),
+    obj_frame_tiles(gEventObjectPic_CuttableTree_2),
+    obj_frame_tiles(gEventObjectPic_CuttableTree_3),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_MartEmployee[] = {
+    obj_frame_tiles(gEventObjectPic_MartEmployee_0),
+    obj_frame_tiles(gEventObjectPic_MartEmployee_1),
+    obj_frame_tiles(gEventObjectPic_MartEmployee_2),
+    obj_frame_tiles(gEventObjectPic_MartEmployee_3),
+    obj_frame_tiles(gEventObjectPic_MartEmployee_4),
+    obj_frame_tiles(gEventObjectPic_MartEmployee_5),
+    obj_frame_tiles(gEventObjectPic_MartEmployee_6),
+    obj_frame_tiles(gEventObjectPic_MartEmployee_7),
+    obj_frame_tiles(gEventObjectPic_MartEmployee_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_RooftopSaleWoman[] = {
+    obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_0),
+    obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_1),
+    obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_2),
+    obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_3),
+    obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_4),
+    obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_5),
+    obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_6),
+    obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_7),
+    obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Teala[] = {
+    obj_frame_tiles(gEventObjectPic_Teala_0),
+    obj_frame_tiles(gEventObjectPic_Teala_1),
+    obj_frame_tiles(gEventObjectPic_Teala_2),
+    obj_frame_tiles(gEventObjectPic_Teala_3),
+    obj_frame_tiles(gEventObjectPic_Teala_4),
+    obj_frame_tiles(gEventObjectPic_Teala_5),
+    obj_frame_tiles(gEventObjectPic_Teala_6),
+    obj_frame_tiles(gEventObjectPic_Teala_7),
+    obj_frame_tiles(gEventObjectPic_Teala_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BreakableRock[] = {
+    obj_frame_tiles(gEventObjectPic_BreakableRock_0),
+    obj_frame_tiles(gEventObjectPic_BreakableRock_1),
+    obj_frame_tiles(gEventObjectPic_BreakableRock_2),
+    obj_frame_tiles(gEventObjectPic_BreakableRock_3),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_PushableBoulder[] = {
+    obj_frame_tiles(gEventObjectPic_PushableBoulder),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_MrBrineysBoat[] = {
+    obj_frame_tiles(gEventObjectPic_MrBrineysBoat_0),
+    obj_frame_tiles(gEventObjectPic_MrBrineysBoat_1),
+    obj_frame_tiles(gEventObjectPic_MrBrineysBoat_2),
+    obj_frame_tiles(gEventObjectPic_MrBrineysBoat_0),
+    obj_frame_tiles(gEventObjectPic_MrBrineysBoat_0),
+    obj_frame_tiles(gEventObjectPic_MrBrineysBoat_1),
+    obj_frame_tiles(gEventObjectPic_MrBrineysBoat_1),
+    obj_frame_tiles(gEventObjectPic_MrBrineysBoat_2),
+    obj_frame_tiles(gEventObjectPic_MrBrineysBoat_2),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Truck[] = {
+    obj_frame_tiles(gEventObjectPic_Truck),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_VigorothCarryingBox[] = {
+    obj_frame_tiles(gEventObjectPic_VigorothCarryingBox_0),
+    obj_frame_tiles(gEventObjectPic_VigorothCarryingBox_0),
+    obj_frame_tiles(gEventObjectPic_VigorothCarryingBox_0),
+    obj_frame_tiles(gEventObjectPic_VigorothCarryingBox_1),
+    obj_frame_tiles(gEventObjectPic_VigorothCarryingBox_2),
+    obj_frame_tiles(gEventObjectPic_VigorothCarryingBox_1),
+    obj_frame_tiles(gEventObjectPic_VigorothCarryingBox_2),
+    obj_frame_tiles(gEventObjectPic_VigorothCarryingBox_1),
+    obj_frame_tiles(gEventObjectPic_VigorothCarryingBox_2),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_VigorothFacingAway[] = {
+    obj_frame_tiles(gEventObjectPic_VigorothFacingAway_0),
+    obj_frame_tiles(gEventObjectPic_VigorothFacingAway_0),
+    obj_frame_tiles(gEventObjectPic_VigorothFacingAway_0),
+    obj_frame_tiles(gEventObjectPic_VigorothFacingAway_1),
+    obj_frame_tiles(gEventObjectPic_VigorothFacingAway_1),
+    obj_frame_tiles(gEventObjectPic_VigorothFacingAway_1),
+    obj_frame_tiles(gEventObjectPic_VigorothFacingAway_1),
+    obj_frame_tiles(gEventObjectPic_VigorothFacingAway_1),
+    obj_frame_tiles(gEventObjectPic_VigorothFacingAway_1),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BirchsBag[] = {
+    obj_frame_tiles(gEventObjectPic_BirchsBag),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_EnemyZigzagoon[] = {
+    obj_frame_tiles(gEventObjectPic_EnemyZigzagoon_0),
+    obj_frame_tiles(gEventObjectPic_EnemyZigzagoon_1),
+    obj_frame_tiles(gEventObjectPic_EnemyZigzagoon_2),
+    obj_frame_tiles(gEventObjectPic_EnemyZigzagoon_3),
+    obj_frame_tiles(gEventObjectPic_EnemyZigzagoon_4),
+    obj_frame_tiles(gEventObjectPic_EnemyZigzagoon_5),
+    obj_frame_tiles(gEventObjectPic_EnemyZigzagoon_6),
+    obj_frame_tiles(gEventObjectPic_EnemyZigzagoon_7),
+    obj_frame_tiles(gEventObjectPic_EnemyZigzagoon_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Poochyena[] = {
+    obj_frame_tiles(gEventObjectPic_Poochyena_0),
+    obj_frame_tiles(gEventObjectPic_Poochyena_1),
+    obj_frame_tiles(gEventObjectPic_Poochyena_2),
+    obj_frame_tiles(gEventObjectPic_Poochyena_3),
+    obj_frame_tiles(gEventObjectPic_Poochyena_4),
+    obj_frame_tiles(gEventObjectPic_Poochyena_5),
+    obj_frame_tiles(gEventObjectPic_Poochyena_6),
+    obj_frame_tiles(gEventObjectPic_Poochyena_7),
+    obj_frame_tiles(gEventObjectPic_Poochyena_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Artist[] = {
+    obj_frame_tiles(gEventObjectPic_Artist_0),
+    obj_frame_tiles(gEventObjectPic_Artist_1),
+    obj_frame_tiles(gEventObjectPic_Artist_2),
+    obj_frame_tiles(gEventObjectPic_Artist_3),
+    obj_frame_tiles(gEventObjectPic_Artist_4),
+    obj_frame_tiles(gEventObjectPic_Artist_5),
+    obj_frame_tiles(gEventObjectPic_Artist_6),
+    obj_frame_tiles(gEventObjectPic_Artist_7),
+    obj_frame_tiles(gEventObjectPic_Artist_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_MayNormal[] = {
+    obj_frame_tiles(gEventObjectPic_MayNormal_0),
+    obj_frame_tiles(gEventObjectPic_MayNormal_1),
+    obj_frame_tiles(gEventObjectPic_MayNormal_2),
+    obj_frame_tiles(gEventObjectPic_MayNormal_3),
+    obj_frame_tiles(gEventObjectPic_MayNormal_4),
+    obj_frame_tiles(gEventObjectPic_MayNormal_5),
+    obj_frame_tiles(gEventObjectPic_MayNormal_6),
+    obj_frame_tiles(gEventObjectPic_MayNormal_7),
+    obj_frame_tiles(gEventObjectPic_MayNormal_8),
+    obj_frame_tiles(gEventObjectPic_MayNormal_9),
+    obj_frame_tiles(gEventObjectPic_MayNormal_10),
+    obj_frame_tiles(gEventObjectPic_MayNormal_11),
+    obj_frame_tiles(gEventObjectPic_MayNormal_12),
+    obj_frame_tiles(gEventObjectPic_MayNormal_13),
+    obj_frame_tiles(gEventObjectPic_MayNormal_14),
+    obj_frame_tiles(gEventObjectPic_MayNormal_15),
+    obj_frame_tiles(gEventObjectPic_MayNormal_16),
+    obj_frame_tiles(gEventObjectPic_MayNormal_17),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_MayMachBike[] = {
+    obj_frame_tiles(gEventObjectPic_MayMachBike_0),
+    obj_frame_tiles(gEventObjectPic_MayMachBike_1),
+    obj_frame_tiles(gEventObjectPic_MayMachBike_2),
+    obj_frame_tiles(gEventObjectPic_MayMachBike_3),
+    obj_frame_tiles(gEventObjectPic_MayMachBike_4),
+    obj_frame_tiles(gEventObjectPic_MayMachBike_5),
+    obj_frame_tiles(gEventObjectPic_MayMachBike_6),
+    obj_frame_tiles(gEventObjectPic_MayMachBike_7),
+    obj_frame_tiles(gEventObjectPic_MayMachBike_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_MayAcroBike[] = {
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_0),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_1),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_2),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_3),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_4),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_5),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_6),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_7),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_8),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_9),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_10),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_11),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_12),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_13),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_14),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_15),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_16),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_17),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_18),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_19),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_20),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_21),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_22),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_23),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_24),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_25),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_26),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_MaySurfing[] = {
+    obj_frame_tiles(gEventObjectPic_MaySurfing_0),
+    obj_frame_tiles(gEventObjectPic_MaySurfing_1),
+    obj_frame_tiles(gEventObjectPic_MaySurfing_2),
+    obj_frame_tiles(gEventObjectPic_MaySurfing_0),
+    obj_frame_tiles(gEventObjectPic_MaySurfing_0),
+    obj_frame_tiles(gEventObjectPic_MaySurfing_1),
+    obj_frame_tiles(gEventObjectPic_MaySurfing_1),
+    obj_frame_tiles(gEventObjectPic_MaySurfing_2),
+    obj_frame_tiles(gEventObjectPic_MaySurfing_2),
+    obj_frame_tiles(gEventObjectPic_MaySurfing_3),
+    obj_frame_tiles(gEventObjectPic_MaySurfing_4),
+    obj_frame_tiles(gEventObjectPic_MaySurfing_5),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_MayUnderwater[] = {
+    obj_frame_tiles(gEventObjectPic_MayUnderwater_0),
+    obj_frame_tiles(gEventObjectPic_MayUnderwater_1),
+    obj_frame_tiles(gEventObjectPic_MayUnderwater_2),
+    obj_frame_tiles(gEventObjectPic_MayUnderwater_0),
+    obj_frame_tiles(gEventObjectPic_MayUnderwater_0),
+    obj_frame_tiles(gEventObjectPic_MayUnderwater_1),
+    obj_frame_tiles(gEventObjectPic_MayUnderwater_1),
+    obj_frame_tiles(gEventObjectPic_MayUnderwater_2),
+    obj_frame_tiles(gEventObjectPic_MayUnderwater_2),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_MayFieldMove[] = {
+    obj_frame_tiles(gEventObjectPic_MayFieldMove_0),
+    obj_frame_tiles(gEventObjectPic_MayFieldMove_1),
+    obj_frame_tiles(gEventObjectPic_MayFieldMove_2),
+    obj_frame_tiles(gEventObjectPic_MayFieldMove_3),
+    obj_frame_tiles(gEventObjectPic_MayFieldMove_4),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Cameraman[] = {
+    obj_frame_tiles(gEventObjectPic_Cameraman_0),
+    obj_frame_tiles(gEventObjectPic_Cameraman_1),
+    obj_frame_tiles(gEventObjectPic_Cameraman_2),
+    obj_frame_tiles(gEventObjectPic_Cameraman_3),
+    obj_frame_tiles(gEventObjectPic_Cameraman_4),
+    obj_frame_tiles(gEventObjectPic_Cameraman_5),
+    obj_frame_tiles(gEventObjectPic_Cameraman_6),
+    obj_frame_tiles(gEventObjectPic_Cameraman_7),
+    obj_frame_tiles(gEventObjectPic_Cameraman_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_MovingBox[] = {
+    obj_frame_tiles(gEventObjectPic_MovingBox),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_CableCar[] = {
+    obj_frame_tiles(gEventObjectPic_CableCar),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Scientist2[] = {
+    obj_frame_tiles(gEventObjectPic_Scientist2_0),
+    obj_frame_tiles(gEventObjectPic_Scientist2_1),
+    obj_frame_tiles(gEventObjectPic_Scientist2_2),
+    obj_frame_tiles(gEventObjectPic_Scientist2_3),
+    obj_frame_tiles(gEventObjectPic_Scientist2_4),
+    obj_frame_tiles(gEventObjectPic_Scientist2_5),
+    obj_frame_tiles(gEventObjectPic_Scientist2_6),
+    obj_frame_tiles(gEventObjectPic_Scientist2_7),
+    obj_frame_tiles(gEventObjectPic_Scientist2_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Man7[] = {
+    obj_frame_tiles(gEventObjectPic_Man7_0),
+    obj_frame_tiles(gEventObjectPic_Man7_1),
+    obj_frame_tiles(gEventObjectPic_Man7_2),
+    obj_frame_tiles(gEventObjectPic_Man7_3),
+    obj_frame_tiles(gEventObjectPic_Man7_4),
+    obj_frame_tiles(gEventObjectPic_Man7_5),
+    obj_frame_tiles(gEventObjectPic_Man7_6),
+    obj_frame_tiles(gEventObjectPic_Man7_7),
+    obj_frame_tiles(gEventObjectPic_Man7_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_AquaMemberM[] = {
+    obj_frame_tiles(gEventObjectPic_AquaMemberM_0),
+    obj_frame_tiles(gEventObjectPic_AquaMemberM_1),
+    obj_frame_tiles(gEventObjectPic_AquaMemberM_2),
+    obj_frame_tiles(gEventObjectPic_AquaMemberM_3),
+    obj_frame_tiles(gEventObjectPic_AquaMemberM_4),
+    obj_frame_tiles(gEventObjectPic_AquaMemberM_5),
+    obj_frame_tiles(gEventObjectPic_AquaMemberM_6),
+    obj_frame_tiles(gEventObjectPic_AquaMemberM_7),
+    obj_frame_tiles(gEventObjectPic_AquaMemberM_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_AquaMemberF[] = {
+    obj_frame_tiles(gEventObjectPic_AquaMemberF_0),
+    obj_frame_tiles(gEventObjectPic_AquaMemberF_1),
+    obj_frame_tiles(gEventObjectPic_AquaMemberF_2),
+    obj_frame_tiles(gEventObjectPic_AquaMemberF_3),
+    obj_frame_tiles(gEventObjectPic_AquaMemberF_4),
+    obj_frame_tiles(gEventObjectPic_AquaMemberF_5),
+    obj_frame_tiles(gEventObjectPic_AquaMemberF_6),
+    obj_frame_tiles(gEventObjectPic_AquaMemberF_7),
+    obj_frame_tiles(gEventObjectPic_AquaMemberF_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_MagmaMemberM[] = {
+    obj_frame_tiles(gEventObjectPic_MagmaMemberM_0),
+    obj_frame_tiles(gEventObjectPic_MagmaMemberM_1),
+    obj_frame_tiles(gEventObjectPic_MagmaMemberM_2),
+    obj_frame_tiles(gEventObjectPic_MagmaMemberM_3),
+    obj_frame_tiles(gEventObjectPic_MagmaMemberM_4),
+    obj_frame_tiles(gEventObjectPic_MagmaMemberM_5),
+    obj_frame_tiles(gEventObjectPic_MagmaMemberM_6),
+    obj_frame_tiles(gEventObjectPic_MagmaMemberM_7),
+    obj_frame_tiles(gEventObjectPic_MagmaMemberM_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_MagmaMemberF[] = {
+    obj_frame_tiles(gEventObjectPic_MagmaMemberF_0),
+    obj_frame_tiles(gEventObjectPic_MagmaMemberF_1),
+    obj_frame_tiles(gEventObjectPic_MagmaMemberF_2),
+    obj_frame_tiles(gEventObjectPic_MagmaMemberF_3),
+    obj_frame_tiles(gEventObjectPic_MagmaMemberF_4),
+    obj_frame_tiles(gEventObjectPic_MagmaMemberF_5),
+    obj_frame_tiles(gEventObjectPic_MagmaMemberF_6),
+    obj_frame_tiles(gEventObjectPic_MagmaMemberF_7),
+    obj_frame_tiles(gEventObjectPic_MagmaMemberF_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Sidney[] = {
+    obj_frame_tiles(gEventObjectPic_Sidney_0),
+    obj_frame_tiles(gEventObjectPic_Sidney_1),
+    obj_frame_tiles(gEventObjectPic_Sidney_2),
+    obj_frame_tiles(gEventObjectPic_Sidney_0),
+    obj_frame_tiles(gEventObjectPic_Sidney_0),
+    obj_frame_tiles(gEventObjectPic_Sidney_1),
+    obj_frame_tiles(gEventObjectPic_Sidney_1),
+    obj_frame_tiles(gEventObjectPic_Sidney_2),
+    obj_frame_tiles(gEventObjectPic_Sidney_2),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Phoebe[] = {
+    obj_frame_tiles(gEventObjectPic_Phoebe_0),
+    obj_frame_tiles(gEventObjectPic_Phoebe_1),
+    obj_frame_tiles(gEventObjectPic_Phoebe_2),
+    obj_frame_tiles(gEventObjectPic_Phoebe_0),
+    obj_frame_tiles(gEventObjectPic_Phoebe_0),
+    obj_frame_tiles(gEventObjectPic_Phoebe_1),
+    obj_frame_tiles(gEventObjectPic_Phoebe_1),
+    obj_frame_tiles(gEventObjectPic_Phoebe_2),
+    obj_frame_tiles(gEventObjectPic_Phoebe_2),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Glacia[] = {
+    obj_frame_tiles(gEventObjectPic_Glacia_0),
+    obj_frame_tiles(gEventObjectPic_Glacia_1),
+    obj_frame_tiles(gEventObjectPic_Glacia_2),
+    obj_frame_tiles(gEventObjectPic_Glacia_0),
+    obj_frame_tiles(gEventObjectPic_Glacia_0),
+    obj_frame_tiles(gEventObjectPic_Glacia_1),
+    obj_frame_tiles(gEventObjectPic_Glacia_1),
+    obj_frame_tiles(gEventObjectPic_Glacia_2),
+    obj_frame_tiles(gEventObjectPic_Glacia_2),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Drake[] = {
+    obj_frame_tiles(gEventObjectPic_Drake_0),
+    obj_frame_tiles(gEventObjectPic_Drake_1),
+    obj_frame_tiles(gEventObjectPic_Drake_2),
+    obj_frame_tiles(gEventObjectPic_Drake_0),
+    obj_frame_tiles(gEventObjectPic_Drake_0),
+    obj_frame_tiles(gEventObjectPic_Drake_1),
+    obj_frame_tiles(gEventObjectPic_Drake_1),
+    obj_frame_tiles(gEventObjectPic_Drake_2),
+    obj_frame_tiles(gEventObjectPic_Drake_2),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Roxanne[] = {
+    obj_frame_tiles(gEventObjectPic_Roxanne_0),
+    obj_frame_tiles(gEventObjectPic_Roxanne_1),
+    obj_frame_tiles(gEventObjectPic_Roxanne_2),
+    obj_frame_tiles(gEventObjectPic_Roxanne_0),
+    obj_frame_tiles(gEventObjectPic_Roxanne_0),
+    obj_frame_tiles(gEventObjectPic_Roxanne_1),
+    obj_frame_tiles(gEventObjectPic_Roxanne_1),
+    obj_frame_tiles(gEventObjectPic_Roxanne_2),
+    obj_frame_tiles(gEventObjectPic_Roxanne_2),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Brawly[] = {
+    obj_frame_tiles(gEventObjectPic_Brawly_0),
+    obj_frame_tiles(gEventObjectPic_Brawly_1),
+    obj_frame_tiles(gEventObjectPic_Brawly_2),
+    obj_frame_tiles(gEventObjectPic_Brawly_0),
+    obj_frame_tiles(gEventObjectPic_Brawly_0),
+    obj_frame_tiles(gEventObjectPic_Brawly_1),
+    obj_frame_tiles(gEventObjectPic_Brawly_1),
+    obj_frame_tiles(gEventObjectPic_Brawly_2),
+    obj_frame_tiles(gEventObjectPic_Brawly_2),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Wattson[] = {
+    obj_frame_tiles(gEventObjectPic_Wattson_0),
+    obj_frame_tiles(gEventObjectPic_Wattson_1),
+    obj_frame_tiles(gEventObjectPic_Wattson_2),
+    obj_frame_tiles(gEventObjectPic_Wattson_0),
+    obj_frame_tiles(gEventObjectPic_Wattson_0),
+    obj_frame_tiles(gEventObjectPic_Wattson_1),
+    obj_frame_tiles(gEventObjectPic_Wattson_1),
+    obj_frame_tiles(gEventObjectPic_Wattson_2),
+    obj_frame_tiles(gEventObjectPic_Wattson_2),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Flannery[] = {
+    obj_frame_tiles(gEventObjectPic_Flannery_0),
+    obj_frame_tiles(gEventObjectPic_Flannery_1),
+    obj_frame_tiles(gEventObjectPic_Flannery_2),
+    obj_frame_tiles(gEventObjectPic_Flannery_0),
+    obj_frame_tiles(gEventObjectPic_Flannery_0),
+    obj_frame_tiles(gEventObjectPic_Flannery_1),
+    obj_frame_tiles(gEventObjectPic_Flannery_1),
+    obj_frame_tiles(gEventObjectPic_Flannery_2),
+    obj_frame_tiles(gEventObjectPic_Flannery_2),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Norman[] = {
+    obj_frame_tiles(gEventObjectPic_Norman_0),
+    obj_frame_tiles(gEventObjectPic_Norman_1),
+    obj_frame_tiles(gEventObjectPic_Norman_2),
+    obj_frame_tiles(gEventObjectPic_Norman_3),
+    obj_frame_tiles(gEventObjectPic_Norman_4),
+    obj_frame_tiles(gEventObjectPic_Norman_5),
+    obj_frame_tiles(gEventObjectPic_Norman_6),
+    obj_frame_tiles(gEventObjectPic_Norman_7),
+    obj_frame_tiles(gEventObjectPic_Norman_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Winona[] = {
+    obj_frame_tiles(gEventObjectPic_Winona_0),
+    obj_frame_tiles(gEventObjectPic_Winona_1),
+    obj_frame_tiles(gEventObjectPic_Winona_2),
+    obj_frame_tiles(gEventObjectPic_Winona_0),
+    obj_frame_tiles(gEventObjectPic_Winona_0),
+    obj_frame_tiles(gEventObjectPic_Winona_1),
+    obj_frame_tiles(gEventObjectPic_Winona_1),
+    obj_frame_tiles(gEventObjectPic_Winona_2),
+    obj_frame_tiles(gEventObjectPic_Winona_2),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Liza[] = {
+    obj_frame_tiles(gEventObjectPic_Liza_0),
+    obj_frame_tiles(gEventObjectPic_Liza_1),
+    obj_frame_tiles(gEventObjectPic_Liza_2),
+    obj_frame_tiles(gEventObjectPic_Liza_0),
+    obj_frame_tiles(gEventObjectPic_Liza_0),
+    obj_frame_tiles(gEventObjectPic_Liza_1),
+    obj_frame_tiles(gEventObjectPic_Liza_1),
+    obj_frame_tiles(gEventObjectPic_Liza_2),
+    obj_frame_tiles(gEventObjectPic_Liza_2),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Tate[] = {
+    obj_frame_tiles(gEventObjectPic_Tate_0),
+    obj_frame_tiles(gEventObjectPic_Tate_1),
+    obj_frame_tiles(gEventObjectPic_Tate_2),
+    obj_frame_tiles(gEventObjectPic_Tate_0),
+    obj_frame_tiles(gEventObjectPic_Tate_0),
+    obj_frame_tiles(gEventObjectPic_Tate_1),
+    obj_frame_tiles(gEventObjectPic_Tate_1),
+    obj_frame_tiles(gEventObjectPic_Tate_2),
+    obj_frame_tiles(gEventObjectPic_Tate_2),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Wallace[] = {
+    obj_frame_tiles(gEventObjectPic_Wallace_0),
+    obj_frame_tiles(gEventObjectPic_Wallace_1),
+    obj_frame_tiles(gEventObjectPic_Wallace_2),
+    obj_frame_tiles(gEventObjectPic_Wallace_3),
+    obj_frame_tiles(gEventObjectPic_Wallace_4),
+    obj_frame_tiles(gEventObjectPic_Wallace_5),
+    obj_frame_tiles(gEventObjectPic_Wallace_6),
+    obj_frame_tiles(gEventObjectPic_Wallace_7),
+    obj_frame_tiles(gEventObjectPic_Wallace_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Steven[] = {
+    obj_frame_tiles(gEventObjectPic_Steven_0),
+    obj_frame_tiles(gEventObjectPic_Steven_1),
+    obj_frame_tiles(gEventObjectPic_Steven_2),
+    obj_frame_tiles(gEventObjectPic_Steven_3),
+    obj_frame_tiles(gEventObjectPic_Steven_4),
+    obj_frame_tiles(gEventObjectPic_Steven_5),
+    obj_frame_tiles(gEventObjectPic_Steven_6),
+    obj_frame_tiles(gEventObjectPic_Steven_7),
+    obj_frame_tiles(gEventObjectPic_Steven_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Wally[] = {
+    obj_frame_tiles(gEventObjectPic_Wally_0),
+    obj_frame_tiles(gEventObjectPic_Wally_1),
+    obj_frame_tiles(gEventObjectPic_Wally_2),
+    obj_frame_tiles(gEventObjectPic_Wally_3),
+    obj_frame_tiles(gEventObjectPic_Wally_4),
+    obj_frame_tiles(gEventObjectPic_Wally_5),
+    obj_frame_tiles(gEventObjectPic_Wally_6),
+    obj_frame_tiles(gEventObjectPic_Wally_7),
+    obj_frame_tiles(gEventObjectPic_Wally_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_RubySapphireLittleBoy[] = {
+    obj_frame_tiles(gEventObjectPic_RubySapphireLittleBoy_0),
+    obj_frame_tiles(gEventObjectPic_RubySapphireLittleBoy_1),
+    obj_frame_tiles(gEventObjectPic_RubySapphireLittleBoy_2),
+    obj_frame_tiles(gEventObjectPic_RubySapphireLittleBoy_3),
+    obj_frame_tiles(gEventObjectPic_RubySapphireLittleBoy_4),
+    obj_frame_tiles(gEventObjectPic_RubySapphireLittleBoy_5),
+    obj_frame_tiles(gEventObjectPic_RubySapphireLittleBoy_6),
+    obj_frame_tiles(gEventObjectPic_RubySapphireLittleBoy_7),
+    obj_frame_tiles(gEventObjectPic_RubySapphireLittleBoy_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BrendanFishing[] = {
+    obj_frame_tiles(gEventObjectPic_BrendanFishing_0),
+    obj_frame_tiles(gEventObjectPic_BrendanFishing_1),
+    obj_frame_tiles(gEventObjectPic_BrendanFishing_2),
+    obj_frame_tiles(gEventObjectPic_BrendanFishing_3),
+    obj_frame_tiles(gEventObjectPic_BrendanFishing_4),
+    obj_frame_tiles(gEventObjectPic_BrendanFishing_5),
+    obj_frame_tiles(gEventObjectPic_BrendanFishing_6),
+    obj_frame_tiles(gEventObjectPic_BrendanFishing_7),
+    obj_frame_tiles(gEventObjectPic_BrendanFishing_8),
+    obj_frame_tiles(gEventObjectPic_BrendanFishing_9),
+    obj_frame_tiles(gEventObjectPic_BrendanFishing_10),
+    obj_frame_tiles(gEventObjectPic_BrendanFishing_11),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_MayFishing[] = {
+    obj_frame_tiles(gEventObjectPic_MayFishing_0),
+    obj_frame_tiles(gEventObjectPic_MayFishing_1),
+    obj_frame_tiles(gEventObjectPic_MayFishing_2),
+    obj_frame_tiles(gEventObjectPic_MayFishing_3),
+    obj_frame_tiles(gEventObjectPic_MayFishing_4),
+    obj_frame_tiles(gEventObjectPic_MayFishing_5),
+    obj_frame_tiles(gEventObjectPic_MayFishing_6),
+    obj_frame_tiles(gEventObjectPic_MayFishing_7),
+    obj_frame_tiles(gEventObjectPic_MayFishing_8),
+    obj_frame_tiles(gEventObjectPic_MayFishing_9),
+    obj_frame_tiles(gEventObjectPic_MayFishing_10),
+    obj_frame_tiles(gEventObjectPic_MayFishing_11),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_HotSpringsOldWoman[] = {
+    obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_0),
+    obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_1),
+    obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_2),
+    obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_3),
+    obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_4),
+    obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_5),
+    obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_6),
+    obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_7),
+    obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_SSTidal[] = {
+    obj_frame_tiles(gEventObjectPic_SSTidal),
+    obj_frame_tiles(gEventObjectPic_SSTidal),
+    obj_frame_tiles(gEventObjectPic_SSTidal),
+    obj_frame_tiles(gEventObjectPic_SSTidal),
+    obj_frame_tiles(gEventObjectPic_SSTidal),
+    obj_frame_tiles(gEventObjectPic_SSTidal),
+    obj_frame_tiles(gEventObjectPic_SSTidal),
+    obj_frame_tiles(gEventObjectPic_SSTidal),
+    obj_frame_tiles(gEventObjectPic_SSTidal),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_SubmarineShadow[] = {
+    obj_frame_tiles(gEventObjectPic_SubmarineShadow),
+    obj_frame_tiles(gEventObjectPic_SubmarineShadow),
+    obj_frame_tiles(gEventObjectPic_SubmarineShadow),
+    obj_frame_tiles(gEventObjectPic_SubmarineShadow),
+    obj_frame_tiles(gEventObjectPic_SubmarineShadow),
+    obj_frame_tiles(gEventObjectPic_SubmarineShadow),
+    obj_frame_tiles(gEventObjectPic_SubmarineShadow),
+    obj_frame_tiles(gEventObjectPic_SubmarineShadow),
+    obj_frame_tiles(gEventObjectPic_SubmarineShadow),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_PichuDoll[] = {
+    obj_frame_tiles(gEventObjectPic_PichuDoll),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_PikachuDoll[] = {
+    obj_frame_tiles(gEventObjectPic_PikachuDoll),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_MarillDoll[] = {
+    obj_frame_tiles(gEventObjectPic_MarillDoll),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_TogepiDoll[] = {
+    obj_frame_tiles(gEventObjectPic_TogepiDoll),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_CyndaquilDoll[] = {
+    obj_frame_tiles(gEventObjectPic_CyndaquilDoll),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_ChikoritaDoll[] = {
+    obj_frame_tiles(gEventObjectPic_ChikoritaDoll),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_TotodileDoll[] = {
+    obj_frame_tiles(gEventObjectPic_TotodileDoll),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_JigglypuffDoll[] = {
+    obj_frame_tiles(gEventObjectPic_JigglypuffDoll),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_MeowthDoll[] = {
+    obj_frame_tiles(gEventObjectPic_MeowthDoll),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_ClefairyDoll[] = {
+    obj_frame_tiles(gEventObjectPic_ClefairyDoll),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_DittoDoll[] = {
+    obj_frame_tiles(gEventObjectPic_DittoDoll),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_SmoochumDoll[] = {
+    obj_frame_tiles(gEventObjectPic_SmoochumDoll),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_TreeckoDoll[] = {
+    obj_frame_tiles(gEventObjectPic_TreeckoDoll),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_TorchicDoll[] = {
+    obj_frame_tiles(gEventObjectPic_TorchicDoll),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_MudkipDoll[] = {
+    obj_frame_tiles(gEventObjectPic_MudkipDoll),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_DuskullDoll[] = {
+    obj_frame_tiles(gEventObjectPic_DuskullDoll),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_WynautDoll[] = {
+    obj_frame_tiles(gEventObjectPic_WynautDoll),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BaltoyDoll[] = {
+    obj_frame_tiles(gEventObjectPic_BaltoyDoll),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_KecleonDoll[] = {
+    obj_frame_tiles(gEventObjectPic_KecleonDoll),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_AzurillDoll[] = {
+    obj_frame_tiles(gEventObjectPic_AzurillDoll),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_SkittyDoll[] = {
+    obj_frame_tiles(gEventObjectPic_SkittyDoll),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_SwabluDoll[] = {
+    obj_frame_tiles(gEventObjectPic_SwabluDoll),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_GulpinDoll[] = {
+    obj_frame_tiles(gEventObjectPic_GulpinDoll),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_LotadDoll[] = {
+    obj_frame_tiles(gEventObjectPic_LotadDoll),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_SeedotDoll[] = {
+    obj_frame_tiles(gEventObjectPic_SeedotDoll),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_PikaCushion[] = {
+    obj_frame_tiles(gEventObjectPic_PikaCushion),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_RoundCushion[] = {
+    obj_frame_tiles(gEventObjectPic_RoundCushion),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_KissCushion[] = {
+    obj_frame_tiles(gEventObjectPic_KissCushion),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_ZigzagCushion[] = {
+    obj_frame_tiles(gEventObjectPic_ZigzagCushion),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_SpinCushion[] = {
+    obj_frame_tiles(gEventObjectPic_SpinCushion),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_DiamondCushion[] = {
+    obj_frame_tiles(gEventObjectPic_DiamondCushion),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BallCushion[] = {
+    obj_frame_tiles(gEventObjectPic_BallCushion),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_GrassCushion[] = {
+    obj_frame_tiles(gEventObjectPic_GrassCushion),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_FireCushion[] = {
+    obj_frame_tiles(gEventObjectPic_FireCushion),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_WaterCushion[] = {
+    obj_frame_tiles(gEventObjectPic_WaterCushion),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BigSnorlaxDoll[] = {
+    obj_frame_tiles(gEventObjectPic_BigSnorlaxDoll),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BigRhydonDoll[] = {
+    obj_frame_tiles(gEventObjectPic_BigRhydonDoll),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BigLaprasDoll[] = {
+    obj_frame_tiles(gEventObjectPic_BigLaprasDoll),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BigVenusaurDoll[] = {
+    obj_frame_tiles(gEventObjectPic_BigVenusaurDoll),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BigCharizardDoll[] = {
+    obj_frame_tiles(gEventObjectPic_BigCharizardDoll),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BigBlastoiseDoll[] = {
+    obj_frame_tiles(gEventObjectPic_BigBlastoiseDoll),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BigWailmerDoll[] = {
+    obj_frame_tiles(gEventObjectPic_BigWailmerDoll),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BigRegirockDoll[] = {
+    obj_frame_tiles(gEventObjectPic_BigRegirockDoll),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BigRegiceDoll[] = {
+    obj_frame_tiles(gEventObjectPic_BigRegiceDoll),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BigRegisteelDoll[] = {
+    obj_frame_tiles(gEventObjectPic_BigRegisteelDoll),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_LatiasLatios[] = {
+    obj_frame_tiles(gEventObjectPic_LatiasLatios_0),
+    obj_frame_tiles(gEventObjectPic_LatiasLatios_0),
+    obj_frame_tiles(gEventObjectPic_LatiasLatios_0),
+    obj_frame_tiles(gEventObjectPic_LatiasLatios_1),
+    obj_frame_tiles(gEventObjectPic_LatiasLatios_2),
+    obj_frame_tiles(gEventObjectPic_LatiasLatios_1),
+    obj_frame_tiles(gEventObjectPic_LatiasLatios_2),
+    obj_frame_tiles(gEventObjectPic_LatiasLatios_1),
+    obj_frame_tiles(gEventObjectPic_LatiasLatios_2),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Boy5[] = {
+    obj_frame_tiles(gEventObjectPic_Boy5_0),
+    obj_frame_tiles(gEventObjectPic_Boy5_1),
+    obj_frame_tiles(gEventObjectPic_Boy5_2),
+    obj_frame_tiles(gEventObjectPic_Boy5_0),
+    obj_frame_tiles(gEventObjectPic_Boy5_0),
+    obj_frame_tiles(gEventObjectPic_Boy5_1),
+    obj_frame_tiles(gEventObjectPic_Boy5_1),
+    obj_frame_tiles(gEventObjectPic_Boy5_2),
+    obj_frame_tiles(gEventObjectPic_Boy5_2),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_ContestOldMan[] = {
+    obj_frame_tiles(gEventObjectPic_ContestOldMan_0),
+    obj_frame_tiles(gEventObjectPic_ContestOldMan_1),
+    obj_frame_tiles(gEventObjectPic_ContestOldMan_2),
+    obj_frame_tiles(gEventObjectPic_ContestOldMan_3),
+    obj_frame_tiles(gEventObjectPic_ContestOldMan_4),
+    obj_frame_tiles(gEventObjectPic_ContestOldMan_5),
+    obj_frame_tiles(gEventObjectPic_ContestOldMan_6),
+    obj_frame_tiles(gEventObjectPic_ContestOldMan_7),
+    obj_frame_tiles(gEventObjectPic_ContestOldMan_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BrendanWatering[] = {
+    obj_frame_tiles(gEventObjectPic_BrendanWatering_0),
+    obj_frame_tiles(gEventObjectPic_BrendanWatering_1),
+    obj_frame_tiles(gEventObjectPic_BrendanWatering_2),
+    obj_frame_tiles(gEventObjectPic_BrendanWatering_3),
+    obj_frame_tiles(gEventObjectPic_BrendanWatering_3),
+    obj_frame_tiles(gEventObjectPic_BrendanWatering_4),
+    obj_frame_tiles(gEventObjectPic_BrendanWatering_4),
+    obj_frame_tiles(gEventObjectPic_BrendanWatering_5),
+    obj_frame_tiles(gEventObjectPic_BrendanWatering_5),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_MayWatering[] = {
+    obj_frame_tiles(gEventObjectPic_MayWatering_0),
+    obj_frame_tiles(gEventObjectPic_MayWatering_1),
+    obj_frame_tiles(gEventObjectPic_MayWatering_2),
+    obj_frame_tiles(gEventObjectPic_MayWatering_3),
+    obj_frame_tiles(gEventObjectPic_MayWatering_3),
+    obj_frame_tiles(gEventObjectPic_MayWatering_4),
+    obj_frame_tiles(gEventObjectPic_MayWatering_4),
+    obj_frame_tiles(gEventObjectPic_MayWatering_5),
+    obj_frame_tiles(gEventObjectPic_MayWatering_5),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BrendanDecorating[] = {
+    obj_frame_tiles(gEventObjectPic_BrendanDecorating),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_MayDecorating[] = {
+    obj_frame_tiles(gEventObjectPic_MayDecorating),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Archie[] = {
+    obj_frame_tiles(gEventObjectPic_Archie_0),
+    obj_frame_tiles(gEventObjectPic_Archie_1),
+    obj_frame_tiles(gEventObjectPic_Archie_2),
+    obj_frame_tiles(gEventObjectPic_Archie_3),
+    obj_frame_tiles(gEventObjectPic_Archie_4),
+    obj_frame_tiles(gEventObjectPic_Archie_5),
+    obj_frame_tiles(gEventObjectPic_Archie_6),
+    obj_frame_tiles(gEventObjectPic_Archie_7),
+    obj_frame_tiles(gEventObjectPic_Archie_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Maxie[] = {
+    obj_frame_tiles(gEventObjectPic_Maxie_0),
+    obj_frame_tiles(gEventObjectPic_Maxie_1),
+    obj_frame_tiles(gEventObjectPic_Maxie_2),
+    obj_frame_tiles(gEventObjectPic_Maxie_3),
+    obj_frame_tiles(gEventObjectPic_Maxie_4),
+    obj_frame_tiles(gEventObjectPic_Maxie_5),
+    obj_frame_tiles(gEventObjectPic_Maxie_6),
+    obj_frame_tiles(gEventObjectPic_Maxie_7),
+    obj_frame_tiles(gEventObjectPic_Maxie_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_KyogreFront[] = {
+    obj_frame_tiles(gEventObjectPic_KyogreFront_0),
+    obj_frame_tiles(gEventObjectPic_KyogreFront_0),
+    obj_frame_tiles(gEventObjectPic_KyogreFront_0),
+    obj_frame_tiles(gEventObjectPic_KyogreFront_1),
+    obj_frame_tiles(gEventObjectPic_KyogreFront_1),
+    obj_frame_tiles(gEventObjectPic_KyogreFront_1),
+    obj_frame_tiles(gEventObjectPic_KyogreFront_1),
+    obj_frame_tiles(gEventObjectPic_KyogreFront_1),
+    obj_frame_tiles(gEventObjectPic_KyogreFront_1),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_GroudonFront[] = {
+    obj_frame_tiles(gEventObjectPic_GroudonFront_0),
+    obj_frame_tiles(gEventObjectPic_GroudonFront_0),
+    obj_frame_tiles(gEventObjectPic_GroudonFront_0),
+    obj_frame_tiles(gEventObjectPic_GroudonFront_1),
+    obj_frame_tiles(gEventObjectPic_GroudonFront_1),
+    obj_frame_tiles(gEventObjectPic_GroudonFront_1),
+    obj_frame_tiles(gEventObjectPic_GroudonFront_1),
+    obj_frame_tiles(gEventObjectPic_GroudonFront_1),
+    obj_frame_tiles(gEventObjectPic_GroudonFront_1),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_KyogreSide[] = {
+    obj_frame_tiles(gEventObjectPic_KyogreSide_0),
+    obj_frame_tiles(gEventObjectPic_KyogreSide_0),
+    obj_frame_tiles(gEventObjectPic_KyogreSide_0),
+    obj_frame_tiles(gEventObjectPic_KyogreSide_1),
+    obj_frame_tiles(gEventObjectPic_KyogreSide_1),
+    obj_frame_tiles(gEventObjectPic_KyogreSide_1),
+    obj_frame_tiles(gEventObjectPic_KyogreSide_1),
+    obj_frame_tiles(gEventObjectPic_KyogreSide_1),
+    obj_frame_tiles(gEventObjectPic_KyogreSide_1),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_GroudonSide[] = {
+    obj_frame_tiles(gEventObjectPic_GroudonSide_0),
+    obj_frame_tiles(gEventObjectPic_GroudonSide_0),
+    obj_frame_tiles(gEventObjectPic_GroudonSide_0),
+    obj_frame_tiles(gEventObjectPic_GroudonSide_1),
+    obj_frame_tiles(gEventObjectPic_GroudonSide_1),
+    obj_frame_tiles(gEventObjectPic_GroudonSide_1),
+    obj_frame_tiles(gEventObjectPic_GroudonSide_1),
+    obj_frame_tiles(gEventObjectPic_GroudonSide_1),
+    obj_frame_tiles(gEventObjectPic_GroudonSide_1),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Fossil[] = {
+    obj_frame_tiles(gEventObjectPic_Fossil),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Regi[] = {
+    obj_frame_tiles(gEventObjectPic_Regi),
+    obj_frame_tiles(gEventObjectPic_Regi),
+    obj_frame_tiles(gEventObjectPic_Regi),
+    obj_frame_tiles(gEventObjectPic_Regi),
+    obj_frame_tiles(gEventObjectPic_Regi),
+    obj_frame_tiles(gEventObjectPic_Regi),
+    obj_frame_tiles(gEventObjectPic_Regi),
+    obj_frame_tiles(gEventObjectPic_Regi),
+    obj_frame_tiles(gEventObjectPic_Regi),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Skitty[] = {
+    obj_frame_tiles(gEventObjectPic_Skitty_0),
+    obj_frame_tiles(gEventObjectPic_Skitty_1),
+    obj_frame_tiles(gEventObjectPic_Skitty_2),
+    obj_frame_tiles(gEventObjectPic_Skitty_0),
+    obj_frame_tiles(gEventObjectPic_Skitty_0),
+    obj_frame_tiles(gEventObjectPic_Skitty_1),
+    obj_frame_tiles(gEventObjectPic_Skitty_1),
+    obj_frame_tiles(gEventObjectPic_Skitty_2),
+    obj_frame_tiles(gEventObjectPic_Skitty_2),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Kecleon[] = {
+    obj_frame_tiles(gEventObjectPic_Kecleon_0),
+    obj_frame_tiles(gEventObjectPic_Kecleon_1),
+    obj_frame_tiles(gEventObjectPic_Kecleon_2),
+    obj_frame_tiles(gEventObjectPic_Kecleon_0),
+    obj_frame_tiles(gEventObjectPic_Kecleon_0),
+    obj_frame_tiles(gEventObjectPic_Kecleon_1),
+    obj_frame_tiles(gEventObjectPic_Kecleon_1),
+    obj_frame_tiles(gEventObjectPic_Kecleon_2),
+    obj_frame_tiles(gEventObjectPic_Kecleon_2),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Rayquaza[] = {
+    obj_frame_tiles(gEventObjectPic_Rayquaza_0),
+    obj_frame_tiles(gEventObjectPic_Rayquaza_1),
+    obj_frame_tiles(gEventObjectPic_Rayquaza_2),
+    obj_frame_tiles(gEventObjectPic_Rayquaza_3),
+    obj_frame_tiles(gEventObjectPic_Rayquaza_4),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_RayquazaStill[] = {
+    obj_frame_tiles(gEventObjectPic_RayquazaStill),
+    obj_frame_tiles(gEventObjectPic_RayquazaStill),
+    obj_frame_tiles(gEventObjectPic_RayquazaStill),
+    obj_frame_tiles(gEventObjectPic_RayquazaStill),
+    obj_frame_tiles(gEventObjectPic_RayquazaStill),
+    obj_frame_tiles(gEventObjectPic_RayquazaStill),
+    obj_frame_tiles(gEventObjectPic_RayquazaStill),
+    obj_frame_tiles(gEventObjectPic_RayquazaStill),
+    obj_frame_tiles(gEventObjectPic_RayquazaStill),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Zigzagoon[] = {
+    obj_frame_tiles(gEventObjectPic_Zigzagoon_0),
+    obj_frame_tiles(gEventObjectPic_Zigzagoon_1),
+    obj_frame_tiles(gEventObjectPic_Zigzagoon_2),
+    obj_frame_tiles(gEventObjectPic_Zigzagoon_0),
+    obj_frame_tiles(gEventObjectPic_Zigzagoon_0),
+    obj_frame_tiles(gEventObjectPic_Zigzagoon_1),
+    obj_frame_tiles(gEventObjectPic_Zigzagoon_1),
+    obj_frame_tiles(gEventObjectPic_Zigzagoon_2),
+    obj_frame_tiles(gEventObjectPic_Zigzagoon_2),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Pikachu[] = {
+    obj_frame_tiles(gEventObjectPic_Pikachu_0),
+    obj_frame_tiles(gEventObjectPic_Pikachu_1),
+    obj_frame_tiles(gEventObjectPic_Pikachu_2),
+    obj_frame_tiles(gEventObjectPic_Pikachu_0),
+    obj_frame_tiles(gEventObjectPic_Pikachu_0),
+    obj_frame_tiles(gEventObjectPic_Pikachu_1),
+    obj_frame_tiles(gEventObjectPic_Pikachu_1),
+    obj_frame_tiles(gEventObjectPic_Pikachu_2),
+    obj_frame_tiles(gEventObjectPic_Pikachu_2),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Azumarill[] = {
+    obj_frame_tiles(gEventObjectPic_Azumarill_0),
+    obj_frame_tiles(gEventObjectPic_Azumarill_1),
+    obj_frame_tiles(gEventObjectPic_Azumarill_2),
+    obj_frame_tiles(gEventObjectPic_Azumarill_0),
+    obj_frame_tiles(gEventObjectPic_Azumarill_0),
+    obj_frame_tiles(gEventObjectPic_Azumarill_1),
+    obj_frame_tiles(gEventObjectPic_Azumarill_1),
+    obj_frame_tiles(gEventObjectPic_Azumarill_2),
+    obj_frame_tiles(gEventObjectPic_Azumarill_2),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Wingull[] = {
+    obj_frame_tiles(gEventObjectPic_Wingull_0),
+    obj_frame_tiles(gEventObjectPic_Wingull_1),
+    obj_frame_tiles(gEventObjectPic_Wingull_2),
+    obj_frame_tiles(gEventObjectPic_Wingull_3),
+    obj_frame_tiles(gEventObjectPic_Wingull_3),
+    obj_frame_tiles(gEventObjectPic_Wingull_4),
+    obj_frame_tiles(gEventObjectPic_Wingull_4),
+    obj_frame_tiles(gEventObjectPic_Wingull_5),
+    obj_frame_tiles(gEventObjectPic_Wingull_5),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_TuberMSwimming[] = {
+    obj_frame_tiles(gEventObjectPic_TuberMSwimming_0),
+    obj_frame_tiles(gEventObjectPic_TuberMSwimming_1),
+    obj_frame_tiles(gEventObjectPic_TuberMSwimming_2),
+    obj_frame_tiles(gEventObjectPic_TuberMSwimming_3),
+    obj_frame_tiles(gEventObjectPic_TuberMSwimming_4),
+    obj_frame_tiles(gEventObjectPic_TuberMSwimming_5),
+    obj_frame_tiles(gEventObjectPic_TuberMSwimming_6),
+    obj_frame_tiles(gEventObjectPic_TuberMSwimming_7),
+    obj_frame_tiles(gEventObjectPic_TuberMSwimming_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Azurill[] = {
+    obj_frame_tiles(gEventObjectPic_Azurill_0),
+    obj_frame_tiles(gEventObjectPic_Azurill_1),
+    obj_frame_tiles(gEventObjectPic_Azurill_2),
+    obj_frame_tiles(gEventObjectPic_Azurill_0),
+    obj_frame_tiles(gEventObjectPic_Azurill_0),
+    obj_frame_tiles(gEventObjectPic_Azurill_1),
+    obj_frame_tiles(gEventObjectPic_Azurill_1),
+    obj_frame_tiles(gEventObjectPic_Azurill_2),
+    obj_frame_tiles(gEventObjectPic_Azurill_2),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Mom[] = {
+    obj_frame_tiles(gEventObjectPic_Mom_0),
+    obj_frame_tiles(gEventObjectPic_Mom_1),
+    obj_frame_tiles(gEventObjectPic_Mom_2),
+    obj_frame_tiles(gEventObjectPic_Mom_3),
+    obj_frame_tiles(gEventObjectPic_Mom_4),
+    obj_frame_tiles(gEventObjectPic_Mom_5),
+    obj_frame_tiles(gEventObjectPic_Mom_6),
+    obj_frame_tiles(gEventObjectPic_Mom_7),
+    obj_frame_tiles(gEventObjectPic_Mom_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Scott[] = {
+    obj_frame_tiles(gEventObjectPic_Scott_0),
+    obj_frame_tiles(gEventObjectPic_Scott_1),
+    obj_frame_tiles(gEventObjectPic_Scott_2),
+    obj_frame_tiles(gEventObjectPic_Scott_3),
+    obj_frame_tiles(gEventObjectPic_Scott_4),
+    obj_frame_tiles(gEventObjectPic_Scott_5),
+    obj_frame_tiles(gEventObjectPic_Scott_6),
+    obj_frame_tiles(gEventObjectPic_Scott_7),
+    obj_frame_tiles(gEventObjectPic_Scott_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Juan[] = {
+    obj_frame_tiles(gEventObjectPic_Juan_0),
+    obj_frame_tiles(gEventObjectPic_Juan_1),
+    obj_frame_tiles(gEventObjectPic_Juan_2),
+    obj_frame_tiles(gEventObjectPic_Juan_3),
+    obj_frame_tiles(gEventObjectPic_Juan_4),
+    obj_frame_tiles(gEventObjectPic_Juan_5),
+    obj_frame_tiles(gEventObjectPic_Juan_6),
+    obj_frame_tiles(gEventObjectPic_Juan_7),
+    obj_frame_tiles(gEventObjectPic_Juan_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_MysteryEventDeliveryman[] = {
+    obj_frame_tiles(gEventObjectPic_MysteryEventDeliveryman_0),
+    obj_frame_tiles(gEventObjectPic_MysteryEventDeliveryman_1),
+    obj_frame_tiles(gEventObjectPic_MysteryEventDeliveryman_2),
+    obj_frame_tiles(gEventObjectPic_MysteryEventDeliveryman_0),
+    obj_frame_tiles(gEventObjectPic_MysteryEventDeliveryman_0),
+    obj_frame_tiles(gEventObjectPic_MysteryEventDeliveryman_1),
+    obj_frame_tiles(gEventObjectPic_MysteryEventDeliveryman_1),
+    obj_frame_tiles(gEventObjectPic_MysteryEventDeliveryman_2),
+    obj_frame_tiles(gEventObjectPic_MysteryEventDeliveryman_2),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Statue[] = {
+    obj_frame_tiles(gEventObjectPic_Statue),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Dusclops[] = {
+    obj_frame_tiles(gEventObjectPic_Dusclops_0),
+    obj_frame_tiles(gEventObjectPic_Dusclops_1),
+    obj_frame_tiles(gEventObjectPic_Dusclops_2),
+    obj_frame_tiles(gEventObjectPic_Dusclops_3),
+    obj_frame_tiles(gEventObjectPic_Dusclops_4),
+    obj_frame_tiles(gEventObjectPic_Dusclops_5),
+    obj_frame_tiles(gEventObjectPic_Dusclops_6),
+    obj_frame_tiles(gEventObjectPic_Dusclops_7),
+    obj_frame_tiles(gEventObjectPic_Dusclops_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Kirlia[] = {
+    obj_frame_tiles(gEventObjectPic_Kirlia_0),
+    obj_frame_tiles(gEventObjectPic_Kirlia_1),
+    obj_frame_tiles(gEventObjectPic_Kirlia_2),
+    obj_frame_tiles(gEventObjectPic_Kirlia_3),
+    obj_frame_tiles(gEventObjectPic_Kirlia_4),
+    obj_frame_tiles(gEventObjectPic_Kirlia_5),
+    obj_frame_tiles(gEventObjectPic_Kirlia_6),
+    obj_frame_tiles(gEventObjectPic_Kirlia_7),
+    obj_frame_tiles(gEventObjectPic_Kirlia_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_UnionRoomAttendant[] = {
+    obj_frame_tiles(gEventObjectPic_UnionRoomAttendant_0),
+    obj_frame_tiles(gEventObjectPic_UnionRoomAttendant_1),
+    obj_frame_tiles(gEventObjectPic_UnionRoomAttendant_2),
+    obj_frame_tiles(gEventObjectPic_UnionRoomAttendant_0),
+    obj_frame_tiles(gEventObjectPic_UnionRoomAttendant_0),
+    obj_frame_tiles(gEventObjectPic_UnionRoomAttendant_1),
+    obj_frame_tiles(gEventObjectPic_UnionRoomAttendant_1),
+    obj_frame_tiles(gEventObjectPic_UnionRoomAttendant_2),
+    obj_frame_tiles(gEventObjectPic_UnionRoomAttendant_2),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Sudowoodo[] = {
+    obj_frame_tiles(gEventObjectPic_Sudowoodo_0),
+    obj_frame_tiles(gEventObjectPic_Sudowoodo_0),
+    obj_frame_tiles(gEventObjectPic_Sudowoodo_1),
+    obj_frame_tiles(gEventObjectPic_Sudowoodo_0),
+    obj_frame_tiles(gEventObjectPic_Sudowoodo_0),
+    obj_frame_tiles(gEventObjectPic_Sudowoodo_0),
+    obj_frame_tiles(gEventObjectPic_Sudowoodo_0),
+    obj_frame_tiles(gEventObjectPic_Sudowoodo_1),
+    obj_frame_tiles(gEventObjectPic_Sudowoodo_2),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Mew[] = {
+    obj_frame_tiles(gEventObjectPic_Mew_0),
+    obj_frame_tiles(gEventObjectPic_Mew_1),
+    obj_frame_tiles(gEventObjectPic_Mew_2),
+    obj_frame_tiles(gEventObjectPic_Mew_3),
+    obj_frame_tiles(gEventObjectPic_Mew_4),
+    obj_frame_tiles(gEventObjectPic_Mew_5),
+    obj_frame_tiles(gEventObjectPic_Mew_6),
+    obj_frame_tiles(gEventObjectPic_Mew_7),
+    obj_frame_tiles(gEventObjectPic_Mew_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Red[] = {
+    obj_frame_tiles(gEventObjectPic_Red_0),
+    obj_frame_tiles(gEventObjectPic_Red_1),
+    obj_frame_tiles(gEventObjectPic_Red_2),
+    obj_frame_tiles(gEventObjectPic_Red_3),
+    obj_frame_tiles(gEventObjectPic_Red_4),
+    obj_frame_tiles(gEventObjectPic_Red_5),
+    obj_frame_tiles(gEventObjectPic_Red_6),
+    obj_frame_tiles(gEventObjectPic_Red_7),
+    obj_frame_tiles(gEventObjectPic_Red_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Leaf[] = {
+    obj_frame_tiles(gEventObjectPic_Leaf_0),
+    obj_frame_tiles(gEventObjectPic_Leaf_1),
+    obj_frame_tiles(gEventObjectPic_Leaf_2),
+    obj_frame_tiles(gEventObjectPic_Leaf_3),
+    obj_frame_tiles(gEventObjectPic_Leaf_4),
+    obj_frame_tiles(gEventObjectPic_Leaf_5),
+    obj_frame_tiles(gEventObjectPic_Leaf_6),
+    obj_frame_tiles(gEventObjectPic_Leaf_7),
+    obj_frame_tiles(gEventObjectPic_Leaf_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Deoxys[] = {
+    obj_frame_tiles(gEventObjectPic_Deoxys_0),
+    obj_frame_tiles(gEventObjectPic_Deoxys_0),
+    obj_frame_tiles(gEventObjectPic_Deoxys_0),
+    obj_frame_tiles(gEventObjectPic_Deoxys_0),
+    obj_frame_tiles(gEventObjectPic_Deoxys_1),
+    obj_frame_tiles(gEventObjectPic_Deoxys_0),
+    obj_frame_tiles(gEventObjectPic_Deoxys_1),
+    obj_frame_tiles(gEventObjectPic_Deoxys_0),
+    obj_frame_tiles(gEventObjectPic_Deoxys_0),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BirthIslandStone[] = {
+    obj_frame_tiles(gEventObjectPic_BirthIslandStone),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Anabel[] = {
+    obj_frame_tiles(gEventObjectPic_Anabel_0),
+    obj_frame_tiles(gEventObjectPic_Anabel_1),
+    obj_frame_tiles(gEventObjectPic_Anabel_2),
+    obj_frame_tiles(gEventObjectPic_Anabel_3),
+    obj_frame_tiles(gEventObjectPic_Anabel_4),
+    obj_frame_tiles(gEventObjectPic_Anabel_5),
+    obj_frame_tiles(gEventObjectPic_Anabel_6),
+    obj_frame_tiles(gEventObjectPic_Anabel_7),
+    obj_frame_tiles(gEventObjectPic_Anabel_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Tucker[] = {
+    obj_frame_tiles(gEventObjectPic_Tucker_0),
+    obj_frame_tiles(gEventObjectPic_Tucker_1),
+    obj_frame_tiles(gEventObjectPic_Tucker_2),
+    obj_frame_tiles(gEventObjectPic_Tucker_3),
+    obj_frame_tiles(gEventObjectPic_Tucker_4),
+    obj_frame_tiles(gEventObjectPic_Tucker_5),
+    obj_frame_tiles(gEventObjectPic_Tucker_6),
+    obj_frame_tiles(gEventObjectPic_Tucker_7),
+    obj_frame_tiles(gEventObjectPic_Tucker_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Spenser[] = {
+    obj_frame_tiles(gEventObjectPic_Spenser_0),
+    obj_frame_tiles(gEventObjectPic_Spenser_1),
+    obj_frame_tiles(gEventObjectPic_Spenser_2),
+    obj_frame_tiles(gEventObjectPic_Spenser_3),
+    obj_frame_tiles(gEventObjectPic_Spenser_4),
+    obj_frame_tiles(gEventObjectPic_Spenser_5),
+    obj_frame_tiles(gEventObjectPic_Spenser_6),
+    obj_frame_tiles(gEventObjectPic_Spenser_7),
+    obj_frame_tiles(gEventObjectPic_Spenser_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Greta[] = {
+    obj_frame_tiles(gEventObjectPic_Greta_0),
+    obj_frame_tiles(gEventObjectPic_Greta_1),
+    obj_frame_tiles(gEventObjectPic_Greta_2),
+    obj_frame_tiles(gEventObjectPic_Greta_3),
+    obj_frame_tiles(gEventObjectPic_Greta_4),
+    obj_frame_tiles(gEventObjectPic_Greta_5),
+    obj_frame_tiles(gEventObjectPic_Greta_6),
+    obj_frame_tiles(gEventObjectPic_Greta_7),
+    obj_frame_tiles(gEventObjectPic_Greta_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Noland[] = {
+    obj_frame_tiles(gEventObjectPic_Noland_0),
+    obj_frame_tiles(gEventObjectPic_Noland_1),
+    obj_frame_tiles(gEventObjectPic_Noland_2),
+    obj_frame_tiles(gEventObjectPic_Noland_3),
+    obj_frame_tiles(gEventObjectPic_Noland_4),
+    obj_frame_tiles(gEventObjectPic_Noland_5),
+    obj_frame_tiles(gEventObjectPic_Noland_6),
+    obj_frame_tiles(gEventObjectPic_Noland_7),
+    obj_frame_tiles(gEventObjectPic_Noland_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Lucy[] = {
+    obj_frame_tiles(gEventObjectPic_Lucy_0),
+    obj_frame_tiles(gEventObjectPic_Lucy_1),
+    obj_frame_tiles(gEventObjectPic_Lucy_2),
+    obj_frame_tiles(gEventObjectPic_Lucy_3),
+    obj_frame_tiles(gEventObjectPic_Lucy_4),
+    obj_frame_tiles(gEventObjectPic_Lucy_5),
+    obj_frame_tiles(gEventObjectPic_Lucy_6),
+    obj_frame_tiles(gEventObjectPic_Lucy_7),
+    obj_frame_tiles(gEventObjectPic_Lucy_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Brandon[] = {
+    obj_frame_tiles(gEventObjectPic_Brandon_0),
+    obj_frame_tiles(gEventObjectPic_Brandon_1),
+    obj_frame_tiles(gEventObjectPic_Brandon_2),
+    obj_frame_tiles(gEventObjectPic_Brandon_3),
+    obj_frame_tiles(gEventObjectPic_Brandon_4),
+    obj_frame_tiles(gEventObjectPic_Brandon_5),
+    obj_frame_tiles(gEventObjectPic_Brandon_6),
+    obj_frame_tiles(gEventObjectPic_Brandon_7),
+    obj_frame_tiles(gEventObjectPic_Brandon_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Lugia[] = {
+    obj_frame_tiles(gEventObjectPic_Lugia_0),
+    obj_frame_tiles(gEventObjectPic_Lugia_0),
+    obj_frame_tiles(gEventObjectPic_Lugia_0),
+    obj_frame_tiles(gEventObjectPic_Lugia_0),
+    obj_frame_tiles(gEventObjectPic_Lugia_1),
+    obj_frame_tiles(gEventObjectPic_Lugia_0),
+    obj_frame_tiles(gEventObjectPic_Lugia_1),
+    obj_frame_tiles(gEventObjectPic_Lugia_0),
+    obj_frame_tiles(gEventObjectPic_Lugia_1),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_HoOh[] = {
+    obj_frame_tiles(gEventObjectPic_HoOh_0),
+    obj_frame_tiles(gEventObjectPic_HoOh_0),
+    obj_frame_tiles(gEventObjectPic_HoOh_0),
+    obj_frame_tiles(gEventObjectPic_HoOh_0),
+    obj_frame_tiles(gEventObjectPic_HoOh_1),
+    obj_frame_tiles(gEventObjectPic_HoOh_0),
+    obj_frame_tiles(gEventObjectPic_HoOh_1),
+    obj_frame_tiles(gEventObjectPic_HoOh_0),
+    obj_frame_tiles(gEventObjectPic_HoOh_1),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_RubySapphireBrendan[] = {
+    obj_frame_tiles(gEventObjectPic_RubySapphireBrendan_0),
+    obj_frame_tiles(gEventObjectPic_RubySapphireBrendan_1),
+    obj_frame_tiles(gEventObjectPic_RubySapphireBrendan_2),
+    obj_frame_tiles(gEventObjectPic_RubySapphireBrendan_3),
+    obj_frame_tiles(gEventObjectPic_RubySapphireBrendan_4),
+    obj_frame_tiles(gEventObjectPic_RubySapphireBrendan_5),
+    obj_frame_tiles(gEventObjectPic_RubySapphireBrendan_6),
+    obj_frame_tiles(gEventObjectPic_RubySapphireBrendan_7),
+    obj_frame_tiles(gEventObjectPic_RubySapphireBrendan_8),
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_RubySapphireMay[] = {
+    obj_frame_tiles(gEventObjectPic_RubySapphireMay_0),
+    obj_frame_tiles(gEventObjectPic_RubySapphireMay_1),
+    obj_frame_tiles(gEventObjectPic_RubySapphireMay_2),
+    obj_frame_tiles(gEventObjectPic_RubySapphireMay_3),
+    obj_frame_tiles(gEventObjectPic_RubySapphireMay_4),
+    obj_frame_tiles(gEventObjectPic_RubySapphireMay_5),
+    obj_frame_tiles(gEventObjectPic_RubySapphireMay_6),
+    obj_frame_tiles(gEventObjectPic_RubySapphireMay_7),
+    obj_frame_tiles(gEventObjectPic_RubySapphireMay_8),
+};
+
+#endif //GUARD_EVENT_OBJECT_PIC_TABLES_H
diff --git a/src/data/field_event_obj/event_object_subsprites.h b/src/data/field_event_obj/event_object_subsprites.h
new file mode 100755
index 000000000..db5fddf1e
--- /dev/null
+++ b/src/data/field_event_obj/event_object_subsprites.h
@@ -0,0 +1,342 @@
+#ifndef GUARD_EVENT_OBJECT_SUBSPRITES_H
+#define GUARD_EVENT_OBJECT_SUBSPRITES_H
+
+const struct Subsprite gEventObjectSpriteOamTable_16x16_0[] = {
+    { -8,  -8, 0, 1, 0, 2}
+};
+
+const struct Subsprite gEventObjectSpriteOamTable_16x16_1[] = {
+    { -8,  -8, 0, 1, 0, 1}
+};
+
+const struct Subsprite gEventObjectSpriteOamTable_16x16_2[] = {
+    { -8,  -8, 1, 0, 0, 2},
+    { -8,   0, 1, 0, 2, 3}
+};
+
+const struct Subsprite gEventObjectSpriteOamTable_16x16_3[] = {
+    { -8,  -8, 0, 1, 0, 2},
+    { -8,  -8, 0, 1, 0, 3}
+};
+
+const struct Subsprite gEventObjectSpriteOamTable_16x16_4[] = {
+    { -8,  -8, 0, 1, 0, 1},
+    { -8,  -8, 0, 1, 0, 3}
+};
+
+const struct SubspriteTable gEventObjectSpriteOamTables_16x16[] = {
+    {0, NULL},
+    {1, gEventObjectSpriteOamTable_16x16_0},
+    {1, gEventObjectSpriteOamTable_16x16_1},
+    {2, gEventObjectSpriteOamTable_16x16_2},
+    {2, gEventObjectSpriteOamTable_16x16_3},
+    {2, gEventObjectSpriteOamTable_16x16_4}
+};
+
+const struct Subsprite gEventObjectSpriteOamTable_16x32_0[] = {
+    { -8, -16, 2, 2, 0, 2}
+};
+
+const struct Subsprite gEventObjectSpriteOamTable_16x32_1[] = {
+    { -8, -16, 2, 2, 0, 1}
+};
+
+const struct Subsprite gEventObjectSpriteOamTable_16x32_2[] = {
+    { -8, -16, 0, 1, 0, 2},
+    { -8,   0, 1, 0, 4, 2},
+    { -8,   8, 1, 0, 6, 3}
+};
+
+const struct Subsprite gEventObjectSpriteOamTable_16x32_3[] = {
+    { -8, -16, 0, 1, 0, 2},
+    { -8,   0, 0, 1, 4, 3}
+};
+
+const struct Subsprite gEventObjectSpriteOamTable_16x32_4[] = {
+    { -8, -16, 0, 1, 0, 1},
+    { -8,   0, 0, 1, 4, 3}
+};
+
+const struct SubspriteTable gEventObjectSpriteOamTables_16x32[] = {
+    {0, NULL},
+    {1, gEventObjectSpriteOamTable_16x32_0},
+    {1, gEventObjectSpriteOamTable_16x32_1},
+    {3, gEventObjectSpriteOamTable_16x32_2},
+    {2, gEventObjectSpriteOamTable_16x32_3},
+    {2, gEventObjectSpriteOamTable_16x32_4}
+};
+
+const struct Subsprite gEventObjectSpriteOamTable_32x32_0[] = {
+    {-16, -16, 0, 2, 0, 2}
+};
+
+const struct Subsprite gEventObjectSpriteOamTable_32x32_1[] = {
+    {-16, -16, 0, 2, 0, 1}
+};
+
+const struct Subsprite gEventObjectSpriteOamTable_32x32_2[] = {
+    {-16, -16, 1, 2, 0, 2},
+    {-16,   0, 1, 1, 8, 2},
+    {-16,   8, 1, 1, 12, 3}
+};
+
+const struct Subsprite gEventObjectSpriteOamTable_32x32_3[] = {
+    {-16, -16, 1, 2, 0, 2},
+    {-16,   0, 1, 2, 8, 3}
+};
+
+const struct Subsprite gEventObjectSpriteOamTable_32x32_4[] = {
+    {-16, -16, 1, 2, 0, 1},
+    {-16,   0, 1, 2, 8, 3}
+};
+
+const struct SubspriteTable gEventObjectSpriteOamTables_32x32[] = {
+    {0, NULL},
+    {1, gEventObjectSpriteOamTable_32x32_0},
+    {1, gEventObjectSpriteOamTable_32x32_1},
+    {3, gEventObjectSpriteOamTable_32x32_2},
+    {2, gEventObjectSpriteOamTable_32x32_3},
+    {2, gEventObjectSpriteOamTable_32x32_4}
+};
+
+const struct Subsprite gEventObjectSpriteOamTable_Truck_0[] = {
+    {-24, -24, 1, 1, 0, 2},
+    {  8, -24, 1, 0, 4, 2},
+    {-24, -16, 1, 1, 6, 2},
+    {  8, -16, 1, 0, 10, 2},
+    {-24,  -8, 1, 1, 12, 2},
+    {  8,  -8, 1, 0, 16, 2},
+    {-24,   0, 1, 1, 18, 2},
+    {  8,   0, 1, 0, 22, 2},
+    {-24,   8, 1, 1, 24, 2},
+    {  8,   8, 1, 0, 28, 2},
+    {-24,  16, 1, 1, 30, 2},
+    {  8,  16, 1, 0, 34, 2}
+};
+
+const struct SubspriteTable gEventObjectSpriteOamTables_Truck[] = {
+    {12, gEventObjectSpriteOamTable_Truck_0},
+    {12, gEventObjectSpriteOamTable_Truck_0},
+    {12, gEventObjectSpriteOamTable_Truck_0},
+    {12, gEventObjectSpriteOamTable_Truck_0},
+    {12, gEventObjectSpriteOamTable_Truck_0},
+    {12, gEventObjectSpriteOamTable_Truck_0}
+};
+
+const struct Subsprite gEventObjectSpriteOamTable_Unused_0[] = {
+    {-32, -16, 1, 3, 0, 2}
+};
+
+const struct Subsprite gEventObjectSpriteOamTable_Unused_1[] = {
+    {-32, -16, 1, 3, 0, 1}
+};
+
+const struct Subsprite gEventObjectSpriteOamTable_Unused_2[] = {
+    {-32, -16, 1, 3, 0, 2}
+};
+
+const struct Subsprite gEventObjectSpriteOamTable_Unused_3[] = {
+    {-32, -16, 1, 3, 0, 2}
+};
+
+const struct SubspriteTable gEventObjectSpriteOamTables_Unused[] = {
+    {0, NULL},
+    {1, gEventObjectSpriteOamTable_Unused_0},
+    {1, gEventObjectSpriteOamTable_Unused_1},
+    {1, gEventObjectSpriteOamTable_Unused_2},
+    {1, gEventObjectSpriteOamTable_Unused_3},
+    {1, gEventObjectSpriteOamTable_Unused_3}
+};
+
+const struct Subsprite gEventObjectSpriteOamTable_64x64_0[] = {
+    {-32, -32, 0, 3, 0, 2}
+};
+
+const struct Subsprite gEventObjectSpriteOamTable_64x64_1[] = {
+    {-32, -32, 0, 3, 0, 1}
+};
+
+const struct Subsprite gEventObjectSpriteOamTable_64x64_2[] = {
+    {-32, -32, 0, 3, 0, 2}
+};
+
+const struct Subsprite gEventObjectSpriteOamTable_64x64_3[] = {
+    {-32, -32, 0, 3, 0, 2}
+};
+
+const struct SubspriteTable gEventObjectSpriteOamTables_64x64[] = {
+    {0, NULL},
+    {1, gEventObjectSpriteOamTable_64x64_0},
+    {1, gEventObjectSpriteOamTable_64x64_1},
+    {1, gEventObjectSpriteOamTable_64x64_2},
+    {1, gEventObjectSpriteOamTable_64x64_3},
+    {1, gEventObjectSpriteOamTable_64x64_3}
+};
+
+const struct Subsprite gEventObjectSpriteOamTable_SSTidal_0[] = {
+    {-48, -20, 1, 1, 0, 2},
+    {-16, -20, 1, 1, 4, 2},
+    { 16, -20, 1, 1, 8, 2},
+    {-48, -12, 1, 1, 12, 2},
+    {-16, -12, 1, 1, 16, 2},
+    { 16, -12, 1, 1, 20, 2},
+    {-48,  -4, 1, 1, 24, 2},
+    {-16,  -4, 1, 1, 28, 2},
+    { 16,  -4, 1, 1, 32, 2},
+    {-48,   4, 1, 1, 36, 2},
+    {-16,   4, 1, 1, 40, 2},
+    { 16,   4, 1, 1, 44, 2},
+    {-48,  12, 1, 1, 48, 2},
+    {-16,  12, 1, 1, 52, 2},
+    { 16,  12, 1, 1, 56, 2}
+};
+
+const struct Subsprite gEventObjectSpriteOamTable_SSTidal_1[] = {
+    {-48, -20, 1, 1, 0, 1},
+    {-16, -20, 1, 1, 4, 1},
+    { 16, -20, 1, 1, 8, 1},
+    {-48, -12, 1, 1, 12, 1},
+    {-16, -12, 1, 1, 16, 1},
+    { 16, -12, 1, 1, 20, 1},
+    {-48,  -4, 1, 1, 24, 1},
+    {-16,  -4, 1, 1, 28, 1},
+    { 16,  -4, 1, 1, 32, 1},
+    {-48,   4, 1, 1, 36, 1},
+    {-16,   4, 1, 1, 40, 1},
+    { 16,   4, 1, 1, 44, 1},
+    {-48,  12, 1, 1, 48, 1},
+    {-16,  12, 1, 1, 52, 1},
+    { 16,  12, 1, 1, 56, 1}
+};
+
+const struct Subsprite gEventObjectSpriteOamTable_SSTidal_2[] = {
+    {-48, -20, 1, 1, 0, 2},
+    {-16, -20, 1, 1, 4, 2},
+    { 16, -20, 1, 1, 8, 2},
+    {-48, -12, 1, 1, 12, 2},
+    {-16, -12, 1, 1, 16, 2},
+    { 16, -12, 1, 1, 20, 2},
+    {-48,  -4, 1, 1, 24, 2},
+    {-16,  -4, 1, 1, 28, 2},
+    { 16,  -4, 1, 1, 32, 2},
+    {-48,   4, 1, 1, 36, 2},
+    {-16,   4, 1, 1, 40, 2},
+    { 16,   4, 1, 1, 44, 2},
+    {-48,  12, 1, 1, 48, 2},
+    {-16,  12, 1, 1, 52, 2},
+    { 16,  12, 1, 1, 56, 2}
+};
+
+const struct Subsprite gEventObjectSpriteOamTable_SSTidal_3[] = {
+    {-48, -20, 1, 1, 0, 1},
+    {-16, -20, 1, 1, 4, 1},
+    { 16, -20, 1, 1, 8, 1},
+    {-48, -12, 1, 1, 12, 1},
+    {-16, -12, 1, 1, 16, 1},
+    { 16, -12, 1, 1, 20, 1},
+    {-48,  -4, 1, 1, 24, 2},
+    {-16,  -4, 1, 1, 28, 2},
+    { 16,  -4, 1, 1, 32, 2},
+    {-48,   4, 1, 1, 36, 2},
+    {-16,   4, 1, 1, 40, 2},
+    { 16,   4, 1, 1, 44, 2},
+    {-48,  12, 1, 1, 48, 2},
+    {-16,  12, 1, 1, 52, 2},
+    { 16,  12, 1, 1, 56, 2}
+};
+
+const struct SubspriteTable gEventObjectSpriteOamTables_SSTidal[] = {
+    {15, gEventObjectSpriteOamTable_SSTidal_0},
+    {15, gEventObjectSpriteOamTable_SSTidal_0},
+    {15, gEventObjectSpriteOamTable_SSTidal_1},
+    {15, gEventObjectSpriteOamTable_SSTidal_2},
+    {15, gEventObjectSpriteOamTable_SSTidal_3},
+    {15, gEventObjectSpriteOamTable_SSTidal_3}
+};
+
+const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_0[] = {
+    {-48, -20, 1, 1, 0, 2},
+    {-16, -20, 1, 1, 4, 2},
+    { 16, -20, 1, 0, 8, 2},
+    { 32, -20, 0, 0, 10, 2},
+    {-48, -12, 1, 1, 11, 2},
+    {-16, -12, 1, 1, 15, 2},
+    { 16, -12, 1, 0, 19, 2},
+    { 32, -12, 0, 0, 21, 2},
+    {-48,  -4, 1, 1, 22, 2},
+    {-16,  -4, 1, 1, 26, 2},
+    { 16,  -4, 1, 0, 30, 2},
+    { 32,  -4, 0, 0, 32, 2},
+    {-48,   4, 1, 1, 33, 2},
+    {-16,   4, 1, 1, 37, 2},
+    { 16,   4, 1, 0, 41, 2},
+    { 32,   4, 0, 0, 43, 2}
+};
+
+const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_1[] = {
+    {-48, -20, 1, 1, 0, 1},
+    {-16, -20, 1, 1, 4, 1},
+    { 16, -20, 1, 0, 8, 1},
+    { 32, -20, 0, 0, 10, 1},
+    {-48, -12, 1, 1, 11, 1},
+    {-16, -12, 1, 1, 15, 1},
+    { 16, -12, 1, 0, 19, 1},
+    { 32, -12, 0, 0, 21, 1},
+    {-48,  -4, 1, 1, 22, 1},
+    {-16,  -4, 1, 1, 26, 1},
+    { 16,  -4, 1, 0, 30, 1},
+    { 32,  -4, 0, 0, 32, 1},
+    {-48,   4, 1, 1, 33, 1},
+    {-16,   4, 1, 1, 37, 1},
+    { 16,   4, 1, 0, 41, 1},
+    { 32,   4, 0, 0, 43, 1}
+};
+
+const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_2[] = {
+    {-48, -20, 1, 1, 0, 2},
+    {-16, -20, 1, 1, 4, 2},
+    { 16, -20, 1, 0, 8, 2},
+    { 32, -20, 0, 0, 10, 2},
+    {-48, -12, 1, 1, 11, 2},
+    {-16, -12, 1, 1, 15, 2},
+    { 16, -12, 1, 0, 19, 2},
+    { 32, -12, 0, 0, 21, 2},
+    {-48,  -4, 1, 1, 22, 2},
+    {-16,  -4, 1, 1, 26, 2},
+    { 16,  -4, 1, 0, 30, 2},
+    { 32,  -4, 0, 0, 32, 2},
+    {-48,   4, 1, 1, 33, 2},
+    {-16,   4, 1, 1, 37, 2},
+    { 16,   4, 1, 0, 41, 2},
+    { 32,   4, 0, 0, 43, 2}
+};
+
+const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_3[] = {
+    {-48, -20, 1, 1, 0, 1},
+    {-16, -20, 1, 1, 4, 1},
+    { 16, -20, 1, 0, 8, 1},
+    { 32, -20, 0, 0, 10, 1},
+    {-48, -12, 1, 1, 11, 1},
+    {-16, -12, 1, 1, 15, 1},
+    { 16, -12, 1, 0, 19, 1},
+    { 32, -12, 0, 0, 21, 1},
+    {-48,  -4, 1, 1, 22, 2},
+    {-16,  -4, 1, 1, 26, 2},
+    { 16,  -4, 1, 0, 30, 2},
+    { 32,  -4, 0, 0, 32, 2},
+    {-48,   4, 1, 1, 33, 2},
+    {-16,   4, 1, 1, 37, 2},
+    { 16,   4, 1, 0, 41, 2},
+    { 32,   4, 0, 0, 43, 2}
+};
+
+const struct SubspriteTable gEventObjectSpriteOamTables_SubmarineShadow[] = {
+    {16, gEventObjectSpriteOamTable_SubmarineShadow_0},
+    {16, gEventObjectSpriteOamTable_SubmarineShadow_0},
+    {16, gEventObjectSpriteOamTable_SubmarineShadow_1},
+    {16, gEventObjectSpriteOamTable_SubmarineShadow_2},
+    {16, gEventObjectSpriteOamTable_SubmarineShadow_3},
+    {16, gEventObjectSpriteOamTable_SubmarineShadow_3}
+};
+
+#endif //GUARD_EVENT_OBJECT_SUBSPRITES_H
diff --git a/src/data/field_event_obj/field_effect_object_template_pointers.h b/src/data/field_event_obj/field_effect_object_template_pointers.h
new file mode 100755
index 000000000..3b08a5ff1
--- /dev/null
+++ b/src/data/field_event_obj/field_effect_object_template_pointers.h
@@ -0,0 +1,82 @@
+#ifndef GUARD_FIELD_EFFECT_OBJECT_TEMPLATE_POINTERS_H
+#define GUARD_FIELD_EFFECT_OBJECT_TEMPLATE_POINTERS_H
+
+const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowSmall;
+const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowMedium;
+const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowLarge;
+const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowExtraLarge;
+const struct SpriteTemplate gFieldEffectObjectTemplate_TallGrass;
+const struct SpriteTemplate gFieldEffectObjectTemplate_Ripple;
+const struct SpriteTemplate gFieldEffectObjectTemplate_Ash;
+const struct SpriteTemplate gFieldEffectObjectTemplate_SurfBlob;
+const struct SpriteTemplate gFieldEffectObjectTemplate_Arrow;
+const struct SpriteTemplate gFieldEffectObjectTemplate_GroundImpactDust;
+const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopTallGrass;
+const struct SpriteTemplate gFieldEffectObjectTemplate_SandFootprints;
+const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopBigSplash;
+const struct SpriteTemplate gFieldEffectObjectTemplate_Splash;
+const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopSmallSplash;
+const struct SpriteTemplate gFieldEffectObjectTemplate_LongGrass;
+const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown16;
+const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown17;
+const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown18;
+const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown19;
+const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown20;
+const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown21;
+const struct SpriteTemplate gFieldEffectObjectTemplate_BerryTreeGrowthSparkle;
+const struct SpriteTemplate gFieldEffectObjectTemplate_DeepSandFootprints;
+const struct SpriteTemplate gFieldEffectObjectTemplate_TreeDisguise;
+const struct SpriteTemplate gFieldEffectObjectTemplate_MountainDisguise;
+const struct SpriteTemplate gFieldEffectObjectTemplate_Bird;
+const struct SpriteTemplate gFieldEffectObjectTemplate_BikeTireTracks;
+const struct SpriteTemplate gFieldEffectObjectTemplate_SandDisguisePlaceholder;
+const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown29;
+const struct SpriteTemplate gFieldEffectObjectTemplate_ShortGrass;
+const struct SpriteTemplate gFieldEffectObjectTemplate_HotSpringsWater;
+const struct SpriteTemplate gFieldEffectObjectTemplate_JumpOutOfAsh;
+const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown33;
+const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles;
+const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown35;
+const struct SpriteTemplate gFieldEffectObjectTemplate_Rayquaza;
+
+const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[] = {
+    &gFieldEffectObjectTemplate_ShadowSmall,
+    &gFieldEffectObjectTemplate_ShadowMedium,
+    &gFieldEffectObjectTemplate_ShadowLarge,
+    &gFieldEffectObjectTemplate_ShadowExtraLarge,
+    &gFieldEffectObjectTemplate_TallGrass,
+    &gFieldEffectObjectTemplate_Ripple,
+    &gFieldEffectObjectTemplate_Ash,
+    &gFieldEffectObjectTemplate_SurfBlob,
+    &gFieldEffectObjectTemplate_Arrow,
+    &gFieldEffectObjectTemplate_GroundImpactDust,
+    &gFieldEffectObjectTemplate_BikeHopTallGrass,
+    &gFieldEffectObjectTemplate_SandFootprints,
+    &gFieldEffectObjectTemplate_BikeHopBigSplash,
+    &gFieldEffectObjectTemplate_Splash,
+    &gFieldEffectObjectTemplate_BikeHopSmallSplash,
+    &gFieldEffectObjectTemplate_LongGrass,
+    &gFieldEffectObjectTemplate_Unknown16,
+    &gFieldEffectObjectTemplate_Unknown17,
+    &gFieldEffectObjectTemplate_Unknown18,
+    &gFieldEffectObjectTemplate_Unknown19,
+    &gFieldEffectObjectTemplate_Unknown20,
+    &gFieldEffectObjectTemplate_Unknown21,
+    &gFieldEffectObjectTemplate_BerryTreeGrowthSparkle,
+    &gFieldEffectObjectTemplate_DeepSandFootprints,
+    &gFieldEffectObjectTemplate_TreeDisguise,
+    &gFieldEffectObjectTemplate_MountainDisguise,
+    &gFieldEffectObjectTemplate_Bird,
+    &gFieldEffectObjectTemplate_BikeTireTracks,
+    &gFieldEffectObjectTemplate_SandDisguisePlaceholder,
+    &gFieldEffectObjectTemplate_Unknown29,
+    &gFieldEffectObjectTemplate_ShortGrass,
+    &gFieldEffectObjectTemplate_HotSpringsWater,
+    &gFieldEffectObjectTemplate_JumpOutOfAsh,
+    &gFieldEffectObjectTemplate_Unknown33,
+    &gFieldEffectObjectTemplate_Bubbles,
+    &gFieldEffectObjectTemplate_Unknown35,
+    &gFieldEffectObjectTemplate_Rayquaza,
+};
+
+#endif //GUARD_FIELD_EFFECT_OBJECT_TEMPLATE_POINTERS_H
diff --git a/src/data/field_event_obj/field_effect_objects.h b/src/data/field_event_obj/field_effect_objects.h
new file mode 100755
index 000000000..c8633daa7
--- /dev/null
+++ b/src/data/field_event_obj/field_effect_objects.h
@@ -0,0 +1,997 @@
+#ifndef GUARD_FIELD_EFFECT_OBJECTS_H
+#define GUARD_FIELD_EFFECT_OBJECTS_H
+
+const struct SpritePalette gFieldEffectObjectPaletteInfo0 = {gFieldEffectObjectPalette0, 0x1004};
+
+const struct SpritePalette gFieldEffectObjectPaletteInfo1 = {gFieldEffectObjectPalette1, 0x1005};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850C9D0[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+const union AnimCmd *const gFieldEffectObjectImageAnimTable_Shadow[] =
+{
+	gFieldEffectObjectImageAnim_850C9D0,
+};
+
+const struct SpriteFrameImage gFieldEffectObjectPicTable_ShadowSmall[] = {
+	obj_frame_tiles(gFieldEffectObjectPic_ShadowSmall),
+};
+
+const struct SpriteFrameImage gFieldEffectObjectPicTable_ShadowMedium[] = {
+	obj_frame_tiles(gFieldEffectObjectPic_ShadowMedium),
+};
+
+const struct SpriteFrameImage gFieldEffectObjectPicTable_ShadowLarge[] = {
+	obj_frame_tiles(gFieldEffectObjectPic_ShadowLarge),
+};
+
+const struct SpriteFrameImage gFieldEffectObjectPicTable_ShadowExtraLarge[] = {
+	obj_frame_tiles(gFieldEffectObjectPic_ShadowExtraLarge),
+};
+
+const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowSmall = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_8x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowSmall, gDummySpriteAffineAnimTable, oamc_shadow};
+
+const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowMedium = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowMedium, gDummySpriteAffineAnimTable, oamc_shadow};
+
+const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowLarge = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_32x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowLarge, gDummySpriteAffineAnimTable, oamc_shadow};
+
+const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowExtraLarge = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_64x32, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowExtraLarge, gDummySpriteAffineAnimTable, oamc_shadow};
+
+const struct SpriteFrameImage gFieldEffectObjectPicTable_TallGrass[] = {
+	obj_frame_tiles(gFieldEffectObjectPic_TallGrass_0),
+	obj_frame_tiles(gFieldEffectObjectPic_TallGrass_1),
+	obj_frame_tiles(gFieldEffectObjectPic_TallGrass_2),
+	obj_frame_tiles(gFieldEffectObjectPic_TallGrass_3),
+	obj_frame_tiles(gFieldEffectObjectPic_TallGrass_4),
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850CA84[] =
+{
+    ANIMCMD_FRAME(1, 10),
+    ANIMCMD_FRAME(2, 10),
+    ANIMCMD_FRAME(3, 10),
+    ANIMCMD_FRAME(4, 10),
+    ANIMCMD_FRAME(0, 10),
+    ANIMCMD_END,
+};
+
+const union AnimCmd *const gFieldEffectObjectImageAnimTable_TallGrass[] =
+{
+    gFieldEffectObjectImageAnim_850CA84,
+};
+
+const struct SpriteTemplate gFieldEffectObjectTemplate_TallGrass = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_TallGrass, gFieldEffectObjectPicTable_TallGrass, gDummySpriteAffineAnimTable, unc_grass_normal};
+
+const struct SpriteFrameImage gFieldEffectObjectPicTable_Ripple[] = {
+	obj_frame_tiles(gFieldEffectObjectPic_Ripple_0),
+	obj_frame_tiles(gFieldEffectObjectPic_Ripple_1),
+	obj_frame_tiles(gFieldEffectObjectPic_Ripple_2),
+	obj_frame_tiles(gFieldEffectObjectPic_Ripple_3),
+	obj_frame_tiles(gFieldEffectObjectPic_Ripple_4),
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850CAE0[] =
+{
+    ANIMCMD_FRAME(0, 12),
+    ANIMCMD_FRAME(1, 9),
+    ANIMCMD_FRAME(2, 9),
+    ANIMCMD_FRAME(3, 9),
+    ANIMCMD_FRAME(0, 9),
+    ANIMCMD_FRAME(1, 9),
+    ANIMCMD_FRAME(2, 11),
+    ANIMCMD_FRAME(4, 11),
+    ANIMCMD_END,
+};
+
+const union AnimCmd *const gFieldEffectObjectImageAnimTable_Ripple[] =
+{
+    gFieldEffectObjectImageAnim_850CAE0,
+};
+
+const struct SpriteTemplate gFieldEffectObjectTemplate_Ripple = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Ripple, gFieldEffectObjectPicTable_Ripple, gDummySpriteAffineAnimTable, sub_81561D0};
+
+const struct SpriteFrameImage gFieldEffectObjectPicTable_Ash[] = {
+	obj_frame_tiles(gFieldEffectObjectPic_Ash_0),
+	obj_frame_tiles(gFieldEffectObjectPic_Ash_1),
+	obj_frame_tiles(gFieldEffectObjectPic_Ash_2),
+	obj_frame_tiles(gFieldEffectObjectPic_Ash_3),
+	obj_frame_tiles(gFieldEffectObjectPic_Ash_4),
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850CB48[] =
+{
+    ANIMCMD_FRAME(0, 12),
+    ANIMCMD_FRAME(1, 12),
+    ANIMCMD_FRAME(2, 8),
+    ANIMCMD_FRAME(3, 12),
+    ANIMCMD_FRAME(4, 12),
+    ANIMCMD_END,
+};
+
+const union AnimCmd *const gFieldEffectObjectImageAnimTable_Ash[] =
+{
+    gFieldEffectObjectImageAnim_850CB48,
+};
+
+const struct SpriteTemplate gFieldEffectObjectTemplate_Ash = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Ash, gFieldEffectObjectPicTable_Ash, gDummySpriteAffineAnimTable, sub_8155460};
+
+const struct SpriteFrameImage gFieldEffectObjectPicTable_SurfBlob[] = {
+	obj_frame_tiles(gFieldEffectObjectPic_SurfBlob_0),
+	obj_frame_tiles(gFieldEffectObjectPic_SurfBlob_1),
+	obj_frame_tiles(gFieldEffectObjectPic_SurfBlob_2),
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850CB94[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850CB9C[] =
+{
+    ANIMCMD_FRAME(1, 1),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850CBA4[] =
+{
+    ANIMCMD_FRAME(2, 1),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850CBAC[] =
+{
+    ANIMCMD_FRAME(2, 1, .hFlip = TRUE),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd *const gFieldEffectObjectImageAnimTable_SurfBlob[] =
+{
+    gFieldEffectObjectImageAnim_850CB94,
+    gFieldEffectObjectImageAnim_850CB9C,
+    gFieldEffectObjectImageAnim_850CBA4,
+    gFieldEffectObjectImageAnim_850CBAC,
+};
+
+const struct SpriteTemplate gFieldEffectObjectTemplate_SurfBlob = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_SurfBlob, gFieldEffectObjectPicTable_SurfBlob, gDummySpriteAffineAnimTable, sub_8155658};
+
+const struct SpriteFrameImage gFieldEffectObjectPicTable_Arrow[] = {
+	obj_frame_tiles(gFieldEffectObjectPic_Arrow_0),
+	obj_frame_tiles(gFieldEffectObjectPic_Arrow_1),
+	obj_frame_tiles(gFieldEffectObjectPic_Arrow_2),
+	obj_frame_tiles(gFieldEffectObjectPic_Arrow_3),
+	obj_frame_tiles(gFieldEffectObjectPic_Arrow_4),
+	obj_frame_tiles(gFieldEffectObjectPic_Arrow_5),
+	obj_frame_tiles(gFieldEffectObjectPic_Arrow_6),
+	obj_frame_tiles(gFieldEffectObjectPic_Arrow_7),
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850CC1C[] =
+{
+    ANIMCMD_FRAME(3, 32),
+    ANIMCMD_FRAME(7, 32),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850CC28[] =
+{
+    ANIMCMD_FRAME(0, 32),
+    ANIMCMD_FRAME(4, 32),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850CC34[] =
+{
+    ANIMCMD_FRAME(1, 32),
+    ANIMCMD_FRAME(5, 32),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850CC40[] =
+{
+    ANIMCMD_FRAME(2, 32),
+    ANIMCMD_FRAME(6, 32),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd *const gFieldEffectObjectImageAnimTable_Arrow[] =
+{
+    gFieldEffectObjectImageAnim_850CC1C,
+    gFieldEffectObjectImageAnim_850CC28,
+    gFieldEffectObjectImageAnim_850CC34,
+    gFieldEffectObjectImageAnim_850CC40,
+};
+
+const struct SpriteTemplate gFieldEffectObjectTemplate_Arrow = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Arrow, gFieldEffectObjectPicTable_Arrow, gDummySpriteAffineAnimTable, SpriteCallbackDummy};
+
+const struct SpriteFrameImage gFieldEffectObjectPicTable_GroundImpactDust[] = {
+	obj_frame_tiles(gFieldEffectObjectPic_GroundImpactDust_0),
+	obj_frame_tiles(gFieldEffectObjectPic_GroundImpactDust_1),
+	obj_frame_tiles(gFieldEffectObjectPic_GroundImpactDust_2),
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850CC8C[] =
+{
+    ANIMCMD_FRAME(0, 8),
+    ANIMCMD_FRAME(1, 8),
+    ANIMCMD_FRAME(2, 8),
+    ANIMCMD_END,
+};
+
+const union AnimCmd *const gFieldEffectObjectImageAnimTable_GroundImpactDust[] =
+{
+    gFieldEffectObjectImageAnim_850CC8C,
+};
+
+const struct SpriteTemplate gFieldEffectObjectTemplate_GroundImpactDust = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_GroundImpactDust, gFieldEffectObjectPicTable_GroundImpactDust, gDummySpriteAffineAnimTable, sub_8156194};
+
+const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeHopTallGrass[] = {
+	obj_frame_tiles(gFieldEffectObjectPic_BikeHopTallGrass_0),
+	obj_frame_tiles(gFieldEffectObjectPic_BikeHopTallGrass_1),
+	obj_frame_tiles(gFieldEffectObjectPic_BikeHopTallGrass_2),
+	obj_frame_tiles(gFieldEffectObjectPic_BikeHopTallGrass_3),
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850CCD8[] =
+{
+    ANIMCMD_FRAME(0, 8),
+    ANIMCMD_FRAME(1, 8),
+    ANIMCMD_FRAME(2, 8),
+    ANIMCMD_FRAME(3, 8),
+    ANIMCMD_END,
+};
+
+const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeHopTallGrass[] =
+{
+    gFieldEffectObjectImageAnim_850CCD8,
+};
+
+const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopTallGrass = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_BikeHopTallGrass, gFieldEffectObjectPicTable_BikeHopTallGrass, gDummySpriteAffineAnimTable, sub_8156194};
+
+const struct SpriteFrameImage gFieldEffectObjectPicTable_SandFootprints[] = {
+	obj_frame_tiles(gFieldEffectObjectPic_SandFootprints_0),
+	obj_frame_tiles(gFieldEffectObjectPic_SandFootprints_1),
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850CD18[] =
+{
+    ANIMCMD_FRAME(0, 1, .vFlip = TRUE),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850CD20[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850CD28[] =
+{
+    ANIMCMD_FRAME(1, 1),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850CD30[] =
+{
+    ANIMCMD_FRAME(1, 1, .hFlip = TRUE),
+    ANIMCMD_END,
+};
+
+const union AnimCmd *const gFieldEffectObjectImageAnimTable_SandFootprints[] =
+{
+    gFieldEffectObjectImageAnim_850CD18,
+    gFieldEffectObjectImageAnim_850CD18,
+    gFieldEffectObjectImageAnim_850CD20,
+    gFieldEffectObjectImageAnim_850CD28,
+    gFieldEffectObjectImageAnim_850CD30,
+};
+
+const struct SpriteTemplate gFieldEffectObjectTemplate_SandFootprints = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_SandFootprints, gFieldEffectObjectPicTable_SandFootprints, gDummySpriteAffineAnimTable, sub_8154C60};
+
+const struct SpriteFrameImage gFieldEffectObjectPicTable_DeepSandFootprints[] = {
+	obj_frame_tiles(gFieldEffectObjectPic_DeepSandFootprints_0),
+	obj_frame_tiles(gFieldEffectObjectPic_DeepSandFootprints_1),
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850CD74[] =
+{
+    ANIMCMD_FRAME(0, 1, .vFlip = TRUE),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850CD7C[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850CD84[] =
+{
+    ANIMCMD_FRAME(1, 1),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850CD8C[] =
+{
+    ANIMCMD_FRAME(1, 1, .hFlip = TRUE),
+    ANIMCMD_END,
+};
+
+const union AnimCmd *const gFieldEffectObjectImageAnimTable_DeepSandFootprints[] =
+{
+    gFieldEffectObjectImageAnim_850CD74,
+    gFieldEffectObjectImageAnim_850CD74,
+    gFieldEffectObjectImageAnim_850CD7C,
+    gFieldEffectObjectImageAnim_850CD84,
+    gFieldEffectObjectImageAnim_850CD8C,
+};
+
+const struct SpriteTemplate gFieldEffectObjectTemplate_DeepSandFootprints = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_DeepSandFootprints, gFieldEffectObjectPicTable_DeepSandFootprints, gDummySpriteAffineAnimTable, sub_8154C60};
+
+const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeTireTracks[] = {
+	obj_frame_tiles(gFieldEffectObjectPic_BikeTireTracks_0),
+	obj_frame_tiles(gFieldEffectObjectPic_BikeTireTracks_1),
+	obj_frame_tiles(gFieldEffectObjectPic_BikeTireTracks_2),
+	obj_frame_tiles(gFieldEffectObjectPic_BikeTireTracks_3),
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850CDE0[] =
+{
+    ANIMCMD_FRAME(2, 1),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850CDE8[] =
+{
+    ANIMCMD_FRAME(2, 1),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850CDF0[] =
+{
+    ANIMCMD_FRAME(1, 1),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850CDF8[] =
+{
+    ANIMCMD_FRAME(1, 1),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850CE00[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850CE08[] =
+{
+    ANIMCMD_FRAME(0, 1, .hFlip = TRUE),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850CE10[] =
+{
+    ANIMCMD_FRAME(3, 1, .hFlip = TRUE),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850CE18[] =
+{
+    ANIMCMD_FRAME(3, 1),
+    ANIMCMD_END,
+};
+
+const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeTireTracks[] =
+{
+    gFieldEffectObjectImageAnim_850CDE0,
+    gFieldEffectObjectImageAnim_850CDE0,
+    gFieldEffectObjectImageAnim_850CDE8,
+    gFieldEffectObjectImageAnim_850CDF0,
+    gFieldEffectObjectImageAnim_850CDF8,
+    gFieldEffectObjectImageAnim_850CE00,
+    gFieldEffectObjectImageAnim_850CE08,
+    gFieldEffectObjectImageAnim_850CE10,
+    gFieldEffectObjectImageAnim_850CE18,
+};
+
+const struct SpriteTemplate gFieldEffectObjectTemplate_BikeTireTracks = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_BikeTireTracks, gFieldEffectObjectPicTable_BikeTireTracks, gDummySpriteAffineAnimTable, sub_8154C60};
+
+const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeHopBigSplash[] = {
+	obj_frame_tiles(gFieldEffectObjectPic_BikeHopBigSplash_0),
+	obj_frame_tiles(gFieldEffectObjectPic_BikeHopBigSplash_1),
+	obj_frame_tiles(gFieldEffectObjectPic_BikeHopBigSplash_2),
+	obj_frame_tiles(gFieldEffectObjectPic_BikeHopBigSplash_3),
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850CE7C[] =
+{
+    ANIMCMD_FRAME(0, 8),
+    ANIMCMD_FRAME(1, 8),
+    ANIMCMD_FRAME(2, 8),
+    ANIMCMD_FRAME(3, 8),
+    ANIMCMD_END,
+};
+
+const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeHopBigSplash[] =
+{
+    gFieldEffectObjectImageAnim_850CE7C,
+};
+
+const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopBigSplash = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_BikeHopBigSplash, gFieldEffectObjectPicTable_BikeHopBigSplash, gDummySpriteAffineAnimTable, sub_8156194};
+
+const struct SpriteFrameImage gFieldEffectObjectPicTable_Splash[] = {
+	obj_frame_tiles(gFieldEffectObjectPic_Splash_0),
+	obj_frame_tiles(gFieldEffectObjectPic_Splash_1),
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850CEBC[] =
+{
+    ANIMCMD_FRAME(0, 4),
+    ANIMCMD_FRAME(1, 4),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850CEC8[] =
+{
+    ANIMCMD_FRAME(0, 4),
+    ANIMCMD_FRAME(1, 4),
+    ANIMCMD_FRAME(0, 6),
+    ANIMCMD_FRAME(1, 6),
+    ANIMCMD_FRAME(0, 8),
+    ANIMCMD_FRAME(1, 8),
+    ANIMCMD_FRAME(0, 6),
+    ANIMCMD_FRAME(1, 6),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd *const gFieldEffectObjectImageAnimTable_Splash[] =
+{
+    gFieldEffectObjectImageAnim_850CEBC,
+    gFieldEffectObjectImageAnim_850CEC8,
+};
+
+const struct SpriteTemplate gFieldEffectObjectTemplate_Splash = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_Splash, gFieldEffectObjectPicTable_Splash, gDummySpriteAffineAnimTable, sub_8154D90};
+
+const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeHopSmallSplash[] = {
+	obj_frame_tiles(gFieldEffectObjectPic_BikeHopSmallSplash_0),
+	obj_frame_tiles(gFieldEffectObjectPic_BikeHopSmallSplash_1),
+	obj_frame_tiles(gFieldEffectObjectPic_BikeHopSmallSplash_2),
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850CF24[] =
+{
+    ANIMCMD_FRAME(0, 4),
+    ANIMCMD_FRAME(1, 4),
+    ANIMCMD_FRAME(2, 4),
+    ANIMCMD_END,
+};
+
+const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeHopSmallSplash[] =
+{
+    gFieldEffectObjectImageAnim_850CF24,
+};
+
+const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopSmallSplash = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_BikeHopSmallSplash, gFieldEffectObjectPicTable_BikeHopSmallSplash, gDummySpriteAffineAnimTable, sub_8156194};
+
+const struct SpriteFrameImage gFieldEffectObjectPicTable_LongGrass[] = {
+	obj_frame_tiles(gFieldEffectObjectPic_LongGrass_0),
+	obj_frame_tiles(gFieldEffectObjectPic_LongGrass_1),
+	obj_frame_tiles(gFieldEffectObjectPic_LongGrass_2),
+	obj_frame_tiles(gFieldEffectObjectPic_LongGrass_3),
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850CF70[] =
+{
+    ANIMCMD_FRAME(1, 3),
+    ANIMCMD_FRAME(2, 3),
+    ANIMCMD_FRAME(0, 4),
+    ANIMCMD_FRAME(3, 4),
+    ANIMCMD_FRAME(0, 4),
+    ANIMCMD_FRAME(3, 4),
+    ANIMCMD_FRAME(0, 4),
+    ANIMCMD_END,
+};
+
+const union AnimCmd *const gFieldEffectObjectImageAnimTable_LongGrass[] =
+{
+    gFieldEffectObjectImageAnim_850CF70,
+};
+
+const struct SpriteTemplate gFieldEffectObjectTemplate_LongGrass = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_LongGrass, gFieldEffectObjectPicTable_LongGrass, gDummySpriteAffineAnimTable, unc_grass_tall};
+
+const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown16[] = {
+	obj_frame_tiles(gFieldEffectObjectPic_Unknown16_0),
+	obj_frame_tiles(gFieldEffectObjectPic_Unknown16_1),
+	obj_frame_tiles(gFieldEffectObjectPic_Unknown16_2),
+	obj_frame_tiles(gFieldEffectObjectPic_Unknown16_3),
+	obj_frame_tiles(gFieldEffectObjectPic_Unknown16_4),
+	obj_frame_tiles(gFieldEffectObjectPic_Unknown16_5),
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850CFDC[] =
+{
+    ANIMCMD_FRAME(0, 4),
+    ANIMCMD_FRAME(1, 4),
+    ANIMCMD_FRAME(2, 8),
+    ANIMCMD_FRAME(3, 8),
+    ANIMCMD_FRAME(4, 8),
+    ANIMCMD_FRAME(5, 8),
+    ANIMCMD_END,
+};
+
+const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown16[] =
+{
+    gFieldEffectObjectImageAnim_850CFDC,
+};
+
+const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown16 = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown16, gFieldEffectObjectPicTable_Unknown16, gDummySpriteAffineAnimTable, sub_8156194};
+
+const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown17[] = {
+	obj_frame_tiles(gFieldEffectObjectPic_Unknown16_5),
+	obj_frame_tiles(gFieldEffectObjectPic_Unknown17_0),
+	obj_frame_tiles(gFieldEffectObjectPic_Unknown17_1),
+	obj_frame_tiles(gFieldEffectObjectPic_Unknown17_2),
+	obj_frame_tiles(gFieldEffectObjectPic_Unknown17_3),
+	obj_frame_tiles(gFieldEffectObjectPic_Unknown17_4),
+	obj_frame_tiles(gFieldEffectObjectPic_Unknown17_5),
+	obj_frame_tiles(gFieldEffectObjectPic_Unknown17_6),
+	obj_frame_tiles(gFieldEffectObjectPic_Unknown17_7),
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850D05C[] =
+{
+    ANIMCMD_FRAME(0, 10),
+    ANIMCMD_FRAME(1, 4),
+    ANIMCMD_FRAME(2, 4),
+    ANIMCMD_FRAME(3, 4),
+    ANIMCMD_FRAME(4, 4),
+    ANIMCMD_FRAME(5, 4),
+    ANIMCMD_FRAME(6, 4),
+    ANIMCMD_FRAME(7, 4),
+    ANIMCMD_FRAME(8, 4),
+    ANIMCMD_JUMP(7),
+};
+
+const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown17[] =
+{
+    gFieldEffectObjectImageAnim_850D05C,
+};
+
+const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown17 = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown17, gFieldEffectObjectPicTable_Unknown17, gDummySpriteAffineAnimTable, sub_81561D0};
+
+const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown18[] = {
+	obj_frame_tiles(gFieldEffectObjectPic_Unknown18_0),
+	obj_frame_tiles(gFieldEffectObjectPic_Unknown18_1),
+	obj_frame_tiles(gFieldEffectObjectPic_Unknown18_2),
+	obj_frame_tiles(gFieldEffectObjectPic_Unknown18_3),
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850D0C0[] =
+{
+    ANIMCMD_FRAME(0, 4),
+    ANIMCMD_FRAME(1, 4),
+    ANIMCMD_FRAME(2, 4),
+    ANIMCMD_FRAME(3, 4),
+    ANIMCMD_FRAME(2, 4),
+    ANIMCMD_FRAME(1, 4),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown18[] =
+{
+    gFieldEffectObjectImageAnim_850D0C0,
+};
+
+const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown18 = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown18, gFieldEffectObjectPicTable_Unknown18, gDummySpriteAffineAnimTable, sub_81561D0};
+
+const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown19[] = {
+	obj_frame_tiles(gFieldEffectObjectPic_Unknown19_0),
+	obj_frame_tiles(gFieldEffectObjectPic_Unknown19_1),
+	obj_frame_tiles(gFieldEffectObjectPic_Unknown19_2),
+	obj_frame_tiles(gFieldEffectObjectPic_Unknown19_3),
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850D118[] =
+{
+    ANIMCMD_FRAME(0, 4),
+    ANIMCMD_FRAME(1, 4),
+    ANIMCMD_FRAME(2, 4),
+    ANIMCMD_FRAME(3, 4),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown19[] =
+{
+    gFieldEffectObjectImageAnim_850D118,
+};
+
+const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown19 = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown19, gFieldEffectObjectPicTable_Unknown19, gDummySpriteAffineAnimTable, sub_81561D0};
+
+const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown29[] = {
+	obj_frame_tiles(gFieldEffectObjectPic_Unknown29_0),
+	obj_frame_tiles(gFieldEffectObjectPic_Unknown29_1),
+	obj_frame_tiles(gFieldEffectObjectPic_Unknown29_2),
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850D160[] =
+{
+    ANIMCMD_FRAME(0, 4),
+    ANIMCMD_FRAME(1, 4),
+    ANIMCMD_FRAME(2, 4),
+    ANIMCMD_END,
+};
+
+const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown29[] =
+{
+    gFieldEffectObjectImageAnim_850D160,
+};
+
+const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown29 = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_Unknown29, gFieldEffectObjectPicTable_Unknown29, gDummySpriteAffineAnimTable, sub_81559BC};
+
+const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown20[] = {
+	obj_frame_tiles(gFieldEffectObjectPic_Unknown20_0),
+	obj_frame_tiles(gFieldEffectObjectPic_Unknown20_1),
+	obj_frame_tiles(gFieldEffectObjectPic_Unknown20_2),
+	obj_frame_tiles(gFieldEffectObjectPic_Unknown20_3),
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850D1AC[] =
+{
+    ANIMCMD_FRAME(0, 4),
+    ANIMCMD_FRAME(1, 4),
+    ANIMCMD_FRAME(2, 4),
+    ANIMCMD_FRAME(3, 4),
+    ANIMCMD_FRAME(2, 4),
+    ANIMCMD_FRAME(1, 4),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown20[] =
+{
+    gFieldEffectObjectImageAnim_850D1AC,
+};
+
+const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown20 = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown20, gFieldEffectObjectPicTable_Unknown20, gDummySpriteAffineAnimTable, sub_81561D0};
+
+const union AffineAnimCmd gFieldEffectObjectRotScalAnim_850D1E4[] =
+{
+    AFFINEANIMCMD_FRAME(0xFF00, 0x100, -128, 0),
+    AFFINEANIMCMD_FRAME(0x1, 0x0, 0, 4),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 8),
+    AFFINEANIMCMD_FRAME(0xFFFF, 0x0, 0, 4),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 8),
+    AFFINEANIMCMD_FRAME(0xFFFF, 0x0, 0, 4),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 8),
+    AFFINEANIMCMD_FRAME(0x1, 0x0, 0, 4),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 8),
+    AFFINEANIMCMD_JUMP(1),
+};
+
+const union AffineAnimCmd gFieldEffectObjectRotScalAnim_850D234[] =
+{
+    AFFINEANIMCMD_FRAME(0x100, 0x100, -128, 0),
+    AFFINEANIMCMD_FRAME(0xFFFF, 0x0, 0, 4),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 8),
+    AFFINEANIMCMD_FRAME(0x1, 0x0, 0, 4),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 8),
+    AFFINEANIMCMD_FRAME(0x1, 0x0, 0, 4),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 8),
+    AFFINEANIMCMD_FRAME(0xFFFF, 0x0, 0, 4),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 8),
+    AFFINEANIMCMD_JUMP(1),
+};
+
+const union AffineAnimCmd *const gFieldEffectObjectRotScalAnimTable_Unknown21[] =
+{
+    gFieldEffectObjectRotScalAnim_850D1E4,
+    gFieldEffectObjectRotScalAnim_850D234,
+};
+
+const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown21 = {0x0, 0xFFFF, &gDummyOamData, gDummySpriteAnimTable, NULL, gFieldEffectObjectRotScalAnimTable_Unknown21, SpriteCallbackDummy};
+
+const struct SpriteFrameImage gFieldEffectObjectPicTable_BerryTreeGrowthSparkle[] = {
+	obj_frame_tiles(gFieldEffectObjectPic_BerryTreeGrowthSparkle_0),
+	obj_frame_tiles(gFieldEffectObjectPic_BerryTreeGrowthSparkle_1),
+	obj_frame_tiles(gFieldEffectObjectPic_BerryTreeGrowthSparkle_2),
+	obj_frame_tiles(gFieldEffectObjectPic_BerryTreeGrowthSparkle_3),
+	obj_frame_tiles(gFieldEffectObjectPic_BerryTreeGrowthSparkle_4),
+	obj_frame_tiles(gFieldEffectObjectPic_BerryTreeGrowthSparkle_5),
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850D2D4[] =
+{
+    ANIMCMD_FRAME(0, 8),
+    ANIMCMD_FRAME(1, 8),
+    ANIMCMD_FRAME(2, 8),
+    ANIMCMD_FRAME(3, 8),
+    ANIMCMD_FRAME(4, 8),
+    ANIMCMD_FRAME(5, 8),
+    ANIMCMD_LOOP(0),
+    ANIMCMD_FRAME(0, 4),
+    ANIMCMD_FRAME(1, 4),
+    ANIMCMD_FRAME(2, 4),
+    ANIMCMD_FRAME(3, 4),
+    ANIMCMD_FRAME(4, 4),
+    ANIMCMD_FRAME(5, 4),
+    ANIMCMD_LOOP(3),
+    ANIMCMD_FRAME(0, 8),
+    ANIMCMD_FRAME(1, 8),
+    ANIMCMD_FRAME(2, 8),
+    ANIMCMD_FRAME(3, 8),
+    ANIMCMD_FRAME(4, 8),
+    ANIMCMD_FRAME(5, 8),
+    ANIMCMD_END,
+};
+
+const union AnimCmd *const gFieldEffectObjectImageAnimTable_BerryTreeGrowthSparkle[] =
+{
+    gFieldEffectObjectImageAnim_850D2D4,
+};
+
+const struct SpriteTemplate gFieldEffectObjectTemplate_BerryTreeGrowthSparkle = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_BerryTreeGrowthSparkle, gFieldEffectObjectPicTable_BerryTreeGrowthSparkle, gDummySpriteAffineAnimTable, sub_81561D0};
+
+const struct SpriteFrameImage gFieldEffectObjectPicTable_TreeDisguise[] = {
+	obj_frame_tiles(gFieldEffectObjectPic_TreeDisguise_0),
+	obj_frame_tiles(gFieldEffectObjectPic_TreeDisguise_1),
+	obj_frame_tiles(gFieldEffectObjectPic_TreeDisguise_2),
+	obj_frame_tiles(gFieldEffectObjectPic_TreeDisguise_3),
+	obj_frame_tiles(gFieldEffectObjectPic_TreeDisguise_4),
+	obj_frame_tiles(gFieldEffectObjectPic_TreeDisguise_5),
+	obj_frame_tiles(gFieldEffectObjectPic_TreeDisguise_6),
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850D37C[] =
+{
+    ANIMCMD_FRAME(0, 16),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850D384[] =
+{
+    ANIMCMD_FRAME(0, 4),
+    ANIMCMD_FRAME(1, 4),
+    ANIMCMD_FRAME(2, 4),
+    ANIMCMD_FRAME(3, 4),
+    ANIMCMD_FRAME(4, 4),
+    ANIMCMD_FRAME(5, 4),
+    ANIMCMD_FRAME(6, 4),
+    ANIMCMD_END,
+};
+
+const union AnimCmd *const gFieldEffectObjectImageAnimTable_TreeDisguise[] =
+{
+    gFieldEffectObjectImageAnim_850D37C,
+    gFieldEffectObjectImageAnim_850D384,
+};
+
+const struct SpriteTemplate gFieldEffectObjectTemplate_TreeDisguise = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_TreeDisguise, gFieldEffectObjectPicTable_TreeDisguise, gDummySpriteAffineAnimTable, sub_8155C88};
+
+const struct SpriteFrameImage gFieldEffectObjectPicTable_MountainDisguise[] = {
+	obj_frame_tiles(gFieldEffectObjectPic_MountainDisguise_0),
+	obj_frame_tiles(gFieldEffectObjectPic_MountainDisguise_1),
+	obj_frame_tiles(gFieldEffectObjectPic_MountainDisguise_2),
+	obj_frame_tiles(gFieldEffectObjectPic_MountainDisguise_3),
+	obj_frame_tiles(gFieldEffectObjectPic_MountainDisguise_4),
+	obj_frame_tiles(gFieldEffectObjectPic_MountainDisguise_5),
+	obj_frame_tiles(gFieldEffectObjectPic_MountainDisguise_6),
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850D3FC[] =
+{
+    ANIMCMD_FRAME(0, 16),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850D404[] =
+{
+    ANIMCMD_FRAME(0, 4),
+    ANIMCMD_FRAME(1, 4),
+    ANIMCMD_FRAME(2, 4),
+    ANIMCMD_FRAME(3, 4),
+    ANIMCMD_FRAME(4, 4),
+    ANIMCMD_FRAME(5, 4),
+    ANIMCMD_FRAME(6, 4),
+    ANIMCMD_END,
+};
+
+const union AnimCmd *const gFieldEffectObjectImageAnimTable_MountainDisguise[] =
+{
+    gFieldEffectObjectImageAnim_850D3FC,
+    gFieldEffectObjectImageAnim_850D404,
+};
+
+const struct SpriteTemplate gFieldEffectObjectTemplate_MountainDisguise = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_MountainDisguise, gFieldEffectObjectPicTable_MountainDisguise, gDummySpriteAffineAnimTable, sub_8155C88};
+
+const struct SpriteFrameImage gFieldEffectObjectPicTable_SandDisguisePlaceholder[] = {
+	obj_frame_tiles(gFieldEffectObjectPic_SandDisguisePlaceholder_0),
+	obj_frame_tiles(gFieldEffectObjectPic_SandDisguisePlaceholder_1),
+	obj_frame_tiles(gFieldEffectObjectPic_SandDisguisePlaceholder_2),
+	obj_frame_tiles(gFieldEffectObjectPic_SandDisguisePlaceholder_3),
+	obj_frame_tiles(gFieldEffectObjectPic_SandDisguisePlaceholder_4),
+	obj_frame_tiles(gFieldEffectObjectPic_SandDisguisePlaceholder_5),
+	obj_frame_tiles(gFieldEffectObjectPic_SandDisguisePlaceholder_6),
+};
+
+const struct SpriteTemplate gFieldEffectObjectTemplate_SandDisguisePlaceholder = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_TreeDisguise, gFieldEffectObjectPicTable_SandDisguisePlaceholder, gDummySpriteAffineAnimTable, sub_8155C88};
+
+const struct SpriteFrameImage gFieldEffectObjectPicTable_Bird[] = {
+	obj_frame_tiles(gFieldEffectObjectPic_Bird),
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850D49C[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+const union AnimCmd *const gFieldEffectObjectImageAnimTable_Bird[] =
+{
+    gFieldEffectObjectImageAnim_850D49C,
+};
+
+const struct SpriteTemplate gFieldEffectObjectTemplate_Bird = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_Bird, gFieldEffectObjectPicTable_Bird, gDummySpriteAffineAnimTable, SpriteCallbackDummy};
+
+const struct SpriteFrameImage gFieldEffectObjectPicTable_ShortGrass[] = {
+	obj_frame_tiles(gFieldEffectObjectPic_ShortGrass_0),
+	obj_frame_tiles(gFieldEffectObjectPic_ShortGrass_1),
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850D4D0[] =
+{
+    ANIMCMD_FRAME(0, 4),
+    ANIMCMD_FRAME(1, 4),
+    ANIMCMD_END,
+};
+
+const union AnimCmd *const gFieldEffectObjectImageAnimTable_ShortGrass[] =
+{
+    gFieldEffectObjectImageAnim_850D4D0,
+};
+
+const struct SpriteTemplate gFieldEffectObjectTemplate_ShortGrass = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_ShortGrass, gFieldEffectObjectPicTable_ShortGrass, gDummySpriteAffineAnimTable, sub_8154A10};
+
+const struct SpriteFrameImage gFieldEffectObjectPicTable_HotSpringsWater[] = {
+	obj_frame_tiles(gFieldEffectObjectPic_HotSpringsWater),
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850D500[] =
+{
+    ANIMCMD_FRAME(0, 4),
+    ANIMCMD_END,
+};
+
+const union AnimCmd *const gFieldEffectObjectImageAnimTable_HotSpringsWater[] =
+{
+    gFieldEffectObjectImageAnim_850D500,
+};
+
+const struct SpriteTemplate gFieldEffectObjectTemplate_HotSpringsWater = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_HotSpringsWater, gFieldEffectObjectPicTable_HotSpringsWater, gDummySpriteAffineAnimTable, sub_8155158};
+
+const struct SpriteFrameImage gFieldEffectObjectPicTable_JumpOutOfAsh[] = {
+	obj_frame_tiles(gFieldEffectObjectPic_JumpOutOfAsh_0),
+	obj_frame_tiles(gFieldEffectObjectPic_JumpOutOfAsh_1),
+	obj_frame_tiles(gFieldEffectObjectPic_JumpOutOfAsh_2),
+	obj_frame_tiles(gFieldEffectObjectPic_JumpOutOfAsh_3),
+	obj_frame_tiles(gFieldEffectObjectPic_JumpOutOfAsh_4),
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850D54C[] =
+{
+    ANIMCMD_FRAME(0, 6),
+    ANIMCMD_FRAME(1, 6),
+    ANIMCMD_FRAME(2, 6),
+    ANIMCMD_FRAME(3, 6),
+    ANIMCMD_FRAME(4, 6),
+    ANIMCMD_END,
+};
+
+const union AnimCmd *const gFieldEffectObjectImageAnimTable_JumpOutOfAsh[] =
+{
+    gFieldEffectObjectImageAnim_850D54C,
+};
+
+const struct SpriteTemplate gFieldEffectObjectTemplate_JumpOutOfAsh = {0xFFFF, 0x100D, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_JumpOutOfAsh, gFieldEffectObjectPicTable_JumpOutOfAsh, gDummySpriteAffineAnimTable, sub_80B7CAC};
+
+const struct SpritePalette gFieldEffectObjectPaletteInfo2 = {gFieldEffectObjectPalette2, 0x100D};
+
+const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown33[] = {
+	obj_frame_tiles(gFieldEffectObjectPic_Unknown33_0),
+	obj_frame_tiles(gFieldEffectObjectPic_Unknown33_1),
+	obj_frame_tiles(gFieldEffectObjectPic_Unknown33_2),
+	obj_frame_tiles(gFieldEffectObjectPic_Unknown33_3),
+	obj_frame_tiles(gFieldEffectObjectPic_Unknown33_4),
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850D5B0[] =
+{
+    ANIMCMD_FRAME(0, 6),
+    ANIMCMD_FRAME(1, 6),
+    ANIMCMD_FRAME(2, 6),
+    ANIMCMD_FRAME(3, 6),
+    ANIMCMD_FRAME(4, 6),
+    ANIMCMD_END,
+};
+
+const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown33[] =
+{
+    gFieldEffectObjectImageAnim_850D5B0,
+};
+
+const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown33 = {0xFFFF, 0x100D, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown33, gFieldEffectObjectPicTable_Unknown33, gDummySpriteAffineAnimTable, sub_80B7A58};
+
+const struct SpriteFrameImage gFieldEffectObjectPicTable_Bubbles[] = {
+	obj_frame_tiles(gFieldEffectObjectPic_Bubbles_0),
+	obj_frame_tiles(gFieldEffectObjectPic_Bubbles_1),
+	obj_frame_tiles(gFieldEffectObjectPic_Bubbles_2),
+	obj_frame_tiles(gFieldEffectObjectPic_Bubbles_3),
+	obj_frame_tiles(gFieldEffectObjectPic_Bubbles_4),
+	obj_frame_tiles(gFieldEffectObjectPic_Bubbles_5),
+	obj_frame_tiles(gFieldEffectObjectPic_Bubbles_6),
+	obj_frame_tiles(gFieldEffectObjectPic_Bubbles_7),
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850D624[] =
+{
+    ANIMCMD_FRAME(0, 4),
+    ANIMCMD_FRAME(1, 4),
+    ANIMCMD_FRAME(2, 4),
+    ANIMCMD_FRAME(3, 6),
+    ANIMCMD_FRAME(4, 6),
+    ANIMCMD_FRAME(5, 4),
+    ANIMCMD_FRAME(6, 4),
+    ANIMCMD_FRAME(7, 4),
+    ANIMCMD_END,
+};
+
+const union AnimCmd *const gFieldEffectObjectImageAnimTable_Bubbles[] =
+{
+    gFieldEffectObjectImageAnim_850D624,
+};
+
+const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_Bubbles, gFieldEffectObjectPicTable_Bubbles, gDummySpriteAffineAnimTable, sub_8155AEC};
+
+const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown35[] = {
+	obj_frame_tiles(gFieldEffectObjectPic_Unknown35_0),
+	obj_frame_tiles(gFieldEffectObjectPic_Unknown35_1),
+};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850D674[] =
+{
+    ANIMCMD_FRAME(0, 3),
+    ANIMCMD_FRAME(1, 5),
+    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_END,
+};
+
+const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown35[] =
+{
+    gFieldEffectObjectImageAnim_850D674,
+};
+
+const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown35 = {0xFFFF, 0x100F, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown35, gFieldEffectObjectPicTable_Unknown35, gDummySpriteAffineAnimTable, sub_8155E50};
+
+const struct SpritePalette gFieldEffectObjectPaletteInfo3 = {gFieldEffectObjectPalette3, 0x100F};
+
+const union AnimCmd gFieldEffectObjectImageAnim_850D6A8[] = {
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+const union AnimCmd *const gFieldEffectObjectImageAnimTable_Rayquaza[] = {
+    gFieldEffectObjectImageAnim_850D6A8,
+};
+
+const struct SpriteFrameImage  gFieldEffectObjectPicTable_Rayquaza[] = {
+	{.data = (u8*)gEventObjectPic_Rayquaza_0, .size = (sizeof gEventObjectPic_Rayquaza_0) / 4}
+};
+
+const struct SpriteTemplate gFieldEffectObjectTemplate_Rayquaza = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_Rayquaza, gFieldEffectObjectPicTable_Rayquaza, gDummySpriteAffineAnimTable, sub_8155F80};
+
+const struct SpritePalette gFieldEffectObjectPaletteInfoUnused = {gEventObjectPalette2, 0x1011};
+
+#endif //GUARD_FIELD_EFFECT_OBJECTS_H
diff --git a/src/data/field_event_obj/movement_action_func_tables.h b/src/data/field_event_obj/movement_action_func_tables.h
new file mode 100755
index 000000000..b24f5dea4
--- /dev/null
+++ b/src/data/field_event_obj/movement_action_func_tables.h
@@ -0,0 +1,1518 @@
+#ifndef GUARD_MOVEMENT_ACTION_FUNC_TABLES_H
+#define GUARD_MOVEMENT_ACTION_FUNC_TABLES_H
+
+u8 MovementAction_FaceDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_FaceDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_PauseSpriteAnim(struct EventObject *, struct Sprite *);
+u8 MovementAction_FaceUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_FaceLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_FaceRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkSlowDiagonalUpLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkSlowDiagonalUpLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkSlowDiagonalUpRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkSlowDiagonalUpRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkSlowDiagonalDownLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkSlowDiagonalDownLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkSlowDiagonalDownRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkSlowDiagonalDownRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkSlowDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkSlowDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkSlowUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkSlowUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkSlowLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkSlowLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkSlowRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkSlowRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkNormalDiagonalUpLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkNormalDiagonalUpLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkNormalDiagonalUpRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkNormalDiagonalUpRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkNormalDiagonalDownLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkNormalDiagonalDownLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkNormalDiagonalDownRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkNormalDiagonalDownRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkNormalDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkNormalDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkNormalUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkNormalUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkNormalLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkNormalLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkNormalRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkNormalRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_Jump2Down_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_Jump2Down_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_Jump2Up_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_Jump2Up_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_Jump2Left_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_Jump2Left_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_Jump2Right_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_Jump2Right_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_Delay1_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_Delay_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_Finish(struct EventObject *, struct Sprite *);
+u8 MovementAction_Delay2_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_Delay4_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_Delay8_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_Delay16_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkFastDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkFastDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkFastUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkFastUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkFastLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkFastLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkFastRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkFastRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceSlowDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceSlow_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceSlowUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceSlowLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceSlowRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceNormalDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkInPlace_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceNormalUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceNormalLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceNormalRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceFastDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceFastUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceFastLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceFastRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceFastestDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceFastestUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceFastestLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceFastestRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_RideWaterCurrentDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_RideWaterCurrentDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_RideWaterCurrentUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_RideWaterCurrentUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_RideWaterCurrentLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_RideWaterCurrentLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_RideWaterCurrentRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_RideWaterCurrentRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkFastestDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkFastestDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkFastestUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkFastestUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkFastestLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkFastestLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkFastestRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkFastestRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_SlideDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_SlideDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_SlideUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_SlideUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_SlideLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_SlideLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_SlideRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_SlideRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_PlayerRunDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_PlayerRunDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_PlayerRunUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_PlayerRunUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_PlayerRunLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_PlayerRunLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_PlayerRunRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_PlayerRunRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_StartAnimInDirection_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WaitSpriteAnim(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpSpecialDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpSpecialDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpSpecialUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpSpecialUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpSpecialLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpSpecialLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpSpecialRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpSpecialRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_FacePlayer_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_FaceAwayPlayer_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_LockFacingDirection_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_UnlockFacingDirection_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceDownUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceDownUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceUpDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceUpDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceLeftRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceLeftRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceRightLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceRightLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_FaceOriginalDirection_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_NurseJoyBowDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_EnableJumpLandingGroundEffect_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_DisableJumpLandingGroundEffect_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_DisableAnimation_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_RestoreAnimation_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_SetInvisible_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_SetVisible_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_EmoteExclamationMark_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_EmoteQuestionMark_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_EmoteHeart_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_RevealTrainer_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_RevealTrainer_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_RockSmashBreak_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_RockSmashBreak_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_RockSmashBreak_Step2(struct EventObject *, struct Sprite *);
+u8 MovementAction_CutTree_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_CutTree_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_CutTree_Step2(struct EventObject *, struct Sprite *);
+u8 MovementAction_SetFixedPriority_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_ClearFixedPriority_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_InitAffineAnim_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_ClearAffineAnim_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_Unknown1_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_Unknown2_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkDownStartAffine_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkDownStartAffine_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkDownAffine_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkDownAffine_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkLeftAffine_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkLeftAffine_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkRightAffine_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkRightAffine_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieFaceDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieFaceUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieFaceLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieFaceRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroPopWheelieDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroPopWheelieUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroPopWheelieLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroPopWheelieRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroEndWheelieFaceDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroEndWheelieFaceUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroEndWheelieFaceLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroEndWheelieFaceRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_UnusedAcroActionDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_UnusedAcroActionUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_UnusedAcroActionLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_UnusedAcroActionRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_Figure8_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_Figure8_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopFaceDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopFaceDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopFaceUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopFaceUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopFaceLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopFaceLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopFaceRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopFaceRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieJumpDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieJumpDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieJumpUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieJumpUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieJumpLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieJumpLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieJumpRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieJumpRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieInPlaceDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieInPlaceUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieInPlaceLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieInPlaceRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroPopWheelieMoveDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroPopWheelieMoveDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroPopWheelieMoveUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroPopWheelieMoveUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroPopWheelieMoveLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroPopWheelieMoveLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroPopWheelieMoveRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroPopWheelieMoveRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieMoveDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieMoveDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieMoveUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieMoveUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieMoveLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieMoveLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieMoveRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieMoveRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroEndWheelieMoveDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroEndWheelieMoveDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroEndWheelieMoveUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroEndWheelieMoveUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroEndWheelieMoveLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroEndWheelieMoveLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroEndWheelieMoveRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroEndWheelieMoveRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_Levitate_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_StopLevitate_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_DestroyExtraTaskIfAtTop_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_StoreAndLockAnim_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_Finish(struct EventObject *, struct Sprite *);
+u8 MovementAction_FreeAndUnlockAnim_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_FlyUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_FlyUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_Fly_Finish(struct EventObject *, struct Sprite *);
+u8 MovementAction_FlyDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_FlyDown_Step1(struct EventObject *, struct Sprite *);
+
+u8 (*const gMovementActionFuncs_FaceDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_FaceUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_FaceLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_FaceRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkSlowDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkSlowUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkSlowLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkSlowRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkNormalDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkNormalUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkNormalLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkNormalRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_Jump2Down[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_Jump2Up[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_Jump2Left[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_Jump2Right[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_Delay1[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_Delay2[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_Delay4[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_Delay8[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_Delay16[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkFastDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkFastUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkFastLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkFastRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceSlowDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceSlowUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceSlowLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceSlowRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceNormalDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceNormalUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceNormalLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceNormalRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceFastDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceFastUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceFastLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceFastRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceFastestDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceFastestUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceFastestLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceFastestRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_RideWaterCurrentDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_RideWaterCurrentUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_RideWaterCurrentLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_RideWaterCurrentRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkFastestDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkFastestUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkFastestLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkFastestRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_SlideDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_SlideUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_SlideLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_SlideRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_PlayerRunDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_PlayerRunUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_PlayerRunLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_PlayerRunRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_StartAnimInDirection[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpSpecialDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpSpecialUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpSpecialLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpSpecialRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_FacePlayer[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_FaceAwayPlayer[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_LockFacingDirection[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_UnlockFacingDirection[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpInPlaceDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpInPlaceUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpInPlaceLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpInPlaceRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpInPlaceDownUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpInPlaceUpDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpInPlaceLeftRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpInPlaceRightLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_FaceOriginalDirection[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_NurseJoyBowDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_EnableJumpLandingGroundEffect[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_DisableJumpLandingGroundEffect[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_DisableAnimation[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_RestoreAnimation[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_SetInvisible[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_SetVisible[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_EmoteExclamationMark[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_EmoteQuestionMark[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_EmoteHeart[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_RevealTrainer[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_RockSmashBreak[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_CutTree[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_SetFixedPriority[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_ClearFixedPriority[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_InitAffineAnim[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_ClearAffineAnim[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_Unknown1[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_Unknown2[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkDownStartAffine[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkDownAffine[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieFaceDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieFaceUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieFaceLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieFaceRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroPopWheelieDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroPopWheelieUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroPopWheelieLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroPopWheelieRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroEndWheelieFaceDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroEndWheelieFaceUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroEndWheelieFaceLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroEndWheelieFaceRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieHopFaceDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieHopFaceUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieHopFaceLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieHopFaceRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieHopDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieHopUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieHopLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieHopRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieJumpDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieJumpUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieJumpLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieJumpRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieInPlaceDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieInPlaceUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieInPlaceLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieInPlaceRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroPopWheelieMoveDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroPopWheelieMoveUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroPopWheelieMoveLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroPopWheelieMoveRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieMoveDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieMoveUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieMoveLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieMoveRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroEndWheelieMoveDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroEndWheelieMoveUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroEndWheelieMoveLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroEndWheelieMoveRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkNormalDiagonalUpLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkNormalDiagonalUpRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkNormalDiagonalDownLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkNormalDiagonalDownRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkSlowDiagonalUpLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkSlowDiagonalUpRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkSlowDiagonalDownLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkSlowDiagonalDownRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_StoreAndLockAnim[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_FreeAndUnlockAnim[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkLeftAffine[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkRightAffine[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_Levitate[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_StopLevitate[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_DestroyExtraTaskIfAtTop[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_Figure8[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_FlyUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_FlyDown[])(struct EventObject *, struct Sprite *);
+
+u8 (*const *const gMovementActionFuncs[])(struct EventObject *, struct Sprite *) = {
+	gMovementActionFuncs_FaceDown,                // MOVEMENT_ACTION_FACE_DOWN
+	gMovementActionFuncs_FaceUp,                  // MOVEMENT_ACTION_FACE_UP
+	gMovementActionFuncs_FaceLeft,                // MOVEMENT_ACTION_FACE_LEFT
+	gMovementActionFuncs_FaceRight,               // MOVEMENT_ACTION_FACE_RIGHT
+	gMovementActionFuncs_WalkSlowDown,            // MOVEMENT_ACTION_WALK_SLOW_DOWN
+	gMovementActionFuncs_WalkSlowUp,              // MOVEMENT_ACTION_WALK_SLOW_UP
+	gMovementActionFuncs_WalkSlowLeft,            // MOVEMENT_ACTION_WALK_SLOW_LEFT
+	gMovementActionFuncs_WalkSlowRight,           // MOVEMENT_ACTION_WALK_SLOW_RIGHT
+	gMovementActionFuncs_WalkNormalDown,          // MOVEMENT_ACTION_WALK_NORMAL_DOWN
+	gMovementActionFuncs_WalkNormalUp,            // MOVEMENT_ACTION_WALK_NORMAL_UP
+	gMovementActionFuncs_WalkNormalLeft,          // MOVEMENT_ACTION_WALK_NORMAL_LEFT
+	gMovementActionFuncs_WalkNormalRight,         // MOVEMENT_ACTION_WALK_NORMAL_RIGHT
+	gMovementActionFuncs_Jump2Down,               // MOVEMENT_ACTION_JUMP_2_DOWN
+	gMovementActionFuncs_Jump2Up,                 // MOVEMENT_ACTION_JUMP_2_UP
+	gMovementActionFuncs_Jump2Left,               // MOVEMENT_ACTION_JUMP_2_LEFT
+	gMovementActionFuncs_Jump2Right,              // MOVEMENT_ACTION_JUMP_2_RIGHT
+	gMovementActionFuncs_Delay1,                  // MOVEMENT_ACTION_DELAY_1
+	gMovementActionFuncs_Delay2,                  // MOVEMENT_ACTION_DELAY_2
+	gMovementActionFuncs_Delay4,                  // MOVEMENT_ACTION_DELAY_4
+	gMovementActionFuncs_Delay8,                  // MOVEMENT_ACTION_DELAY_8
+	gMovementActionFuncs_Delay16,                 // MOVEMENT_ACTION_DELAY_16
+	gMovementActionFuncs_WalkFastDown,            // MOVEMENT_ACTION_WALK_FAST_DOWN
+	gMovementActionFuncs_WalkFastUp,              // MOVEMENT_ACTION_WALK_FAST_UP
+	gMovementActionFuncs_WalkFastLeft,            // MOVEMENT_ACTION_WALK_FAST_LEFT
+	gMovementActionFuncs_WalkFastRight,           // MOVEMENT_ACTION_WALK_FAST_RIGHT
+	gMovementActionFuncs_WalkInPlaceSlowDown,     // MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN
+	gMovementActionFuncs_WalkInPlaceSlowUp,       // MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP
+	gMovementActionFuncs_WalkInPlaceSlowLeft,     // MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT
+	gMovementActionFuncs_WalkInPlaceSlowRight,    // MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT
+	gMovementActionFuncs_WalkInPlaceNormalDown,   // MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN
+	gMovementActionFuncs_WalkInPlaceNormalUp,     // MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP
+	gMovementActionFuncs_WalkInPlaceNormalLeft,   // MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT
+	gMovementActionFuncs_WalkInPlaceNormalRight,  // MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT
+	gMovementActionFuncs_WalkInPlaceFastDown,     // MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN
+	gMovementActionFuncs_WalkInPlaceFastUp,       // MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP
+	gMovementActionFuncs_WalkInPlaceFastLeft,     // MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT
+	gMovementActionFuncs_WalkInPlaceFastRight,    // MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT
+	gMovementActionFuncs_WalkInPlaceFastestDown,  // MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN
+	gMovementActionFuncs_WalkInPlaceFastestUp,    // MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP
+	gMovementActionFuncs_WalkInPlaceFastestLeft,  // MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT
+	gMovementActionFuncs_WalkInPlaceFastestRight, // MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT
+	gMovementActionFuncs_RideWaterCurrentDown,    // MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN
+	gMovementActionFuncs_RideWaterCurrentUp,      // MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP
+	gMovementActionFuncs_RideWaterCurrentLeft,    // MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT
+	gMovementActionFuncs_RideWaterCurrentRight,   // MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT
+	gMovementActionFuncs_WalkFastestDown,         // MOVEMENT_ACTION_WALK_FASTEST_DOWN
+	gMovementActionFuncs_WalkFastestUp,           // MOVEMENT_ACTION_WALK_FASTEST_UP
+	gMovementActionFuncs_WalkFastestLeft,         // MOVEMENT_ACTION_WALK_FASTEST_LEFT
+	gMovementActionFuncs_WalkFastestRight,        // MOVEMENT_ACTION_WALK_FASTEST_RIGHT
+	gMovementActionFuncs_SlideDown,               // MOVEMENT_ACTION_SLIDE_DOWN
+	gMovementActionFuncs_SlideUp,                 // MOVEMENT_ACTION_SLIDE_UP
+	gMovementActionFuncs_SlideLeft,               // MOVEMENT_ACTION_SLIDE_LEFT
+	gMovementActionFuncs_SlideRight,              // MOVEMENT_ACTION_SLIDE_RIGHT
+	gMovementActionFuncs_PlayerRunDown,           // MOVEMENT_ACTION_PLAYER_RUN_DOWN
+	gMovementActionFuncs_PlayerRunUp,             // MOVEMENT_ACTION_PLAYER_RUN_UP
+	gMovementActionFuncs_PlayerRunLeft,           // MOVEMENT_ACTION_PLAYER_RUN_LEFT
+	gMovementActionFuncs_PlayerRunRight,          // MOVEMENT_ACTION_PLAYER_RUN_RIGHT
+	gMovementActionFuncs_StartAnimInDirection,    // MOVEMENT_ACTION_START_ANIM_IN_DIRECTION
+	gMovementActionFuncs_JumpSpecialDown,         // MOVEMENT_ACTION_JUMP_SPECIAL_DOWN
+	gMovementActionFuncs_JumpSpecialUp,           // MOVEMENT_ACTION_JUMP_SPECIAL_UP
+	gMovementActionFuncs_JumpSpecialLeft,         // MOVEMENT_ACTION_JUMP_SPECIAL_LEFT
+	gMovementActionFuncs_JumpSpecialRight,        // MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT
+	gMovementActionFuncs_FacePlayer,              // MOVEMENT_ACTION_FACE_PLAYER
+	gMovementActionFuncs_FaceAwayPlayer,          // MOVEMENT_ACTION_FACE_AWAY_PLAYER
+	gMovementActionFuncs_LockFacingDirection,     // MOVEMENT_ACTION_LOCK_FACING_DIRECTION
+	gMovementActionFuncs_UnlockFacingDirection,   // MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION
+	gMovementActionFuncs_JumpDown,                // MOVEMENT_ACTION_JUMP_DOWN
+	gMovementActionFuncs_JumpUp,                  // MOVEMENT_ACTION_JUMP_UP
+	gMovementActionFuncs_JumpLeft,                // MOVEMENT_ACTION_JUMP_LEFT
+	gMovementActionFuncs_JumpRight,               // MOVEMENT_ACTION_JUMP_RIGHT
+	gMovementActionFuncs_JumpInPlaceDown,         // MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN
+	gMovementActionFuncs_JumpInPlaceUp,           // MOVEMENT_ACTION_JUMP_IN_PLACE_UP
+	gMovementActionFuncs_JumpInPlaceLeft,         // MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT
+	gMovementActionFuncs_JumpInPlaceRight,        // MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT
+	gMovementActionFuncs_JumpInPlaceDownUp,       // MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP
+	gMovementActionFuncs_JumpInPlaceUpDown,       // MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN
+	gMovementActionFuncs_JumpInPlaceLeftRight,    // MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT
+	gMovementActionFuncs_JumpInPlaceRightLeft,    // MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT
+	gMovementActionFuncs_FaceOriginalDirection,   // MOVEMENT_ACTION_FACE_ORIGINAL_DIRECTION
+	gMovementActionFuncs_NurseJoyBowDown,         // MOVEMENT_ACTION_NURSE_JOY_BOW_DOWN
+	gMovementActionFuncs_EnableJumpLandingGroundEffect,  // MOVEMENT_ACTION_ENABLE_JUMP_LANDING_GROUND_EFFECT
+	gMovementActionFuncs_DisableJumpLandingGroundEffect, // MOVEMENT_ACTION_DISABLE_JUMP_LANDING_GROUND_EFFECT
+	gMovementActionFuncs_DisableAnimation,        // MOVEMENT_ACTION_DISABLE_ANIMATION
+	gMovementActionFuncs_RestoreAnimation,        // MOVEMENT_ACTION_RESTORE_ANIMATION
+	gMovementActionFuncs_SetInvisible,            // MOVEMENT_ACTION_SET_INVISIBLE
+	gMovementActionFuncs_SetVisible,              // MOVEMENT_ACTION_SET_VISIBLE
+	gMovementActionFuncs_EmoteExclamationMark,    // MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK
+	gMovementActionFuncs_EmoteQuestionMark,       // MOVEMENT_ACTION_EMOTE_QUESTION_MARK
+	gMovementActionFuncs_EmoteHeart,              // MOVEMENT_ACTION_EMOTE_HEART
+	gMovementActionFuncs_RevealTrainer,           // MOVEMENT_ACTION_REVEAL_TRAINER
+	gMovementActionFuncs_RockSmashBreak,          // MOVEMENT_ACTION_ROCK_SMASH_BREAK
+	gMovementActionFuncs_CutTree,                 // MOVEMENT_ACTION_CUT_TREE
+	gMovementActionFuncs_SetFixedPriority,        // MOVEMENT_ACTION_SET_FIXED_PRIORITY
+	gMovementActionFuncs_ClearFixedPriority,      // MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY
+	gMovementActionFuncs_InitAffineAnim,          // MOVEMENT_ACTION_INIT_AFFINE_ANIM
+	gMovementActionFuncs_ClearAffineAnim,         // MOVEMENT_ACTION_CLEAR_AFFINE_ANIM
+	gMovementActionFuncs_Unknown1,                // MOVEMENT_ACTION_UNKNOWN1
+	gMovementActionFuncs_Unknown2,                // MOVEMENT_ACTION_UNKNOWN2
+	gMovementActionFuncs_WalkDownStartAffine,     // MOVEMENT_ACTION_WALK_DOWN_START_AFFINE
+	gMovementActionFuncs_WalkDownAffine,          // MOVEMENT_ACTION_WALK_DOWN_AFFINE
+	gMovementActionFuncs_AcroWheelieFaceDown,     // MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN
+	gMovementActionFuncs_AcroWheelieFaceUp,       // MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP
+	gMovementActionFuncs_AcroWheelieFaceLeft,     // MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT
+	gMovementActionFuncs_AcroWheelieFaceRight,    // MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT
+	gMovementActionFuncs_AcroPopWheelieDown,      // MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN
+	gMovementActionFuncs_AcroPopWheelieUp,        // MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP
+	gMovementActionFuncs_AcroPopWheelieLeft,      // MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT
+	gMovementActionFuncs_AcroPopWheelieRight,     // MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT
+	gMovementActionFuncs_AcroEndWheelieFaceDown,  // MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN
+	gMovementActionFuncs_AcroEndWheelieFaceUp,    // MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP
+	gMovementActionFuncs_AcroEndWheelieFaceLeft,  // MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT
+	gMovementActionFuncs_AcroEndWheelieFaceRight, // MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT
+	gMovementActionFuncs_AcroWheelieHopFaceDown,  // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN
+	gMovementActionFuncs_AcroWheelieHopFaceUp,    // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP
+	gMovementActionFuncs_AcroWheelieHopFaceLeft,  // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT
+	gMovementActionFuncs_AcroWheelieHopFaceRight, // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT
+	gMovementActionFuncs_AcroWheelieHopDown,      // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN
+	gMovementActionFuncs_AcroWheelieHopUp,        // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP
+	gMovementActionFuncs_AcroWheelieHopLeft,      // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT
+	gMovementActionFuncs_AcroWheelieHopRight,     // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT
+	gMovementActionFuncs_AcroWheelieJumpDown,     // MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN
+	gMovementActionFuncs_AcroWheelieJumpUp,       // MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP
+	gMovementActionFuncs_AcroWheelieJumpLeft,     // MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT
+	gMovementActionFuncs_AcroWheelieJumpRight,    // MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT
+	gMovementActionFuncs_AcroWheelieInPlaceDown,  // MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN
+	gMovementActionFuncs_AcroWheelieInPlaceUp,    // MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP
+	gMovementActionFuncs_AcroWheelieInPlaceLeft,  // MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT
+	gMovementActionFuncs_AcroWheelieInPlaceRight, // MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT
+	gMovementActionFuncs_AcroPopWheelieMoveDown,  // MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN
+	gMovementActionFuncs_AcroPopWheelieMoveUp,    // MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP
+	gMovementActionFuncs_AcroPopWheelieMoveLeft,  // MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT
+	gMovementActionFuncs_AcroPopWheelieMoveRight, // MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT
+	gMovementActionFuncs_AcroWheelieMoveDown,     // MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN
+	gMovementActionFuncs_AcroWheelieMoveUp,       // MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP
+	gMovementActionFuncs_AcroWheelieMoveLeft,     // MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT
+	gMovementActionFuncs_AcroWheelieMoveRight,    // MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT
+	gMovementActionFuncs_AcroEndWheelieMoveDown,  // MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN
+	gMovementActionFuncs_AcroEndWheelieMoveUp,    // MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP
+	gMovementActionFuncs_AcroEndWheelieMoveLeft,  // MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT
+	gMovementActionFuncs_AcroEndWheelieMoveRight, // MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT
+	gMovementActionFuncs_WalkNormalDiagonalUpLeft,    // MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_LEFT
+	gMovementActionFuncs_WalkNormalDiagonalUpRight,   // MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_RIGHT
+	gMovementActionFuncs_WalkNormalDiagonalDownLeft,  // MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_LEFT
+	gMovementActionFuncs_WalkNormalDiagonalDownRight, // MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_RIGHT
+	gMovementActionFuncs_WalkSlowDiagonalUpLeft,      // MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_LEFT
+	gMovementActionFuncs_WalkSlowDiagonalUpRight,     // MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_RIGHT
+	gMovementActionFuncs_WalkSlowDiagonalDownLeft,    // MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_LEFT
+	gMovementActionFuncs_WalkSlowDiagonalDownRight,   // MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_RIGHT
+	gMovementActionFuncs_StoreAndLockAnim,            // MOVEMENT_ACTION_STORE_AND_LOCK_ANIM
+	gMovementActionFuncs_FreeAndUnlockAnim,           // MOVEMENT_ACTION_FREE_AND_UNLOCK_ANIM
+	gMovementActionFuncs_WalkLeftAffine,              // MOVEMENT_ACTION_WALK_LEFT_AFFINE
+	gMovementActionFuncs_WalkRightAffine,             // MOVEMENT_ACTION_WALK_RIGHT_AFFINE
+	gMovementActionFuncs_Levitate,                    // MOVEMENT_ACTION_LEVITATE
+	gMovementActionFuncs_StopLevitate,                // MOVEMENT_ACTION_STOP_LEVITATE
+	gMovementActionFuncs_DestroyExtraTaskIfAtTop,     // MOVEMENT_ACTION_DESTROY_EXTRA_TASK_IF_AT_TOP
+	gMovementActionFuncs_Figure8,                     // MOVEMENT_ACTION_FIGURE_8
+	gMovementActionFuncs_FlyUp,                       // MOVEMENT_ACTION_FLY_UP
+	gMovementActionFuncs_FlyDown,                     // MOVEMENT_ACTION_FLY_DOWN
+};
+
+u8 (*const gMovementActionFuncs_FaceDown[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_FaceDown_Step0,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_FaceUp[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_FaceUp_Step0,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_FaceLeft[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_FaceLeft_Step0,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_FaceRight[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_FaceRight_Step0,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gUnknown_0850DEE8[])(u8) = {
+	GetMoveDirectionAnimNum,
+	GetMoveDirectionFastAnimNum,
+	GetMoveDirectionFastAnimNum,
+	GetMoveDirectionFasterAnimNum,
+	GetMoveDirectionFastestAnimNum,
+};
+
+u8 (*const gMovementActionFuncs_WalkSlowDiagonalUpLeft[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_WalkSlowDiagonalUpLeft_Step0,
+	MovementAction_WalkSlowDiagonalUpLeft_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_WalkSlowDiagonalUpRight[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_WalkSlowDiagonalUpRight_Step0,
+	MovementAction_WalkSlowDiagonalUpRight_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_WalkSlowDiagonalDownLeft[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_WalkSlowDiagonalDownLeft_Step0,
+	MovementAction_WalkSlowDiagonalDownLeft_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_WalkSlowDiagonalDownRight[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_WalkSlowDiagonalDownRight_Step0,
+	MovementAction_WalkSlowDiagonalDownRight_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_WalkSlowDown[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_WalkSlowDown_Step0,
+	MovementAction_WalkSlowDown_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_WalkSlowUp[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_WalkSlowUp_Step0,
+	MovementAction_WalkSlowUp_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_WalkSlowLeft[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_WalkSlowLeft_Step0,
+	MovementAction_WalkSlowLeft_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_WalkSlowRight[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_WalkSlowRight_Step0,
+	MovementAction_WalkSlowRight_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_WalkNormalDiagonalUpLeft[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_WalkNormalDiagonalUpLeft_Step0,
+	MovementAction_WalkNormalDiagonalUpLeft_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_WalkNormalDiagonalUpRight[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_WalkNormalDiagonalUpRight_Step0,
+	MovementAction_WalkNormalDiagonalUpRight_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_WalkNormalDiagonalDownLeft[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_WalkNormalDiagonalDownLeft_Step0,
+	MovementAction_WalkNormalDiagonalDownLeft_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_WalkNormalDiagonalDownRight[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_WalkNormalDiagonalDownRight_Step0,
+	MovementAction_WalkNormalDiagonalDownRight_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_WalkNormalDown[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_WalkNormalDown_Step0,
+	MovementAction_WalkNormalDown_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_WalkNormalUp[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_WalkNormalUp_Step0,
+	MovementAction_WalkNormalUp_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_WalkNormalLeft[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_WalkNormalLeft_Step0,
+	MovementAction_WalkNormalLeft_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_WalkNormalRight[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_WalkNormalRight_Step0,
+	MovementAction_WalkNormalRight_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+const s16 gUnknown_0850DFBC[] = {0, 1, 1};
+const s16 gUnknown_0850DFC2[] = {0, 0, 1};
+
+u8 (*const gMovementActionFuncs_Jump2Down[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_Jump2Down_Step0,
+	MovementAction_Jump2Down_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_Jump2Up[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_Jump2Up_Step0,
+	MovementAction_Jump2Up_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_Jump2Left[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_Jump2Left_Step0,
+	MovementAction_Jump2Left_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_Jump2Right[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_Jump2Right_Step0,
+	MovementAction_Jump2Right_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_Delay1[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_Delay1_Step0,
+	MovementAction_Delay_Step1,
+	MovementAction_Finish,
+};
+
+u8 (*const gMovementActionFuncs_Delay2[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_Delay2_Step0,
+	MovementAction_Delay_Step1,
+	MovementAction_Finish,
+};
+
+u8 (*const gMovementActionFuncs_Delay4[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_Delay4_Step0,
+	MovementAction_Delay_Step1,
+	MovementAction_Finish,
+};
+
+u8 (*const gMovementActionFuncs_Delay8[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_Delay8_Step0,
+	MovementAction_Delay_Step1,
+	MovementAction_Finish,
+};
+
+u8 (*const gMovementActionFuncs_Delay16[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_Delay16_Step0,
+	MovementAction_Delay_Step1,
+	MovementAction_Finish,
+};
+
+u8 (*const gMovementActionFuncs_WalkFastDown[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_WalkFastDown_Step0,
+	MovementAction_WalkFastDown_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_WalkFastUp[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_WalkFastUp_Step0,
+	MovementAction_WalkFastUp_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_WalkFastLeft[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_WalkFastLeft_Step0,
+	MovementAction_WalkFastLeft_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_WalkFastRight[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_WalkFastRight_Step0,
+	MovementAction_WalkFastRight_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_WalkInPlaceSlowDown[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_WalkInPlaceSlowDown_Step0,
+	MovementAction_WalkInPlaceSlow_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_WalkInPlaceSlowUp[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_WalkInPlaceSlowUp_Step0,
+	MovementAction_WalkInPlaceSlow_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_WalkInPlaceSlowLeft[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_WalkInPlaceSlowLeft_Step0,
+	MovementAction_WalkInPlaceSlow_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_WalkInPlaceSlowRight[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_WalkInPlaceSlowRight_Step0,
+	MovementAction_WalkInPlaceSlow_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_WalkInPlaceNormalDown[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_WalkInPlaceNormalDown_Step0,
+	MovementAction_WalkInPlace_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_WalkInPlaceNormalUp[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_WalkInPlaceNormalUp_Step0,
+	MovementAction_WalkInPlace_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_WalkInPlaceNormalLeft[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_WalkInPlaceNormalLeft_Step0,
+	MovementAction_WalkInPlace_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_WalkInPlaceNormalRight[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_WalkInPlaceNormalRight_Step0,
+	MovementAction_WalkInPlace_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_WalkInPlaceFastDown[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_WalkInPlaceFastDown_Step0,
+	MovementAction_WalkInPlace_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_WalkInPlaceFastUp[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_WalkInPlaceFastUp_Step0,
+	MovementAction_WalkInPlace_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_WalkInPlaceFastLeft[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_WalkInPlaceFastLeft_Step0,
+	MovementAction_WalkInPlace_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_WalkInPlaceFastRight[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_WalkInPlaceFastRight_Step0,
+	MovementAction_WalkInPlace_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_WalkInPlaceFastestDown[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_WalkInPlaceFastestDown_Step0,
+	MovementAction_WalkInPlace_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_WalkInPlaceFastestUp[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_WalkInPlaceFastestUp_Step0,
+	MovementAction_WalkInPlace_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_WalkInPlaceFastestLeft[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_WalkInPlaceFastestLeft_Step0,
+	MovementAction_WalkInPlace_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_WalkInPlaceFastestRight[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_WalkInPlaceFastestRight_Step0,
+	MovementAction_WalkInPlace_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_RideWaterCurrentDown[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_RideWaterCurrentDown_Step0,
+	MovementAction_RideWaterCurrentDown_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_RideWaterCurrentUp[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_RideWaterCurrentUp_Step0,
+	MovementAction_RideWaterCurrentUp_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_RideWaterCurrentLeft[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_RideWaterCurrentLeft_Step0,
+	MovementAction_RideWaterCurrentLeft_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_RideWaterCurrentRight[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_RideWaterCurrentRight_Step0,
+	MovementAction_RideWaterCurrentRight_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_WalkFastestDown[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_WalkFastestDown_Step0,
+	MovementAction_WalkFastestDown_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_WalkFastestUp[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_WalkFastestUp_Step0,
+	MovementAction_WalkFastestUp_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_WalkFastestLeft[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_WalkFastestLeft_Step0,
+	MovementAction_WalkFastestLeft_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_WalkFastestRight[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_WalkFastestRight_Step0,
+	MovementAction_WalkFastestRight_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_SlideDown[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_SlideDown_Step0,
+	MovementAction_SlideDown_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_SlideUp[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_SlideUp_Step0,
+	MovementAction_SlideUp_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_SlideLeft[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_SlideLeft_Step0,
+	MovementAction_SlideLeft_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_SlideRight[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_SlideRight_Step0,
+	MovementAction_SlideRight_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_PlayerRunDown[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_PlayerRunDown_Step0,
+	MovementAction_PlayerRunDown_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_PlayerRunUp[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_PlayerRunUp_Step0,
+	MovementAction_PlayerRunUp_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_PlayerRunLeft[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_PlayerRunLeft_Step0,
+	MovementAction_PlayerRunLeft_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_PlayerRunRight[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_PlayerRunRight_Step0,
+	MovementAction_PlayerRunRight_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_StartAnimInDirection[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_StartAnimInDirection_Step0,
+	MovementAction_WaitSpriteAnim,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_JumpSpecialDown[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_JumpSpecialDown_Step0,
+	MovementAction_JumpSpecialDown_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_JumpSpecialUp[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_JumpSpecialUp_Step0,
+	MovementAction_JumpSpecialUp_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_JumpSpecialLeft[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_JumpSpecialLeft_Step0,
+	MovementAction_JumpSpecialLeft_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_JumpSpecialRight[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_JumpSpecialRight_Step0,
+	MovementAction_JumpSpecialRight_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_FacePlayer[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_FacePlayer_Step0,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_FaceAwayPlayer[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_FaceAwayPlayer_Step0,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_LockFacingDirection[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_LockFacingDirection_Step0,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_UnlockFacingDirection[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_UnlockFacingDirection_Step0,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_JumpDown[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_JumpDown_Step0,
+	MovementAction_JumpDown_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_JumpUp[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_JumpUp_Step0,
+	MovementAction_JumpUp_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_JumpLeft[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_JumpLeft_Step0,
+	MovementAction_JumpLeft_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_JumpRight[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_JumpRight_Step0,
+	MovementAction_JumpRight_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_JumpInPlaceDown[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_JumpInPlaceDown_Step0,
+	MovementAction_JumpInPlaceDown_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_JumpInPlaceUp[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_JumpInPlaceUp_Step0,
+	MovementAction_JumpInPlaceUp_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_JumpInPlaceLeft[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_JumpInPlaceLeft_Step0,
+	MovementAction_JumpInPlaceLeft_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_JumpInPlaceRight[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_JumpInPlaceRight_Step0,
+	MovementAction_JumpInPlaceRight_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_JumpInPlaceDownUp[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_JumpInPlaceDownUp_Step0,
+	MovementAction_JumpInPlaceDownUp_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_JumpInPlaceUpDown[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_JumpInPlaceUpDown_Step0,
+	MovementAction_JumpInPlaceUpDown_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_JumpInPlaceLeftRight[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_JumpInPlaceLeftRight_Step0,
+	MovementAction_JumpInPlaceLeftRight_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_JumpInPlaceRightLeft[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_JumpInPlaceRightLeft_Step0,
+	MovementAction_JumpInPlaceRightLeft_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_FaceOriginalDirection[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_FaceOriginalDirection_Step0,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_NurseJoyBowDown[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_NurseJoyBowDown_Step0,
+	MovementAction_WaitSpriteAnim,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_EnableJumpLandingGroundEffect[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_EnableJumpLandingGroundEffect_Step0,
+	MovementAction_Finish,
+};
+
+u8 (*const gMovementActionFuncs_DisableJumpLandingGroundEffect[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_DisableJumpLandingGroundEffect_Step0,
+	MovementAction_Finish,
+};
+
+u8 (*const gMovementActionFuncs_DisableAnimation[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_DisableAnimation_Step0,
+	MovementAction_Finish,
+};
+
+u8 (*const gMovementActionFuncs_RestoreAnimation[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_RestoreAnimation_Step0,
+	MovementAction_Finish,
+};
+
+u8 (*const gMovementActionFuncs_SetInvisible[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_SetInvisible_Step0,
+	MovementAction_Finish,
+};
+
+u8 (*const gMovementActionFuncs_SetVisible[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_SetVisible_Step0,
+	MovementAction_Finish,
+};
+
+u8 (*const gMovementActionFuncs_EmoteExclamationMark[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_EmoteExclamationMark_Step0,
+	MovementAction_Finish,
+};
+
+u8 (*const gMovementActionFuncs_EmoteQuestionMark[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_EmoteQuestionMark_Step0,
+	MovementAction_Finish,
+};
+
+u8 (*const gMovementActionFuncs_EmoteHeart[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_EmoteHeart_Step0,
+	MovementAction_Finish,
+};
+
+u8 (*const gMovementActionFuncs_RevealTrainer[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_RevealTrainer_Step0,
+	MovementAction_RevealTrainer_Step1,
+	MovementAction_Finish,
+};
+
+u8 (*const gMovementActionFuncs_RockSmashBreak[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_RockSmashBreak_Step0,
+	MovementAction_RockSmashBreak_Step1,
+	MovementAction_RockSmashBreak_Step2,
+	MovementAction_Finish,
+};
+
+u8 (*const gMovementActionFuncs_CutTree[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_CutTree_Step0,
+	MovementAction_CutTree_Step1,
+	MovementAction_CutTree_Step2,
+	MovementAction_Finish,
+};
+
+u8 (*const gMovementActionFuncs_SetFixedPriority[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_SetFixedPriority_Step0,
+	MovementAction_Finish,
+};
+
+u8 (*const gMovementActionFuncs_ClearFixedPriority[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_ClearFixedPriority_Step0,
+	MovementAction_Finish,
+};
+
+u8 (*const gMovementActionFuncs_InitAffineAnim[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_InitAffineAnim_Step0,
+	MovementAction_Finish,
+};
+
+u8 (*const gMovementActionFuncs_ClearAffineAnim[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_ClearAffineAnim_Step0,
+	MovementAction_Finish,
+};
+
+u8 (*const gMovementActionFuncs_Unknown1[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_Unknown1_Step0,
+	MovementAction_Finish,
+};
+
+u8 (*const gMovementActionFuncs_Unknown2[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_Unknown2_Step0,
+	MovementAction_Finish,
+};
+
+u8 (*const gMovementActionFuncs_WalkDownStartAffine[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_WalkDownStartAffine_Step0,
+	MovementAction_WalkDownStartAffine_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_WalkDownAffine[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_WalkDownAffine_Step0,
+	MovementAction_WalkDownAffine_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_WalkLeftAffine[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_WalkLeftAffine_Step0,
+	MovementAction_WalkLeftAffine_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_WalkRightAffine[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_WalkRightAffine_Step0,
+	MovementAction_WalkRightAffine_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieFaceDown[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_AcroWheelieFaceDown_Step0,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieFaceUp[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_AcroWheelieFaceUp_Step0,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieFaceLeft[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_AcroWheelieFaceLeft_Step0,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieFaceRight[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_AcroWheelieFaceRight_Step0,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroPopWheelieDown[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_AcroPopWheelieDown_Step0,
+	MovementAction_WaitSpriteAnim,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroPopWheelieUp[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_AcroPopWheelieUp_Step0,
+	MovementAction_WaitSpriteAnim,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroPopWheelieLeft[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_AcroPopWheelieLeft_Step0,
+	MovementAction_WaitSpriteAnim,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroPopWheelieRight[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_AcroPopWheelieRight_Step0,
+	MovementAction_WaitSpriteAnim,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroEndWheelieFaceDown[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_AcroEndWheelieFaceDown_Step0,
+	MovementAction_WaitSpriteAnim,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroEndWheelieFaceUp[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_AcroEndWheelieFaceUp_Step0,
+	MovementAction_WaitSpriteAnim,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroEndWheelieFaceLeft[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_AcroEndWheelieFaceLeft_Step0,
+	MovementAction_WaitSpriteAnim,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroEndWheelieFaceRight[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_AcroEndWheelieFaceRight_Step0,
+	MovementAction_WaitSpriteAnim,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroUnusedAcroActionDown[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_UnusedAcroActionDown_Step0,
+	MovementAction_WaitSpriteAnim,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroUnusedAcroActionUp[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_UnusedAcroActionUp_Step0,
+	MovementAction_WaitSpriteAnim,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroUnusedAcroActionLeft[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_UnusedAcroActionLeft_Step0,
+	MovementAction_WaitSpriteAnim,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroUnusedAcroActionRight[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_UnusedAcroActionRight_Step0,
+	MovementAction_WaitSpriteAnim,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_Figure8[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_Figure8_Step0,
+	MovementAction_Figure8_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieHopFaceDown[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_AcroWheelieHopFaceDown_Step0,
+	MovementAction_AcroWheelieHopFaceDown_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieHopFaceUp[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_AcroWheelieHopFaceUp_Step0,
+	MovementAction_AcroWheelieHopFaceUp_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieHopFaceLeft[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_AcroWheelieHopFaceLeft_Step0,
+	MovementAction_AcroWheelieHopFaceLeft_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieHopFaceRight[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_AcroWheelieHopFaceRight_Step0,
+	MovementAction_AcroWheelieHopFaceRight_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieHopDown[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_AcroWheelieHopDown_Step0,
+	MovementAction_AcroWheelieHopDown_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieHopUp[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_AcroWheelieHopUp_Step0,
+	MovementAction_AcroWheelieHopUp_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieHopLeft[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_AcroWheelieHopLeft_Step0,
+	MovementAction_AcroWheelieHopLeft_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieHopRight[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_AcroWheelieHopRight_Step0,
+	MovementAction_AcroWheelieHopRight_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieJumpDown[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_AcroWheelieJumpDown_Step0,
+	MovementAction_AcroWheelieJumpDown_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieJumpUp[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_AcroWheelieJumpUp_Step0,
+	MovementAction_AcroWheelieJumpUp_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieJumpLeft[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_AcroWheelieJumpLeft_Step0,
+	MovementAction_AcroWheelieJumpLeft_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieJumpRight[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_AcroWheelieJumpRight_Step0,
+	MovementAction_AcroWheelieJumpRight_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieInPlaceDown[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_AcroWheelieInPlaceDown_Step0,
+	MovementAction_WalkInPlace_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieInPlaceUp[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_AcroWheelieInPlaceUp_Step0,
+	MovementAction_WalkInPlace_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieInPlaceLeft[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_AcroWheelieInPlaceLeft_Step0,
+	MovementAction_WalkInPlace_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieInPlaceRight[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_AcroWheelieInPlaceRight_Step0,
+	MovementAction_WalkInPlace_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroPopWheelieMoveDown[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_AcroPopWheelieMoveDown_Step0,
+	MovementAction_AcroPopWheelieMoveDown_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroPopWheelieMoveUp[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_AcroPopWheelieMoveUp_Step0,
+	MovementAction_AcroPopWheelieMoveUp_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroPopWheelieMoveLeft[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_AcroPopWheelieMoveLeft_Step0,
+	MovementAction_AcroPopWheelieMoveLeft_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroPopWheelieMoveRight[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_AcroPopWheelieMoveRight_Step0,
+	MovementAction_AcroPopWheelieMoveRight_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieMoveDown[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_AcroWheelieMoveDown_Step0,
+	MovementAction_AcroWheelieMoveDown_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieMoveUp[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_AcroWheelieMoveUp_Step0,
+	MovementAction_AcroWheelieMoveUp_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieMoveLeft[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_AcroWheelieMoveLeft_Step0,
+	MovementAction_AcroWheelieMoveLeft_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieMoveRight[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_AcroWheelieMoveRight_Step0,
+	MovementAction_AcroWheelieMoveRight_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroEndWheelieMoveDown[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_AcroEndWheelieMoveDown_Step0,
+	MovementAction_AcroEndWheelieMoveDown_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroEndWheelieMoveUp[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_AcroEndWheelieMoveUp_Step0,
+	MovementAction_AcroEndWheelieMoveUp_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroEndWheelieMoveLeft[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_AcroEndWheelieMoveLeft_Step0,
+	MovementAction_AcroEndWheelieMoveLeft_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroEndWheelieMoveRight[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_AcroEndWheelieMoveRight_Step0,
+	MovementAction_AcroEndWheelieMoveRight_Step1,
+	MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_Levitate[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_Levitate_Step0,
+	MovementAction_Finish,
+};
+
+u8 (*const gMovementActionFuncs_StopLevitate[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_StopLevitate_Step0,
+	MovementAction_Finish,
+};
+
+u8 (*const gMovementActionFuncs_DestroyExtraTaskIfAtTop[])(struct EventObject *, struct Sprite *) = {
+	MovementAction_DestroyExtraTaskIfAtTop_Step0,
+	MovementAction_Finish,
+};
+
+#endif //GUARD_MOVEMENT_ACTION_FUNC_TABLES_H
diff --git a/src/data/field_event_obj/movement_type_func_tables.h b/src/data/field_event_obj/movement_type_func_tables.h
new file mode 100755
index 000000000..165e96220
--- /dev/null
+++ b/src/data/field_event_obj/movement_type_func_tables.h
@@ -0,0 +1,443 @@
+#ifndef GUARD_MOVEMENT_TYPE_FUNC_TABLES_H
+#define GUARD_MOVEMENT_TYPE_FUNC_TABLES_H
+
+u8 (*const gMovementTypeFuncs_WanderAround[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WanderAround_Step0,
+    MovementType_WanderAround_Step1,
+    MovementType_WanderAround_Step2,
+    MovementType_WanderAround_Step3,
+    MovementType_WanderAround_Step4,
+    MovementType_WanderAround_Step5,
+    MovementType_WanderAround_Step6,
+};
+
+const u8 gStandardDirections[] = {DIR_SOUTH, DIR_NORTH, DIR_WEST, DIR_EAST};
+
+u8 (*const gGetVectorDirectionFuncs[])(s16, s16, s16, s16) = {
+    GetVectorDirection,
+    GetLimitedVectorDirection_SouthNorth,
+    GetLimitedVectorDirection_WestEast,
+    GetLimitedVectorDirection_WestNorth,
+    GetLimitedVectorDirection_EastNorth,
+    GetLimitedVectorDirection_WestSouth,
+    GetLimitedVectorDirection_EastSouth,
+    GetLimitedVectorDirection_SouthNorthWest,
+    GetLimitedVectorDirection_SouthNorthEast,
+    GetLimitedVectorDirection_NorthWestEast,
+    GetLimitedVectorDirection_SouthWestEast,
+};
+
+u8 (*const gMovementTypeFuncs_LookAround[])(struct EventObject *, struct Sprite *) = {
+    MovementType_LookAround_Step0,
+    MovementType_LookAround_Step1,
+    MovementType_LookAround_Step2,
+    MovementType_LookAround_Step3,
+    MovementType_LookAround_Step4,
+};
+
+u8 (*const gMovementTypeFuncs_WanderUpAndDown[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WanderUpAndDown_Step0,
+    MovementType_WanderUpAndDown_Step1,
+    MovementType_WanderUpAndDown_Step2,
+    MovementType_WanderUpAndDown_Step3,
+    MovementType_WanderUpAndDown_Step4,
+    MovementType_WanderUpAndDown_Step5,
+    MovementType_WanderUpAndDown_Step6,
+};
+
+const u8 gUpAndDownDirections[] = {DIR_SOUTH, DIR_NORTH};
+
+u8 (*const gMovementTypeFuncs_WanderLeftAndRight[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WanderLeftAndRight_Step0,
+    MovementType_WanderLeftAndRight_Step1,
+    MovementType_WanderLeftAndRight_Step2,
+    MovementType_WanderLeftAndRight_Step3,
+    MovementType_WanderLeftAndRight_Step4,
+    MovementType_WanderLeftAndRight_Step5,
+    MovementType_WanderLeftAndRight_Step6,
+};
+
+const u8 gLeftAndRightDirections[] = {DIR_WEST, DIR_EAST};
+
+u8 (*const gMovementTypeFuncs_FaceDirection[])(struct EventObject *, struct Sprite *) = {
+    MovementType_FaceDirection_Step0,
+    MovementType_FaceDirection_Step1,
+    MovementType_FaceDirection_Step2,
+};
+
+u8 (*const gMovementTypeFuncs_BerryTreeGrowth[])(struct EventObject *, struct Sprite *) = {
+    MovementType_BerryTreeGrowth_Step0,
+    MovementType_BerryTreeGrowth_Step1,
+    MovementType_BerryTreeGrowth_Step2,
+    MovementType_BerryTreeGrowth_Step3,
+    MovementType_BerryTreeGrowth_Step4,
+};
+
+u8 (*const gMovementTypeFuncs_FaceDownAndUp[])(struct EventObject *, struct Sprite *) = {
+    MovementType_FaceDownAndUp_Step0,
+    MovementType_FaceDownAndUp_Step1,
+    MovementType_FaceDownAndUp_Step2,
+    MovementType_FaceDownAndUp_Step3,
+    MovementType_FaceDownAndUp_Step4,
+};
+
+u8 (*const gMovementTypeFuncs_FaceLeftAndRight[])(struct EventObject *, struct Sprite *) = {
+    MovementType_FaceLeftAndRight_Step0,
+    MovementType_FaceLeftAndRight_Step1,
+    MovementType_FaceLeftAndRight_Step2,
+    MovementType_FaceLeftAndRight_Step3,
+    MovementType_FaceLeftAndRight_Step4,
+};
+
+u8 (*const gMovementTypeFuncs_FaceUpAndLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementType_FaceUpAndLeft_Step0,
+    MovementType_FaceUpAndLeft_Step1,
+    MovementType_FaceUpAndLeft_Step2,
+    MovementType_FaceUpAndLeft_Step3,
+    MovementType_FaceUpAndLeft_Step4,
+};
+
+const u8 gUpAndLeftDirections[] = {DIR_NORTH, DIR_WEST};
+
+u8 (*const gMovementTypeFuncs_FaceUpAndRight[])(struct EventObject *, struct Sprite *) = {
+    MovementType_FaceUpAndRight_Step0,
+    MovementType_FaceUpAndRight_Step1,
+    MovementType_FaceUpAndRight_Step2,
+    MovementType_FaceUpAndRight_Step3,
+    MovementType_FaceUpAndRight_Step4,
+};
+
+const u8 gUpAndRightDirections[] = {DIR_NORTH, DIR_EAST};
+
+u8 (*const gMovementTypeFuncs_FaceDownAndLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementType_FaceDownAndLeft_Step0,
+    MovementType_FaceDownAndLeft_Step1,
+    MovementType_FaceDownAndLeft_Step2,
+    MovementType_FaceDownAndLeft_Step3,
+    MovementType_FaceDownAndLeft_Step4,
+};
+
+const u8 gDownAndLeftDirections[] = {DIR_SOUTH, DIR_WEST};
+
+u8 (*const gMovementTypeFuncs_FaceDownAndRight[])(struct EventObject *, struct Sprite *) = {
+    MovementType_FaceDownAndRight_Step0,
+    MovementType_FaceDownAndRight_Step1,
+    MovementType_FaceDownAndRight_Step2,
+    MovementType_FaceDownAndRight_Step3,
+    MovementType_FaceDownAndRight_Step4,
+};
+
+const u8 gDownAndRightDirections[] = {DIR_SOUTH, DIR_EAST};
+
+u8 (*const gMovementTypeFuncs_FaceDownUpAndLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementType_FaceDownUpAndLeft_Step0,
+    MovementType_FaceDownUpAndLeft_Step1,
+    MovementType_FaceDownUpAndLeft_Step2,
+    MovementType_FaceDownUpAndLeft_Step3,
+    MovementType_FaceDownUpAndLeft_Step4,
+};
+
+const u8 gDownUpAndLeftDirections[] = {DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_SOUTH};
+
+u8 (*const gMovementTypeFuncs_FaceDownUpAndRight[])(struct EventObject *, struct Sprite *) = {
+    MovementType_FaceDownUpAndRight_Step0,
+    MovementType_FaceDownUpAndRight_Step1,
+    MovementType_FaceDownUpAndRight_Step2,
+    MovementType_FaceDownUpAndRight_Step3,
+    MovementType_FaceDownUpAndRight_Step4,
+};
+
+const u8 gDownUpAndRightDirections[] = {DIR_SOUTH, DIR_NORTH, DIR_EAST, DIR_SOUTH};
+
+u8 (*const gMovementTypeFuncs_FaceUpLeftAndRight[])(struct EventObject *, struct Sprite *) = {
+    MovementType_FaceUpLeftAndRight_Step0,
+    MovementType_FaceUpLeftAndRight_Step1,
+    MovementType_FaceUpLeftAndRight_Step2,
+    MovementType_FaceUpLeftAndRight_Step3,
+    MovementType_FaceUpLeftAndRight_Step4,
+};
+
+const u8 gUpLeftAndRightDirections[] = {DIR_NORTH, DIR_WEST, DIR_EAST, DIR_NORTH};
+
+u8 (*const gMovementTypeFuncs_FaceDownLeftAndRight[])(struct EventObject *, struct Sprite *) = {
+    MovementType_FaceDownLeftAndRight_Step0,
+    MovementType_FaceDownLeftAndRight_Step1,
+    MovementType_FaceDownLeftAndRight_Step2,
+    MovementType_FaceDownLeftAndRight_Step3,
+    MovementType_FaceDownLeftAndRight_Step4,
+};
+
+const u8 gDownLeftAndRightDirections[] = {DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_SOUTH};
+
+u8 (*const gMovementTypeFuncs_RotateCounterclockwise[])(struct EventObject *, struct Sprite *) = {
+    MovementType_RotateCounterclockwise_Step0,
+    MovementType_RotateCounterclockwise_Step1,
+    MovementType_RotateCounterclockwise_Step2,
+    MovementType_RotateCounterclockwise_Step3,
+};
+
+const u8 gCounterclockwiseDirections[] = {DIR_SOUTH, DIR_EAST, DIR_WEST, DIR_SOUTH, DIR_NORTH};
+
+u8 (*const gMovementTypeFuncs_RotateClockwise[])(struct EventObject *, struct Sprite *) = {
+    MovementType_RotateClockwise_Step0,
+    MovementType_RotateClockwise_Step1,
+    MovementType_RotateClockwise_Step2,
+    MovementType_RotateClockwise_Step3,
+};
+
+const u8 gClockwiseDirections[] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH};
+
+u8 (*const gMovementTypeFuncs_WalkBackAndForth[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkBackAndForth_Step0,
+    MovementType_WalkBackAndForth_Step1,
+    MovementType_WalkBackAndForth_Step2,
+    MovementType_WalkBackAndForth_Step3,
+};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceUpRightLeftDown[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceUpRightLeftDown_Step1,
+    MovementType_WalkSequence_Step2,
+};
+
+const u8 gUpRightLeftDownDirections[] = {DIR_NORTH, DIR_EAST, DIR_WEST, DIR_SOUTH};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceRightLeftDownUp[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceRightLeftDownUp_Step1,
+    MovementType_WalkSequence_Step2,
+};
+
+const u8 gRightLeftDownUpDirections[] = {DIR_EAST, DIR_WEST, DIR_SOUTH, DIR_NORTH};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceDownUpRightLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceDownUpRightLeft_Step1,
+    MovementType_WalkSequence_Step2,
+};
+
+const u8 gDownUpRightLeftDirections[] = {DIR_SOUTH, DIR_NORTH, DIR_EAST, DIR_WEST};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceLeftDownUpRight[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceLeftDownUpRight_Step1,
+    MovementType_WalkSequence_Step2,
+};
+
+const u8 gLeftDownUpRightDirections[] = {DIR_WEST, DIR_SOUTH, DIR_NORTH, DIR_EAST};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceUpLeftRightDown[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceUpLeftRightDown_Step1,
+    MovementType_WalkSequence_Step2,
+};
+
+const u8 gUpLeftRightDownDirections[] = {DIR_NORTH, DIR_WEST, DIR_EAST, DIR_SOUTH};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceLeftRightDownUp[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceLeftRightDownUp_Step1,
+    MovementType_WalkSequence_Step2,
+};
+
+const u8 gLeftRightDownUpDirections[] = {DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_NORTH};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceDownUpLeftRight[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceDownUpLeftRight_Step1,
+    MovementType_WalkSequence_Step2,
+};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceRightDownUpLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceRightDownUpLeft_Step1,
+    MovementType_WalkSequence_Step2,
+};
+
+const u8 gRightDownUpLeftDirections[] = {DIR_EAST, DIR_SOUTH, DIR_NORTH, DIR_WEST};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceLeftUpDownRight[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceLeftUpDownRight_Step1,
+    MovementType_WalkSequence_Step2,
+};
+
+const u8 gLeftUpDownRightDirections[] = {DIR_WEST, DIR_NORTH, DIR_SOUTH, DIR_EAST};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceUpDownRightLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceUpDownRightLeft_Step1,
+    MovementType_WalkSequence_Step2,
+};
+
+const u8 gUpDownRightLeftDirections[] = {DIR_NORTH, DIR_SOUTH, DIR_EAST, DIR_WEST};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceRightLeftUpDown[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceRightLeftUpDown_Step1,
+    MovementType_WalkSequence_Step2,
+};
+
+const u8 gRightLeftUpDownDirections[] = {DIR_EAST, DIR_WEST, DIR_NORTH, DIR_SOUTH};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceDownRightLeftUp[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceDownRightLeftUp_Step1,
+    MovementType_WalkSequence_Step2,
+};
+
+const u8 gDownRightLeftUpDirections[] = {DIR_SOUTH, DIR_EAST, DIR_WEST, DIR_NORTH};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceRightUpDownLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceRightUpDownLeft_Step1,
+    MovementType_WalkSequence_Step2,
+};
+
+const u8 gRightUpDownLeftDirections[] = {DIR_EAST, DIR_NORTH, DIR_SOUTH, DIR_WEST};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceUpDownLeftRight[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceUpDownLeftRight_Step1,
+    MovementType_WalkSequence_Step2,
+};
+
+const u8 gUpDownLeftRightDirections[] = {DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_EAST};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceLeftRightUpDown[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceLeftRightUpDown_Step1,
+    MovementType_WalkSequence_Step2,
+};
+
+const u8 gLeftRightUpDownDirections[] = {DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceDownLeftRightUp[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceDownLeftRightUp_Step1,
+    MovementType_WalkSequence_Step2,
+};
+
+const u8 gDownLeftRightUpDirections[] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceUpLeftDownRight[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceUpLeftDownRight_Step1,
+    MovementType_WalkSequence_Step2,
+};
+
+const u8 gUpLeftDownRightDirections[] = {DIR_NORTH, DIR_WEST, DIR_SOUTH, DIR_EAST};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceDownRightUpLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceDownRightUpLeft_Step1,
+    MovementType_WalkSequence_Step2,
+};
+
+const u8 gDownRightUpLeftDirections[] = {DIR_SOUTH, DIR_EAST, DIR_NORTH, DIR_WEST};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceLeftDownRightUp[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceLeftDownRightUp_Step1,
+    MovementType_WalkSequence_Step2,
+};
+
+const u8 gLeftDownRightUpDirections[] = {DIR_WEST, DIR_SOUTH, DIR_EAST, DIR_NORTH};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceRightUpLeftDown[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceRightUpLeftDown_Step1,
+    MovementType_WalkSequence_Step2,
+};
+
+const u8 gRightUpLeftDownDirections[] = {DIR_EAST, DIR_NORTH, DIR_WEST, DIR_SOUTH};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceUpRightDownLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceUpRightDownLeft_Step1,
+    MovementType_WalkSequence_Step2,
+};
+
+const u8 gUpRightDownLeftDirections[] = {DIR_NORTH, DIR_EAST, DIR_SOUTH, DIR_WEST};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceDownLeftUpRight[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceDownLeftUpRight_Step1,
+    MovementType_WalkSequence_Step2,
+};
+
+const u8 gDownLeftUpRightDirections[] = {DIR_SOUTH, DIR_WEST, DIR_NORTH, DIR_EAST};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceLeftUpRightDown[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceLeftUpRightDown_Step1,
+    MovementType_WalkSequence_Step2,
+};
+
+const u8 gLeftUpRightDownDirections[] = {DIR_WEST, DIR_NORTH, DIR_EAST, DIR_SOUTH};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceRightDownLeftUp[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceRightDownLeftUp_Step1,
+    MovementType_WalkSequence_Step2,
+};
+
+const u8 gRightDownLeftUpDirections[] = {DIR_EAST, DIR_SOUTH, DIR_WEST, DIR_NORTH};
+
+u8 (*const gMovementTypeFuncs_CopyPlayer[])(struct EventObject *, struct Sprite *) = {
+    MovementType_CopyPlayer_Step0,
+    MovementType_CopyPlayer_Step1,
+    MovementType_CopyPlayer_Step2,
+};
+
+bool8 (*const gCopyPlayerMovementFuncs[])(struct EventObject *, struct Sprite *, u8, bool8(u8)) = {
+    CopyablePlayerMovement_None,
+    CopyablePlayerMovement_FaceDirection,
+    CopyablePlayerMovement_GoSpeed0,
+    CopyablePlayerMovement_GoSpeed1,
+    CopyablePlayerMovement_GoSpeed2,
+    CopyablePlayerMovement_Slide,
+    cph_IM_DIFFERENT,
+    CopyablePlayerMovement_GoSpeed4,
+    CopyablePlayerMovement_Jump,
+    CopyablePlayerMovement_None,
+    CopyablePlayerMovement_None,
+};
+
+u8 (*const gMovementTypeFuncs_CopyPlayerInGrass[])(struct EventObject *, struct Sprite *) = {
+    MovementType_CopyPlayer_Step0,
+    MovementType_CopyPlayerInGrass_Step1,
+    MovementType_CopyPlayer_Step2,
+};
+
+u8 (*const gMovementTypeFuncs_Hidden[])(struct EventObject *, struct Sprite *) = {
+    MovementType_Hidden_Step0,
+};
+
+u8 (*const gMovementTypeFuncs_WalkInPlace[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkInPlace_Step0,
+    MovementType_MoveInPlace_Step1,
+};
+
+u8 (*const gMovementTypeFuncs_WalkSlowlyInPlace[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSlowlyInPlace_Step0,
+    MovementType_MoveInPlace_Step1,
+};
+
+u8 (*const gMovementTypeFuncs_JogInPlace[])(struct EventObject *, struct Sprite *) = {
+    MovementType_JogInPlace_Step0,
+    MovementType_MoveInPlace_Step1,
+};
+
+u8 (*const gMovementTypeFuncs_RunInPlace[])(struct EventObject *, struct Sprite *) = {
+    MovementType_RunInPlace_Step0,
+    MovementType_MoveInPlace_Step1,
+};
+
+u8 (*const gMovementTypeFuncs_Invisible[])(struct EventObject *, struct Sprite *) = {
+    MovementType_Invisible_Step0,
+    MovementType_Invisible_Step1,
+    MovementType_Invisible_Step2,
+};
+
+#endif //GUARD_MOVEMENT_TYPE_FUNC_TABLES_H
diff --git a/src/decoration.c b/src/decoration.c
index 08287a3cc..ad2cdfa30 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -17,7 +17,7 @@
 #include "field_player_avatar.h"
 #include "field_camera.h"
 #include "field_screen.h"
-#include "field_map_obj.h"
+#include "event_object_movement.h"
 #include "list_menu.h"
 #include "menu_helpers.h"
 #include "menu.h"
@@ -32,7 +32,7 @@
 #include "tilesets.h"
 #include "item_icon.h"
 #include "trader.h"
-#include "constants/map_objects.h"
+#include "constants/event_objects.h"
 #include "decoration_inventory.h"
 #include "decoration.h"
 #include "graphics.h"
@@ -1202,15 +1202,15 @@ void sub_8127E18(void)
         if (FlagGet(0xAE + i) == TRUE)
         {
             FlagClear(0xAE + i);
-            for (j = 0; j < gMapHeader.events->mapObjectCount; j ++)
+            for (j = 0; j < gMapHeader.events->eventObjectCount; j ++)
             {
-                if (gMapHeader.events->mapObjects[j].flagId == 0xAE + i)
+                if (gMapHeader.events->eventObjects[j].flagId == 0xAE + i)
                 {
                     break;
                 }
             }
-            VarSet(0x3F20 + gMapHeader.events->mapObjects[j].graphicsId, sPlaceDecorationGraphicsDataBuffer.decoration->tiles[0]);
-            gSpecialVar_0x8005 = gMapHeader.events->mapObjects[j].localId;
+            VarSet(0x3F20 + gMapHeader.events->eventObjects[j].graphicsId, sPlaceDecorationGraphicsDataBuffer.decoration->tiles[0]);
+            gSpecialVar_0x8005 = gMapHeader.events->eventObjects[j].localId;
             gSpecialVar_0x8006 = sCurDecorMapX;
             gSpecialVar_0x8007 = sCurDecorMapY;
             show_sprite(gSpecialVar_0x8005, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
@@ -1321,11 +1321,11 @@ void SetUpPlacingDecorationPlayerAvatar(u8 taskId, struct PlaceDecorationGraphic
     }
     if (gSaveBlock2Ptr->playerGender == MALE)
     {
-        sDecor_CameraSpriteObjectIdx2 = AddPseudoFieldObject(0xC1, SpriteCallbackDummy, v0, 0x48, 0);
+        sDecor_CameraSpriteObjectIdx2 = AddPseudoEventObject(0xC1, SpriteCallbackDummy, v0, 0x48, 0);
     }
     else
     {
-        sDecor_CameraSpriteObjectIdx2 = AddPseudoFieldObject(0xC2, SpriteCallbackDummy, v0, 0x48, 0);
+        sDecor_CameraSpriteObjectIdx2 = AddPseudoEventObject(0xC2, SpriteCallbackDummy, v0, 0x48, 0);
     }
     gSprites[sDecor_CameraSpriteObjectIdx2].oam.priority = 1;
     DestroySprite(&gSprites[sDecor_CameraSpriteObjectIdx1]);
@@ -1466,7 +1466,7 @@ bool8 sub_812853C(u8 taskId, const struct Decoration *decoration)
                     {
                         return FALSE;
                     }
-                    behaviorAt = GetFieldObjectIdByXYZ(curX, curY, 0);
+                    behaviorAt = GetEventObjectIdByXYZ(curX, curY, 0);
                     if (behaviorAt != 0 && behaviorAt != 16)
                     {
                         return FALSE;
@@ -1491,7 +1491,7 @@ bool8 sub_812853C(u8 taskId, const struct Decoration *decoration)
                     {
                         return FALSE;
                     }
-                    if (GetFieldObjectIdByXYZ(curX, curY, 0) != 16)
+                    if (GetEventObjectIdByXYZ(curX, curY, 0) != 16)
                     {
                         return FALSE;
                     }
@@ -1511,7 +1511,7 @@ bool8 sub_812853C(u8 taskId, const struct Decoration *decoration)
                 {
                     return FALSE;
                 }
-                behaviorAt = GetFieldObjectIdByXYZ(curX, curY, 0);
+                behaviorAt = GetEventObjectIdByXYZ(curX, curY, 0);
                 if (behaviorAt != 0 && behaviorAt != 16)
                 {
                     return FALSE;
@@ -1556,7 +1556,7 @@ bool8 sub_812853C(u8 taskId, const struct Decoration *decoration)
                         return FALSE;
                     }
                 }
-                if (GetFieldObjectIdByXYZ(curX, curY, 0) != 16)
+                if (GetEventObjectIdByXYZ(curX, curY, 0) != 16)
                 {
                     return FALSE;
                 }
@@ -1990,7 +1990,7 @@ u8 gpu_pal_decompress_alloc_tag_and_upload(struct PlaceDecorationGraphicsDataBuf
     data->decoration = &gDecorations[decor];
     if (data->decoration->permission == DECORPERM_SOLID_MAT)
     {
-        return AddPseudoFieldObject(data->decoration->tiles[0], SpriteCallbackDummy, 0, 0, 1);
+        return AddPseudoEventObject(data->decoration->tiles[0], SpriteCallbackDummy, 0, 0, 1);
     }
     FreeSpritePaletteByTag(OVERWORLD_PLACE_DECOR_SELECTOR_PAL_TAG);
     sub_81291E8(data);
@@ -2040,7 +2040,7 @@ const u8 *GetDecorationIconPicOrPalette(u16 decor, u8 mode)
     return gUnknown_085A6BE8[decor][mode];
 }
 
-u8 AddDecorationIconObjectFromFieldObject(u16 tilesTag, u16 paletteTag, u8 decor)
+u8 AddDecorationIconObjectFromEventObject(u16 tilesTag, u16 paletteTag, u8 decor)
 {
     u8 spriteId;
     struct SpriteSheet sheet;
@@ -2071,7 +2071,7 @@ u8 AddDecorationIconObjectFromFieldObject(u16 tilesTag, u16 paletteTag, u8 decor
     }
     else
     {
-        spriteId = AddPseudoFieldObject(sPlaceDecorationGraphicsDataBuffer.decoration->tiles[0], SpriteCallbackDummy, 0, 0, 1);
+        spriteId = AddPseudoEventObject(sPlaceDecorationGraphicsDataBuffer.decoration->tiles[0], SpriteCallbackDummy, 0, 0, 1);
     }
     return spriteId;
 }
@@ -2092,7 +2092,7 @@ u8 AddDecorationIconObject(u8 decor, s16 x, s16 y, u8 priority, u16 tilesTag, u1
     }
     else if (gUnknown_085A6BE8[decor][0] == NULL)
     {
-        spriteId = AddDecorationIconObjectFromFieldObject(tilesTag, paletteTag, decor);
+        spriteId = AddDecorationIconObjectFromEventObject(tilesTag, paletteTag, decor);
         if (spriteId == MAX_SPRITES)
         {
             return MAX_SPRITES;
@@ -2141,11 +2141,11 @@ void sub_8129708(void)
     {
         gSpecialVar_0x8005 = sDecorRearrangementDataBuffer[gSpecialVar_0x8004].flagId;
         sub_81296EC(sDecorRearrangementDataBuffer[gSpecialVar_0x8004].idx);
-        for (i = 0; i < gMapHeader.events->mapObjectCount; i ++)
+        for (i = 0; i < gMapHeader.events->eventObjectCount; i ++)
         {
-            if (gMapHeader.events->mapObjects[i].flagId == gSpecialVar_0x8005)
+            if (gMapHeader.events->eventObjects[i].flagId == gSpecialVar_0x8005)
             {
-                gSpecialVar_0x8006 = gMapHeader.events->mapObjects[i].localId;
+                gSpecialVar_0x8006 = gMapHeader.events->eventObjects[i].localId;
                 break;
             }
         }
@@ -2156,11 +2156,11 @@ void sub_81297AC(void)
 {
     u8 i;
 
-    for (i = 0; i < gMapHeader.events->mapObjectCount; i ++)
+    for (i = 0; i < gMapHeader.events->eventObjectCount; i ++)
     {
-        if (gMapHeader.events->mapObjects[i].flagId == gSpecialVar_0x8004)
+        if (gMapHeader.events->eventObjects[i].flagId == gSpecialVar_0x8004)
         {
-            gSpecialVar_0x8005 = gMapHeader.events->mapObjects[i].localId;
+            gSpecialVar_0x8005 = gMapHeader.events->eventObjects[i].localId;
             break;
         }
     }
@@ -2247,17 +2247,17 @@ bool8 sub_81299AC(u8 taskId)
 
 void SetUpPuttingAwayDecorationPlayerAvatar(void)
 {
-    player_get_direction_lower_nybble();
+    GetPlayerFacingDirection();
     sDecor_CameraSpriteObjectIdx1 = gSprites[gUnknown_03005DD0.spriteId].data[0];
     sub_812A39C();
     gUnknown_03005DD0.spriteId = CreateSprite(&gUnknown_085A7404, 0x78, 0x50, 0);
     if (gSaveBlock2Ptr->playerGender == MALE)
     {
-        sDecor_CameraSpriteObjectIdx2 = AddPseudoFieldObject(0xC1, SpriteCallbackDummy, 0x88, 0x48, 0);
+        sDecor_CameraSpriteObjectIdx2 = AddPseudoEventObject(0xC1, SpriteCallbackDummy, 0x88, 0x48, 0);
     }
     else
     {
-        sDecor_CameraSpriteObjectIdx2 = AddPseudoFieldObject(0xC2, SpriteCallbackDummy, 0x88, 0x48, 0);
+        sDecor_CameraSpriteObjectIdx2 = AddPseudoEventObject(0xC2, SpriteCallbackDummy, 0x88, 0x48, 0);
     }
     gSprites[sDecor_CameraSpriteObjectIdx2].oam.priority = 1;
     DestroySprite(&gSprites[sDecor_CameraSpriteObjectIdx1]);
@@ -2451,9 +2451,9 @@ void sub_8129F20(void)
     yOff = gUnknown_0203A17C.pos[sDecorRearrangementDataBuffer[sCurDecorSelectedInRearrangement].idx] & 0x0F;
     for (i = 0; i < 0x40; i ++)
     {
-        if (gSaveBlock1Ptr->mapObjectTemplates[i].x == xOff && gSaveBlock1Ptr->mapObjectTemplates[i].y == yOff && !FlagGet(gSaveBlock1Ptr->mapObjectTemplates[i].flagId))
+        if (gSaveBlock1Ptr->eventObjectTemplates[i].x == xOff && gSaveBlock1Ptr->eventObjectTemplates[i].y == yOff && !FlagGet(gSaveBlock1Ptr->eventObjectTemplates[i].flagId))
         {
-            sDecorRearrangementDataBuffer[sCurDecorSelectedInRearrangement].flagId = gSaveBlock1Ptr->mapObjectTemplates[i].flagId;
+            sDecorRearrangementDataBuffer[sCurDecorSelectedInRearrangement].flagId = gSaveBlock1Ptr->eventObjectTemplates[i].flagId;
             break;
         }
     }
diff --git a/src/event_data.c b/src/event_data.c
index 9f1432f17..efd439a3c 100644
--- a/src/event_data.c
+++ b/src/event_data.c
@@ -190,7 +190,7 @@ bool8 VarSet(u16 id, u16 value)
     return TRUE;
 }
 
-u8 VarGetFieldObjectGraphicsId(u8 id)
+u8 VarGetEventObjectGraphicsId(u8 id)
 {
     return VarGet(0x4010 + id);
 }
diff --git a/src/map_obj_lock.c b/src/event_obj_lock.c
index 688d0594d..efa498c0f 100644
--- a/src/map_obj_lock.c
+++ b/src/event_obj_lock.c
@@ -1,9 +1,8 @@
 #include "global.h"
 #include "event_data.h"
-#include "field_map_obj.h"
-#include "field_map_obj_helpers.h"
+#include "event_object_movement.h"
 #include "field_player_avatar.h"
-#include "map_obj_lock.h"
+#include "event_obj_lock.h"
 #include "script_movement.h"
 #include "task.h"
 #include "trainer_see.h"
@@ -39,9 +38,9 @@ bool8 sub_80983C4(void)
 }
 
 
-void ScriptFreezeMapObjects(void)
+void ScriptFreezeEventObjects(void)
 {
-    FreezeMapObjects();
+    FreezeEventObjects();
     CreateTask(sub_80983A4, 80);
 }
 
@@ -54,9 +53,9 @@ static void sub_8098400(u8 taskId)
         sub_808B864();
         task->data[0] = 1;
     }
-    if (!task->data[1] && !gMapObjects[gSelectedMapObject].mapobj_bit_1)
+    if (!task->data[1] && !gEventObjects[gSelectedEventObject].singleMovementActive)
     {
-        FreezeMapObject(&gMapObjects[gSelectedMapObject]);
+        FreezeEventObject(&gEventObjects[gSelectedEventObject]);
         task->data[1] = 1;
     }
     if (task->data[0] && task->data[1])
@@ -76,61 +75,61 @@ bool8 sub_809847C(void)
     }
 }
 
-void LockSelectedMapObject(void)
+void LockSelectedEventObject(void)
 {
     u8 taskId;
-    FreezeMapObjectsExceptOne(gSelectedMapObject);
+    FreezeEventObjectsExceptOne(gSelectedEventObject);
     taskId = CreateTask(sub_8098400, 80);
-    if (!gMapObjects[gSelectedMapObject].mapobj_bit_1)
+    if (!gEventObjects[gSelectedEventObject].singleMovementActive)
     {
-        FreezeMapObject(&gMapObjects[gSelectedMapObject]);
+        FreezeEventObject(&gEventObjects[gSelectedEventObject]);
         gTasks[taskId].data[1] = 1;
     }
 }
 
 void sub_80984F4(void)
 {
-    u8 objectId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0);
-    FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[objectId]);
+    u8 objectId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0);
+    EventObjectClearHeldMovementIfFinished(&gEventObjects[objectId]);
     sub_80D338C();
-    UnfreezeMapObjects();
+    UnfreezeEventObjects();
 }
 
 void sub_8098524(void)
 {
     u8 objectId;
 
-    if (gMapObjects[gSelectedMapObject].active)
-        FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[gSelectedMapObject]);
-    objectId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0);
-    FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[objectId]);
+    if (gEventObjects[gSelectedEventObject].active)
+        EventObjectClearHeldMovementIfFinished(&gEventObjects[gSelectedEventObject]);
+    objectId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0);
+    EventObjectClearHeldMovementIfFinished(&gEventObjects[objectId]);
     sub_80D338C();
-    UnfreezeMapObjects();
+    UnfreezeEventObjects();
 }
 
 void sub_8098574(void)
 {
-    FieldObjectFaceOppositeDirection(&gMapObjects[gSelectedMapObject], gSpecialVar_Facing);
+    EventObjectFaceOppositeDirection(&gEventObjects[gSelectedEventObject], gSpecialVar_Facing);
 }
 
 void sub_809859C(void)
 {
-    FieldObjectClearAnimIfSpecialAnimActive(&gMapObjects[gSelectedMapObject]);
+    EventObjectClearHeldMovementIfActive(&gEventObjects[gSelectedEventObject]);
 }
 
 static void sub_80985BC(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
-    u8 mapObjectId = task->data[2];
+    u8 eventObjectId = task->data[2];
 
     if (!task->data[0] && walkrun_is_standing_still() == TRUE)
     {
         sub_808B864();
         task->data[0] = 1;
     }
-    if (!task->data[1] && !gMapObjects[mapObjectId].mapobj_bit_1)
+    if (!task->data[1] && !gEventObjects[eventObjectId].singleMovementActive)
     {
-        FreezeMapObject(&gMapObjects[mapObjectId]);
+        FreezeEventObject(&gEventObjects[eventObjectId]);
         task->data[1] = 1;
     }
     if (task->data[0] && task->data[1])
@@ -140,34 +139,34 @@ static void sub_80985BC(u8 taskId)
 void sub_8098630(void)
 {
     u8 trainerObjectId1, trainerObjectId2, taskId;
-    trainerObjectId1 = GetChosenApproachingTrainerMapObjectId(0);
+    trainerObjectId1 = GetChosenApproachingTrainerEventObjectId(0);
     if(gNoOfApproachingTrainers == 2)
     {
-        trainerObjectId2 = GetChosenApproachingTrainerMapObjectId(1);
+        trainerObjectId2 = GetChosenApproachingTrainerEventObjectId(1);
         sub_8098074(trainerObjectId1, trainerObjectId2);
         taskId = CreateTask(sub_80985BC, 80);
         gTasks[taskId].data[2] = trainerObjectId1;
-        if(!gMapObjects[trainerObjectId1].mapobj_bit_1)
+        if(!gEventObjects[trainerObjectId1].singleMovementActive)
         {
-            FreezeMapObject(&gMapObjects[trainerObjectId1]);
+            FreezeEventObject(&gEventObjects[trainerObjectId1]);
             gTasks[taskId].data[1] = 1;
         }
         taskId = CreateTask(sub_80985BC, 81);
         gTasks[taskId].data[2] = trainerObjectId2;
-        if(!gMapObjects[trainerObjectId2].mapobj_bit_1)
+        if(!gEventObjects[trainerObjectId2].singleMovementActive)
         {
-            FreezeMapObject(&gMapObjects[trainerObjectId2]);
+            FreezeEventObject(&gEventObjects[trainerObjectId2]);
             gTasks[taskId].data[1] = 1;
         }
     }
     else
     {
-        FreezeMapObjectsExceptOne(trainerObjectId1);
+        FreezeEventObjectsExceptOne(trainerObjectId1);
         taskId = CreateTask(sub_80985BC, 80);
         gTasks[taskId].data[2] = trainerObjectId1;
-        if(!gMapObjects[trainerObjectId1].mapobj_bit_1)
+        if(!gEventObjects[trainerObjectId1].singleMovementActive)
         {
-            FreezeMapObject(&gMapObjects[trainerObjectId1]);
+            FreezeEventObject(&gEventObjects[trainerObjectId1]);
             gTasks[taskId].data[1] = 1;
         }
     }
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
new file mode 100644
index 000000000..35b04ea1e
--- /dev/null
+++ b/src/event_object_movement.c
@@ -0,0 +1,9159 @@
+#include "global.h"
+#include "berry.h"
+#include "decoration.h"
+#include "event_data.h"
+#include "event_object_movement.h"
+#include "event_scripts.h"
+#include "field_camera.h"
+#include "field_effect.h"
+#include "field_effect_helpers.h"
+#include "field_player_avatar.h"
+#include "fieldmap.h"
+#include "malloc.h"
+#include "mauville_old_man.h"
+#include "metatile_behavior.h"
+#include "overworld.h"
+#include "palette.h"
+#include "pokenav.h"
+#include "random.h"
+#include "rom_818CFC8.h"
+#include "rom_81BE66C.h"
+#include "sprite.h"
+#include "trainer_see.h"
+#include "util.h"
+#include "constants/event_objects.h"
+
+// this file was known as evobjmv.c in Game Freak's original source
+
+extern u8 gUnknown_020375B4;
+extern u16 gUnknown_020375B6;
+extern struct LockedAnimEventObjects *gLockedAnimEventObjects;
+
+static void MoveCoordsInDirection(u32, s16 *, s16 *, s16, s16);
+static bool8 EventObjectExecSingleMovementAction(struct EventObject *, struct Sprite *);
+static void SetMovementDelay(struct Sprite *, s16);
+static bool8 WaitForMovementDelay(struct Sprite *);
+static u8 GetCollisionInDirection(struct EventObject *, u8);
+static u32 state_to_direction(u8, u32, u32);
+static void TryEnableEventObjectAnim(struct EventObject *, struct Sprite *);
+static void EventObjectExecHeldMovementAction(struct EventObject *, struct Sprite *);
+static void UpdateEventObjectSpriteAnimPause(struct EventObject *, struct Sprite *);
+static bool8 IsCoordOutsideEventObjectMovementRange(struct EventObject *, s16, s16);
+static bool8 IsMetatileDirectionallyImpassable(struct EventObject *, s16, s16, u8);
+static bool8 DoesObjectCollideWithObjectAt(struct EventObject *, s16, s16);
+static void sub_8096530(struct EventObject *, struct Sprite *);
+static void npc_update_obj_anim_flag(struct EventObject *, struct Sprite *);
+static void EventObjectUpdateMetatileBehaviors(struct EventObject*);
+static void GetGroundEffectFlags_Reflection(struct EventObject*, u32*);
+static void GetGroundEffectFlags_TallGrassOnSpawn(struct EventObject*, u32*);
+static void GetGroundEffectFlags_LongGrassOnSpawn(struct EventObject*, u32*);
+static void GetGroundEffectFlags_SandHeap(struct EventObject*, u32*);
+static void GetGroundEffectFlags_ShallowFlowingWater(struct EventObject*, u32*);
+static void GetGroundEffectFlags_ShortGrass(struct EventObject*, u32*);
+static void GetGroundEffectFlags_HotSprings(struct EventObject*, u32*);
+static void GetGroundEffectFlags_TallGrassOnBeginStep(struct EventObject*, u32*);
+static void GetGroundEffectFlags_LongGrassOnBeginStep(struct EventObject*, u32*);
+static void GetGroundEffectFlags_Tracks(struct EventObject*, u32*);
+static void GetGroundEffectFlags_Puddle(struct EventObject*, u32*);
+static void GetGroundEffectFlags_Ripple(struct EventObject*, u32*);
+static void GetGroundEffectFlags_Seaweed(struct EventObject*, u32*);
+static void GetGroundEffectFlags_JumpLanding(struct EventObject*, u32*);
+static u8 EventObjectCheckForReflectiveSurface(struct EventObject*);
+static u8 GetReflectionTypeByMetatileBehavior(u32);
+static void InitObjectPriorityByZCoord(struct Sprite *sprite, u8 z);
+static void EventObjectUpdateSubpriority(struct EventObject*, struct Sprite*);
+static void DoTracksGroundEffect_None(struct EventObject*, struct Sprite*, u8);
+static void DoTracksGroundEffect_Footprints(struct EventObject*, struct Sprite*, u8);
+static void DoTracksGroundEffect_BikeTireTracks(struct EventObject*, struct Sprite*, u8);
+static void DoRippleFieldEffect(struct EventObject*, struct Sprite*);
+static void DoGroundEffects_OnSpawn(struct EventObject*, struct Sprite*);
+static void DoGroundEffects_OnBeginStep(struct EventObject*, struct Sprite*);
+static void DoGroundEffects_OnFinishStep(struct EventObject*, struct Sprite*);
+static void sub_8097D68(struct Sprite*);
+static void ApplyLevitateMovement(u8);
+static bool8 MovementType_Disguise_Callback(struct EventObject *, struct Sprite *);
+static bool8 MovementType_Hidden_Callback(struct EventObject *, struct Sprite *);
+static void sub_808D450(void);
+static u8 GetEventObjectIdByLocalId(u8);
+static u8 GetEventObjectIdByLocalIdAndMapInternal(u8, u8, u8);
+static bool8 GetAvailableEventObjectId(u16, u8, u8, u8 *);
+static void SetEventObjectDynamicGraphicsId(struct EventObject *);
+static void RemoveEventObjectInternal(struct EventObject *);
+static u16 GetEventObjectFlagIdByEventObjectId(u8);
+static void UpdateEventObjectVisibility(struct EventObject *, struct Sprite *);
+static void MakeObjectTemplateFromEventObjectTemplate(struct EventObjectTemplate *, struct SpriteTemplate *, const struct SubspriteTable **);
+static void GetEventObjectMovingCameraOffset(s16 *, s16 *);
+static struct EventObjectTemplate *GetEventObjectTemplateByLocalIdAndMap(u8, u8, u8);
+static void sub_808E894(u16);
+static void RemoveEventObjectIfOutsideView(struct EventObject *);
+static void sub_808E1B8(u8, s16, s16);
+static void SetPlayerAvatarEventObjectIdAndObjectId(u8, u8);
+static void sub_808E38C(struct EventObject *);
+static u8 sub_808E8F4(const struct SpritePalette *);
+static u8 FindEventObjectPaletteIndexByTag(u16);
+static void sub_808EAB0(u16, u8);
+static bool8 EventObjectDoesZCoordMatch(struct EventObject *, u8);
+static void ObjectCB_CameraObject(struct Sprite *);
+static void CameraObject_0(struct Sprite *);
+static void CameraObject_1(struct Sprite *);
+static void CameraObject_2(struct Sprite *);
+static struct EventObjectTemplate *FindEventObjectTemplateByLocalId(u8 localId, struct EventObjectTemplate *templates, u8 count);
+static void ClearEventObjectMovement(struct EventObject *, struct Sprite *);
+static void EventObjectSetSingleMovement(struct EventObject *, struct Sprite *, u8);
+
+const u8 gUnknown_084975C4[] = {1, 1, 6, 7, 8, 9, 6, 7, 8, 9, 11, 11, 0, 0, 0, 0};
+
+const struct SpriteTemplate gCameraSpriteTemplate = {0, 0xFFFF, &gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, ObjectCB_CameraObject};
+
+void (*const gCameraObjectFuncs[])(struct Sprite *) = {
+    CameraObject_0,
+    CameraObject_1,
+    CameraObject_2,
+};
+
+#include "data/field_event_obj/event_object_graphics.h"
+
+// movement type callbacks
+static void (*const sMovementTypeCallbacks[])(struct Sprite *) =
+{
+    MovementType_None,                         // MOVEMENT_TYPE_NONE
+    MovementType_LookAround,                   // MOVEMENT_TYPE_LOOK_AROUND
+    MovementType_WanderAround,                 // MOVEMENT_TYPE_WANDER_AROUND
+    MovementType_WanderUpAndDown,              // MOVEMENT_TYPE_WANDER_UP_AND_DOWN
+    MovementType_WanderUpAndDown,              // MOVEMENT_TYPE_WANDER_DOWN_AND_UP
+    MovementType_WanderLeftAndRight,           // MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT
+    MovementType_WanderLeftAndRight,           // MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT
+    MovementType_FaceDirection,                // MOVEMENT_TYPE_FACE_UP
+    MovementType_FaceDirection,                // MOVEMENT_TYPE_FACE_DOWN
+    MovementType_FaceDirection,                // MOVEMENT_TYPE_FACE_LEFT
+    MovementType_FaceDirection,                // MOVEMENT_TYPE_FACE_RIGHT
+    MovementType_Player,                       // MOVEMENT_TYPE_PLAYER
+    MovementType_BerryTreeGrowth,              // MOVEMENT_TYPE_BERRY_TREE_GROWTH
+    MovementType_FaceDownAndUp,                // MOVEMENT_TYPE_FACE_DOWN_AND_UP
+    MovementType_FaceLeftAndRight,             // MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT
+    MovementType_FaceUpAndLeft,                // MOVEMENT_TYPE_FACE_UP_AND_LEFT
+    MovementType_FaceUpAndRight,               // MOVEMENT_TYPE_FACE_UP_AND_RIGHT
+    MovementType_FaceDownAndLeft,              // MOVEMENT_TYPE_FACE_DOWN_AND_LEFT
+    MovementType_FaceDownAndRight,             // MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT
+    MovementType_FaceDownUpAndLeft,            // MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT
+    MovementType_FaceDownUpAndRight,           // MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT
+    MovementType_FaceUpRightAndLeft,           // MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT
+    MovementType_FaceDownRightAndLeft,         // MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT
+    MovementType_RotateCounterclockwise,       // MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE
+    MovementType_RotateClockwise,              // MOVEMENT_TYPE_ROTATE_CLOCKWISE
+    MovementType_WalkBackAndForth,             // MOVEMENT_TYPE_WALK_UP_AND_DOWN
+    MovementType_WalkBackAndForth,             // MOVEMENT_TYPE_WALK_DOWN_AND_UP
+    MovementType_WalkBackAndForth,             // MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT
+    MovementType_WalkBackAndForth,             // MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT
+    MovementType_WalkSequenceUpRightLeftDown,  // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN
+    MovementType_WalkSequenceRightLeftDownUp,  // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP
+    MovementType_WalkSequenceDownUpRightLeft,  // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT
+    MovementType_WalkSequenceLeftDownUpRight,  // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT
+    MovementType_WalkSequenceUpLeftRightDown,  // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN
+    MovementType_WalkSequenceLeftRightDownUp,  // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP
+    MovementType_WalkSequenceDownUpLeftRight,  // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT
+    MovementType_WalkSequenceRightDownUpLeft,  // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT
+    MovementType_WalkSequenceLeftUpDownRight,  // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT
+    MovementType_WalkSequenceUpDownRightLeft,  // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT
+    MovementType_WalkSequenceRightLeftUpDown,  // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN
+    MovementType_WalkSequenceDownRightLeftUp,  // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP
+    MovementType_WalkSequenceRightUpDownLeft,  // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT
+    MovementType_WalkSequenceUpDownLeftRight,  // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT
+    MovementType_WalkSequenceLeftRightUpDown,  // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN
+    MovementType_WalkSequenceDownLeftRightUp,  // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP
+    MovementType_WalkSequenceUpLeftDownRight,  // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT
+    MovementType_WalkSequenceDownRightUpLeft,  // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT
+    MovementType_WalkSequenceLeftDownRightUp,  // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP
+    MovementType_WalkSequenceRightUpLeftDown,  // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN
+    MovementType_WalkSequenceUpRightDownLeft,  // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT
+    MovementType_WalkSequenceDownLeftUpRight,  // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT
+    MovementType_WalkSequenceLeftUpRightDown,  // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN
+    MovementType_WalkSequenceRightDownLeftUp,  // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP
+    MovementType_CopyPlayer,                   // MOVEMENT_TYPE_COPY_PLAYER
+    MovementType_CopyPlayer,                   // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE
+    MovementType_CopyPlayer,                   // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE
+    MovementType_CopyPlayer,                   // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE
+    MovementType_TreeDisguise,                 // MOVEMENT_TYPE_TREE_DISGUISE
+    MovementType_MountainDisguise,             // MOVEMENT_TYPE_MOUNTAIN_DISGUISE
+    MovementType_CopyPlayerInGrass,            // MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS
+    MovementType_CopyPlayerInGrass,            // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS
+    MovementType_CopyPlayerInGrass,            // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS
+    MovementType_CopyPlayerInGrass,            // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS
+    MovementType_Hidden,                       // MOVEMENT_TYPE_HIDDEN
+    MovementType_WalkInPlace,                  // MOVEMENT_TYPE_WALK_IN_PLACE_DOWN
+    MovementType_WalkInPlace,                  // MOVEMENT_TYPE_WALK_IN_PLACE_UP
+    MovementType_WalkInPlace,                  // MOVEMENT_TYPE_WALK_IN_PLACE_LEFT
+    MovementType_WalkInPlace,                  // MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT
+    MovementType_JogInPlace,                   // MOVEMENT_TYPE_JOG_IN_PLACE_DOWN
+    MovementType_JogInPlace,                   // MOVEMENT_TYPE_JOG_IN_PLACE_UP
+    MovementType_JogInPlace,                   // MOVEMENT_TYPE_JOG_IN_PLACE_LEFT
+    MovementType_JogInPlace,                   // MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT
+    MovementType_RunInPlace,                   // MOVEMENT_TYPE_RUN_IN_PLACE_DOWN
+    MovementType_RunInPlace,                   // MOVEMENT_TYPE_RUN_IN_PLACE_UP
+    MovementType_RunInPlace,                   // MOVEMENT_TYPE_RUN_IN_PLACE_LEFT
+    MovementType_RunInPlace,                   // MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT
+    MovementType_Invisible,                    // MOVEMENT_TYPE_INVISIBLE
+    MovementType_WalkSlowlyInPlace,            // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN
+    MovementType_WalkSlowlyInPlace,            // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP
+    MovementType_WalkSlowlyInPlace,            // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT
+    MovementType_WalkSlowlyInPlace,            // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT
+};
+
+const u8 gRangedMovementTypes[] = {
+    0, // MOVEMENT_TYPE_NONE
+    0, // MOVEMENT_TYPE_LOOK_AROUND
+    1, // MOVEMENT_TYPE_WANDER_AROUND
+    1, // MOVEMENT_TYPE_WANDER_UP_AND_DOWN
+    1, // MOVEMENT_TYPE_WANDER_DOWN_AND_UP
+    1, // MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT
+    1, // MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT
+    0, // MOVEMENT_TYPE_FACE_UP
+    0, // MOVEMENT_TYPE_FACE_DOWN
+    0, // MOVEMENT_TYPE_FACE_LEFT
+    0, // MOVEMENT_TYPE_FACE_RIGHT
+    0, // MOVEMENT_TYPE_PLAYER
+    0, // MOVEMENT_TYPE_BERRY_TREE_GROWTH
+    0, // MOVEMENT_TYPE_FACE_DOWN_AND_UP
+    0, // MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT
+    0, // MOVEMENT_TYPE_FACE_UP_AND_LEFT
+    0, // MOVEMENT_TYPE_FACE_UP_AND_RIGHT
+    0, // MOVEMENT_TYPE_FACE_DOWN_AND_LEFT
+    0, // MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT
+    0, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT
+    0, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT
+    0, // MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT
+    0, // MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT
+    0, // MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE
+    0, // MOVEMENT_TYPE_ROTATE_CLOCKWISE
+    1, // MOVEMENT_TYPE_WALK_UP_AND_DOWN
+    1, // MOVEMENT_TYPE_WALK_DOWN_AND_UP
+    1, // MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT
+    1, // MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP
+    1, // MOVEMENT_TYPE_COPY_PLAYER
+    1, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE
+    1, // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE
+    1, // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE
+    0, // MOVEMENT_TYPE_TREE_DISGUISE
+    0, // MOVEMENT_TYPE_MOUNTAIN_DISGUISE
+    1, // MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS
+    1, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS
+    1, // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS
+    1, // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS
+    0, // MOVEMENT_TYPE_HIDDEN
+    0, // MOVEMENT_TYPE_WALK_IN_PLACE_DOWN
+    0, // MOVEMENT_TYPE_WALK_IN_PLACE_UP
+    0, // MOVEMENT_TYPE_WALK_IN_PLACE_LEFT
+    0, // MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT
+    0, // MOVEMENT_TYPE_JOG_IN_PLACE_DOWN
+    0, // MOVEMENT_TYPE_JOG_IN_PLACE_UP
+    0, // MOVEMENT_TYPE_JOG_IN_PLACE_LEFT
+    0, // MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT
+    0, // MOVEMENT_TYPE_RUN_IN_PLACE_DOWN
+    0, // MOVEMENT_TYPE_RUN_IN_PLACE_UP
+    0, // MOVEMENT_TYPE_RUN_IN_PLACE_LEFT
+    0, // MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT
+    0, // MOVEMENT_TYPE_INVISIBLE
+    0, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN
+    0, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP
+    0, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT
+    0, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT
+};
+
+const u8 gInitialMovementTypeFacingDirections[] = {
+    DIR_SOUTH, // MOVEMENT_TYPE_NONE
+    DIR_SOUTH, // MOVEMENT_TYPE_LOOK_AROUND
+    DIR_SOUTH, // MOVEMENT_TYPE_WANDER_AROUND
+    DIR_NORTH, // MOVEMENT_TYPE_WANDER_UP_AND_DOWN
+    DIR_SOUTH, // MOVEMENT_TYPE_WANDER_DOWN_AND_UP
+    DIR_WEST,  // MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT
+    DIR_EAST,  // MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT
+    DIR_NORTH, // MOVEMENT_TYPE_FACE_UP
+    DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN
+    DIR_WEST,  // MOVEMENT_TYPE_FACE_LEFT
+    DIR_EAST,  // MOVEMENT_TYPE_FACE_RIGHT
+    DIR_SOUTH, // MOVEMENT_TYPE_PLAYER
+    DIR_SOUTH, // MOVEMENT_TYPE_BERRY_TREE_GROWTH
+    DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_AND_UP
+    DIR_WEST,  // MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT
+    DIR_NORTH, // MOVEMENT_TYPE_FACE_UP_AND_LEFT
+    DIR_NORTH, // MOVEMENT_TYPE_FACE_UP_AND_RIGHT
+    DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_AND_LEFT
+    DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT
+    DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT
+    DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT
+    DIR_NORTH, // MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT
+    DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT
+    DIR_SOUTH, // MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE
+    DIR_SOUTH, // MOVEMENT_TYPE_ROTATE_CLOCKWISE
+    DIR_NORTH, // MOVEMENT_TYPE_WALK_UP_AND_DOWN
+    DIR_SOUTH, // MOVEMENT_TYPE_WALK_DOWN_AND_UP
+    DIR_WEST,  // MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT
+    DIR_EAST,  // MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT
+    DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN
+    DIR_EAST,  // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP
+    DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT
+    DIR_WEST,  // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT
+    DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN
+    DIR_WEST,  // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP
+    DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT
+    DIR_EAST,  // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT
+    DIR_WEST,  // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT
+    DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT
+    DIR_EAST,  // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN
+    DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP
+    DIR_EAST,  // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT
+    DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT
+    DIR_WEST,  // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN
+    DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP
+    DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT
+    DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT
+    DIR_WEST,  // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP
+    DIR_EAST,  // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN
+    DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT
+    DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT
+    DIR_WEST,  // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN
+    DIR_EAST,  // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP
+    DIR_NORTH, // MOVEMENT_TYPE_COPY_PLAYER
+    DIR_SOUTH, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE
+    DIR_WEST,  // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE
+    DIR_EAST,  // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE
+    DIR_SOUTH, // MOVEMENT_TYPE_TREE_DISGUISE
+    DIR_SOUTH, // MOVEMENT_TYPE_MOUNTAIN_DISGUISE
+    DIR_NORTH, // MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS
+    DIR_SOUTH, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS
+    DIR_WEST,  // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS
+    DIR_EAST,  // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS
+    DIR_SOUTH, // MOVEMENT_TYPE_HIDDEN
+    DIR_SOUTH, // MOVEMENT_TYPE_WALK_IN_PLACE_DOWN
+    DIR_NORTH, // MOVEMENT_TYPE_WALK_IN_PLACE_UP
+    DIR_WEST,  // MOVEMENT_TYPE_WALK_IN_PLACE_LEFT
+    DIR_EAST,  // MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT
+    DIR_SOUTH, // MOVEMENT_TYPE_JOG_IN_PLACE_DOWN
+    DIR_NORTH, // MOVEMENT_TYPE_JOG_IN_PLACE_UP
+    DIR_WEST,  // MOVEMENT_TYPE_JOG_IN_PLACE_LEFT
+    DIR_EAST,  // MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT
+    DIR_SOUTH, // MOVEMENT_TYPE_RUN_IN_PLACE_DOWN
+    DIR_NORTH, // MOVEMENT_TYPE_RUN_IN_PLACE_UP
+    DIR_WEST,  // MOVEMENT_TYPE_RUN_IN_PLACE_LEFT
+    DIR_EAST,  // MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT
+    DIR_SOUTH, // MOVEMENT_TYPE_INVISIBLE
+    DIR_SOUTH, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN
+    DIR_NORTH, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP
+    DIR_WEST,  // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT
+    DIR_EAST,  // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT
+};
+
+#include "data/field_event_obj/event_object_graphics_info_pointers.h"
+#include "data/field_event_obj/field_effect_object_template_pointers.h"
+#include "data/field_event_obj/event_object_pic_tables.h"
+#include "data/field_event_obj/event_object_anims.h"
+#include "data/field_event_obj/base_oam.h"
+#include "data/field_event_obj/event_object_subsprites.h"
+#include "data/field_event_obj/event_object_graphics_info.h"
+
+const struct SpritePalette gUnknown_0850BBC8[] = {
+    {gEventObjectPalette0,  0x1103},
+    {gEventObjectPalette1,  0x1104},
+    {gEventObjectPalette2,  0x1105},
+    {gEventObjectPalette3,  0x1106},
+    {gEventObjectPalette4,  0x1107},
+    {gEventObjectPalette5,  0x1108},
+    {gEventObjectPalette6,  0x1109},
+    {gEventObjectPalette7,  0x110A},
+    {gEventObjectPalette8,  0x1100},
+    {gEventObjectPalette9,  0x1101},
+    {gEventObjectPalette10, 0x1102},
+    {gEventObjectPalette11, 0x1115},
+    {gEventObjectPalette12, 0x110B},
+    {gEventObjectPalette13, 0x110C},
+    {gEventObjectPalette14, 0x110D},
+    {gEventObjectPalette15, 0x110E},
+    {gEventObjectPalette16, 0x110F},
+    {gEventObjectPalette17, 0x1110},
+    {gEventObjectPalette18, 0x1111},
+    {gEventObjectPalette19, 0x1112},
+    {gEventObjectPalette20, 0x1113},
+    {gEventObjectPalette21, 0x1114},
+    {gEventObjectPalette22, 0x1116},
+    {gEventObjectPalette23, 0x1117},
+    {gEventObjectPalette24, 0x1118},
+    {gEventObjectPalette25, 0x1119},
+    {gEventObjectPalette26, 0x111B},
+    {gEventObjectPalette27, 0x111C},
+    {gEventObjectPalette28, 0x111D},
+    {gEventObjectPalette29, 0x111E},
+    {gEventObjectPalette30, 0x111F},
+    {gEventObjectPalette31, 0x1120},
+    {gEventObjectPalette32, 0x1121},
+    {gEventObjectPalette33, 0x1122},
+    {gEventObjectPalette34, 0x1123},
+    {NULL,                  0x0000},
+};
+
+const u16 Unknown_0850BCE8[] = {
+    0x1101,
+    0x1101,
+    0x1101,
+    0x1101,
+};
+
+const u16 Unknown_0850BCF0[] = {
+    0x1111,
+    0x1111,
+    0x1111,
+    0x1111,
+};
+
+const u16 Unknown_0850BCF8[] = {
+    0x1115,
+    0x1115,
+    0x1115,
+    0x1115,
+};
+
+const struct PairedPalettes gUnknown_0850BD00[] = {
+    {0x1100, Unknown_0850BCE8},
+    {0x1110, Unknown_0850BCF0},
+    {0x1115, Unknown_0850BCF8},
+    {0x11FF, NULL},
+};
+
+const u16 Unknown_0850BD20[] = {
+    0x110C,
+    0x110C,
+    0x110C,
+    0x110C,
+};
+
+const u16 Unknown_0850BD28[] = {
+    0x110D,
+    0x110D,
+    0x110D,
+    0x110D,
+};
+
+const u16 Unknown_0850BD30[] = {
+    0x110E,
+    0x110E,
+    0x110E,
+    0x110E,
+};
+
+const u16 Unknown_0850BD38[] = {
+    0x1112,
+    0x1112,
+    0x1112,
+    0x1112,
+};
+
+const u16 Unknown_0850BD40[] = {
+    0x1113,
+    0x1113,
+    0x1113,
+    0x1113,
+};
+
+const u16 Unknown_0850BD48[] = {
+    0x1114,
+    0x1114,
+    0x1114,
+    0x1114,
+};
+
+const u16 Unknown_0850BD50[] = {
+    0x111B,
+    0x111B,
+    0x111B,
+    0x111B,
+};
+
+const u16 Unknown_0850BD58[] = {
+    0x1117,
+    0x1117,
+    0x1117,
+    0x1117,
+};
+
+const u16 Unknown_0850BD60[] = {
+    0x1119,
+    0x1119,
+    0x1119,
+    0x1119,
+};
+
+const u16 Unknown_0850BD68[] = {
+    0x1109,
+    0x1109,
+    0x1109,
+    0x1109,
+};
+
+const u16 Unknown_0850BD70[] = {
+    0x111D,
+    0x111D,
+    0x111D,
+    0x111D,
+};
+
+const struct PairedPalettes gUnknown_0850BD78[] = {
+    {4352, Unknown_0850BCE8},
+    {4368, Unknown_0850BCF0},
+    {4363, Unknown_0850BD20},
+    {4365, Unknown_0850BD28},
+    {4366, Unknown_0850BD30},
+    {4370, Unknown_0850BD38},
+    {4371, Unknown_0850BD40},
+    {4372, Unknown_0850BD48},
+    {4374, Unknown_0850BD58},
+    {4376, Unknown_0850BD60},
+    {4357, Unknown_0850BD68},
+    {4379, Unknown_0850BD50},
+    {4381, Unknown_0850BD70},
+    {4607, NULL},
+};
+
+const u16 gUnknown_0850BDE8[] = {
+    0x1100,
+    0x1101,
+    0x1103,
+    0x1104,
+    0x1105,
+    0x1106,
+    0x1107,
+    0x1108,
+    0x1109,
+    0x110A,
+};
+
+const u16 gUnknown_0850BDFC[] = {
+    0x1100,
+    0x1101,
+    0x1103,
+    0x1104,
+    0x1105,
+    0x1106,
+    0x1107,
+    0x1108,
+    0x1109,
+    0x110A,
+};
+
+const u16 gUnknown_0850BE10[] = {
+    0x1100,
+    0x1101,
+    0x1103,
+    0x1104,
+    0x1105,
+    0x1106,
+    0x1107,
+    0x1108,
+    0x1109,
+    0x110A,
+};
+
+const u16 gUnknown_0850BE24[] = {
+     0x1100,
+     0x1101,
+     0x1103,
+     0x1104,
+     0x1105,
+     0x1106,
+     0x1107,
+     0x1108,
+     0x1109,
+     0x110A,
+};
+
+
+const u16 *const gUnknown_0850BE38[] = {
+    gUnknown_0850BDE8,
+    gUnknown_0850BDFC,
+    gUnknown_0850BE10,
+    gUnknown_0850BE24,
+};
+
+#include "data/field_event_obj/berry_tree_graphics_tables.h"
+#include "data/field_event_obj/field_effect_objects.h"
+
+const s16 gMovementDelaysMedium[] = {32, 64,  96, 128};
+const s16 gMovementDelaysLong[] =   {32, 64, 128, 192};
+const s16 gMovementDelaysShort[] =  {32, 48,  64,  80};
+
+#include "data/field_event_obj/movement_type_func_tables.h"
+
+const u8 gFaceDirectionAnimNums[] = {
+    0, // DIR_NONE
+    0, // DIR_SOUTH
+    1, // DIR_NORTH
+    2, // DIR_WEST
+    3, // DIR_EAST
+    0, // DIR_SOUTHWEST
+    0, // DIR_SOUTHEAST
+    1, // DIR_NORTHWEST
+    1, // DIR_NORTHEAST
+};
+const u8 gMoveDirectionAnimNums[] = {
+    4, // DIR_NONE
+    4, // DIR_SOUTH
+    5, // DIR_NORTH
+    6, // DIR_WEST
+    7, // DIR_EAST
+    4, // DIR_SOUTHWEST
+    4, // DIR_SOUTHEAST
+    5, // DIR_NORTHWEST
+    5, // DIR_NORTHEAST
+};
+const u8 gMoveDirectionFastAnimNums[] = {
+    8,  // DIR_NONE
+    8,  // DIR_SOUTH
+    9,  // DIR_NORTH
+    10, // DIR_WEST
+    11, // DIR_EAST
+    8,  // DIR_SOUTHWEST
+    8,  // DIR_SOUTHEAST
+    9,  // DIR_NORTHWEST
+    9,  // DIR_NORTHEAST
+};
+const u8 gMoveDirectionFasterAnimNums[] = {
+    12, // DIR_NONE
+    12, // DIR_SOUTH
+    13, // DIR_NORTH
+    14, // DIR_WEST
+    15, // DIR_EAST
+    12, // DIR_SOUTHWEST
+    12, // DIR_SOUTHEAST
+    13, // DIR_NORTHWEST
+    13, // DIR_NORTHEAST
+};
+const u8 gMoveDirectionFastestAnimNums[] = {
+    16, // DIR_NONE
+    16, // DIR_SOUTH
+    17, // DIR_NORTH
+    18, // DIR_WEST
+    19, // DIR_EAST
+    16, // DIR_SOUTHWEST
+    16, // DIR_SOUTHEAST
+    17, // DIR_NORTHWEST
+    17, // DIR_NORTHEAST
+};
+const u8 gJumpSpecialDirectionAnimNums[] = { // used for jumping onto surf mon
+    20, // DIR_NONE
+    20, // DIR_SOUTH
+    21, // DIR_NORTH
+    22, // DIR_WEST
+    23, // DIR_EAST
+    20, // DIR_SOUTHWEST
+    20, // DIR_SOUTHEAST
+    21, // DIR_NORTHWEST
+    21, // DIR_NORTHEAST
+};
+const u8 gAcroWheelieDirectionAnimNums[] = {
+    20, // DIR_NONE
+    20, // DIR_SOUTH
+    21, // DIR_NORTH
+    22, // DIR_WEST
+    23, // DIR_EAST
+    20, // DIR_SOUTHWEST
+    20, // DIR_SOUTHEAST
+    21, // DIR_NORTHWEST
+    21, // DIR_NORTHEAST
+};
+const u8 gUnrefAnimNums_08375633[] = {
+    24, // DIR_NONE
+    24, // DIR_SOUTH
+    25, // DIR_NORTH
+    26, // DIR_WEST
+    27, // DIR_EAST
+    24, // DIR_SOUTHWEST
+    24, // DIR_SOUTHEAST
+    25, // DIR_NORTHWEST
+    25, // DIR_NORTHEAST
+};
+const u8 gAcroEndWheelieDirectionAnimNums[] = {
+    28, // DIR_NONE
+    28, // DIR_SOUTH
+    29, // DIR_NORTH
+    30, // DIR_WEST
+    31, // DIR_EAST
+    28, // DIR_SOUTHWEST
+    28, // DIR_SOUTHEAST
+    29, // DIR_NORTHWEST
+    29, // DIR_NORTHEAST
+};
+const u8 gAcroUnusedActionDirectionAnimNums[] = {
+    32, // DIR_NONE
+    32, // DIR_SOUTH
+    33, // DIR_NORTH
+    34, // DIR_WEST
+    35, // DIR_EAST
+    32, // DIR_SOUTHWEST
+    32, // DIR_SOUTHEAST
+    33, // DIR_NORTHWEST
+    33, // DIR_NORTHEAST
+};
+const u8 gAcroWheeliePedalDirectionAnimNums[] = {
+    36, // DIR_NONE
+    36, // DIR_SOUTH
+    37, // DIR_NORTH
+    38, // DIR_WEST
+    39, // DIR_EAST
+    36, // DIR_SOUTHWEST
+    36, // DIR_SOUTHEAST
+    37, // DIR_NORTHWEST
+    37, // DIR_NORTHEAST
+};
+const u8 gFishingDirectionAnimNums[] = {
+    0, // DIR_NONE
+    0, // DIR_SOUTH
+    1, // DIR_NORTH
+    2, // DIR_WEST
+    3, // DIR_EAST
+    0, // DIR_SOUTHWEST
+    0, // DIR_SOUTHEAST
+    1, // DIR_NORTHWEST
+    1, // DIR_NORTHEAST
+};
+const u8 gFishingNoCatchDirectionAnimNums[] = {
+    4, // DIR_NONE
+    4, // DIR_SOUTH
+    5, // DIR_NORTH
+    6, // DIR_WEST
+    7, // DIR_EAST
+    4, // DIR_SOUTHWEST
+    4, // DIR_SOUTHEAST
+    5, // DIR_NORTHWEST
+    5, // DIR_NORTHEAST
+};
+const u8 gFishingBiteDirectionAnimNums[] = {
+    8,  // DIR_NONE
+    8,  // DIR_SOUTH
+    9,  // DIR_NORTH
+    10, // DIR_WEST
+    11, // DIR_EAST
+    8,  // DIR_SOUTHWEST
+    8,  // DIR_SOUTHEAST
+    9,  // DIR_NORTHWEST
+    9,  // DIR_NORTHEAST
+};
+const u8 gRunningDirectionAnimNums[] = {
+    20, // DIR_NONE
+    20, // DIR_SOUTH
+    21, // DIR_NORTH
+    22, // DIR_WEST
+    23, // DIR_EAST
+    20, // DIR_SOUTHWEST
+    20, // DIR_SOUTHEAST
+    21, // DIR_NORTHWEST
+    21, // DIR_NORTHEAST
+};
+
+const u8 gTrainerFacingDirectionMovementTypes[] = {
+    MOVEMENT_TYPE_FACE_DOWN,  // DIR_NONE
+    MOVEMENT_TYPE_FACE_DOWN,  // DIR_SOUTH
+    MOVEMENT_TYPE_FACE_UP,    // DIR_NORTH
+    MOVEMENT_TYPE_FACE_LEFT,  // DIR_WEST
+    MOVEMENT_TYPE_FACE_RIGHT, // DIR_EAST
+    MOVEMENT_TYPE_FACE_DOWN,  // DIR_SOUTHWEST
+    MOVEMENT_TYPE_FACE_DOWN,  // DIR_SOUTHEAST
+    MOVEMENT_TYPE_FACE_UP,    // DIR_NORTHWEST
+    MOVEMENT_TYPE_FACE_UP,    // DIR_NORTHEAST
+};
+
+bool8 (*const gOppositeDirectionBlockedMetatileFuncs[])(u8) = {
+    MetatileBehavior_IsSouthBlocked,
+    MetatileBehavior_IsNorthBlocked,
+    MetatileBehavior_IsWestBlocked,
+    MetatileBehavior_IsEastBlocked
+};
+
+bool8 (*const gDirectionBlockedMetatileFuncs[])(u8) = {
+    MetatileBehavior_IsNorthBlocked,
+    MetatileBehavior_IsSouthBlocked,
+    MetatileBehavior_IsEastBlocked,
+    MetatileBehavior_IsWestBlocked
+};
+
+const struct Coords16 gDirectionToVectors[] = {
+    { 0,  0},
+    { 0,  1},
+    { 0, -1},
+    {-1,  0},
+    { 1,  0},
+    {-1,  1},
+    { 1,  1},
+    {-1, -1},
+    { 1, -1}
+};
+
+const u8 gFaceDirectionMovementActions[] = {
+    MOVEMENT_ACTION_FACE_DOWN,
+    MOVEMENT_ACTION_FACE_DOWN,
+    MOVEMENT_ACTION_FACE_UP,
+    MOVEMENT_ACTION_FACE_LEFT,
+    MOVEMENT_ACTION_FACE_RIGHT,
+};
+const u8 gWalkSlowMovementActions[] = {
+    MOVEMENT_ACTION_WALK_SLOW_DOWN,
+    MOVEMENT_ACTION_WALK_SLOW_DOWN,
+    MOVEMENT_ACTION_WALK_SLOW_UP,
+    MOVEMENT_ACTION_WALK_SLOW_LEFT,
+    MOVEMENT_ACTION_WALK_SLOW_RIGHT,
+};
+const u8 gWalkNormalMovementActions[] = {
+    MOVEMENT_ACTION_WALK_NORMAL_DOWN,
+    MOVEMENT_ACTION_WALK_NORMAL_DOWN,
+    MOVEMENT_ACTION_WALK_NORMAL_UP,
+    MOVEMENT_ACTION_WALK_NORMAL_LEFT,
+    MOVEMENT_ACTION_WALK_NORMAL_RIGHT,
+};
+const u8 gWalkFastMovementActions[] = {
+    MOVEMENT_ACTION_WALK_FAST_DOWN,
+    MOVEMENT_ACTION_WALK_FAST_DOWN,
+    MOVEMENT_ACTION_WALK_FAST_UP,
+    MOVEMENT_ACTION_WALK_FAST_LEFT,
+    MOVEMENT_ACTION_WALK_FAST_RIGHT,
+};
+const u8 gRideWaterCurrentMovementActions[] = {
+    MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN,
+    MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN,
+    MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP,
+    MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT,
+    MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT,
+};
+const u8 gWalkFastestMovementActions[] = {
+    MOVEMENT_ACTION_WALK_FASTEST_DOWN,
+    MOVEMENT_ACTION_WALK_FASTEST_DOWN,
+    MOVEMENT_ACTION_WALK_FASTEST_UP,
+    MOVEMENT_ACTION_WALK_FASTEST_LEFT,
+    MOVEMENT_ACTION_WALK_FASTEST_RIGHT,
+};
+const u8 gSlideMovementActions[] = {
+    MOVEMENT_ACTION_SLIDE_DOWN,
+    MOVEMENT_ACTION_SLIDE_DOWN,
+    MOVEMENT_ACTION_SLIDE_UP,
+    MOVEMENT_ACTION_SLIDE_LEFT,
+    MOVEMENT_ACTION_SLIDE_RIGHT,
+};
+const u8 gPlayerRunMovementActions[] = {
+    MOVEMENT_ACTION_PLAYER_RUN_DOWN,
+    MOVEMENT_ACTION_PLAYER_RUN_DOWN,
+    MOVEMENT_ACTION_PLAYER_RUN_UP,
+    MOVEMENT_ACTION_PLAYER_RUN_LEFT,
+    MOVEMENT_ACTION_PLAYER_RUN_RIGHT,
+};
+const u8 gJump2MovementActions[] = {
+    MOVEMENT_ACTION_JUMP_2_DOWN,
+    MOVEMENT_ACTION_JUMP_2_DOWN,
+    MOVEMENT_ACTION_JUMP_2_UP,
+    MOVEMENT_ACTION_JUMP_2_LEFT,
+    MOVEMENT_ACTION_JUMP_2_RIGHT,
+};
+const u8 gJumpInPlaceMovementActions[] = {
+    MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN,
+    MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN,
+    MOVEMENT_ACTION_JUMP_IN_PLACE_UP,
+    MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT,
+    MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT,
+};
+const u8 gJumpInPlaceTurnAroundMovementActions[] = {
+    MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN,
+    MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN,
+    MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP,
+    MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT,
+    MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT,
+};
+const u8 gJumpMovementActions[] = {
+    MOVEMENT_ACTION_JUMP_DOWN,
+    MOVEMENT_ACTION_JUMP_DOWN,
+    MOVEMENT_ACTION_JUMP_UP,
+    MOVEMENT_ACTION_JUMP_LEFT,
+    MOVEMENT_ACTION_JUMP_RIGHT,
+};
+const u8 gJumpSpecialMovementActions[] = {
+    MOVEMENT_ACTION_JUMP_SPECIAL_DOWN,
+    MOVEMENT_ACTION_JUMP_SPECIAL_DOWN,
+    MOVEMENT_ACTION_JUMP_SPECIAL_UP,
+    MOVEMENT_ACTION_JUMP_SPECIAL_LEFT,
+    MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT,
+};
+const u8 gWalkInPlaceSlowMovementActions[] = {
+    MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN,
+    MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN,
+    MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP,
+    MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT,
+    MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT,
+};
+const u8 gWalkInPlaceNormalMovementActions[] = {
+    MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN,
+    MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN,
+    MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP,
+    MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT,
+    MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT,
+};
+const u8 gWalkInPlaceFastMovementActions[] = {
+    MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN,
+    MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN,
+    MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP,
+    MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT,
+    MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT,
+};
+const u8 gWalkInPlaceFastestMovementActions[] = {
+    MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN,
+    MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN,
+    MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP,
+    MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT,
+    MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT,
+};
+const u8 gAcroWheelieFaceDirectionMovementActions[] = {
+    MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN,
+    MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN,
+    MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP,
+    MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT,
+};
+const u8 gAcroPopWheelieFaceDirectionMovementActions[] = {
+    MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN,
+    MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN,
+    MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP,
+    MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT,
+    MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT,
+};
+const u8 gAcroEndWheelieFaceDirectionMovementActions[] = {
+    MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN,
+    MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN,
+    MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP,
+    MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT,
+    MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT,
+};
+const u8 gAcroWheelieHopFaceDirectionMovementActions[] = {
+    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN,
+    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN,
+    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP,
+    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT,
+};
+const u8 gAcroWheelieHopDirectionMovementActions[] = {
+    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN,
+    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN,
+    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP,
+    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT,
+};
+const u8 gAcroWheelieJumpDirectionMovementActions[] = {
+    MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN,
+    MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN,
+    MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP,
+    MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT,
+};
+const u8 gAcroWheelieInPlaceDirectionMovementActions[] = {
+    MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN,
+    MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN,
+    MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP,
+    MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT,
+};
+const u8 gAcroPopWheelieMoveDirectionMovementActions[] = {
+    MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN,
+    MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN,
+    MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP,
+    MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT,
+    MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT,
+};
+const u8 gAcroWheelieMoveDirectionMovementActions[] = {
+    MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN,
+    MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN,
+    MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP,
+    MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT,
+};
+const u8 gAcroEndWheelieMoveDirectionMovementActions[] = {
+    MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN,
+    MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN,
+    MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP,
+    MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT,
+    MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT,
+};
+
+const u8 gOppositeDirections[] = {
+    DIR_NORTH,
+    DIR_SOUTH,
+    DIR_EAST,
+    DIR_WEST,
+    DIR_NORTHEAST,
+    DIR_NORTHWEST,
+    DIR_SOUTHEAST,
+    DIR_SOUTHWEST,
+};
+
+const u8 gUnknown_0850DC2F[][4] = {
+    {2, 1, 4, 3},
+    {1, 2, 3, 4},
+    {3, 4, 2, 1},
+    {4, 3, 1, 2}
+};
+
+const u8 gUnknown_0850DC3F[][4] = {
+    {2, 1, 4, 3},
+    {1, 2, 3, 4},
+    {4, 3, 1, 2},
+    {3, 4, 2, 1}
+};
+
+#include "data/field_event_obj/movement_action_func_tables.h"
+
+// Code
+
+static void ClearEventObject(struct EventObject *eventObject)
+{
+    *eventObject = (struct EventObject){};
+    eventObject->localId = 0xFF;
+    eventObject->mapNum = 0xFF;
+    eventObject->mapGroup = 0xFF;
+    eventObject->movementActionId = 0xFF;
+}
+
+static void ClearAllEventObjects(void)
+{
+    u8 i;
+
+    for (i = 0; i < NUM_EVENT_OBJECTS; i++)
+        ClearEventObject(&gEventObjects[i]);
+}
+
+void sub_808D438(void)
+{
+    ClearLinkPlayerEventObjects();
+    ClearAllEventObjects();
+    ClearPlayerAvatarInfo();
+    sub_808D450();
+}
+
+static void sub_808D450(void)
+{
+    u8 spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[21], 0, 0, 31);
+    gSprites[spriteId].oam.affineMode = 1;
+    InitSpriteAffineAnim(&gSprites[spriteId]);
+    StartSpriteAffineAnim(&gSprites[spriteId], 0);
+    gSprites[spriteId].invisible = 1;
+
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[21], 0, 0, 31);
+    gSprites[spriteId].oam.affineMode = 1;
+    InitSpriteAffineAnim(&gSprites[spriteId]);
+    StartSpriteAffineAnim(&gSprites[spriteId], 1);
+    gSprites[spriteId].invisible = 1;
+}
+
+u8 GetFirstInactiveEventObjectId(void)
+{
+    u8 i;
+    for (i = 0; i < NUM_EVENT_OBJECTS; i++)
+    {
+        if (!gEventObjects[i].active)
+            break;
+    }
+
+    return i;
+}
+
+u8 GetEventObjectIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroupId)
+{
+    if (localId < 0xff)
+    {
+        return GetEventObjectIdByLocalIdAndMapInternal(localId, mapNum, mapGroupId);
+    }
+    return GetEventObjectIdByLocalId(localId);
+}
+
+bool8 TryGetEventObjectIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroupId, u8 *eventObjectId)
+{
+    *eventObjectId = GetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroupId);
+    if (*eventObjectId == NUM_EVENT_OBJECTS)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+u8 GetEventObjectIdByXY(s16 x, s16 y)
+{
+    u8 i;
+    for (i = 0; i < NUM_EVENT_OBJECTS; i++)
+    {
+        if (gEventObjects[i].active && gEventObjects[i].currentCoords.x == x && gEventObjects[i].currentCoords.y == y)
+            break;
+    }
+
+    return i;
+}
+
+static u8 GetEventObjectIdByLocalIdAndMapInternal(u8 localId, u8 mapNum, u8 mapGroupId)
+{
+    u8 i;
+    for (i = 0; i < NUM_EVENT_OBJECTS; i++)
+    {
+        if (gEventObjects[i].active && gEventObjects[i].localId == localId && gEventObjects[i].mapNum == mapNum && gEventObjects[i].mapGroup == mapGroupId)
+            return i;
+    }
+
+    return NUM_EVENT_OBJECTS;
+}
+
+static u8 GetEventObjectIdByLocalId(u8 localId)
+{
+    u8 i;
+    for (i = 0; i < NUM_EVENT_OBJECTS; i++)
+    {
+        if (gEventObjects[i].active && gEventObjects[i].localId == localId)
+            return i;
+    }
+
+    return NUM_EVENT_OBJECTS;
+}
+
+// This function has the same nonmatching quirk as in Ruby/Sapphire.
+#ifdef NONMATCHING
+static u8 InitEventObjectStateFromTemplate(struct EventObjectTemplate *template, u8 mapNum, u8 mapGroup)
+{
+    struct EventObject *eventObject;
+    u8 eventObjectId;
+    s16 x;
+    s16 y;
+
+    // mapNum and mapGroup are in the wrong registers (r7/r6 instead of r6/r7)
+    if (GetAvailableEventObjectId(template->localId, mapNum, mapGroup, &eventObjectId))
+    {
+        return NUM_EVENT_OBJECTS;
+    }
+    eventObject = &gEventObjects[eventObjectId];
+    ClearEventObject(eventObject);
+    x = template->x + 7;
+    y = template->y + 7;
+    eventObject->active = TRUE;
+    eventObject->triggerGroundEffectsOnMove = TRUE;
+    eventObject->graphicsId = template->graphicsId;
+    eventObject->movementType = template->movementType;
+    eventObject->localId = template->localId;
+    eventObject->mapNum = mapNum;
+    eventObject->mapGroup = mapGroup;
+    eventObject->initialCoords.x = x;
+    eventObject->initialCoords.y = y;
+    eventObject->currentCoords.x = x;
+    eventObject->currentCoords.y = y;
+    eventObject->previousCoords.x = x;
+    eventObject->previousCoords.y = y;
+    eventObject->currentElevation = template->elevation;
+    eventObject->previousElevation = template->elevation;
+    // For some reason, 0x0F is placed in r9, to be used later
+    eventObject->range.as_nybbles.x = template->movementRangeX;
+    eventObject->range.as_nybbles.y = template->movementRangeY;
+    eventObject->trainerType = template->trainerType;
+    eventObject->trainerRange_berryTreeId = template->trainerRange_berryTreeId;
+    eventObject->previousMovementDirection = gInitialMovementTypeFacingDirections[template->movementType];
+    SetEventObjectDirection(eventObject, eventObject->previousMovementDirection);
+    SetEventObjectDynamicGraphicsId(eventObject);
+
+    if (gRangedMovementTypes[eventObject->movementType])
+    {
+        if ((eventObject->range.as_nybbles.x) == 0)
+        {
+            // r9 is invoked here
+            eventObject->range.as_nybbles.x++;
+        }
+        if ((eventObject->range.as_nybbles.y) == 0)
+        {
+            eventObject->range.as_nybbles.y++;
+        }
+    }
+    return eventObjectId;
+}
+#else
+static NAKED u8 InitEventObjectStateFromTemplate(struct EventObjectTemplate *template, u8 mapId, u8 mapGroupId)
+{
+    asm_unified("\tpush {r4-r7,lr}\n"
+                "\tmov r7, r9\n"
+                "\tmov r6, r8\n"
+                "\tpush {r6,r7}\n"
+                "\tsub sp, 0x4\n"
+                "\tadds r5, r0, 0\n"
+                "\tlsls r1, 24\n"
+                "\tlsrs r6, r1, 24\n"
+                "\tlsls r2, 24\n"
+                "\tlsrs r7, r2, 24\n"
+                "\tldrb r0, [r5]\n"
+                "\tadds r1, r6, 0\n"
+                "\tadds r2, r7, 0\n"
+                "\tmov r3, sp\n"
+                "\tbl GetAvailableEventObjectId\n"
+                "\tlsls r0, 24\n"
+                "\tcmp r0, 0\n"
+                "\tbeq _0808D66E\n"
+                "\tmovs r0, 0x10\n"
+                "\tb _0808D762\n"
+                "_0808D66E:\n"
+                "\tmov r0, sp\n"
+                "\tldrb r1, [r0]\n"
+                "\tlsls r0, r1, 3\n"
+                "\tadds r0, r1\n"
+                "\tlsls r0, 2\n"
+                "\tldr r1, =gEventObjects\n"
+                "\tadds r4, r0, r1\n"
+                "\tadds r0, r4, 0\n"
+                "\tbl ClearEventObject\n"
+                "\tldrh r3, [r5, 0x4]\n"
+                "\tadds r3, 0x7\n"
+                "\tlsls r3, 16\n"
+                "\tlsrs r3, 16\n"
+                "\tldrh r2, [r5, 0x6]\n"
+                "\tadds r2, 0x7\n"
+                "\tlsls r2, 16\n"
+                "\tlsrs r2, 16\n"
+                "\tldrb r0, [r4]\n"
+                "\tmovs r1, 0x1\n"
+                "\torrs r0, r1\n"
+                "\tmovs r1, 0x4\n"
+                "\torrs r0, r1\n"
+                "\tstrb r0, [r4]\n"
+                "\tldrb r0, [r5, 0x1]\n"
+                "\tstrb r0, [r4, 0x5]\n"
+                "\tldrb r0, [r5, 0x9]\n"
+                "\tstrb r0, [r4, 0x6]\n"
+                "\tldrb r0, [r5]\n"
+                "\tstrb r0, [r4, 0x8]\n"
+                "\tstrb r6, [r4, 0x9]\n"
+                "\tstrb r7, [r4, 0xA]\n"
+                "\tstrh r3, [r4, 0xC]\n"
+                "\tstrh r2, [r4, 0xE]\n"
+                "\tstrh r3, [r4, 0x10]\n"
+                "\tstrh r2, [r4, 0x12]\n"
+                "\tstrh r3, [r4, 0x14]\n"
+                "\tstrh r2, [r4, 0x16]\n"
+                "\tldrb r0, [r5, 0x8]\n"
+                "\tmovs r7, 0xF\n"
+                "\tadds r1, r7, 0\n"
+                "\tands r1, r0\n"
+                "\tldrb r2, [r4, 0xB]\n"
+                "\tmovs r0, 0x10\n"
+                "\tnegs r0, r0\n"
+                "\tmov r8, r0\n"
+                "\tands r0, r2\n"
+                "\torrs r0, r1\n"
+                "\tstrb r0, [r4, 0xB]\n"
+                "\tldrb r1, [r5, 0x8]\n"
+                "\tlsls r1, 4\n"
+                "\tands r0, r7\n"
+                "\torrs r0, r1\n"
+                "\tstrb r0, [r4, 0xB]\n"
+                "\tldrb r1, [r5, 0xA]\n"
+                "\tlsls r1, 28\n"
+                "\tmovs r0, 0xF\n"
+                "\tmov r9, r0\n"
+                "\tlsrs r1, 28\n"
+                "\tldrb r2, [r4, 0x19]\n"
+                "\tmov r0, r8\n"
+                "\tands r0, r2\n"
+                "\torrs r0, r1\n"
+                "\tstrb r0, [r4, 0x19]\n"
+                "\tldrb r1, [r5, 0xA]\n"
+                "\tlsrs r1, 4\n"
+                "\tlsls r1, 4\n"
+                "\tands r0, r7\n"
+                "\torrs r0, r1\n"
+                "\tstrb r0, [r4, 0x19]\n"
+                "\tldrh r0, [r5, 0xC]\n"
+                "\tstrb r0, [r4, 0x7]\n"
+                "\tldrh r0, [r5, 0xE]\n"
+                "\tstrb r0, [r4, 0x1D]\n"
+                "\tldr r1, =gInitialMovementTypeFacingDirections\n"
+                "\tldrb r0, [r5, 0x9]\n"
+                "\tadds r0, r1\n"
+                "\tldrb r1, [r0]\n"
+                "\tadds r0, r4, 0\n"
+                "\tadds r0, 0x20\n"
+                "\tstrb r1, [r0]\n"
+                "\tldrb r1, [r0]\n"
+                "\tadds r0, r4, 0\n"
+                "\tbl SetEventObjectDirection\n"
+                "\tadds r0, r4, 0\n"
+                "\tbl SetEventObjectDynamicGraphicsId\n"
+                "\tldr r1, =gRangedMovementTypes\n"
+                "\tldrb r0, [r4, 0x6]\n"
+                "\tadds r0, r1\n"
+                "\tldrb r0, [r0]\n"
+                "\tcmp r0, 0\n"
+                "\tbeq _0808D75E\n"
+                "\tldrb r2, [r4, 0x19]\n"
+                "\tadds r0, r7, 0\n"
+                "\tands r0, r2\n"
+                "\tcmp r0, 0\n"
+                "\tbne _0808D746\n"
+                "\tlsls r0, r2, 28\n"
+                "\tlsrs r0, 28\n"
+                "\tadds r0, 0x1\n"
+                "\tmov r1, r9\n"
+                "\tands r0, r1\n"
+                "\tmov r1, r8\n"
+                "\tands r1, r2\n"
+                "\torrs r1, r0\n"
+                "\tstrb r1, [r4, 0x19]\n"
+                "_0808D746:\n"
+                "\tldrb r2, [r4, 0x19]\n"
+                "\tmovs r0, 0xF0\n"
+                "\tands r0, r2\n"
+                "\tcmp r0, 0\n"
+                "\tbne _0808D75E\n"
+                "\tlsrs r1, r2, 4\n"
+                "\tadds r1, 0x1\n"
+                "\tlsls r1, 4\n"
+                "\tadds r0, r7, 0\n"
+                "\tands r0, r2\n"
+                "\torrs r0, r1\n"
+                "\tstrb r0, [r4, 0x19]\n"
+                "_0808D75E:\n"
+                "\tmov r0, sp\n"
+                "\tldrb r0, [r0]\n"
+                "_0808D762:\n"
+                "\tadd sp, 0x4\n"
+                "\tpop {r3,r4}\n"
+                "\tmov r8, r3\n"
+                "\tmov r9, r4\n"
+                "\tpop {r4-r7}\n"
+                "\tpop {r1}\n"
+                "\tbx r1\n"
+                ".pool");
+}
+#endif
+
+u8 Unref_TryInitLocalEventObject(u8 localId)
+{
+    u8 i;
+    u8 nObjects;
+    struct EventObjectTemplate *template;
+
+    if (gMapHeader.events != NULL)
+    {
+        if (InBattlePyramid())
+        {
+            nObjects = sub_81AAA40();
+        }
+        else if (InTrainerHill())
+        {
+            nObjects = 2;
+        }
+        else
+        {
+            nObjects = gMapHeader.events->eventObjectCount;
+        }
+        for (i = 0; i < nObjects; i++)
+        {
+            template = &gSaveBlock1Ptr->eventObjectTemplates[i];
+            if (template->localId == localId && !FlagGet(template->flagId))
+            {
+                return InitEventObjectStateFromTemplate(template, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
+            }
+        }
+    }
+    return NUM_EVENT_OBJECTS;
+}
+
+static bool8 GetAvailableEventObjectId(u16 localId, u8 mapNum, u8 mapGroup, u8 *eventObjectId)
+// Looks for an empty slot.
+// Returns FALSE and the location of the available slot
+// in *eventObjectId.
+// If no slots are available, or if the object is already
+// loaded, returns TRUE.
+{
+    u8 i = 0;
+
+    for (i = 0; i < NUM_EVENT_OBJECTS; i++)
+    {
+        if (!gEventObjects[i].active)
+            break;
+        if (gEventObjects[i].localId == localId && gEventObjects[i].mapNum == mapNum && gEventObjects[i].mapGroup == mapGroup)
+            return TRUE;
+    }
+    if (i >= NUM_EVENT_OBJECTS)
+        return TRUE;
+    *eventObjectId = i;
+    do
+    {
+        if (gEventObjects[i].active && gEventObjects[i].localId == localId && gEventObjects[i].mapNum == mapNum && gEventObjects[i].mapGroup == mapGroup)
+            return TRUE;
+        i++;
+    } while (i < NUM_EVENT_OBJECTS);
+    return FALSE;
+}
+
+static void RemoveEventObject(struct EventObject *eventObject)
+{
+    eventObject->active = FALSE;
+    RemoveEventObjectInternal(eventObject);
+}
+
+void RemoveEventObjectByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup)
+{
+    u8 eventObjectId;
+    if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
+    {
+        FlagSet(GetEventObjectFlagIdByEventObjectId(eventObjectId));
+        RemoveEventObject(&gEventObjects[eventObjectId]);
+    }
+}
+
+static void RemoveEventObjectInternal(struct EventObject *eventObject)
+{
+    struct SpriteFrameImage image;
+    image.size = GetEventObjectGraphicsInfo(eventObject->graphicsId)->size;
+    gSprites[eventObject->spriteId].images = &image;
+    DestroySprite(&gSprites[eventObject->spriteId]);
+}
+
+void RemoveAllEventObjectsExceptPlayer(void)
+{
+    u8 i;
+
+    for (i = 0; i < NUM_EVENT_OBJECTS; i++)
+    {
+        if (i != gPlayerAvatar.eventObjectId)
+            RemoveEventObject(&gEventObjects[i]);
+    }
+}
+
+static u8 TrySetupEventObjectSprite(struct EventObjectTemplate *eventObjectTemplate, struct SpriteTemplate *spriteTemplate, u8 mapNum, u8 mapGroup, s16 cameraX, s16 cameraY)
+{
+    struct EventObject *eventObject;
+    const struct EventObjectGraphicsInfo *graphicsInfo;
+    struct Sprite *sprite;
+    u8 eventObjectId;
+    u8 paletteSlot;
+    u8 spriteId;
+
+    eventObjectId = InitEventObjectStateFromTemplate(eventObjectTemplate, mapNum, mapGroup);
+    if (eventObjectId == NUM_EVENT_OBJECTS)
+        return NUM_EVENT_OBJECTS;
+
+    eventObject = &gEventObjects[eventObjectId];
+    graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId);
+    paletteSlot = graphicsInfo->paletteSlot;
+    if (paletteSlot == 0)
+    {
+        npc_load_two_palettes__no_record(graphicsInfo->paletteTag1, 0);
+    }
+    else if (paletteSlot == 10)
+    {
+        npc_load_two_palettes__and_record(graphicsInfo->paletteTag1, 10);
+    }
+    else if (paletteSlot >= 16)
+    {
+        paletteSlot -= 16;
+        sub_808EAB0(graphicsInfo->paletteTag1, paletteSlot);
+    }
+    if (eventObject->movementType == 0x4c)
+    {
+        eventObject->invisible = TRUE;
+    }
+    *(u16 *)&spriteTemplate->paletteTag = 0xFFFF;
+    spriteId = CreateSprite(spriteTemplate, 0, 0, 0);
+    if (spriteId == MAX_SPRITES)
+    {
+        gEventObjects[eventObjectId].active = FALSE;
+        return NUM_EVENT_OBJECTS;
+    }
+    sprite = &gSprites[spriteId];
+    sub_8092FF0(eventObject->currentCoords.x + cameraX, eventObject->currentCoords.y + cameraY, &sprite->pos1.x, &sprite->pos1.y);
+    sprite->centerToCornerVecX = -(graphicsInfo->width >> 1);
+    sprite->centerToCornerVecY = -(graphicsInfo->height >> 1);
+    sprite->pos1.x += 8;
+    sprite->pos1.y += 16 + sprite->centerToCornerVecY;
+    sprite->oam.paletteNum = paletteSlot;
+    sprite->coordOffsetEnabled = TRUE;
+    sprite->data[0] = eventObjectId;
+    eventObject->spriteId = spriteId;
+    eventObject->inanimate = graphicsInfo->inanimate;
+    if (!eventObject->inanimate)
+    {
+        StartSpriteAnim(sprite, GetFaceDirectionAnimNum(eventObject->facingDirection));
+    }
+    SetObjectSubpriorityByZCoord(eventObject->previousElevation, sprite, 1);
+    UpdateEventObjectVisibility(eventObject, sprite);
+    return eventObjectId;
+}
+
+static u8 TrySpawnEventObject(struct EventObjectTemplate *eventObjectTemplate, u8 mapNum, u8 mapGroup, s16 cameraX, s16 cameraY)
+{
+    const struct EventObjectGraphicsInfo *graphicsInfo;
+    struct SpriteTemplate spriteTemplate;
+    const struct SubspriteTable *subspriteTables;
+    struct SpriteFrameImage spriteFrameImage;
+    u8 eventObjectId;
+
+    subspriteTables = NULL;
+    graphicsInfo = GetEventObjectGraphicsInfo(eventObjectTemplate->graphicsId);
+    MakeObjectTemplateFromEventObjectTemplate(eventObjectTemplate, &spriteTemplate, &subspriteTables);
+    spriteFrameImage.size = graphicsInfo->size;
+    spriteTemplate.images = &spriteFrameImage;
+    eventObjectId = TrySetupEventObjectSprite(eventObjectTemplate, &spriteTemplate, mapNum, mapGroup, cameraX, cameraY);
+    if (eventObjectId == NUM_EVENT_OBJECTS)
+    {
+        return NUM_EVENT_OBJECTS;
+    }
+    gSprites[gEventObjects[eventObjectId].spriteId].images = graphicsInfo->images;
+    if (subspriteTables != NULL)
+    {
+        SetSubspriteTables(&gSprites[gEventObjects[eventObjectId].spriteId], subspriteTables);
+    }
+    return eventObjectId;
+}
+
+u8 SpawnSpecialEventObject(struct EventObjectTemplate *eventObjectTemplate)
+{
+    s16 cameraX;
+    s16 cameraY;
+
+    GetEventObjectMovingCameraOffset(&cameraX, &cameraY);
+    return TrySpawnEventObject(eventObjectTemplate, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, cameraX, cameraY);
+}
+
+u8 SpawnSpecialEventObjectParametrized(u8 graphicsId, u8 movementBehavior, u8 localId, s16 x, s16 y, u8 z)
+{
+    struct EventObjectTemplate eventObjectTemplate;
+
+    x -= 7;
+    y -= 7;
+    eventObjectTemplate.localId = localId;
+    eventObjectTemplate.graphicsId = graphicsId;
+    eventObjectTemplate.unk2 = 0;
+    eventObjectTemplate.x = x;
+    eventObjectTemplate.y = y;
+    eventObjectTemplate.elevation = z;
+    eventObjectTemplate.movementType = movementBehavior;
+    eventObjectTemplate.movementRangeX = 0;
+    eventObjectTemplate.movementRangeY = 0;
+    eventObjectTemplate.trainerType = 0;
+    eventObjectTemplate.trainerRange_berryTreeId = 0;
+    return SpawnSpecialEventObject(&eventObjectTemplate);
+}
+
+u8 show_sprite(u8 localId, u8 mapNum, u8 mapGroup)
+{
+    struct EventObjectTemplate *eventObjectTemplate;
+    s16 cameraX;
+    s16 cameraY;
+
+    eventObjectTemplate = GetEventObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup);
+    if (eventObjectTemplate == NULL)
+    {
+        return NUM_EVENT_OBJECTS;
+    }
+    GetEventObjectMovingCameraOffset(&cameraX, &cameraY);
+    return TrySpawnEventObject(eventObjectTemplate, mapNum, mapGroup, cameraX, cameraY);
+}
+
+static void MakeObjectTemplateFromEventObjectGraphicsInfo(u16 graphicsId, void (*callback)(struct Sprite *), struct SpriteTemplate *sprTemplate, const struct SubspriteTable **subspriteTables)
+{
+    const struct EventObjectGraphicsInfo *gfxInfo = GetEventObjectGraphicsInfo(graphicsId);
+
+    sprTemplate->tileTag = gfxInfo->tileTag;
+    sprTemplate->paletteTag = gfxInfo->paletteTag1;
+    sprTemplate->oam = gfxInfo->oam;
+    sprTemplate->anims = gfxInfo->anims;
+    sprTemplate->images = gfxInfo->images;
+    sprTemplate->affineAnims = gfxInfo->affineAnims;
+    sprTemplate->callback = callback;
+    *subspriteTables = gfxInfo->subspriteTables;
+}
+
+static void MakeObjectTemplateFromEventObjectGraphicsInfoWithCallbackIndex(u16 graphicsId, u16 callbackIndex, struct SpriteTemplate *sprTemplate, const struct SubspriteTable **subspriteTables)
+{
+    MakeObjectTemplateFromEventObjectGraphicsInfo(graphicsId, sMovementTypeCallbacks[callbackIndex], sprTemplate, subspriteTables);
+}
+
+static void MakeObjectTemplateFromEventObjectTemplate(struct EventObjectTemplate *eventObjectTemplate, struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables)
+{
+    MakeObjectTemplateFromEventObjectGraphicsInfoWithCallbackIndex(eventObjectTemplate->graphicsId, eventObjectTemplate->movementType, spriteTemplate, subspriteTables);
+}
+
+u8 AddPseudoEventObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority)
+{
+    struct SpriteTemplate *spriteTemplate;
+    const struct SubspriteTable *subspriteTables;
+    struct Sprite *sprite;
+    u8 spriteIdx;
+
+    spriteTemplate = malloc(sizeof(struct SpriteTemplate));
+    MakeObjectTemplateFromEventObjectGraphicsInfo(graphicsId, callback, spriteTemplate, &subspriteTables);
+    if (spriteTemplate->paletteTag != 0xffff)
+    {
+        sub_808E894(spriteTemplate->paletteTag);
+    }
+    spriteIdx = CreateSprite(spriteTemplate, x, y, subpriority);
+    free(spriteTemplate);
+
+    if (spriteIdx != MAX_SPRITES && subspriteTables != NULL)
+    {
+        sprite = &gSprites[spriteIdx];
+        SetSubspriteTables(sprite, subspriteTables);
+        sprite->subspriteMode = 2;
+    }
+    return spriteIdx;
+}
+
+u8 sprite_new(u8 graphicsId, u8 a1, s16 x, s16 y, u8 z, u8 direction)
+{
+    const struct EventObjectGraphicsInfo *graphicsInfo;
+    struct SpriteTemplate spriteTemplate;
+    const struct SubspriteTable *subspriteTables;
+    u8 spriteId;
+    struct Sprite *sprite;
+
+    graphicsInfo = GetEventObjectGraphicsInfo(graphicsId);
+    MakeObjectTemplateFromEventObjectGraphicsInfo(graphicsId, UpdateEventObjectSpriteSubpriorityAndVisibility, &spriteTemplate, &subspriteTables);
+    *(u16 *)&spriteTemplate.paletteTag = 0xffff;
+    x += 7;
+    y += 7;
+    sub_80930E0(&x, &y, 8, 16);
+    spriteId = CreateSpriteAtEnd(&spriteTemplate, x, y, 0);
+    if (spriteId != MAX_SPRITES)
+    {
+        sprite = &gSprites[spriteId];
+        sprite->centerToCornerVecX = -(graphicsInfo->width >> 1);
+        sprite->centerToCornerVecY = -(graphicsInfo->height >> 1);
+        sprite->pos1.y += sprite->centerToCornerVecY;
+        sprite->oam.paletteNum = graphicsInfo->paletteSlot;
+        if (sprite->oam.paletteNum >= 16)
+        {
+            sprite->oam.paletteNum -= 16;
+        }
+        sprite->coordOffsetEnabled = TRUE;
+        sprite->data[0] = a1;
+        sprite->data[1] = z;
+        if (graphicsInfo->paletteSlot == 10)
+        {
+            npc_load_two_palettes__and_record(graphicsInfo->paletteTag1, graphicsInfo->paletteSlot);
+        }
+        else if (graphicsInfo->paletteSlot >= 16)
+        {
+            sub_808EAB0(graphicsInfo->paletteTag1, graphicsInfo->paletteSlot | 0xf0);
+        }
+        if (subspriteTables != NULL)
+        {
+            SetSubspriteTables(sprite, subspriteTables);
+            sprite->subspriteMode = 2;
+        }
+        InitObjectPriorityByZCoord(sprite, z);
+        SetObjectSubpriorityByZCoord(z, sprite, 1);
+        StartSpriteAnim(sprite, GetFaceDirectionAnimNum(direction));
+    }
+    return spriteId;
+}
+
+void TrySpawnEventObjects(s16 cameraX, s16 cameraY)
+{
+    u8 i;
+    s16 left;
+    s16 right;
+    s16 top;
+    s16 bottom;
+    u8 objectCount;
+    s16 npcX;
+    s16 npcY;
+
+    if (gMapHeader.events != NULL)
+    {
+        left = gSaveBlock1Ptr->pos.x - 2;
+        right = gSaveBlock1Ptr->pos.x + 17;
+        top = gSaveBlock1Ptr->pos.y;
+        bottom = gSaveBlock1Ptr->pos.y + 16;
+
+        if (InBattlePyramid())
+        {
+            objectCount = sub_81AAA40();
+        }
+        else if (InTrainerHill())
+        {
+            objectCount = 2;
+        }
+        else
+        {
+            objectCount = gMapHeader.events->eventObjectCount;
+        }
+
+        for (i = 0; i < objectCount; i++)
+        {
+            struct EventObjectTemplate *template = &gSaveBlock1Ptr->eventObjectTemplates[i];
+            npcX = template->x + 7;
+            npcY = template->y + 7;
+
+            if (top <= npcY && bottom >= npcY && left <= npcX && right >= npcX
+                && !FlagGet(template->flagId))
+                TrySpawnEventObject(template, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, cameraX, cameraY);
+        }
+    }
+}
+
+void RemoveEventObjectsOutsideView(void)
+{
+    u8 i;
+    u8 j;
+    bool8 isActiveLinkPlayer;
+    struct EventObject *eventObject;
+
+    for (i = 0; i < NUM_EVENT_OBJECTS; i++)
+    {
+        for (j = 0, isActiveLinkPlayer = FALSE; j < ARRAY_COUNT(gLinkPlayerEventObjects); j++)
+        {
+            if (gLinkPlayerEventObjects[j].active && i == gLinkPlayerEventObjects[j].eventObjId)
+                isActiveLinkPlayer = TRUE;
+        }
+        if (!isActiveLinkPlayer)
+        {
+            eventObject = &gEventObjects[i];
+
+            if (eventObject->active && !eventObject->isPlayer)
+                RemoveEventObjectIfOutsideView(eventObject);
+        }
+    }
+}
+
+static void RemoveEventObjectIfOutsideView(struct EventObject *eventObject)
+{
+    s16 left;
+    s16 right;
+    s16 top;
+    s16 bottom;
+
+    left = gSaveBlock1Ptr->pos.x - 2;
+    right = gSaveBlock1Ptr->pos.x + 17;
+    top = gSaveBlock1Ptr->pos.y;
+    bottom = gSaveBlock1Ptr->pos.y + 16;
+
+    if (eventObject->currentCoords.x >= left && eventObject->currentCoords.x <= right
+        && eventObject->currentCoords.y >= top && eventObject->currentCoords.y <= bottom)
+        return;
+    if (eventObject->initialCoords.x >= left && eventObject->initialCoords.x <= right
+        && eventObject->initialCoords.y >= top && eventObject->initialCoords.y <= bottom)
+        return;
+    RemoveEventObject(eventObject);
+}
+
+void sub_808E16C(s16 x, s16 y)
+{
+    u8 i;
+
+    ClearPlayerAvatarInfo();
+    for (i = 0; i < NUM_EVENT_OBJECTS; i++)
+    {
+        if (gEventObjects[i].active)
+        {
+            sub_808E1B8(i, x, y);
+        }
+    }
+    sub_808D450();
+}
+
+static void sub_808E1B8(u8 eventObjectId, s16 x, s16 y)
+{
+    u8 spriteId;
+    u8 paletteSlot;
+    struct EventObject *eventObject;
+    const struct SubspriteTable *subspriteTables;
+    const struct EventObjectGraphicsInfo *graphicsInfo;
+    struct SpriteFrameImage spriteFrameImage;
+    struct SpriteTemplate spriteTemplate;
+    struct Sprite *sprite;
+
+#define i spriteId
+    for (i = 0; i < ARRAY_COUNT(gLinkPlayerEventObjects); i++)
+    {
+        if (gLinkPlayerEventObjects[i].active && eventObjectId == gLinkPlayerEventObjects[i].eventObjId)
+        {
+            return;
+        }
+    }
+#undef i
+
+    eventObject = &gEventObjects[eventObjectId];
+    subspriteTables = NULL;
+    graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId);
+    spriteFrameImage.size = graphicsInfo->size;
+    MakeObjectTemplateFromEventObjectGraphicsInfoWithCallbackIndex(eventObject->graphicsId, eventObject->movementType, &spriteTemplate, &subspriteTables);
+    spriteTemplate.images = &spriteFrameImage;
+    *(u16 *)&spriteTemplate.paletteTag = 0xffff;
+    paletteSlot = graphicsInfo->paletteSlot;
+    if (paletteSlot == 0)
+    {
+        npc_load_two_palettes__no_record(graphicsInfo->paletteTag1, graphicsInfo->paletteSlot);
+    }
+    else if (paletteSlot == 10)
+    {
+        npc_load_two_palettes__and_record(graphicsInfo->paletteTag1, graphicsInfo->paletteSlot);
+    }
+    else if (paletteSlot >= 16)
+    {
+        paletteSlot -= 16;
+        sub_808EAB0(graphicsInfo->paletteTag1, paletteSlot);
+    }
+    *(u16 *)&spriteTemplate.paletteTag = 0xffff;
+    spriteId = CreateSprite(&spriteTemplate, 0, 0, 0);
+    if (spriteId != MAX_SPRITES)
+    {
+        sprite = &gSprites[spriteId];
+        sub_8092FF0(x + eventObject->currentCoords.x, y + eventObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y);
+        sprite->centerToCornerVecX = -(graphicsInfo->width >> 1);
+        sprite->centerToCornerVecY = -(graphicsInfo->height >> 1);
+        sprite->pos1.x += 8;
+        sprite->pos1.y += 16 + sprite->centerToCornerVecY;
+        sprite->images = graphicsInfo->images;
+        if (eventObject->movementType == 0x0b)
+        {
+            SetPlayerAvatarEventObjectIdAndObjectId(eventObjectId, spriteId);
+            eventObject->warpArrowSpriteId = sub_8154228();
+        }
+        if (subspriteTables != NULL)
+        {
+            SetSubspriteTables(sprite, subspriteTables);
+        }
+        sprite->oam.paletteNum = paletteSlot;
+        sprite->coordOffsetEnabled = TRUE;
+        sprite->data[0] = eventObjectId;
+        eventObject->spriteId = spriteId;
+        if (!eventObject->inanimate && eventObject->movementType != 0x0b)
+        {
+            StartSpriteAnim(sprite, GetFaceDirectionAnimNum(eventObject->facingDirection));
+        }
+        sub_808E38C(eventObject);
+        SetObjectSubpriorityByZCoord(eventObject->previousElevation, sprite, 1);
+    }
+}
+
+static void sub_808E38C(struct EventObject *eventObject)
+{
+    eventObject->singleMovementActive = 0;
+    eventObject->triggerGroundEffectsOnMove = TRUE;
+    eventObject->hasShadow = FALSE;
+    eventObject->hasReflection = FALSE;
+    eventObject->inShortGrass = FALSE;
+    eventObject->inShallowFlowingWater = FALSE;
+    eventObject->inSandPile = FALSE;
+    eventObject->inHotSprings = FALSE;
+    EventObjectClearHeldMovement(eventObject);
+}
+
+static void SetPlayerAvatarEventObjectIdAndObjectId(u8 eventObjectId, u8 spriteId)
+{
+    gPlayerAvatar.eventObjectId = eventObjectId;
+    gPlayerAvatar.spriteId = spriteId;
+    gPlayerAvatar.gender = GetPlayerAvatarGenderByGraphicsId(gEventObjects[eventObjectId].graphicsId);
+    SetPlayerAvatarExtraStateTransition(gEventObjects[eventObjectId].graphicsId, 0x20);
+}
+
+void EventObjectSetGraphicsId(struct EventObject *eventObject, u8 graphicsId)
+{
+    const struct EventObjectGraphicsInfo *graphicsInfo;
+    struct Sprite *sprite;
+    u8 paletteSlot;
+
+    graphicsInfo = GetEventObjectGraphicsInfo(graphicsId);
+    sprite = &gSprites[eventObject->spriteId];
+    paletteSlot = graphicsInfo->paletteSlot;
+    if (paletteSlot == 0)
+    {
+        pal_patch_for_npc(graphicsInfo->paletteTag1, graphicsInfo->paletteSlot);
+    }
+    else if (paletteSlot == 10)
+    {
+        npc_load_two_palettes__and_record(graphicsInfo->paletteTag1, graphicsInfo->paletteSlot);
+    }
+    else if (paletteSlot >= 16)
+    {
+        paletteSlot -= 16;
+        sub_808EAB0(graphicsInfo->paletteTag1, paletteSlot);
+    }
+    sprite->oam.shape = graphicsInfo->oam->shape;
+    sprite->oam.size = graphicsInfo->oam->size;
+    sprite->images = graphicsInfo->images;
+    sprite->anims = graphicsInfo->anims;
+    sprite->subspriteTables = graphicsInfo->subspriteTables;
+    sprite->oam.paletteNum = paletteSlot;
+    eventObject->inanimate = graphicsInfo->inanimate;
+    eventObject->graphicsId = graphicsId;
+    sub_8093038(eventObject->currentCoords.x, eventObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y);
+    sprite->centerToCornerVecX = -(graphicsInfo->width >> 1);
+    sprite->centerToCornerVecY = -(graphicsInfo->height >> 1);
+    sprite->pos1.x += 8;
+    sprite->pos1.y += 16 + sprite->centerToCornerVecY;
+    if (eventObject->trackedByCamera)
+    {
+        CameraObjectReset1();
+    }
+}
+
+void EventObjectSetGraphicsIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 graphicsId)
+{
+    u8 eventObjectId;
+
+    if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
+    {
+        EventObjectSetGraphicsId(&gEventObjects[eventObjectId], graphicsId);
+    }
+}
+
+void EventObjectTurn(struct EventObject *eventObject, u8 direction)
+{
+    SetEventObjectDirection(eventObject, direction);
+    if (!eventObject->inanimate)
+    {
+        StartSpriteAnim(&gSprites[eventObject->spriteId], GetFaceDirectionAnimNum(eventObject->facingDirection));
+        SeekSpriteAnim(&gSprites[eventObject->spriteId], 0);
+    }
+}
+
+void EventObjectTurnByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 direction)
+{
+    u8 eventObjectId;
+
+    if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
+    {
+        EventObjectTurn(&gEventObjects[eventObjectId], direction);
+    }
+}
+
+void PlayerObjectTurn(struct PlayerAvatar *playerAvatar, u8 direction)
+{
+    EventObjectTurn(&gEventObjects[playerAvatar->eventObjectId], direction);
+}
+
+/*static*/ void get_berry_tree_graphics(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 berryStage;
+    u8 berryId;
+
+    eventObject->invisible = TRUE;
+    sprite->invisible = TRUE;
+    berryStage = GetStageByBerryTreeId(eventObject->trainerRange_berryTreeId);
+    if (berryStage != 0)
+    {
+        eventObject->invisible = FALSE;
+        sprite->invisible = FALSE;
+        berryId = GetBerryTypeByBerryTreeId(eventObject->trainerRange_berryTreeId) - 1;
+        berryStage -= 1;
+        if (berryId >= NUM_BERRIES)
+        {
+            berryId = 0;
+        }
+        EventObjectSetGraphicsId(eventObject, gBerryTreeEventObjectGraphicsIdTablePointers[berryId][berryStage]);
+        sprite->images = gBerryTreePicTablePointers[berryId];
+        sprite->oam.paletteNum = gBerryTreePaletteSlotTablePointers[berryId][berryStage];
+        StartSpriteAnim(sprite, berryStage);
+    }
+}
+
+const struct EventObjectGraphicsInfo *GetEventObjectGraphicsInfo(u8 graphicsId)
+{
+    u8 bard;
+
+    if (graphicsId >= SPRITE_VAR)
+    {
+        graphicsId = VarGetEventObjectGraphicsId(graphicsId - SPRITE_VAR);
+    }
+    if (graphicsId == 0x45)
+    {
+        bard = GetCurrentMauvilleOldMan();
+        return gMauvilleOldManGraphicsInfoPointers[bard];
+    }
+    if (graphicsId >= NUM_OBJECT_GRAPHICS_INFO)
+    {
+        graphicsId = 0x05; // LittleBoy1
+    }
+    return gEventObjectGraphicsInfoPointers[graphicsId];
+}
+
+static void SetEventObjectDynamicGraphicsId(struct EventObject *eventObject)
+{
+    if (eventObject->graphicsId >= SPRITE_VAR)
+    {
+        eventObject->graphicsId = VarGetEventObjectGraphicsId(eventObject->graphicsId - SPRITE_VAR);
+    }
+}
+
+void npc_by_local_id_and_map_set_field_1_bit_x20(u8 localId, u8 mapNum, u8 mapGroup, u8 state)
+{
+    u8 eventObjectId;
+
+    if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
+    {
+        gEventObjects[eventObjectId].invisible = state;
+    }
+}
+
+void EventObjectGetLocalIdAndMap(struct EventObject *eventObject, void *localId, void *mapNum, void *mapGroup)
+{
+    *(u8*)(localId) = eventObject->localId;
+    *(u8*)(mapNum) = eventObject->mapNum;
+    *(u8*)(mapGroup) = eventObject->mapGroup;
+}
+
+void sub_808E75C(s16 x, s16 y)
+{
+    u8 eventObjectId;
+    struct EventObject *eventObject;
+
+    eventObjectId = GetEventObjectIdByXY(x, y);
+    if (eventObjectId != NUM_EVENT_OBJECTS)
+    {
+        eventObject = &gEventObjects[eventObjectId];
+        eventObject->triggerGroundEffectsOnMove = TRUE;
+    }
+}
+
+void sub_808E78C(u8 localId, u8 mapNum, u8 mapGroup, u8 subpriority)
+{
+    u8 eventObjectId;
+    struct EventObject *eventObject;
+    struct Sprite *sprite;
+
+    if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
+    {
+        eventObject = &gEventObjects[eventObjectId];
+        sprite = &gSprites[eventObject->spriteId];
+        eventObject->fixedPriority = TRUE;
+        sprite->subpriority = subpriority;
+    }
+}
+
+void sub_808E7E4(u8 localId, u8 mapNum, u8 mapGroup)
+{
+    u8 eventObjectId;
+    struct EventObject *eventObject;
+
+    if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
+    {
+        eventObject = &gEventObjects[eventObjectId];
+        eventObject->fixedPriority = FALSE;
+        eventObject->triggerGroundEffectsOnMove = TRUE;
+    }
+}
+
+void sub_808E82C(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y)
+{
+    u8 eventObjectId;
+    struct Sprite *sprite;
+
+    if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
+    {
+        sprite = &gSprites[gEventObjects[eventObjectId].spriteId];
+        sprite->pos2.x = x;
+        sprite->pos2.y = y;
+    }
+}
+
+void gpu_pal_allocator_reset__manage_upper_four(void)
+{
+    FreeAllSpritePalettes();
+    gReservedSpritePaletteCount = 12;
+}
+
+static void sub_808E894(u16 paletteTag)
+{
+    u16 paletteSlot;
+
+    paletteSlot = FindEventObjectPaletteIndexByTag(paletteTag);
+    if (paletteSlot != 0x11ff) // always true
+    {
+        sub_808E8F4(&gUnknown_0850BBC8[paletteSlot]);
+    }
+}
+
+void sub_808E8C0(u16 *paletteTags)
+{
+    u8 i;
+
+    for (i = 0; paletteTags[i] != 0x11ff; i++)
+    {
+        sub_808E894(paletteTags[i]);
+    }
+}
+
+static u8 sub_808E8F4(const struct SpritePalette *spritePalette)
+{
+    if (IndexOfSpritePaletteTag(spritePalette->tag) != 0xff)
+    {
+        return 0xff;
+    }
+    return LoadSpritePalette(spritePalette);
+}
+
+void pal_patch_for_npc(u16 paletteTag, u8 paletteSlot)
+{
+    u16 paletteIdx;
+
+    paletteIdx = FindEventObjectPaletteIndexByTag(paletteTag);
+    LoadPalette(gUnknown_0850BBC8[paletteIdx].data, 16 * paletteSlot + 256, 0x20);
+}
+
+void pal_patch_for_npc_range(const u16 *paletteTags, u8 minSlot, u8 maxSlot)
+{
+    while (minSlot < maxSlot)
+    {
+        pal_patch_for_npc(*paletteTags, minSlot);
+        paletteTags++;
+        minSlot++;
+    }
+}
+
+static u8 FindEventObjectPaletteIndexByTag(u16 tag)
+{
+    u8 i;
+
+    for (i = 0; gUnknown_0850BBC8[i].tag != 0x11ff; i++)
+    {
+        if (gUnknown_0850BBC8[i].tag == tag)
+        {
+            return i;
+        }
+    }
+    return 0xff;
+}
+
+void npc_load_two_palettes__no_record(u16 tag, u8 slot)
+{
+    u8 i;
+
+    pal_patch_for_npc(tag, slot);
+    for (i = 0; gUnknown_0850BD00[i].tag != 0x11ff; i++)
+    {
+        if (gUnknown_0850BD00[i].tag == tag)
+        {
+            pal_patch_for_npc(gUnknown_0850BD00[i].data[gUnknown_020375B4], gUnknown_084975C4[slot]);
+            return;
+        }
+    }
+}
+
+void npc_load_two_palettes__and_record(u16 tag, u8 slot)
+{
+    u8 i;
+
+    gUnknown_020375B6 = tag;
+    pal_patch_for_npc(tag, slot);
+    for (i = 0; gUnknown_0850BD78[i].tag != 0x11ff; i++)
+    {
+        if (gUnknown_0850BD78[i].tag == tag)
+        {
+            pal_patch_for_npc(gUnknown_0850BD78[i].data[gUnknown_020375B4], gUnknown_084975C4[slot]);
+            return;
+        }
+    }
+}
+
+static void sub_808EAB0(u16 tag, u8 slot)
+{
+    pal_patch_for_npc(tag, slot);
+}
+
+void unref_sub_808EAC4(struct EventObject *eventObject, s16 x, s16 y)
+{
+    eventObject->previousCoords.x = eventObject->currentCoords.x;
+    eventObject->previousCoords.y = eventObject->currentCoords.y;
+    eventObject->currentCoords.x += x;
+    eventObject->currentCoords.y += y;
+}
+
+void ShiftEventObjectCoords(struct EventObject *eventObject, s16 x, s16 y)
+{
+    eventObject->previousCoords.x = eventObject->currentCoords.x;
+    eventObject->previousCoords.y = eventObject->currentCoords.y;
+    eventObject->currentCoords.x = x;
+    eventObject->currentCoords.y = y;
+}
+
+/*static*/ void npc_coords_set(struct EventObject *eventObject, s16 x, s16 y)
+{
+    eventObject->previousCoords.x = x;
+    eventObject->previousCoords.y = y;
+    eventObject->currentCoords.x = x;
+    eventObject->currentCoords.y = y;
+}
+
+void sub_808EB08(struct EventObject *eventObject, s16 x, s16 y)
+{
+    struct Sprite *sprite;
+    const struct EventObjectGraphicsInfo *graphicsInfo;
+
+    sprite = &gSprites[eventObject->spriteId];
+    graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId);
+    npc_coords_set(eventObject, x, y);
+    sub_8093038(eventObject->currentCoords.x, eventObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y);
+    sprite->centerToCornerVecX = -(graphicsInfo->width >> 1);
+    sprite->centerToCornerVecY = -(graphicsInfo->height >> 1);
+    sprite->pos1.x += 8;
+    sprite->pos1.y += 16 + sprite->centerToCornerVecY;
+    sub_808E38C(eventObject);
+    if (eventObject->trackedByCamera)
+    {
+        CameraObjectReset1();
+    }
+}
+
+void sub_808EBA8(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y)
+{
+    u8 eventObjectId;
+
+    if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
+    {
+        x += 7;
+        y += 7;
+        sub_808EB08(&gEventObjects[eventObjectId], x, y);
+    }
+}
+
+void ShiftStillEventObjectCoords(struct EventObject *eventObject)
+{
+    ShiftEventObjectCoords(eventObject, eventObject->currentCoords.x, eventObject->currentCoords.y);
+}
+
+void UpdateEventObjectCoordsForCameraUpdate(void)
+{
+    u8 i;
+    s16 dx;
+    s16 dy;
+
+    if (gCamera.active)
+    {
+        dx = gCamera.x;
+        dy = gCamera.y;
+        for (i = 0; i < NUM_EVENT_OBJECTS; i++)
+        {
+            if (gEventObjects[i].active)
+            {
+                gEventObjects[i].initialCoords.x -= dx;
+                gEventObjects[i].initialCoords.y -= dy;
+                gEventObjects[i].currentCoords.x -= dx;
+                gEventObjects[i].currentCoords.y -= dy;
+                gEventObjects[i].previousCoords.x -= dx;
+                gEventObjects[i].previousCoords.y -= dy;
+            }
+        }
+    }
+}
+
+u8 GetEventObjectIdByXYZ(u16 x, u16 y, u8 z)
+{
+    u8 i;
+    for (i = 0; i < NUM_EVENT_OBJECTS; i++)
+    {
+        if (gEventObjects[i].active)
+        {
+            if (gEventObjects[i].currentCoords.x == x && gEventObjects[i].currentCoords.y == y && EventObjectDoesZCoordMatch(&gEventObjects[i], z))
+            {
+                return i;
+            }
+        }
+    }
+    return NUM_EVENT_OBJECTS;
+}
+
+static bool8 EventObjectDoesZCoordMatch(struct EventObject *eventObject, u8 z)
+{
+    if (eventObject->currentElevation != 0 && z != 0 && eventObject->currentElevation != z)
+    {
+        return FALSE;
+    }
+    return TRUE;
+}
+
+void UpdateEventObjectsForCameraUpdate(s16 x, s16 y)
+{
+    UpdateEventObjectCoordsForCameraUpdate();
+    TrySpawnEventObjects(x, y);
+    RemoveEventObjectsOutsideView();
+}
+
+u8 AddCameraObject(u8 linkedSpriteId)
+{
+    u8 spriteId;
+
+    spriteId = CreateSprite(&gCameraSpriteTemplate, 0, 0, 4);
+    gSprites[spriteId].invisible = TRUE;
+    gSprites[spriteId].data[0] = linkedSpriteId;
+    return spriteId;
+}
+
+static void ObjectCB_CameraObject(struct Sprite *sprite)
+{
+    void (*callbacks[ARRAY_COUNT(gCameraObjectFuncs)])(struct Sprite *);
+
+    memcpy(callbacks, gCameraObjectFuncs, sizeof gCameraObjectFuncs);
+    callbacks[sprite->data[1]](sprite);
+}
+
+static void CameraObject_0(struct Sprite *sprite)
+{
+    sprite->pos1.x = gSprites[sprite->data[0]].pos1.x;
+    sprite->pos1.y = gSprites[sprite->data[0]].pos1.y;
+    sprite->invisible = TRUE;
+    sprite->data[1] = 1;
+    CameraObject_1(sprite);
+}
+
+static void CameraObject_1(struct Sprite *sprite)
+{
+    s16 x;
+    s16 y;
+
+    y = gSprites[sprite->data[0]].pos1.y;
+    x = gSprites[sprite->data[0]].pos1.x;
+    sprite->data[2] = x - sprite->pos1.x;
+    sprite->data[3] = y - sprite->pos1.y;
+    sprite->pos1.x = x;
+    sprite->pos1.y = y;
+}
+
+static void CameraObject_2(struct Sprite *sprite)
+{
+    sprite->pos1.x = gSprites[sprite->data[0]].pos1.x;
+    sprite->pos1.y = gSprites[sprite->data[0]].pos1.y;
+    sprite->data[2] = 0;
+    sprite->data[3] = 0;
+}
+
+static struct Sprite *FindCameraObject(void)
+{
+    u8 spriteId;
+
+    for (spriteId = 0; spriteId < MAX_SPRITES; spriteId++)
+    {
+        if (gSprites[spriteId].inUse && gSprites[spriteId].callback == ObjectCB_CameraObject)
+        {
+            return &gSprites[spriteId];
+        }
+    }
+    return NULL;
+}
+
+void CameraObjectReset1(void)
+{
+    struct Sprite *cameraObject;
+
+    cameraObject = FindCameraObject();
+    if (cameraObject != NULL)
+    {
+        cameraObject->data[1] = 0;
+        cameraObject->callback(cameraObject);
+    }
+}
+
+void CameraObjectSetFollowedObjectId(u8 objectId)
+{
+    struct Sprite *cameraObject;
+
+    cameraObject = FindCameraObject();
+    if (cameraObject != NULL)
+    {
+        cameraObject->data[0] = objectId;
+        CameraObjectReset1();
+    }
+}
+
+u8 CameraObjectGetFollowedObjectId(void)
+{
+    struct Sprite *cameraObject;
+
+    cameraObject = FindCameraObject();
+    if (cameraObject == NULL)
+    {
+        return MAX_SPRITES;
+    }
+    return cameraObject->data[0];
+}
+
+void CameraObjectReset2(void)
+{
+    FindCameraObject()->data[1] = 2;
+}
+
+u8 CopySprite(struct Sprite *sprite, s16 x, s16 y, u8 subpriority)
+{
+    u8 i;
+
+    for (i = 0; i < MAX_SPRITES; i++)
+    {
+        if (!gSprites[i].inUse)
+        {
+            gSprites[i] = *sprite;
+            gSprites[i].pos1.x = x;
+            gSprites[i].pos1.y = y;
+            gSprites[i].subpriority = subpriority;
+            break;
+        }
+    }
+    return i;
+}
+
+u8 obj_unfreeze(struct Sprite *sprite, s16 x, s16 y, u8 subpriority)
+{
+    s16 i;
+
+    for (i = MAX_SPRITES - 1; i > -1; i --)
+    {
+        if (!gSprites[i].inUse)
+        {
+            gSprites[i] = *sprite;
+            gSprites[i].pos1.x = x;
+            gSprites[i].pos1.y = y;
+            gSprites[i].subpriority = subpriority;
+            return i;
+        }
+    }
+    return MAX_SPRITES;
+}
+
+void SetEventObjectDirection(struct EventObject *eventObject, u8 direction)
+{
+    s8 d2;
+    eventObject->previousMovementDirection = eventObject->facingDirection;
+    if (!eventObject->facingDirectionLocked)
+    {
+        d2 = direction;
+        eventObject->facingDirection = d2;
+    }
+    eventObject->movementDirection = direction;
+}
+
+static const u8 *GetEventObjectScriptPointerByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup)
+{
+    return GetEventObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->script;
+}
+
+const u8 *GetEventObjectScriptPointerByEventObjectId(u8 eventObjectId)
+{
+    return GetEventObjectScriptPointerByLocalIdAndMap(gEventObjects[eventObjectId].localId, gEventObjects[eventObjectId].mapNum, gEventObjects[eventObjectId].mapGroup);
+}
+
+static u16 GetEventObjectFlagIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup)
+{
+    return GetEventObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->flagId;
+}
+
+static u16 GetEventObjectFlagIdByEventObjectId(u8 eventObjectId)
+{
+    return GetEventObjectFlagIdByLocalIdAndMap(gEventObjects[eventObjectId].localId, gEventObjects[eventObjectId].mapNum, gEventObjects[eventObjectId].mapGroup);
+}
+
+u8 sub_808F080(u8 localId, u8 mapNum, u8 mapGroup)
+{
+    u8 eventObjectId;
+
+    if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
+    {
+        return 0xFF;
+    }
+    return gEventObjects[eventObjectId].trainerType;
+}
+
+u8 sub_808F0BC(u8 eventObjectId)
+{
+    return gEventObjects[eventObjectId].trainerType;
+}
+
+u8 sub_808F0D4(u8 localId, u8 mapNum, u8 mapGroup)
+{
+    u8 eventObjectId;
+
+    if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
+    {
+        return 0xFF;
+    }
+    return gEventObjects[eventObjectId].trainerRange_berryTreeId;
+}
+
+u8 EventObjectGetBerryTreeId(u8 eventObjectId)
+{
+    return gEventObjects[eventObjectId].trainerRange_berryTreeId;
+}
+
+static struct EventObjectTemplate *GetEventObjectTemplateByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup)
+{
+    struct EventObjectTemplate *templates;
+    const struct MapHeader *mapHeader;
+    u8 count;
+
+    if (gSaveBlock1Ptr->location.mapNum == mapNum && gSaveBlock1Ptr->location.mapGroup == mapGroup)
+    {
+        templates = gSaveBlock1Ptr->eventObjectTemplates;
+        count = gMapHeader.events->eventObjectCount;
+    }
+    else
+    {
+        mapHeader = Overworld_GetMapHeaderByGroupAndId(mapGroup, mapNum);
+        templates = mapHeader->events->eventObjects;
+        count = mapHeader->events->eventObjectCount;
+    }
+    return FindEventObjectTemplateByLocalId(localId, templates, count);
+}
+
+static struct EventObjectTemplate *FindEventObjectTemplateByLocalId(u8 localId, struct EventObjectTemplate *templates, u8 count)
+{
+    u8 i;
+
+    for (i = 0; i < count; i++)
+    {
+        if (templates[i].localId == localId)
+        {
+            return &templates[i];
+        }
+    }
+    return NULL;
+}
+
+struct EventObjectTemplate *GetBaseTemplateForEventObject(const struct EventObject *eventObject)
+{
+    int i;
+
+    if (eventObject->mapNum != gSaveBlock1Ptr->location.mapNum || eventObject->mapGroup != gSaveBlock1Ptr->location.mapGroup)
+    {
+        return NULL;
+    }
+    for (i = 0; i < 64; i++) // Using ARRAY_COUNT here results in the wrong conditional branch instruction (bls instead of ble)
+    {
+        if (eventObject->localId == gSaveBlock1Ptr->eventObjectTemplates[i].localId)
+        {
+            return &gSaveBlock1Ptr->eventObjectTemplates[i];
+        }
+    }
+    return NULL;
+}
+
+void OverrideTemplateCoordsForEventObject(const struct EventObject *eventObject)
+{
+    struct EventObjectTemplate *eventObjectTemplate;
+
+    eventObjectTemplate = GetBaseTemplateForEventObject(eventObject);
+    if (eventObjectTemplate != NULL)
+    {
+        eventObjectTemplate->x = eventObject->currentCoords.x - 7;
+        eventObjectTemplate->y = eventObject->currentCoords.y - 7;
+    }
+}
+
+void OverrideMovementTypeForEventObject(const struct EventObject *eventObject, const u8 *script)
+{
+    struct EventObjectTemplate *eventObjectTemplate;
+
+    eventObjectTemplate = GetBaseTemplateForEventObject(eventObject);
+    if (eventObjectTemplate != NULL)
+    {
+        eventObjectTemplate->script = script;
+    }
+}
+
+void TryOverrideTemplateCoordsForEventObject(const struct EventObject *eventObject, u8 movementType)
+{
+    struct EventObjectTemplate *eventObjectTemplate;
+
+    eventObjectTemplate = GetBaseTemplateForEventObject(eventObject);
+    if (eventObjectTemplate != NULL)
+    {
+        eventObjectTemplate->movementType = movementType;
+    }
+}
+
+void sub_808F254(u8 localId, u8 mapNum, u8 mapGroup)
+{
+    u8 eventObjectId;
+
+    if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
+    {
+        OverrideTemplateCoordsForEventObject(&gEventObjects[eventObjectId]);
+    }
+}
+
+void sub_808F28C(u8 localId, u8 mapNum, u8 mapGroup, u8 decorCat)
+{
+    u8 eventObjectId;
+
+    if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
+    {
+        switch (decorCat)
+        {
+            case DECORCAT_DOLL:
+                OverrideMovementTypeForEventObject(&gEventObjects[eventObjectId], EventScript_2766A2);
+                break;
+            case DECORCAT_CUSHION:
+                OverrideMovementTypeForEventObject(&gEventObjects[eventObjectId], EventScript_2766A6);
+                break;
+        }
+    }
+}
+
+void npc_paltag_set_load(u8 palSlot)
+{
+    gpu_pal_allocator_reset__manage_upper_four();
+    gUnknown_020375B6 = 0x11ff;
+    gUnknown_020375B4 = palSlot;
+    if (palSlot == 1)
+    {
+        pal_patch_for_npc_range(gUnknown_0850BE38[gUnknown_020375B4], 0, 6);
+        gReservedSpritePaletteCount = 8;
+    }
+    else
+    {
+        pal_patch_for_npc_range(gUnknown_0850BE38[gUnknown_020375B4], 0, 10);
+    }
+}
+
+u16 npc_paltag_by_palslot(u8 palSlot)
+{
+    u8 i;
+
+    if (palSlot < 10)
+    {
+        return gUnknown_0850BE38[gUnknown_020375B4][palSlot];
+    }
+    for (i = 0; gUnknown_0850BD78[i].tag != 0x11ff; i++)
+    {
+        if (gUnknown_0850BD78[i].tag == gUnknown_020375B6)
+        {
+            return gUnknown_0850BD78[i].data[gUnknown_020375B4];
+        }
+    }
+    return 0x11ff;
+}
+
+movement_type_empty_callback(MovementType_None)
+movement_type_def(MovementType_WanderAround, gMovementTypeFuncs_WanderAround)
+
+bool8 MovementType_WanderAround_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    ClearEventObjectMovement(eventObject, sprite);
+    sprite->data[1] = 1;
+    return TRUE;
+}
+
+bool8 MovementType_WanderAround_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection));
+    sprite->data[1] = 2;
+    return TRUE;
+}
+
+bool8 MovementType_WanderAround_Step2(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (!EventObjectExecSingleMovementAction(eventObject, sprite))
+    {
+        return FALSE;
+    }
+    SetMovementDelay(sprite, gMovementDelaysMedium[Random() & 3]);
+    sprite->data[1] = 3;
+    return TRUE;
+}
+
+bool8 MovementType_WanderAround_Step3(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (WaitForMovementDelay(sprite))
+    {
+        sprite->data[1] = 4;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementType_WanderAround_Step4(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 directions[4];
+    u8 chosenDirection;
+
+    memcpy(directions, gStandardDirections, sizeof directions);
+    chosenDirection = directions[Random() & 3];
+    SetEventObjectDirection(eventObject, chosenDirection);
+    sprite->data[1] = 5;
+    if (GetCollisionInDirection(eventObject, chosenDirection))
+    {
+        sprite->data[1] = 1;
+    }
+    return TRUE;
+}
+
+bool8 MovementType_WanderAround_Step5(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    EventObjectSetSingleMovement(eventObject, sprite, GetWalkNormalMovementAction(eventObject->movementDirection));
+    eventObject->singleMovementActive = 1;
+    sprite->data[1] = 6;
+    return TRUE;
+}
+
+bool8 MovementType_WanderAround_Step6(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (EventObjectExecSingleMovementAction(eventObject, sprite))
+    {
+        eventObject->singleMovementActive = 0;
+        sprite->data[1] = 1;
+    }
+    return FALSE;
+}
+
+bool8 EventObjectIsTrainerAndCloseToPlayer(struct EventObject *eventObject)
+{
+    s16 playerX;
+    s16 playerY;
+    s16 objX;
+    s16 objY;
+    s16 minX;
+    s16 maxX;
+    s16 minY;
+    s16 maxY;
+
+    if (!TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_DASH))
+    {
+        return FALSE;
+    }
+    if (eventObject->trainerType != 1 && eventObject->trainerType != 3)
+    {
+        return FALSE;
+    }
+    PlayerGetDestCoords(&playerX, &playerY);
+    objX = eventObject->currentCoords.x;
+    objY = eventObject->currentCoords.y;
+    minX = objX - eventObject->trainerRange_berryTreeId;
+    minY = objY - eventObject->trainerRange_berryTreeId;
+    maxX = objX + eventObject->trainerRange_berryTreeId;
+    maxY = objY + eventObject->trainerRange_berryTreeId;
+    if (minX > playerX || maxX < playerX || minY > playerY || maxY < playerY)
+    {
+        return FALSE;
+    }
+    return TRUE;
+}
+
+u8 GetVectorDirection(s16 dx, s16 dy, s16 absdx, s16 absdy)
+{
+    u8 direction;
+
+    if (absdx > absdy)
+    {
+        direction = DIR_EAST;
+        if (dx < 0)
+        {
+            direction = DIR_WEST;
+        }
+    }
+    else
+    {
+        direction = DIR_SOUTH;
+        if (dy < 0)
+        {
+            direction = DIR_NORTH;
+        }
+    }
+    return direction;
+}
+
+u8 GetLimitedVectorDirection_SouthNorth(s16 dx, s16 dy, s16 absdx, s16 absdy)
+{
+    u8 direction;
+
+    direction = DIR_SOUTH;
+    if (dy < 0)
+    {
+        direction = DIR_NORTH;
+    }
+    return direction;
+}
+
+u8 GetLimitedVectorDirection_WestEast(s16 dx, s16 dy, s16 absdx, s16 absdy)
+{
+    u8 direction;
+
+    direction = DIR_EAST;
+    if (dx < 0)
+    {
+        direction = DIR_WEST;
+    }
+    return direction;
+}
+
+u8 GetLimitedVectorDirection_WestNorth(s16 dx, s16 dy, s16 absdx, s16 absdy)
+{
+    u8 direction;
+
+    direction = GetVectorDirection(dx, dy, absdx, absdy);
+    if (direction == DIR_SOUTH)
+    {
+        direction = GetLimitedVectorDirection_WestEast(dx, dy, absdx, absdy);
+        if (direction == DIR_EAST)
+        {
+            direction = DIR_NORTH;
+        }
+    }
+    else if (direction == DIR_EAST)
+    {
+        direction = GetLimitedVectorDirection_SouthNorth(dx, dy, absdx, absdy);
+        if (direction == DIR_SOUTH)
+        {
+            direction = DIR_NORTH;
+        }
+    }
+    return direction;
+}
+
+u8 GetLimitedVectorDirection_EastNorth(s16 dx, s16 dy, s16 absdx, s16 absdy)
+{
+    u8 direction;
+
+    direction = GetVectorDirection(dx, dy, absdx, absdy);
+    if (direction == DIR_SOUTH)
+    {
+        direction = GetLimitedVectorDirection_WestEast(dx, dy, absdx, absdy);
+        if (direction == DIR_WEST)
+        {
+            direction = DIR_NORTH;
+        }
+    }
+    else if (direction == DIR_WEST)
+    {
+        direction = GetLimitedVectorDirection_SouthNorth(dx, dy, absdx, absdy);
+        if (direction == DIR_SOUTH)
+        {
+            direction = DIR_NORTH;
+        }
+    }
+    return direction;
+}
+
+u8 GetLimitedVectorDirection_WestSouth(s16 dx, s16 dy, s16 absdx, s16 absdy)
+{
+    u8 direction;
+
+    direction = GetVectorDirection(dx, dy, absdx, absdy);
+    if (direction == DIR_NORTH)
+    {
+        direction = GetLimitedVectorDirection_WestEast(dx, dy, absdx, absdy);
+        if (direction == DIR_EAST)
+        {
+            direction = DIR_SOUTH;
+        }
+    }
+    else if (direction == DIR_EAST)
+    {
+        direction = GetLimitedVectorDirection_SouthNorth(dx, dy, absdx, absdy);
+        if (direction == DIR_NORTH)
+        {
+            direction = DIR_SOUTH;
+        }
+    }
+    return direction;
+}
+
+u8 GetLimitedVectorDirection_EastSouth(s16 dx, s16 dy, s16 absdx, s16 absdy)
+{
+    u8 direction;
+
+    direction = GetVectorDirection(dx, dy, absdx, absdy);
+    if (direction == DIR_NORTH)
+    {
+        direction = GetLimitedVectorDirection_WestEast(dx, dy, absdx, absdy);
+        if (direction == DIR_WEST)
+        {
+            direction = DIR_SOUTH;
+        }
+    }
+    else if (direction == DIR_WEST)
+    {
+        direction = GetLimitedVectorDirection_SouthNorth(dx, dy, absdx, absdy);
+        if (direction == DIR_NORTH)
+        {
+            direction = DIR_SOUTH;
+        }
+    }
+    return direction;
+}
+
+u8 GetLimitedVectorDirection_SouthNorthWest(s16 dx, s16 dy, s16 absdx, s16 absdy)
+{
+    u8 direction;
+
+    direction = GetVectorDirection(dx, dy, absdx, absdy);
+    if (direction == DIR_EAST)
+    {
+        direction = GetLimitedVectorDirection_SouthNorth(dx, dy, absdx, absdy);
+    }
+    return direction;
+}
+
+u8 GetLimitedVectorDirection_SouthNorthEast(s16 dx, s16 dy, s16 absdx, s16 absdy)
+{
+    u8 direction;
+
+    direction = GetVectorDirection(dx, dy, absdx, absdy);
+    if (direction == DIR_WEST)
+    {
+        direction = GetLimitedVectorDirection_SouthNorth(dx, dy, absdx, absdy);
+    }
+    return direction;
+}
+
+u8 GetLimitedVectorDirection_NorthWestEast(s16 dx, s16 dy, s16 absdx, s16 absdy)
+{
+    u8 direction;
+
+    direction = GetVectorDirection(dx, dy, absdx, absdy);
+    if (direction == DIR_SOUTH)
+    {
+        direction = GetLimitedVectorDirection_WestEast(dx, dy, absdx, absdy);
+    }
+    return direction;
+}
+
+u8 GetLimitedVectorDirection_SouthWestEast(s16 dx, s16 dy, s16 absdx, s16 absdy)
+{
+    u8 direction;
+
+    direction = GetVectorDirection(dx, dy, absdx, absdy);
+    if (direction == DIR_NORTH)
+    {
+        direction = GetLimitedVectorDirection_WestEast(dx, dy, absdx, absdy);
+    }
+    return direction;
+}
+
+u8 TryGetTrainerEncounterDirection(struct EventObject *eventObject, u8 movementType)
+{
+    s16 dx;
+    s16 dy;
+    s16 absdx;
+    s16 absdy;
+
+    if (!EventObjectIsTrainerAndCloseToPlayer(eventObject))
+    {
+        return 0;
+    }
+    PlayerGetDestCoords(&dx, &dy);
+    dx -= eventObject->currentCoords.x;
+    dy -= eventObject->currentCoords.y;
+    absdx = dx;
+    absdy = dy;
+    if (absdx < 0)
+    {
+        absdx = -absdx;
+    }
+    if (absdy < 0)
+    {
+        absdy = -absdy;
+    }
+    return gGetVectorDirectionFuncs[movementType](dx, dy, absdx, absdy);
+}
+
+movement_type_def(MovementType_LookAround, gMovementTypeFuncs_LookAround)
+
+bool8 MovementType_LookAround_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    ClearEventObjectMovement(eventObject, sprite);
+    sprite->data[1] = 1;
+    return TRUE;
+}
+
+bool8 MovementType_LookAround_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection));
+    sprite->data[1] = 2;
+    return TRUE;
+}
+
+bool8 MovementType_LookAround_Step2(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (EventObjectExecSingleMovementAction(eventObject, sprite))
+    {
+        SetMovementDelay(sprite, gMovementDelaysMedium[Random() & 3]);
+        eventObject->singleMovementActive = 0;
+        sprite->data[1] = 3;
+    }
+    return FALSE;
+}
+
+bool8 MovementType_LookAround_Step3(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject))
+    {
+        sprite->data[1] = 4;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementType_LookAround_Step4(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 direction;
+    u8 directions[4];
+    memcpy(directions, gStandardDirections, sizeof directions);
+    direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_ANY);
+    if (direction == DIR_NONE)
+        direction = directions[Random() & 3];
+
+    SetEventObjectDirection(eventObject, direction);
+    sprite->data[1] = 1;
+    return TRUE;
+}
+
+movement_type_def(MovementType_WanderUpAndDown, gMovementTypeFuncs_WanderUpAndDown)
+
+bool8 MovementType_WanderUpAndDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    ClearEventObjectMovement(eventObject, sprite);
+    sprite->data[1] = 1;
+    return TRUE;
+}
+
+bool8 MovementType_WanderUpAndDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection));
+    sprite->data[1] = 2;
+    return TRUE;
+}
+
+bool8 MovementType_WanderUpAndDown_Step2(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (!EventObjectExecSingleMovementAction(eventObject, sprite))
+    {
+        return FALSE;
+    }
+    SetMovementDelay(sprite, gMovementDelaysMedium[Random() & 3]);
+    sprite->data[1] = 3;
+    return TRUE;
+}
+
+bool8 MovementType_WanderUpAndDown_Step3(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (WaitForMovementDelay(sprite))
+    {
+        sprite->data[1] = 4;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementType_WanderUpAndDown_Step4(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 direction;
+    u8 directions[2];
+    memcpy(directions, gUpAndDownDirections, sizeof directions);
+    direction = directions[Random() & 1];
+    SetEventObjectDirection(eventObject, direction);
+    sprite->data[1] = 5;
+    if (GetCollisionInDirection(eventObject, direction))
+    {
+        sprite->data[1] = 1;
+    }
+    return TRUE;
+}
+
+bool8 MovementType_WanderUpAndDown_Step5(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    EventObjectSetSingleMovement(eventObject, sprite, GetWalkNormalMovementAction(eventObject->movementDirection));
+    eventObject->singleMovementActive = 1;
+    sprite->data[1] = 6;
+    return TRUE;
+}
+
+bool8 MovementType_WanderUpAndDown_Step6(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (EventObjectExecSingleMovementAction(eventObject, sprite))
+    {
+        eventObject->singleMovementActive = 0;
+        sprite->data[1] = 1;
+    }
+    return FALSE;
+}
+
+movement_type_def(MovementType_WanderLeftAndRight, gMovementTypeFuncs_WanderLeftAndRight)
+
+bool8 MovementType_WanderLeftAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    ClearEventObjectMovement(eventObject, sprite);
+    sprite->data[1] = 1;
+    return TRUE;
+}
+
+bool8 MovementType_WanderLeftAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection));
+    sprite->data[1] = 2;
+    return TRUE;
+}
+
+bool8 MovementType_WanderLeftAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (!EventObjectExecSingleMovementAction(eventObject, sprite))
+    {
+        return FALSE;
+    }
+    SetMovementDelay(sprite, gMovementDelaysMedium[Random() & 3]);
+    sprite->data[1] = 3;
+    return TRUE;
+}
+
+bool8 MovementType_WanderLeftAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (WaitForMovementDelay(sprite))
+    {
+        sprite->data[1] = 4;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementType_WanderLeftAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 direction;
+    u8 directions[2];
+    memcpy(directions, gLeftAndRightDirections, sizeof directions);
+    direction = directions[Random() & 1];
+    SetEventObjectDirection(eventObject, direction);
+    sprite->data[1] = 5;
+    if (GetCollisionInDirection(eventObject, direction))
+    {
+        sprite->data[1] = 1;
+    }
+    return TRUE;
+}
+
+bool8 MovementType_WanderLeftAndRight_Step5(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    EventObjectSetSingleMovement(eventObject, sprite, GetWalkNormalMovementAction(eventObject->movementDirection));
+    eventObject->singleMovementActive = 1;
+    sprite->data[1] = 6;
+    return TRUE;
+}
+
+bool8 MovementType_WanderLeftAndRight_Step6(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (EventObjectExecSingleMovementAction(eventObject, sprite))
+    {
+        eventObject->singleMovementActive = 0;
+        sprite->data[1] = 1;
+    }
+    return FALSE;
+}
+
+movement_type_def(MovementType_FaceDirection, gMovementTypeFuncs_FaceDirection)
+
+bool8 MovementType_FaceDirection_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    ClearEventObjectMovement(eventObject, sprite);
+    EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection));
+    sprite->data[1] = 1;
+    return TRUE;
+}
+
+bool8 MovementType_FaceDirection_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (EventObjectExecSingleMovementAction(eventObject, sprite))
+    {
+        sprite->data[1] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementType_FaceDirection_Step2(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    eventObject->singleMovementActive = 0;
+    return FALSE;
+}
+
+static bool8 EventObjectCB2_BerryTree(struct EventObject *eventObject, struct Sprite *sprite);
+extern bool8 (*const gMovementTypeFuncs_BerryTreeGrowth[])(struct EventObject *eventObject, struct Sprite *sprite);
+void MovementType_BerryTreeGrowth(struct Sprite *sprite)
+{
+    struct EventObject *eventObject;
+
+    eventObject = &gEventObjects[sprite->data[0]];
+    if (!(sprite->data[7] & 1))
+    {
+        get_berry_tree_graphics(eventObject, sprite);
+        sprite->data[7] |= 1;
+    }
+    UpdateEventObjectCurrentMovement(eventObject, sprite, EventObjectCB2_BerryTree);
+}
+static bool8 EventObjectCB2_BerryTree(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    return gMovementTypeFuncs_BerryTreeGrowth[sprite->data[1]](eventObject, sprite);
+}
+
+bool8 MovementType_BerryTreeGrowth_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 berryStage;
+    ClearEventObjectMovement(eventObject, sprite);
+    eventObject->invisible = TRUE;
+    sprite->invisible = TRUE;
+    berryStage = GetStageByBerryTreeId(eventObject->trainerRange_berryTreeId);
+    if (berryStage == 0)
+    {
+        if (!(sprite->data[7] & 4) && sprite->animNum == 4)
+        {
+            gFieldEffectArguments[0] = eventObject->currentCoords.x;
+            gFieldEffectArguments[1] = eventObject->currentCoords.y;
+            gFieldEffectArguments[2] = sprite->subpriority - 1;
+            gFieldEffectArguments[3] = sprite->oam.priority;
+            FieldEffectStart(FLDEFF_BERRY_TREE_GROWTH_SPARKLE);
+            sprite->animNum = berryStage;
+        }
+        return FALSE;
+    }
+    eventObject->invisible = FALSE;
+    sprite->invisible = FALSE;
+    berryStage --;
+    if (sprite->animNum != berryStage)
+    {
+        sprite->data[1] = 2;
+        return TRUE;
+    }
+    get_berry_tree_graphics(eventObject, sprite);
+    EventObjectSetSingleMovement(eventObject, sprite, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION);
+    sprite->data[1] = 1;
+    return TRUE;
+}
+
+bool8 MovementType_BerryTreeGrowth_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (EventObjectExecSingleMovementAction(eventObject, sprite))
+    {
+        sprite->data[1] = 0;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementType_BerryTreeGrowth_Step2(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    eventObject->singleMovementActive = 1;
+    sprite->data[1] = 3;
+    sprite->data[2] = 0;
+    sprite->data[7] |= 2;
+    gFieldEffectArguments[0] = eventObject->currentCoords.x;
+    gFieldEffectArguments[1] = eventObject->currentCoords.y;
+    gFieldEffectArguments[2] = sprite->subpriority - 1;
+    gFieldEffectArguments[3] = sprite->oam.priority;
+    FieldEffectStart(FLDEFF_BERRY_TREE_GROWTH_SPARKLE);
+    return TRUE;
+}
+
+bool8 MovementType_BerryTreeGrowth_Step3(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sprite->data[2]++;
+    eventObject->invisible = (sprite->data[2] & 0x02) >> 1;
+    sprite->animPaused = TRUE;
+    if (sprite->data[2] > 64)
+    {
+        get_berry_tree_graphics(eventObject, sprite);
+        sprite->data[1] = 4;
+        sprite->data[2] = 0;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementType_BerryTreeGrowth_Step4(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sprite->data[2]++;
+    eventObject->invisible = (sprite->data[2] & 0x02) >> 1;
+    sprite->animPaused = TRUE;
+    if (sprite->data[2] > 64)
+    {
+        sprite->data[1] = 0;
+        sprite->data[7] &= ~0x0002;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+movement_type_def(MovementType_FaceDownAndUp, gMovementTypeFuncs_FaceDownAndUp)
+
+bool8 MovementType_FaceDownAndUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    ClearEventObjectMovement(eventObject, sprite);
+    sprite->data[1] = 1;
+    return TRUE;
+}
+
+bool8 MovementType_FaceDownAndUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection));
+    sprite->data[1] = 2;
+    return TRUE;
+}
+
+bool8 MovementType_FaceDownAndUp_Step2(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (EventObjectExecSingleMovementAction(eventObject, sprite))
+    {
+        SetMovementDelay(sprite, gMovementDelaysMedium[Random() & 3]);
+        eventObject->singleMovementActive = 0;
+        sprite->data[1] = 3;
+    }
+    return FALSE;
+}
+
+bool8 MovementType_FaceDownAndUp_Step3(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject))
+    {
+        sprite->data[1] = 4;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementType_FaceDownAndUp_Step4(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 direction;
+    u8 directions[2];
+    memcpy(directions, gUpAndDownDirections, sizeof gUpAndDownDirections);
+    direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_NORTH_SOUTH);
+    if (direction == 0)
+    {
+        direction = directions[Random() & 1];
+    }
+    SetEventObjectDirection(eventObject, direction);
+    sprite->data[1] = 1;
+    return TRUE;
+}
+
+movement_type_def(MovementType_FaceLeftAndRight, gMovementTypeFuncs_FaceLeftAndRight)
+
+bool8 MovementType_FaceLeftAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    ClearEventObjectMovement(eventObject, sprite);
+    sprite->data[1] = 1;
+    return TRUE;
+}
+
+bool8 MovementType_FaceLeftAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection));
+    sprite->data[1] = 2;
+    return TRUE;
+}
+
+bool8 MovementType_FaceLeftAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (EventObjectExecSingleMovementAction(eventObject, sprite))
+    {
+        SetMovementDelay(sprite, gMovementDelaysMedium[Random() & 3]);
+        eventObject->singleMovementActive = 0;
+        sprite->data[1] = 3;
+    }
+    return FALSE;
+}
+
+bool8 MovementType_FaceLeftAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject))
+    {
+        sprite->data[1] = 4;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementType_FaceLeftAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 direction;
+    u8 directions[2];
+    memcpy(directions, gLeftAndRightDirections, sizeof gLeftAndRightDirections);
+    direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_EAST_WEST);
+    if (direction == 0)
+    {
+        direction = directions[Random() & 1];
+    }
+    SetEventObjectDirection(eventObject, direction);
+    sprite->data[1] = 1;
+    return TRUE;
+}
+
+movement_type_def(MovementType_FaceUpAndLeft, gMovementTypeFuncs_FaceUpAndLeft)
+
+bool8 MovementType_FaceUpAndLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    ClearEventObjectMovement(eventObject, sprite);
+    sprite->data[1] = 1;
+    return TRUE;
+}
+
+bool8 MovementType_FaceUpAndLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection));
+    sprite->data[1] = 2;
+    return TRUE;
+}
+
+bool8 MovementType_FaceUpAndLeft_Step2(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (EventObjectExecSingleMovementAction(eventObject, sprite))
+    {
+        SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]);
+        eventObject->singleMovementActive = 0;
+        sprite->data[1] = 3;
+    }
+    return FALSE;
+}
+
+bool8 MovementType_FaceUpAndLeft_Step3(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject))
+    {
+        sprite->data[1] = 4;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementType_FaceUpAndLeft_Step4(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 direction;
+    u8 directions[2];
+    memcpy(directions, gUpAndLeftDirections, sizeof gUpAndLeftDirections);
+    direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_NORTH_WEST);
+    if (direction == 0)
+    {
+        direction = directions[Random() & 1];
+    }
+    SetEventObjectDirection(eventObject, direction);
+    sprite->data[1] = 1;
+    return TRUE;
+}
+
+movement_type_def(MovementType_FaceUpAndRight, gMovementTypeFuncs_FaceUpAndRight)
+
+bool8 MovementType_FaceUpAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    ClearEventObjectMovement(eventObject, sprite);
+    sprite->data[1] = 1;
+    return TRUE;
+}
+
+bool8 MovementType_FaceUpAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection));
+    sprite->data[1] = 2;
+    return TRUE;
+}
+
+bool8 MovementType_FaceUpAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (EventObjectExecSingleMovementAction(eventObject, sprite))
+    {
+        SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]);
+        eventObject->singleMovementActive = 0;
+        sprite->data[1] = 3;
+    }
+    return FALSE;
+}
+
+bool8 MovementType_FaceUpAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject))
+    {
+        sprite->data[1] = 4;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementType_FaceUpAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 direction;
+    u8 directions[2];
+    memcpy(directions, gUpAndRightDirections, sizeof gUpAndRightDirections);
+    direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_NORTH_EAST);
+    if (direction == 0)
+    {
+        direction = directions[Random() & 1];
+    }
+    SetEventObjectDirection(eventObject, direction);
+    sprite->data[1] = 1;
+    return TRUE;
+}
+
+movement_type_def(MovementType_FaceDownAndLeft, gMovementTypeFuncs_FaceDownAndLeft)
+
+bool8 MovementType_FaceDownAndLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    ClearEventObjectMovement(eventObject, sprite);
+    sprite->data[1] = 1;
+    return TRUE;
+}
+
+bool8 MovementType_FaceDownAndLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection));
+    sprite->data[1] = 2;
+    return TRUE;
+}
+
+bool8 MovementType_FaceDownAndLeft_Step2(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (EventObjectExecSingleMovementAction(eventObject, sprite))
+    {
+        SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]);
+        eventObject->singleMovementActive = 0;
+        sprite->data[1] = 3;
+    }
+    return FALSE;
+}
+
+bool8 MovementType_FaceDownAndLeft_Step3(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject))
+    {
+        sprite->data[1] = 4;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementType_FaceDownAndLeft_Step4(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 direction;
+    u8 directions[2];
+    memcpy(directions, gDownAndLeftDirections, sizeof gDownAndLeftDirections);
+    direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_SOUTH_WEST);
+    if (direction == 0)
+    {
+        direction = directions[Random() & 1];
+    }
+    SetEventObjectDirection(eventObject, direction);
+    sprite->data[1] = 1;
+    return TRUE;
+}
+
+movement_type_def(MovementType_FaceDownAndRight, gMovementTypeFuncs_FaceDownAndRight)
+
+bool8 MovementType_FaceDownAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    ClearEventObjectMovement(eventObject, sprite);
+    sprite->data[1] = 1;
+    return TRUE;
+}
+
+bool8 MovementType_FaceDownAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection));
+    sprite->data[1] = 2;
+    return TRUE;
+}
+
+bool8 MovementType_FaceDownAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (EventObjectExecSingleMovementAction(eventObject, sprite))
+    {
+        SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]);
+        eventObject->singleMovementActive = 0;
+        sprite->data[1] = 3;
+    }
+    return FALSE;
+}
+
+bool8 MovementType_FaceDownAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject))
+    {
+        sprite->data[1] = 4;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementType_FaceDownAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 direction;
+    u8 directions[2];
+    memcpy(directions, gDownAndRightDirections, sizeof gDownAndRightDirections);
+    direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_SOUTH_EAST);
+    if (direction == 0)
+    {
+        direction = directions[Random() & 1];
+    }
+    SetEventObjectDirection(eventObject, direction);
+    sprite->data[1] = 1;
+    return TRUE;
+}
+
+movement_type_def(MovementType_FaceDownUpAndLeft, gMovementTypeFuncs_FaceDownUpAndLeft)
+
+bool8 MovementType_FaceDownUpAndLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    ClearEventObjectMovement(eventObject, sprite);
+    sprite->data[1] = 1;
+    return TRUE;
+}
+
+bool8 MovementType_FaceDownUpAndLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection));
+    sprite->data[1] = 2;
+    return TRUE;
+}
+
+bool8 MovementType_FaceDownUpAndLeft_Step2(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (EventObjectExecSingleMovementAction(eventObject, sprite))
+    {
+        SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]);
+        eventObject->singleMovementActive = 0;
+        sprite->data[1] = 3;
+    }
+    return FALSE;
+}
+
+bool8 MovementType_FaceDownUpAndLeft_Step3(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject))
+    {
+        sprite->data[1] = 4;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementType_FaceDownUpAndLeft_Step4(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 direction;
+    u8 directions[4];
+    memcpy(directions, gDownUpAndLeftDirections, sizeof gDownUpAndLeftDirections);
+    direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_NORTH_SOUTH_WEST);
+    if (direction == 0)
+    {
+        direction = directions[Random() & 3];
+    }
+    SetEventObjectDirection(eventObject, direction);
+    sprite->data[1] = 1;
+    return TRUE;
+}
+
+movement_type_def(MovementType_FaceDownUpAndRight, gMovementTypeFuncs_FaceDownUpAndRight)
+
+bool8 MovementType_FaceDownUpAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    ClearEventObjectMovement(eventObject, sprite);
+    sprite->data[1] = 1;
+    return TRUE;
+}
+
+bool8 MovementType_FaceDownUpAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection));
+    sprite->data[1] = 2;
+    return TRUE;
+}
+
+bool8 MovementType_FaceDownUpAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (EventObjectExecSingleMovementAction(eventObject, sprite))
+    {
+        SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]);
+        eventObject->singleMovementActive = 0;
+        sprite->data[1] = 3;
+    }
+    return FALSE;
+}
+
+bool8 MovementType_FaceDownUpAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject))
+    {
+        sprite->data[1] = 4;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementType_FaceDownUpAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 direction;
+    u8 directions[4];
+    memcpy(directions, gDownUpAndRightDirections, sizeof gDownUpAndRightDirections);
+    direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_NORTH_SOUTH_EAST);
+    if (direction == 0)
+    {
+        direction = directions[Random() & 3];
+    }
+    SetEventObjectDirection(eventObject, direction);
+    sprite->data[1] = 1;
+    return TRUE;
+}
+
+movement_type_def(MovementType_FaceUpRightAndLeft, gMovementTypeFuncs_FaceUpLeftAndRight)
+
+bool8 MovementType_FaceUpLeftAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    ClearEventObjectMovement(eventObject, sprite);
+    sprite->data[1] = 1;
+    return TRUE;
+}
+
+bool8 MovementType_FaceUpLeftAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection));
+    sprite->data[1] = 2;
+    return TRUE;
+}
+
+bool8 MovementType_FaceUpLeftAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (EventObjectExecSingleMovementAction(eventObject, sprite))
+    {
+        SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]);
+        eventObject->singleMovementActive = 0;
+        sprite->data[1] = 3;
+    }
+    return FALSE;
+}
+
+bool8 MovementType_FaceUpLeftAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject))
+    {
+        sprite->data[1] = 4;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementType_FaceUpLeftAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 direction;
+    u8 directions[4];
+    memcpy(directions, gUpLeftAndRightDirections, sizeof gUpLeftAndRightDirections);
+    direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_NORTH_EAST_WEST);
+    if (direction == 0)
+    {
+        direction = directions[Random() & 3];
+    }
+    SetEventObjectDirection(eventObject, direction);
+    sprite->data[1] = 1;
+    return TRUE;
+}
+
+movement_type_def(MovementType_FaceDownRightAndLeft, gMovementTypeFuncs_FaceDownLeftAndRight)
+
+bool8 MovementType_FaceDownLeftAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    ClearEventObjectMovement(eventObject, sprite);
+    sprite->data[1] = 1;
+    return TRUE;
+}
+
+bool8 MovementType_FaceDownLeftAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection));
+    sprite->data[1] = 2;
+    return TRUE;
+}
+
+bool8 MovementType_FaceDownLeftAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (EventObjectExecSingleMovementAction(eventObject, sprite))
+    {
+        SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]);
+        eventObject->singleMovementActive = 0;
+        sprite->data[1] = 3;
+    }
+    return FALSE;
+}
+
+bool8 MovementType_FaceDownLeftAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject))
+    {
+        sprite->data[1] = 4;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementType_FaceDownLeftAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 direction;
+    u8 directions[4];
+    memcpy(directions, gDownLeftAndRightDirections, sizeof gDownLeftAndRightDirections);
+    direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_SOUTH_EAST_WEST);
+    if (direction == 0)
+    {
+        direction = directions[Random() & 3];
+    }
+    SetEventObjectDirection(eventObject, direction);
+    sprite->data[1] = 1;
+    return TRUE;
+}
+
+movement_type_def(MovementType_RotateCounterclockwise, gMovementTypeFuncs_RotateCounterclockwise)
+
+bool8 MovementType_RotateCounterclockwise_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    ClearEventObjectMovement(eventObject, sprite);
+    EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection));
+    sprite->data[1] = 1;
+    return TRUE;
+}
+
+bool8 MovementType_RotateCounterclockwise_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (EventObjectExecSingleMovementAction(eventObject, sprite))
+    {
+        SetMovementDelay(sprite, 48);
+        sprite->data[1] = 2;
+    }
+    return FALSE;
+}
+
+bool8 MovementType_RotateCounterclockwise_Step2(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject))
+    {
+        sprite->data[1] = 3;
+    }
+    return FALSE;
+}
+
+bool8 MovementType_RotateCounterclockwise_Step3(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 direction;
+    u8 directions[5];
+    memcpy(directions, gCounterclockwiseDirections, sizeof gCounterclockwiseDirections);
+    direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_ANY);
+    if (direction == 0)
+    {
+        direction = directions[eventObject->facingDirection];
+    }
+    SetEventObjectDirection(eventObject, direction);
+    sprite->data[1] = 0;
+    return TRUE;
+}
+
+movement_type_def(MovementType_RotateClockwise, gMovementTypeFuncs_RotateClockwise)
+
+bool8 MovementType_RotateClockwise_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    ClearEventObjectMovement(eventObject, sprite);
+    EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection));
+    sprite->data[1] = 1;
+    return TRUE;
+}
+
+bool8 MovementType_RotateClockwise_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (EventObjectExecSingleMovementAction(eventObject, sprite))
+    {
+        SetMovementDelay(sprite, 48);
+        sprite->data[1] = 2;
+    }
+    return FALSE;
+}
+
+bool8 MovementType_RotateClockwise_Step2(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject))
+    {
+        sprite->data[1] = 3;
+    }
+    return FALSE;
+}
+
+bool8 MovementType_RotateClockwise_Step3(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 direction;
+    u8 directions[5];
+    memcpy(directions, gClockwiseDirections, sizeof gClockwiseDirections);
+    direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_ANY);
+    if (direction == 0)
+    {
+        direction = directions[eventObject->facingDirection];
+    }
+    SetEventObjectDirection(eventObject, direction);
+    sprite->data[1] = 0;
+    return TRUE;
+}
+
+movement_type_def(MovementType_WalkBackAndForth, gMovementTypeFuncs_WalkBackAndForth)
+
+bool8 MovementType_WalkBackAndForth_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    ClearEventObjectMovement(eventObject, sprite);
+    sprite->data[1] = 1;
+    return TRUE;
+}
+
+bool8 MovementType_WalkBackAndForth_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 direction;
+
+    direction = gInitialMovementTypeFacingDirections[eventObject->movementType];
+    if (eventObject->directionSequenceIndex)
+    {
+        direction = GetOppositeDirection(direction);
+    }
+    SetEventObjectDirection(eventObject, direction);
+    sprite->data[1] = 2;
+    return TRUE;
+}
+
+bool8 MovementType_WalkBackAndForth_Step2(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    bool8 collisionState;
+    u8 movementActionId;
+
+    if (eventObject->directionSequenceIndex && eventObject->initialCoords.x == eventObject->currentCoords.x && eventObject->initialCoords.y == eventObject->currentCoords.y)
+    {
+        eventObject->directionSequenceIndex = 0;
+        SetEventObjectDirection(eventObject, GetOppositeDirection(eventObject->movementDirection));
+    }
+    collisionState = GetCollisionInDirection(eventObject, eventObject->movementDirection);
+    movementActionId = GetWalkNormalMovementAction(eventObject->movementDirection);
+    if (collisionState == TRUE)
+    {
+        eventObject->directionSequenceIndex++;
+        SetEventObjectDirection(eventObject, GetOppositeDirection(eventObject->movementDirection));
+        movementActionId = GetWalkNormalMovementAction(eventObject->movementDirection);
+        collisionState = GetCollisionInDirection(eventObject, eventObject->movementDirection);
+    }
+    if (collisionState)
+    {
+        movementActionId = GetWalkInPlaceNormalMovementAction(eventObject->facingDirection);
+    }
+    EventObjectSetSingleMovement(eventObject, sprite, movementActionId);
+    eventObject->singleMovementActive = 1;
+    sprite->data[1] = 3;
+    return TRUE;
+}
+
+bool8 MovementType_WalkBackAndForth_Step3(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (EventObjectExecSingleMovementAction(eventObject, sprite))
+    {
+        eventObject->singleMovementActive = 0;
+        sprite->data[1] = 1;
+    }
+    return FALSE;
+}
+
+bool8 MovementType_WalkSequence_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    ClearEventObjectMovement(eventObject, sprite);
+    sprite->data[1] = 1;
+    return TRUE;
+}
+
+bool8 MoveNextDirectionInSequence(struct EventObject *eventObject, struct Sprite *sprite, u8 *route)
+{
+    u8 collisionState;
+    u8 movementActionId;
+
+    if (eventObject->directionSequenceIndex == 3 && eventObject->initialCoords.x == eventObject->currentCoords.x && eventObject->initialCoords.y == eventObject->currentCoords.y)
+    {
+        eventObject->directionSequenceIndex = 0;
+    }
+    SetEventObjectDirection(eventObject, route[eventObject->directionSequenceIndex]);
+    movementActionId = GetWalkNormalMovementAction(eventObject->movementDirection);
+    collisionState = GetCollisionInDirection(eventObject, eventObject->movementDirection);
+    if (collisionState == TRUE)
+    {
+        eventObject->directionSequenceIndex++;
+        SetEventObjectDirection(eventObject, route[eventObject->directionSequenceIndex]);
+        movementActionId = GetWalkNormalMovementAction(eventObject->movementDirection);
+        collisionState = GetCollisionInDirection(eventObject, eventObject->movementDirection);
+    }
+    if (collisionState)
+    {
+        movementActionId = GetWalkInPlaceNormalMovementAction(eventObject->facingDirection);
+    }
+    EventObjectSetSingleMovement(eventObject, sprite, movementActionId);
+    eventObject->singleMovementActive = 1;
+    sprite->data[1] = 2;
+    return TRUE;
+}
+
+bool8 MovementType_WalkSequence_Step2(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (EventObjectExecSingleMovementAction(eventObject, sprite))
+    {
+        eventObject->singleMovementActive = 0;
+        sprite->data[1] = 1;
+    }
+    return FALSE;
+}
+
+movement_type_def(MovementType_WalkSequenceUpRightLeftDown, gMovementTypeFuncs_WalkSequenceUpRightLeftDown)
+
+u8 MovementType_WalkSequenceUpRightLeftDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 directions[sizeof(gUpRightLeftDownDirections)];
+    memcpy(directions, gUpRightLeftDownDirections, sizeof(gUpRightLeftDownDirections));
+    if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x)
+    {
+        eventObject->directionSequenceIndex = 3;
+    }
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
+}
+
+movement_type_def(MovementType_WalkSequenceRightLeftDownUp, gMovementTypeFuncs_WalkSequenceRightLeftDownUp)
+
+u8 MovementType_WalkSequenceRightLeftDownUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 directions[sizeof(gRightLeftDownUpDirections)];
+    memcpy(directions, gRightLeftDownUpDirections, sizeof(gRightLeftDownUpDirections));
+    if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.x == eventObject->currentCoords.x)
+    {
+        eventObject->directionSequenceIndex = 2;
+    }
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
+}
+
+movement_type_def(MovementType_WalkSequenceDownUpRightLeft, gMovementTypeFuncs_WalkSequenceDownUpRightLeft)
+
+u8 MovementType_WalkSequenceDownUpRightLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 directions[sizeof(gDownUpRightLeftDirections)];
+    memcpy(directions, gDownUpRightLeftDirections, sizeof(gDownUpRightLeftDirections));
+    if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.y == eventObject->currentCoords.y)
+    {
+        eventObject->directionSequenceIndex = 2;
+    }
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
+}
+
+movement_type_def(MovementType_WalkSequenceLeftDownUpRight, gMovementTypeFuncs_WalkSequenceLeftDownUpRight)
+
+u8 MovementType_WalkSequenceLeftDownUpRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 directions[sizeof(gLeftDownUpRightDirections)];
+    memcpy(directions, gLeftDownUpRightDirections, sizeof(gLeftDownUpRightDirections));
+    if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y)
+    {
+        eventObject->directionSequenceIndex = 3;
+    }
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
+}
+
+movement_type_def(MovementType_WalkSequenceUpLeftRightDown, gMovementTypeFuncs_WalkSequenceUpLeftRightDown)
+
+u8 MovementType_WalkSequenceUpLeftRightDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 directions[sizeof(gUpLeftRightDownDirections)];
+    memcpy(directions, gUpLeftRightDownDirections, sizeof(gUpLeftRightDownDirections));
+    if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x)
+    {
+        eventObject->directionSequenceIndex = 3;
+    }
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
+}
+
+movement_type_def(MovementType_WalkSequenceLeftRightDownUp, gMovementTypeFuncs_WalkSequenceLeftRightDownUp)
+
+u8 MovementType_WalkSequenceLeftRightDownUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 directions[sizeof(gLeftRightDownUpDirections)];
+    memcpy(directions, gLeftRightDownUpDirections, sizeof(gLeftRightDownUpDirections));
+    if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.x == eventObject->currentCoords.x)
+    {
+        eventObject->directionSequenceIndex = 2;
+    }
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
+}
+
+movement_type_def(MovementType_WalkSequenceDownUpLeftRight, gMovementTypeFuncs_WalkSequenceDownUpLeftRight)
+
+u8 MovementType_WalkSequenceDownUpLeftRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 directions[sizeof(gStandardDirections)];
+    memcpy(directions, gStandardDirections, sizeof(gStandardDirections));
+    if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.y == eventObject->currentCoords.y)
+    {
+        eventObject->directionSequenceIndex = 2;
+    }
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
+}
+
+movement_type_def(MovementType_WalkSequenceRightDownUpLeft, gMovementTypeFuncs_WalkSequenceRightDownUpLeft)
+
+u8 MovementType_WalkSequenceRightDownUpLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 directions[sizeof(gRightDownUpLeftDirections)];
+    memcpy(directions, gRightDownUpLeftDirections, sizeof(gRightDownUpLeftDirections));
+    if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y)
+    {
+        eventObject->directionSequenceIndex = 3;
+    }
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
+}
+
+movement_type_def(MovementType_WalkSequenceLeftUpDownRight, gMovementTypeFuncs_WalkSequenceLeftUpDownRight)
+
+u8 MovementType_WalkSequenceLeftUpDownRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 directions[sizeof(gLeftUpDownRightDirections)];
+    memcpy(directions, gLeftUpDownRightDirections, sizeof(gLeftUpDownRightDirections));
+    if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y)
+    {
+        eventObject->directionSequenceIndex = 3;
+    }
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
+}
+
+movement_type_def(MovementType_WalkSequenceUpDownRightLeft, gMovementTypeFuncs_WalkSequenceUpDownRightLeft)
+
+u8 MovementType_WalkSequenceUpDownRightLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 directions[sizeof(gUpDownRightLeftDirections)];
+    memcpy(directions, gUpDownRightLeftDirections, sizeof(gUpDownRightLeftDirections));
+    if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.y == eventObject->currentCoords.y)
+    {
+        eventObject->directionSequenceIndex = 2;
+    }
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
+}
+
+movement_type_def(MovementType_WalkSequenceRightLeftUpDown, gMovementTypeFuncs_WalkSequenceRightLeftUpDown)
+
+u8 MovementType_WalkSequenceRightLeftUpDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 directions[sizeof(gRightLeftUpDownDirections)];
+    memcpy(directions, gRightLeftUpDownDirections, sizeof(gRightLeftUpDownDirections));
+    if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.x == eventObject->currentCoords.x)
+    {
+        eventObject->directionSequenceIndex = 2;
+    }
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
+}
+
+movement_type_def(MovementType_WalkSequenceDownRightLeftUp, gMovementTypeFuncs_WalkSequenceDownRightLeftUp)
+
+u8 MovementType_WalkSequenceDownRightLeftUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 directions[sizeof(gDownRightLeftUpDirections)];
+    memcpy(directions, gDownRightLeftUpDirections, sizeof(gDownRightLeftUpDirections));
+    if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x)
+    {
+        eventObject->directionSequenceIndex = 3;
+    }
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
+}
+
+movement_type_def(MovementType_WalkSequenceRightUpDownLeft, gMovementTypeFuncs_WalkSequenceRightUpDownLeft)
+
+u8 MovementType_WalkSequenceRightUpDownLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 directions[sizeof(gRightUpDownLeftDirections)];
+    memcpy(directions, gRightUpDownLeftDirections, sizeof(gRightUpDownLeftDirections));
+    if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y)
+    {
+        eventObject->directionSequenceIndex = 3;
+    }
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
+}
+
+movement_type_def(MovementType_WalkSequenceUpDownLeftRight, gMovementTypeFuncs_WalkSequenceUpDownLeftRight)
+
+u8 MovementType_WalkSequenceUpDownLeftRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 directions[sizeof(gUpDownLeftRightDirections)];
+    memcpy(directions, gUpDownLeftRightDirections, sizeof(gUpDownLeftRightDirections));
+    if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.y == eventObject->currentCoords.y)
+    {
+        eventObject->directionSequenceIndex = 2;
+    }
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
+}
+
+movement_type_def(MovementType_WalkSequenceLeftRightUpDown, gMovementTypeFuncs_WalkSequenceLeftRightUpDown)
+
+u8 MovementType_WalkSequenceLeftRightUpDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 directions[sizeof(gLeftRightUpDownDirections)];
+    memcpy(directions, gLeftRightUpDownDirections, sizeof(gLeftRightUpDownDirections));
+    if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.x == eventObject->currentCoords.x)
+    {
+        eventObject->directionSequenceIndex = 2;
+    }
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
+}
+
+movement_type_def(MovementType_WalkSequenceDownLeftRightUp, gMovementTypeFuncs_WalkSequenceDownLeftRightUp)
+
+u8 MovementType_WalkSequenceDownLeftRightUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 directions[sizeof(gDownLeftRightUpDirections)];
+    memcpy(directions, gDownLeftRightUpDirections, sizeof(gDownLeftRightUpDirections));
+    if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x)
+    {
+        eventObject->directionSequenceIndex = 3;
+    }
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
+}
+
+movement_type_def(MovementType_WalkSequenceUpLeftDownRight, gMovementTypeFuncs_WalkSequenceUpLeftDownRight)
+
+u8 MovementType_WalkSequenceUpLeftDownRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 directions[sizeof(gUpLeftDownRightDirections)];
+    memcpy(directions, gUpLeftDownRightDirections, sizeof(gUpLeftDownRightDirections));
+    if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y)
+    {
+        eventObject->directionSequenceIndex = 3;
+    }
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
+}
+
+movement_type_def(MovementType_WalkSequenceDownRightUpLeft, gMovementTypeFuncs_WalkSequenceDownRightUpLeft)
+
+u8 MovementType_WalkSequenceDownRightUpLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 directions[sizeof(gDownRightUpLeftDirections)];
+    memcpy(directions, gDownRightUpLeftDirections, sizeof(gDownRightUpLeftDirections));
+    if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y)
+    {
+        eventObject->directionSequenceIndex = 3;
+    }
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
+}
+
+movement_type_def(MovementType_WalkSequenceLeftDownRightUp, gMovementTypeFuncs_WalkSequenceLeftDownRightUp)
+
+u8 MovementType_WalkSequenceLeftDownRightUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 directions[sizeof(gLeftDownRightUpDirections)];
+    memcpy(directions, gLeftDownRightUpDirections, sizeof(gLeftDownRightUpDirections));
+    if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x)
+    {
+        eventObject->directionSequenceIndex = 3;
+    }
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
+}
+
+movement_type_def(MovementType_WalkSequenceRightUpLeftDown, gMovementTypeFuncs_WalkSequenceRightUpLeftDown)
+
+u8 MovementType_WalkSequenceRightUpLeftDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 directions[sizeof(gRightUpLeftDownDirections)];
+    memcpy(directions, gRightUpLeftDownDirections, sizeof(gRightUpLeftDownDirections));
+    if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x)
+    {
+        eventObject->directionSequenceIndex = 3;
+    }
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
+}
+
+movement_type_def(MovementType_WalkSequenceUpRightDownLeft, gMovementTypeFuncs_WalkSequenceUpRightDownLeft)
+
+u8 MovementType_WalkSequenceUpRightDownLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 directions[sizeof(gUpRightDownLeftDirections)];
+    memcpy(directions, gUpRightDownLeftDirections, sizeof(gUpRightDownLeftDirections));
+    if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y)
+    {
+        eventObject->directionSequenceIndex = 3;
+    }
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
+}
+
+movement_type_def(MovementType_WalkSequenceDownLeftUpRight, gMovementTypeFuncs_WalkSequenceDownLeftUpRight)
+
+u8 MovementType_WalkSequenceDownLeftUpRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 directions[sizeof(gDownLeftUpRightDirections)];
+    memcpy(directions, gDownLeftUpRightDirections, sizeof(gDownLeftUpRightDirections));
+    if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y)
+    {
+        eventObject->directionSequenceIndex = 3;
+    }
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
+}
+
+movement_type_def(MovementType_WalkSequenceLeftUpRightDown, gMovementTypeFuncs_WalkSequenceLeftUpRightDown)
+
+u8 MovementType_WalkSequenceLeftUpRightDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 directions[sizeof(gLeftUpRightDownDirections)];
+    memcpy(directions, gLeftUpRightDownDirections, sizeof(gLeftUpRightDownDirections));
+    if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x)
+    {
+        eventObject->directionSequenceIndex = 3;
+    }
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
+}
+
+movement_type_def(MovementType_WalkSequenceRightDownLeftUp, gMovementTypeFuncs_WalkSequenceRightDownLeftUp)
+
+u8 MovementType_WalkSequenceRightDownLeftUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 directions[sizeof(gRightDownLeftUpDirections)];
+    memcpy(directions, gRightDownLeftUpDirections, sizeof(gRightDownLeftUpDirections));
+    if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x)
+    {
+        eventObject->directionSequenceIndex = 3;
+    }
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
+}
+
+movement_type_def(MovementType_CopyPlayer, gMovementTypeFuncs_CopyPlayer)
+
+bool8 MovementType_CopyPlayer_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    ClearEventObjectMovement(eventObject, sprite);
+    if (eventObject->directionSequenceIndex == 0)
+    {
+        eventObject->directionSequenceIndex = GetPlayerFacingDirection();
+    }
+    sprite->data[1] = 1;
+    return TRUE;
+}
+
+bool8 MovementType_CopyPlayer_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (gEventObjects[gPlayerAvatar.eventObjectId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER)
+    {
+        return FALSE;
+    }
+    return gCopyPlayerMovementFuncs[PlayerGetCopyableMovement()](eventObject, sprite, GetPlayerMovementDirection(), NULL);
+}
+
+bool8 MovementType_CopyPlayer_Step2(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (EventObjectExecSingleMovementAction(eventObject, sprite))
+    {
+        eventObject->singleMovementActive = 0;
+        sprite->data[1] = 1;
+    }
+    return FALSE;
+}
+
+bool8 CopyablePlayerMovement_None(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8))
+{
+    return FALSE;
+}
+
+bool8 CopyablePlayerMovement_FaceDirection(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8))
+{
+    EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, playerDirection)));
+    eventObject->singleMovementActive = 1;
+    sprite->data[1] = 2;
+    return TRUE;
+}
+
+bool8 CopyablePlayerMovement_GoSpeed0(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8))
+{
+    u32 direction;
+    s16 x;
+    s16 y;
+
+    direction = playerDirection;
+    if (EventObjectIsFarawayIslandMew(eventObject))
+    {
+        direction = sub_81D427C();
+        if (direction == 0)
+        {
+            direction = playerDirection;
+            direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction);
+            EventObjectMoveDestCoords(eventObject, direction, &x, &y);
+            EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction));
+            eventObject->singleMovementActive = 1;
+            sprite->data[1] = 2;
+            return TRUE;
+        }
+    }
+    else
+    {
+        direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction);
+    }
+    EventObjectMoveDestCoords(eventObject, direction, &x, &y);
+    EventObjectSetSingleMovement(eventObject, sprite, GetWalkNormalMovementAction(direction));
+    if (GetCollisionAtCoords(eventObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y))))
+    {
+        EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction));
+    }
+    eventObject->singleMovementActive = 1;
+    sprite->data[1] = 2;
+    return TRUE;
+}
+
+bool8 CopyablePlayerMovement_GoSpeed1(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8))
+{
+    u32 direction;
+    s16 x;
+    s16 y;
+
+    direction = playerDirection;
+    direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction);
+    EventObjectMoveDestCoords(eventObject, direction, &x, &y);
+    EventObjectSetSingleMovement(eventObject, sprite, GetWalkFastMovementAction(direction));
+    if (GetCollisionAtCoords(eventObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y))))
+    {
+        EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction));
+    }
+    eventObject->singleMovementActive = 1;
+    sprite->data[1] = 2;
+    return TRUE;
+}
+
+bool8 CopyablePlayerMovement_GoSpeed2(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8))
+{
+    u32 direction;
+    s16 x;
+    s16 y;
+
+    direction = playerDirection;
+    direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction);
+    EventObjectMoveDestCoords(eventObject, direction, &x, &y);
+    EventObjectSetSingleMovement(eventObject, sprite, GetWalkFastestMovementAction(direction));
+    if (GetCollisionAtCoords(eventObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y))))
+    {
+        EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction));
+    }
+    eventObject->singleMovementActive = 1;
+    sprite->data[1] = 2;
+    return TRUE;
+}
+
+bool8 CopyablePlayerMovement_Slide(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8))
+{
+    u32 direction;
+    s16 x;
+    s16 y;
+
+    direction = playerDirection;
+    direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction);
+    EventObjectMoveDestCoords(eventObject, direction, &x, &y);
+    EventObjectSetSingleMovement(eventObject, sprite, GetSlideMovementAction(direction));
+    if (GetCollisionAtCoords(eventObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y))))
+    {
+        EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction));
+    }
+    eventObject->singleMovementActive = 1;
+    sprite->data[1] = 2;
+    return TRUE;
+}
+
+bool8 cph_IM_DIFFERENT(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8))
+{
+    u32 direction;
+
+    direction = playerDirection;
+    direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction);
+    EventObjectSetSingleMovement(eventObject, sprite, GetJumpInPlaceMovementAction(direction));
+    eventObject->singleMovementActive = 1;
+    sprite->data[1] = 2;
+    return TRUE;
+}
+
+bool8 CopyablePlayerMovement_GoSpeed4(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8))
+{
+    u32 direction;
+    s16 x;
+    s16 y;
+
+    direction = playerDirection;
+    direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction);
+    EventObjectMoveDestCoords(eventObject, direction, &x, &y);
+    EventObjectSetSingleMovement(eventObject, sprite, GetJumpMovementAction(direction));
+    if (GetCollisionAtCoords(eventObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y))))
+    {
+        EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction));
+    }
+    eventObject->singleMovementActive = 1;
+    sprite->data[1] = 2;
+    return TRUE;
+}
+
+bool8 CopyablePlayerMovement_Jump(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8))
+{
+    u32 direction;
+    s16 x;
+    s16 y;
+
+    direction = playerDirection;
+    direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction);
+    x = eventObject->currentCoords.x;
+    y = eventObject->currentCoords.y;
+    MoveCoordsInDirection(direction, &x, &y, 2, 2);
+    EventObjectSetSingleMovement(eventObject, sprite, GetJump2MovementAction(direction));
+    if (GetCollisionAtCoords(eventObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y))))
+    {
+        EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction));
+    }
+    eventObject->singleMovementActive = 1;
+    sprite->data[1] = 2;
+    return TRUE;
+}
+
+movement_type_def(MovementType_CopyPlayerInGrass, gMovementTypeFuncs_CopyPlayerInGrass)
+
+bool8 MovementType_CopyPlayerInGrass_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (gEventObjects[gPlayerAvatar.eventObjectId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER)
+    {
+        return FALSE;
+    }
+    return gCopyPlayerMovementFuncs[PlayerGetCopyableMovement()](eventObject, sprite, GetPlayerMovementDirection(), MetatileBehavior_IsPokeGrass);
+}
+
+void MovementType_TreeDisguise(struct Sprite *sprite)
+{
+    struct EventObject *eventObject;
+
+    eventObject = &gEventObjects[sprite->data[0]];
+    if (eventObject->directionSequenceIndex == 0 || (eventObject->directionSequenceIndex == 1 && !sprite->data[7]))
+    {
+        EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
+        eventObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_TREE_DISGUISE);
+        eventObject->directionSequenceIndex = 1;
+        sprite->data[7]++;
+    }
+    UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, MovementType_Disguise_Callback);
+}
+
+static bool8 MovementType_Disguise_Callback(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    ClearEventObjectMovement(eventObject, sprite);
+    return FALSE;
+}
+
+void MovementType_MountainDisguise(struct Sprite *sprite)
+{
+    struct EventObject *eventObject;
+
+    eventObject = &gEventObjects[sprite->data[0]];
+    if (eventObject->directionSequenceIndex == 0 || (eventObject->directionSequenceIndex == 1 && !sprite->data[7]))
+    {
+        EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
+        eventObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_MOUNTAIN_DISGUISE);
+        eventObject->directionSequenceIndex = 1;
+        sprite->data[7]++;
+    }
+    UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, MovementType_Disguise_Callback);
+}
+
+void MovementType_Hidden(struct Sprite *sprite)
+{
+    if (!sprite->data[7])
+    {
+        gEventObjects[sprite->data[0]].fixedPriority = TRUE;
+        sprite->subspriteMode = 2;
+        sprite->oam.priority = 3;
+        sprite->data[7]++;
+    }
+    UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, MovementType_Hidden_Callback);
+}
+
+static bool8 MovementType_Hidden_Callback(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    return gMovementTypeFuncs_Hidden[sprite->data[1]](eventObject, sprite);
+}
+
+bool8 MovementType_Hidden_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    ClearEventObjectMovement(eventObject, sprite);
+    return FALSE;
+}
+
+bool8 MovementType_MoveInPlace_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (EventObjectExecSingleMovementAction(eventObject, sprite))
+    {
+        sprite->data[1] = 0;
+    }
+    return FALSE;
+}
+
+movement_type_def(MovementType_WalkInPlace, gMovementTypeFuncs_WalkInPlace)
+
+bool8 MovementType_WalkInPlace_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    ClearEventObjectMovement(eventObject, sprite);
+    EventObjectSetSingleMovement(eventObject, sprite, GetWalkInPlaceNormalMovementAction(eventObject->facingDirection));
+    sprite->data[1] = 1;
+    return TRUE;
+}
+
+movement_type_def(MovementType_WalkSlowlyInPlace, gMovementTypeFuncs_WalkSlowlyInPlace)
+
+bool8 MovementType_WalkSlowlyInPlace_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    ClearEventObjectMovement(eventObject, sprite);
+    EventObjectSetSingleMovement(eventObject, sprite, GetWalkInPlaceSlowMovementAction(eventObject->facingDirection));
+    sprite->data[1] = 1;
+    return TRUE;
+}
+
+movement_type_def(MovementType_JogInPlace, gMovementTypeFuncs_JogInPlace)
+
+bool8 MovementType_JogInPlace_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    ClearEventObjectMovement(eventObject, sprite);
+    EventObjectSetSingleMovement(eventObject, sprite, GetWalkInPlaceFastMovementAction(eventObject->facingDirection));
+    sprite->data[1] = 1;
+    return TRUE;
+}
+
+movement_type_def(MovementType_RunInPlace, gMovementTypeFuncs_RunInPlace)
+
+bool8 MovementType_RunInPlace_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    ClearEventObjectMovement(eventObject, sprite);
+    EventObjectSetSingleMovement(eventObject, sprite, GetWalkInPlaceFastestMovementAction(eventObject->facingDirection));
+    sprite->data[1] = 1;
+    return TRUE;
+}
+
+movement_type_def(MovementType_Invisible, gMovementTypeFuncs_Invisible)
+
+bool8 MovementType_Invisible_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    ClearEventObjectMovement(eventObject, sprite);
+    EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection));
+    eventObject->invisible = TRUE;
+    sprite->data[1] = 1;
+    return TRUE;
+}
+bool8 MovementType_Invisible_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (EventObjectExecSingleMovementAction(eventObject, sprite))
+    {
+        sprite->data[1] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementType_Invisible_Step2(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    eventObject->singleMovementActive = 0;
+    return FALSE;
+}
+
+static void ClearEventObjectMovement(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    eventObject->singleMovementActive = 0;
+    eventObject->heldMovementActive = FALSE;
+    eventObject->heldMovementFinished = FALSE;
+    eventObject->movementActionId = 0xFF;
+    sprite->data[1] = 0;
+}
+
+u8 GetFaceDirectionAnimNum(u8 direction)
+{
+    return gFaceDirectionAnimNums[direction];
+}
+
+u8 GetMoveDirectionAnimNum(u8 direction)
+{
+    return gMoveDirectionAnimNums[direction];
+}
+
+u8 GetMoveDirectionFastAnimNum(u8 direction)
+{
+    return gMoveDirectionFastAnimNums[direction];
+}
+
+u8 GetMoveDirectionFasterAnimNum(u8 direction)
+{
+    return gMoveDirectionFasterAnimNums[direction];
+}
+
+u8 GetMoveDirectionFastestAnimNum(u8 direction)
+{
+    return gMoveDirectionFastestAnimNums[direction];
+}
+
+u8 GetJumpSpecialDirectionAnimNum(u8 direction)
+{
+    return gJumpSpecialDirectionAnimNums[direction];
+}
+
+u8 GetAcroWheelieDirectionAnimNum(u8 direction)
+{
+    return gAcroWheelieDirectionAnimNums[direction];
+}
+
+u8 Unref_GetAnimNums_08375633(u8 direction)
+{
+    return gUnrefAnimNums_08375633[direction];
+}
+
+u8 GetAcroEndWheelieDirectionAnimNum(u8 direction)
+{
+    return gAcroEndWheelieDirectionAnimNums[direction];
+}
+
+u8 GetAcroUnusedActionDirectionAnimNum(u8 direction)
+{
+    return gAcroUnusedActionDirectionAnimNums[direction];
+}
+
+u8 GetAcroWheeliePedalDirectionAnimNum(u8 direction)
+{
+    return gAcroWheeliePedalDirectionAnimNums[direction];
+}
+
+u8 GetFishingDirectionAnimNum(u8 direction)
+{
+    return gFishingDirectionAnimNums[direction];
+}
+
+u8 GetFishingNoCatchDirectionAnimNum(u8 direction)
+{
+    return gFishingNoCatchDirectionAnimNums[direction];
+}
+
+u8 GetFishingBiteDirectionAnimNum(u8 direction)
+{
+    return gFishingBiteDirectionAnimNums[direction];
+}
+
+u8 GetRunningDirectionAnimNum(u8 direction)
+{
+    return gRunningDirectionAnimNums[direction];
+}
+
+static const struct UnkStruct_085094AC *sub_8092A4C(const union AnimCmd *const *anims)
+{
+    const struct UnkStruct_085094AC *retval;
+
+    for (retval = gUnknown_085094AC; retval->anims != NULL; retval++)
+    {
+        if (retval->anims == anims)
+        {
+            return retval;
+        }
+    }
+    return NULL;
+}
+
+void npc_apply_anim_looping(struct EventObject *eventObject, struct Sprite *sprite, u8 animNum)
+{
+    const struct UnkStruct_085094AC *unk85094AC;
+
+    if (!eventObject->inanimate)
+    {
+        sprite->animNum = animNum;
+        unk85094AC = sub_8092A4C(sprite->anims);
+        if (unk85094AC != NULL)
+        {
+            if (sprite->animCmdIndex == unk85094AC->animPos[0])
+            {
+                sprite->animCmdIndex = unk85094AC->animPos[3];
+            }
+            else if (sprite->animCmdIndex == unk85094AC->animPos[1])
+            {
+                sprite->animCmdIndex = unk85094AC->animPos[2];
+            }
+        }
+        SeekSpriteAnim(sprite, sprite->animCmdIndex);
+    }
+}
+
+void obj_npc_animation_step(struct EventObject *eventObject, struct Sprite *sprite, u8 animNum)
+{
+    const struct UnkStruct_085094AC *unk85094AC;
+
+    if (!eventObject->inanimate)
+    {
+        u8 animPos;
+
+        sprite->animNum = animNum;
+        unk85094AC = sub_8092A4C(sprite->anims);
+        if (unk85094AC != NULL)
+        {
+            animPos = unk85094AC->animPos[1];
+            if (sprite->animCmdIndex <= unk85094AC->animPos[0])
+            {
+                animPos = unk85094AC->animPos[0];
+            }
+            SeekSpriteAnim(sprite, animPos);
+        }
+    }
+}
+
+// file boundary?
+
+u8 GetDirectionToFace(s16 x1, s16 y1, s16 x2, s16 y2)
+{
+    if (x1 > x2)
+    {
+        return DIR_WEST;
+    }
+    if (x1 < x2)
+    {
+        return DIR_EAST;
+    }
+    if (y1 > y2)
+    {
+        return DIR_NORTH;
+    }
+    return DIR_SOUTH;
+}
+
+void SetTrainerMovementType(struct EventObject *eventObject, u8 movementType)
+{
+    eventObject->movementType = movementType;
+    eventObject->directionSequenceIndex = 0;
+    eventObject->playerCopyableMovement = 0;
+    gSprites[eventObject->spriteId].callback = sMovementTypeCallbacks[movementType];
+    gSprites[eventObject->spriteId].data[1] = 0;
+}
+
+u8 GetTrainerFacingDirectionMovementType(u8 direction)
+{
+    return gTrainerFacingDirectionMovementTypes[direction];
+}
+
+static u8 GetCollisionInDirection(struct EventObject *eventObject, u8 direction)
+{
+    s16 x;
+    s16 y;
+    x = eventObject->currentCoords.x;
+    y = eventObject->currentCoords.y;
+    MoveCoords(direction, &x, &y);
+    return GetCollisionAtCoords(eventObject, x, y, direction);
+}
+
+u8 GetCollisionAtCoords(struct EventObject *eventObject, s16 x, s16 y, u32 dirn)
+{
+    u8 direction;
+
+    direction = dirn;
+    if (IsCoordOutsideEventObjectMovementRange(eventObject, x, y))
+        return 1;
+    else if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(eventObject, x, y, direction))
+        return 2;
+    else if (eventObject->trackedByCamera && !CanCameraMoveInDirection(direction))
+        return 2;
+    else if (IsZCoordMismatchAt(eventObject->currentElevation, x, y))
+        return 3;
+    else if (DoesObjectCollideWithObjectAt(eventObject, x, y))
+        return 4;
+    return 0;
+}
+
+u8 GetCollisionFlagsAtCoords(struct EventObject *eventObject, s16 x, s16 y, u8 direction)
+{
+    u8 flags = 0;
+
+    if (IsCoordOutsideEventObjectMovementRange(eventObject, x, y))
+        flags |= 1;
+    if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(eventObject, x, y, direction) || (eventObject->trackedByCamera && !CanCameraMoveInDirection(direction)))
+        flags |= 2;
+    if (IsZCoordMismatchAt(eventObject->currentElevation, x, y))
+        flags |= 4;
+    if (DoesObjectCollideWithObjectAt(eventObject, x, y))
+        flags |= 8;
+    return flags;
+}
+
+static bool8 IsCoordOutsideEventObjectMovementRange(struct EventObject *eventObject, s16 x, s16 y)
+{
+    s16 left;
+    s16 right;
+    s16 top;
+    s16 bottom;
+
+    if (eventObject->range.as_nybbles.x != 0)
+    {
+        left = eventObject->initialCoords.x - eventObject->range.as_nybbles.x;
+        right = eventObject->initialCoords.x + eventObject->range.as_nybbles.x;
+        if (left > x || right < x)
+        {
+            return TRUE;
+        }
+    }
+    if (eventObject->range.as_nybbles.y != 0)
+    {
+        top = eventObject->initialCoords.y - eventObject->range.as_nybbles.y;
+        bottom = eventObject->initialCoords.y + eventObject->range.as_nybbles.y;
+        if (top > y || bottom < y)
+        {
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
+
+static bool8 IsMetatileDirectionallyImpassable(struct EventObject *eventObject, s16 x, s16 y, u8 direction)
+{
+    if (gOppositeDirectionBlockedMetatileFuncs[direction - 1](eventObject->currentMetatileBehavior)
+        || gDirectionBlockedMetatileFuncs[direction - 1](MapGridGetMetatileBehaviorAt(x, y)))
+    {
+        return TRUE;
+    }
+    return FALSE;
+}
+
+static bool8 DoesObjectCollideWithObjectAt(struct EventObject *eventObject, s16 x, s16 y)
+{
+    u8 i;
+    struct EventObject *curObject;
+
+    for (i = 0; i < NUM_EVENT_OBJECTS; i++)
+    {
+        curObject = &gEventObjects[i];
+        if (curObject->active && curObject != eventObject)
+        {
+            if ((curObject->currentCoords.x == x && curObject->currentCoords.y == y) || (curObject->previousCoords.x == x && curObject->previousCoords.y == y))
+            {
+                if (AreZCoordsCompatible(eventObject->currentElevation, curObject->currentElevation))
+                {
+                    return TRUE;
+                }
+            }
+        }
+    }
+    return FALSE;
+}
+
+bool8 IsBerryTreeSparkling(u8 localId, u8 mapNum, u8 mapGroup)
+{
+    u8 eventObjectId;
+
+    if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)
+        && gSprites[gEventObjects[eventObjectId].spriteId].data[7] & 2)
+    {
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+void sub_8092EF0(u8 localId, u8 mapNum, u8 mapGroup)
+{
+    u8 eventObjectId;
+
+    if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
+    {
+        gSprites[gEventObjects[eventObjectId].spriteId].data[7] |= 0x04;
+    }
+}
+
+void MoveCoords(u8 direction, s16 *x, s16 *y)
+{
+    *x += gDirectionToVectors[direction].x;
+    *y += gDirectionToVectors[direction].y;
+}
+
+void sub_8092F60(u8 direction, s16 *x, s16 *y)
+{
+    *x += gDirectionToVectors[direction].x << 4;
+    *y += gDirectionToVectors[direction].y << 4;
+}
+
+static void MoveCoordsInDirection(u32 dir, s16 *x, s16 *y, s16 deltaX, s16 deltaY)
+{
+    u8 direction = dir;
+    s16 dx2 = (u16)deltaX;
+    s16 dy2 = (u16)deltaY;
+    if (gDirectionToVectors[direction].x > 0)
+        *x += dx2;
+    if (gDirectionToVectors[direction].x < 0)
+        *x -= dx2;
+    if (gDirectionToVectors[direction].y > 0)
+        *y += dy2;
+    if (gDirectionToVectors[direction].y < 0)
+        *y -= dy2;
+}
+
+void sub_8092FF0(s16 x, s16 y, s16 *dest_x, s16 *dest_y)
+{
+    *dest_x = (x - gSaveBlock1Ptr->pos.x) << 4;
+    *dest_y = (y - gSaveBlock1Ptr->pos.y) << 4;
+    *dest_x -= gUnknown_03005DEC;
+    *dest_y -= gUnknown_03005DE8;
+}
+
+void sub_8093038(s16 x, s16 y, s16 *dest_x, s16 *dest_y)
+{
+    s16 dx;
+    s16 dy;
+
+    dx = -gUnknown_03005DEC - gUnknown_03005DD0.x;
+    dy = -gUnknown_03005DE8 - gUnknown_03005DD0.y;
+    if (gUnknown_03005DD0.x > 0)
+    {
+        dx += 0x10;
+    }
+    if (gUnknown_03005DD0.x < 0)
+    {
+        dx -= 0x10;
+    }
+    if (gUnknown_03005DD0.y > 0)
+    {
+        dy += 0x10;
+    }
+    if (gUnknown_03005DD0.y < 0)
+    {
+        dy -= 0x10;
+    }
+    *dest_x = ((x - gSaveBlock1Ptr->pos.x) << 4) + dx;
+    *dest_y = ((y - gSaveBlock1Ptr->pos.y) << 4) + dy;
+}
+
+void sub_80930E0(s16 *x, s16 *y, s16 dx, s16 dy)
+{
+    sub_8093038(*x, *y, x, y);
+    *x += dx;
+    *y += dy;
+}
+
+static void GetEventObjectMovingCameraOffset(s16 *x, s16 *y)
+{
+    *x = 0;
+    *y = 0;
+    if (gUnknown_03005DD0.x > 0)
+    {
+        (*x)++;
+    }
+    if (gUnknown_03005DD0.x < 0)
+    {
+        (*x) --;
+    }
+    if (gUnknown_03005DD0.y > 0)
+    {
+        (*y)++;
+    }
+    if (gUnknown_03005DD0.y < 0)
+    {
+        (*y) --;
+    }
+}
+
+void EventObjectMoveDestCoords(struct EventObject *eventObject, u32 direction, s16 *x, s16 *y)
+{
+    u8 newDirn = direction;
+    *x = eventObject->currentCoords.x;
+    *y = eventObject->currentCoords.y;
+    MoveCoords(newDirn, x, y);
+}
+
+bool8 EventObjectIsMovementOverridden(struct EventObject *eventObject)
+{
+    if (eventObject->singleMovementActive || eventObject->heldMovementActive)
+        return TRUE;
+
+    return FALSE;
+}
+
+bool8 EventObjectIsHeldMovementActive(struct EventObject *eventObject)
+{
+    if (eventObject->heldMovementActive && eventObject->movementActionId != 0xFF)
+        return TRUE;
+
+    return FALSE;
+}
+
+bool8 EventObjectSetHeldMovement(struct EventObject *eventObject, u8 movementActionId)
+{
+    if (EventObjectIsMovementOverridden(eventObject))
+        return TRUE;
+
+    UnfreezeEventObject(eventObject);
+    eventObject->movementActionId = movementActionId;
+    eventObject->heldMovementActive = TRUE;
+    eventObject->heldMovementFinished = FALSE;
+    gSprites[eventObject->spriteId].data[2] = 0;
+    return FALSE;
+}
+
+void EventObjectForceSetHeldMovement(struct EventObject *eventObject, u8 movementActionId)
+{
+    EventObjectClearHeldMovementIfActive(eventObject);
+    EventObjectSetHeldMovement(eventObject, movementActionId);
+}
+
+void EventObjectClearHeldMovementIfActive(struct EventObject *eventObject)
+{
+    if (eventObject->heldMovementActive)
+        EventObjectClearHeldMovement(eventObject);
+}
+
+void EventObjectClearHeldMovement(struct EventObject *eventObject)
+{
+    eventObject->movementActionId = 0xFF;
+    eventObject->heldMovementActive = FALSE;
+    eventObject->heldMovementFinished = FALSE;
+    gSprites[eventObject->spriteId].data[1] = 0;
+    gSprites[eventObject->spriteId].data[2] = 0;
+}
+
+u8 EventObjectCheckHeldMovementStatus(struct EventObject *eventObject)
+{
+    if (eventObject->heldMovementActive)
+        return eventObject->heldMovementFinished;
+
+    return 16;
+}
+
+u8 EventObjectClearHeldMovementIfFinished(struct EventObject *eventObject)
+{
+    u8 heldMovementStatus = EventObjectCheckHeldMovementStatus(eventObject);
+    if (heldMovementStatus != 0 && heldMovementStatus != 16)
+        EventObjectClearHeldMovementIfActive(eventObject);
+
+    return heldMovementStatus;
+}
+
+u8 EventObjectGetHeldMovementActionId(struct EventObject *eventObject)
+{
+    if (eventObject->heldMovementActive)
+        return eventObject->movementActionId;
+
+    return 0xFF;
+}
+
+void UpdateEventObjectCurrentMovement(struct EventObject *eventObject, struct Sprite *sprite, bool8 (*callback)(struct EventObject *, struct Sprite *))
+{
+    DoGroundEffects_OnSpawn(eventObject, sprite);
+    TryEnableEventObjectAnim(eventObject, sprite);
+    if (EventObjectIsHeldMovementActive(eventObject))
+    {
+        EventObjectExecHeldMovementAction(eventObject, sprite);
+    }
+    else if (!eventObject->frozen)
+    {
+        while (callback(eventObject, sprite));
+    }
+    DoGroundEffects_OnBeginStep(eventObject, sprite);
+    DoGroundEffects_OnFinishStep(eventObject, sprite);
+    UpdateEventObjectSpriteAnimPause(eventObject, sprite);
+    UpdateEventObjectVisibility(eventObject, sprite);
+    EventObjectUpdateSubpriority(eventObject, sprite);
+}
+
+#define dirn_to_anim(name, table)\
+u8 name(u32 idx)\
+{\
+    u8 direction;\
+    u8 animIds[sizeof(table)];\
+    direction = idx;\
+    memcpy(animIds, (table), sizeof(table));\
+    if (direction > DIR_EAST) direction = 0;\
+    return animIds[direction];\
+}
+
+dirn_to_anim(GetFaceDirectionMovementAction, gFaceDirectionMovementActions);
+dirn_to_anim(GetWalkSlowMovementAction, gWalkSlowMovementActions);
+dirn_to_anim(GetWalkNormalMovementAction, gWalkNormalMovementActions);
+dirn_to_anim(GetWalkFastMovementAction, gWalkFastMovementActions);
+dirn_to_anim(GetRideWaterCurrentMovementAction, gRideWaterCurrentMovementActions);
+dirn_to_anim(GetWalkFastestMovementAction, gWalkFastestMovementActions);
+dirn_to_anim(GetSlideMovementAction, gSlideMovementActions);
+dirn_to_anim(GetPlayerRunMovementAction, gPlayerRunMovementActions);
+dirn_to_anim(GetJump2MovementAction, gJump2MovementActions);
+dirn_to_anim(GetJumpInPlaceMovementAction, gJumpInPlaceMovementActions);
+dirn_to_anim(GetJumpInPlaceTurnAroundMovementAction, gJumpInPlaceTurnAroundMovementActions);
+dirn_to_anim(GetJumpMovementAction, gJumpMovementActions);
+dirn_to_anim(GetJumpSpecialMovementAction, gJumpSpecialMovementActions);
+dirn_to_anim(GetWalkInPlaceSlowMovementAction, gWalkInPlaceSlowMovementActions);
+dirn_to_anim(GetWalkInPlaceNormalMovementAction, gWalkInPlaceNormalMovementActions);
+dirn_to_anim(GetWalkInPlaceFastMovementAction, gWalkInPlaceFastMovementActions);
+dirn_to_anim(GetWalkInPlaceFastestMovementAction, gWalkInPlaceFastestMovementActions);
+
+bool8 EventObjectFaceOppositeDirection(struct EventObject *eventObject, u8 direction)
+{
+    return EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(GetOppositeDirection(direction)));
+}
+
+dirn_to_anim(GetAcroWheelieFaceDirectionMovementAction, gAcroWheelieFaceDirectionMovementActions);
+dirn_to_anim(GetAcroPopWheelieFaceDirectionMovementAction, gAcroPopWheelieFaceDirectionMovementActions);
+dirn_to_anim(GetAcroEndWheelieFaceDirectionMovementAction, gAcroEndWheelieFaceDirectionMovementActions);
+dirn_to_anim(GetAcroWheelieHopFaceDirectionMovementAction, gAcroWheelieHopFaceDirectionMovementActions);
+dirn_to_anim(GetAcroWheelieHopDirectionMovementAction, gAcroWheelieHopDirectionMovementActions);
+dirn_to_anim(GetAcroWheelieJumpDirectionMovementAction, gAcroWheelieJumpDirectionMovementActions);
+dirn_to_anim(GetAcroWheelieInPlaceDirectionMovementAction, gAcroWheelieInPlaceDirectionMovementActions);
+dirn_to_anim(GetAcroPopWheelieMoveDirectionMovementAction, gAcroPopWheelieMoveDirectionMovementActions);
+dirn_to_anim(GetAcroWheelieMoveDirectionMovementAction, gAcroWheelieMoveDirectionMovementActions);
+dirn_to_anim(GetAcroEndWheelieMoveDirectionMovementAction, gAcroEndWheelieMoveDirectionMovementActions);
+
+u8 GetOppositeDirection(u8 direction)
+{
+    u8 directions[sizeof gOppositeDirections];
+
+    memcpy(directions, gOppositeDirections, sizeof gOppositeDirections);
+    if (direction < 1 || direction > (sizeof gOppositeDirections))
+    {
+        return direction;
+    }
+    return directions[direction - 1];
+}
+
+static u32 zffu_offset_calc(u8 a0, u8 a1)
+{
+    return gUnknown_0850DC2F[a0 - 1][a1 - 1];
+}
+
+static u32 state_to_direction(u8 a0, u32 a1, u32 a2)
+{
+    u32 zffuOffset;
+    u8 a1_2;
+    u8 a2_2;
+
+    a1_2 = a1;
+    a2_2 = a2;
+    if (a1_2 == 0 || a2_2 == 0 || a1_2 > DIR_EAST || a2_2 > DIR_EAST)
+    {
+        return 0;
+    }
+    zffuOffset = zffu_offset_calc(a1_2, a2);
+    return gUnknown_0850DC3F[a0 - 1][zffuOffset - 1];
+}
+
+static void EventObjectExecHeldMovementAction(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (gMovementActionFuncs[eventObject->movementActionId][sprite->data[2]](eventObject, sprite))
+    {
+        eventObject->heldMovementFinished = TRUE;
+    }
+}
+
+static bool8 EventObjectExecSingleMovementAction(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (gMovementActionFuncs[eventObject->movementActionId][sprite->data[2]](eventObject, sprite))
+    {
+        eventObject->movementActionId = 0xFF;
+        sprite->data[2] = 0;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+static void EventObjectSetSingleMovement(struct EventObject *eventObject, struct Sprite *sprite, u8 animId)
+{
+    eventObject->movementActionId = animId;
+    sprite->data[2] = 0;
+}
+
+static void FaceDirection(struct EventObject *eventObject, struct Sprite *sprite, u8 direction)
+{
+    SetEventObjectDirection(eventObject, direction);
+    ShiftStillEventObjectCoords(eventObject);
+    obj_npc_animation_step(eventObject, sprite, GetMoveDirectionAnimNum(eventObject->facingDirection));
+    sprite->animPaused = TRUE;
+    sprite->data[2] = 1;
+}
+
+bool8 MovementAction_FaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    FaceDirection(eventObject, sprite, DIR_SOUTH);
+    return TRUE;
+}
+
+bool8 MovementAction_FaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    FaceDirection(eventObject, sprite, DIR_NORTH);
+    return TRUE;
+}
+
+bool8 MovementAction_FaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    FaceDirection(eventObject, sprite, DIR_WEST);
+    return TRUE;
+}
+
+bool8 MovementAction_FaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    FaceDirection(eventObject, sprite, DIR_EAST);
+    return TRUE;
+}
+
+void npc_apply_direction(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed)
+{
+    s16 x;
+    s16 y;
+
+    x = eventObject->currentCoords.x;
+    y = eventObject->currentCoords.y;
+    SetEventObjectDirection(eventObject, direction);
+    MoveCoords(direction, &x, &y);
+    ShiftEventObjectCoords(eventObject, x, y);
+    oamt_npc_ministep_reset(sprite, direction, speed);
+    sprite->animPaused = FALSE;
+    if (gLockedAnimEventObjects != NULL && FindLockedEventObjectIndex(eventObject) != NUM_EVENT_OBJECTS)
+    {
+        sprite->animPaused = TRUE;
+    }
+    eventObject->triggerGroundEffectsOnMove = TRUE;
+    sprite->data[2] = 1;
+}
+
+void do_go_anim(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed)
+{
+    u8 (*functions[ARRAY_COUNT(gUnknown_0850DEE8)])(u8);
+
+    memcpy(functions, gUnknown_0850DEE8, sizeof gUnknown_0850DEE8);
+    npc_apply_direction(eventObject, sprite, direction, speed);
+    npc_apply_anim_looping(eventObject, sprite, functions[speed](eventObject->facingDirection));
+}
+
+void StartRunningAnim(struct EventObject *eventObject, struct Sprite *sprite, u8 direction)
+{
+    npc_apply_direction(eventObject, sprite, direction, 1);
+    npc_apply_anim_looping(eventObject, sprite, GetRunningDirectionAnimNum(eventObject->facingDirection));
+}
+
+bool8 npc_obj_ministep_stop_on_arrival(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (obj_npc_ministep(sprite))
+    {
+        ShiftStillEventObjectCoords(eventObject);
+        eventObject->triggerGroundEffectsOnStop = TRUE;
+        sprite->animPaused = TRUE;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+void sub_8093AF0(struct EventObject *eventObject, struct Sprite *sprite, u8 direction)
+{
+    s16 x;
+    s16 y;
+
+    x = eventObject->currentCoords.x;
+    y = eventObject->currentCoords.y;
+    SetEventObjectDirection(eventObject, direction);
+    MoveCoords(direction, &x, &y);
+    ShiftEventObjectCoords(eventObject, x, y);
+    sub_80976DC(sprite, direction);
+    sprite->animPaused = FALSE;
+    eventObject->triggerGroundEffectsOnMove = TRUE;
+    sprite->data[2] = 1;
+}
+
+void sub_8093B60(struct EventObject *eventObject, struct Sprite *sprite, u8 direction)
+{
+    sub_8093AF0(eventObject, sprite, direction);
+    npc_apply_anim_looping(eventObject, sprite, GetMoveDirectionAnimNum(eventObject->facingDirection));
+}
+
+bool8 an_walk_any_2(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (sub_80976EC(sprite))
+    {
+        ShiftStillEventObjectCoords(eventObject);
+        eventObject->triggerGroundEffectsOnStop = TRUE;
+        sprite->animPaused = TRUE;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_WalkSlowDiagonalUpLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8093B60(eventObject, sprite, DIR_NORTHWEST);
+    return MovementAction_WalkSlowDiagonalUpLeft_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkSlowDiagonalUpLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (an_walk_any_2(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_WalkSlowDiagonalUpRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8093B60(eventObject, sprite, DIR_NORTHEAST);
+    return MovementAction_WalkSlowDiagonalUpRight_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkSlowDiagonalUpRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (an_walk_any_2(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_WalkSlowDiagonalDownLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8093B60(eventObject, sprite, DIR_SOUTHWEST);
+    return MovementAction_WalkSlowDiagonalDownLeft_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkSlowDiagonalDownLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (an_walk_any_2(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_WalkSlowDiagonalDownRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8093B60(eventObject, sprite, DIR_SOUTHEAST);
+    return MovementAction_WalkSlowDiagonalDownRight_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkSlowDiagonalDownRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (an_walk_any_2(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_WalkSlowDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8093B60(eventObject, sprite, DIR_SOUTH);
+    return MovementAction_WalkSlowDown_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkSlowDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (an_walk_any_2(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_WalkSlowUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8093B60(eventObject, sprite, DIR_NORTH);
+    return MovementAction_WalkSlowUp_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkSlowUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (an_walk_any_2(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_WalkSlowLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8093B60(eventObject, sprite, DIR_WEST);
+    return MovementAction_WalkSlowLeft_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkSlowLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (an_walk_any_2(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_WalkSlowRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8093B60(eventObject, sprite, DIR_EAST);
+    return MovementAction_WalkSlowRight_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkSlowRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (an_walk_any_2(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_WalkNormalDiagonalUpLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    do_go_anim(eventObject, sprite, DIR_NORTHWEST, 0);
+    return MovementAction_WalkNormalDiagonalUpLeft_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkNormalDiagonalUpLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_WalkNormalDiagonalUpRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    do_go_anim(eventObject, sprite, DIR_NORTHEAST, 0);
+    return MovementAction_WalkNormalDiagonalUpRight_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkNormalDiagonalUpRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_WalkNormalDiagonalDownLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    do_go_anim(eventObject, sprite, DIR_SOUTHWEST, 0);
+    return MovementAction_WalkNormalDiagonalDownLeft_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkNormalDiagonalDownLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_WalkNormalDiagonalDownRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    do_go_anim(eventObject, sprite, DIR_SOUTHEAST, 0);
+    return MovementAction_WalkNormalDiagonalDownRight_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkNormalDiagonalDownRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_WalkNormalDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    do_go_anim(eventObject, sprite, DIR_SOUTH, 0);
+    return MovementAction_WalkNormalDown_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkNormalDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_WalkNormalUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    do_go_anim(eventObject, sprite, DIR_NORTH, 0);
+    return MovementAction_WalkNormalUp_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkNormalUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_WalkNormalLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    do_go_anim(eventObject, sprite, DIR_WEST, 0);
+    return MovementAction_WalkNormalLeft_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkNormalLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_WalkNormalRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    do_go_anim(eventObject, sprite, DIR_EAST, 0);
+    return MovementAction_WalkNormalRight_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkNormalRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+void sub_8093FC4(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed, u8 a5)
+{
+    s16 displacements[ARRAY_COUNT(gUnknown_0850DFBC)];
+    s16 x;
+    s16 y;
+
+    memcpy(displacements, gUnknown_0850DFBC, sizeof gUnknown_0850DFBC);
+    x = 0;
+    y = 0;
+    SetEventObjectDirection(eventObject, direction);
+    MoveCoordsInDirection(direction, &x, &y, displacements[speed], displacements[speed]);
+    ShiftEventObjectCoords(eventObject, eventObject->currentCoords.x + x, eventObject->currentCoords.y + y);
+    sub_809783C(sprite, direction, speed, a5);
+    sprite->data[2] = 1;
+    sprite->animPaused = 0;
+    eventObject->triggerGroundEffectsOnMove = 1;
+    eventObject->disableCoveringGroundEffects = 1;
+}
+
+void maybe_shadow_1(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed, u8 a4)
+{
+    sub_8093FC4(eventObject, sprite, direction, speed, a4);
+    npc_apply_anim_looping(eventObject, sprite, GetMoveDirectionAnimNum(eventObject->facingDirection));
+    DoShadowFieldEffect(eventObject);
+}
+
+u8 sub_80940C4(struct EventObject *eventObject, struct Sprite *sprite, u8 callback(struct Sprite *))
+{
+    s16 displacements[ARRAY_COUNT(gUnknown_0850DFC2)];
+    s16 x;
+    s16 y;
+    u8 result;
+
+    memcpy(displacements, gUnknown_0850DFC2, sizeof gUnknown_0850DFC2);
+    result = callback(sprite);
+    if (result == 1 && displacements[sprite->data[4]] != 0)
+    {
+        x = 0;
+        y = 0;
+        MoveCoordsInDirection(eventObject->movementDirection, &x, &y, displacements[sprite->data[4]], displacements[sprite->data[4]]);
+        ShiftEventObjectCoords(eventObject, eventObject->currentCoords.x + x, eventObject->currentCoords.y + y);
+        eventObject->triggerGroundEffectsOnMove = TRUE;
+        eventObject->disableCoveringGroundEffects = TRUE;
+    }
+    else if (result == 0xFF)
+    {
+        ShiftStillEventObjectCoords(eventObject);
+        eventObject->triggerGroundEffectsOnStop = TRUE;
+        eventObject->landingJump = TRUE;
+        sprite->animPaused = TRUE;
+    }
+    return result;
+}
+
+u8 sub_8094188(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    return sub_80940C4(eventObject, sprite, sub_809785C);
+}
+
+u8 sub_809419C(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    return sub_80940C4(eventObject, sprite, sub_80978E4);
+}
+
+bool8 sub_80941B0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (sub_8094188(eventObject, sprite) == 0xFF)
+    {
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 sub_80941C8(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (sub_809419C(eventObject, sprite) == 0xFF)
+    {
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 sub_80941E0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    switch (sub_8094188(eventObject, sprite))
+    {
+        case 255:
+            return TRUE;
+        case   1:
+            SetEventObjectDirection(eventObject, GetOppositeDirection(eventObject->movementDirection));
+            obj_npc_animation_step(eventObject, sprite, GetMoveDirectionAnimNum(eventObject->facingDirection));
+        default:
+            return FALSE;
+    }
+}
+
+bool8 MovementAction_Jump2Down_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    maybe_shadow_1(eventObject, sprite, DIR_SOUTH, 2, 0);
+    return MovementAction_Jump2Down_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_Jump2Down_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (sub_80941B0(eventObject, sprite))
+    {
+        eventObject->hasShadow = FALSE;
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_Jump2Up_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    maybe_shadow_1(eventObject, sprite, DIR_NORTH, 2, 0);
+    return MovementAction_Jump2Up_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_Jump2Up_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (sub_80941B0(eventObject, sprite))
+    {
+        eventObject->hasShadow = FALSE;
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_Jump2Left_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    maybe_shadow_1(eventObject, sprite, DIR_WEST, 2, 0);
+    return MovementAction_Jump2Left_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_Jump2Left_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (sub_80941B0(eventObject, sprite))
+    {
+        eventObject->hasShadow = FALSE;
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_Jump2Right_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    maybe_shadow_1(eventObject, sprite, DIR_EAST, 2, 0);
+    return MovementAction_Jump2Right_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_Jump2Right_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (sub_80941B0(eventObject, sprite))
+    {
+        eventObject->hasShadow = FALSE;
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+
+void sub_8094390(struct Sprite *sprite, u16 duration)
+{
+    sprite->data[2] = 1;
+    sprite->data[3] = duration;
+}
+
+bool8 MovementAction_Delay_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (-- sprite->data[3] == 0)
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_Delay1_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8094390(sprite, 1);
+    return MovementAction_Delay_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_Delay2_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8094390(sprite, 2);
+    return MovementAction_Delay_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_Delay4_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8094390(sprite, 4);
+    return MovementAction_Delay_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_Delay8_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8094390(sprite, 8);
+    return MovementAction_Delay_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_Delay16_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8094390(sprite, 16);
+    return MovementAction_Delay_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkFastDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    do_go_anim(eventObject, sprite, DIR_SOUTH, 1);
+    return MovementAction_WalkFastDown_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkFastDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_WalkFastUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    do_go_anim(eventObject, sprite, DIR_NORTH, 1);
+    return MovementAction_WalkFastUp_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkFastUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_WalkFastLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    do_go_anim(eventObject, sprite, DIR_WEST, 1);
+    return MovementAction_WalkFastLeft_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkFastLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_WalkFastRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    do_go_anim(eventObject, sprite, DIR_EAST, 1);
+    return MovementAction_WalkFastRight_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkFastRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+
+void sub_8094554(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 animNum, u16 duration)
+{
+    SetEventObjectDirection(eventObject, direction);
+    npc_apply_anim_looping(eventObject, sprite, animNum);
+    sprite->animPaused = FALSE;
+    sprite->data[2] = 1;
+    sprite->data[3] = duration;
+}
+
+bool8 MovementAction_WalkInPlace_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (-- sprite->data[3] == 0)
+    {
+        sprite->data[2] = 2;
+        sprite->animPaused = TRUE;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_WalkInPlaceSlow_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (sprite->data[3] & 1)
+    {
+        sprite->animDelayCounter++;
+    }
+    return MovementAction_WalkInPlace_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkInPlaceSlowDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8094554(eventObject, sprite, DIR_SOUTH, GetMoveDirectionAnimNum(DIR_SOUTH), 32);
+    return MovementAction_WalkInPlaceSlow_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkInPlaceSlowUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8094554(eventObject, sprite, DIR_NORTH, GetMoveDirectionAnimNum(DIR_NORTH), 32);
+    return MovementAction_WalkInPlaceSlow_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkInPlaceSlowLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8094554(eventObject, sprite, DIR_WEST, GetMoveDirectionAnimNum(DIR_WEST), 32);
+    return MovementAction_WalkInPlaceSlow_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkInPlaceSlowRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8094554(eventObject, sprite, DIR_EAST, GetMoveDirectionAnimNum(DIR_EAST), 32);
+    return MovementAction_WalkInPlaceSlow_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkInPlaceNormalDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8094554(eventObject, sprite, DIR_SOUTH, GetMoveDirectionAnimNum(DIR_SOUTH), 16);
+    return MovementAction_WalkInPlace_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkInPlaceNormalUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8094554(eventObject, sprite, DIR_NORTH, GetMoveDirectionAnimNum(DIR_NORTH), 16);
+    return MovementAction_WalkInPlace_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkInPlaceNormalLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8094554(eventObject, sprite, DIR_WEST, GetMoveDirectionAnimNum(DIR_WEST), 16);
+    return MovementAction_WalkInPlace_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkInPlaceNormalRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8094554(eventObject, sprite, DIR_EAST, GetMoveDirectionAnimNum(DIR_EAST), 16);
+    return MovementAction_WalkInPlace_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkInPlaceFastDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8094554(eventObject, sprite, DIR_SOUTH, GetMoveDirectionFastAnimNum(DIR_SOUTH), 8);
+    return MovementAction_WalkInPlace_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkInPlaceFastUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8094554(eventObject, sprite, DIR_NORTH, GetMoveDirectionFastAnimNum(DIR_NORTH), 8);
+    return MovementAction_WalkInPlace_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkInPlaceFastLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8094554(eventObject, sprite, DIR_WEST, GetMoveDirectionFastAnimNum(DIR_WEST), 8);
+    return MovementAction_WalkInPlace_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkInPlaceFastRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8094554(eventObject, sprite, DIR_EAST, GetMoveDirectionFastAnimNum(DIR_EAST), 8);
+    return MovementAction_WalkInPlace_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkInPlaceFastestDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8094554(eventObject, sprite, DIR_SOUTH, GetMoveDirectionFasterAnimNum(DIR_SOUTH), 4);
+    return MovementAction_WalkInPlace_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkInPlaceFastestUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8094554(eventObject, sprite, DIR_NORTH, GetMoveDirectionFasterAnimNum(DIR_NORTH), 4);
+    return MovementAction_WalkInPlace_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkInPlaceFastestLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8094554(eventObject, sprite, DIR_WEST, GetMoveDirectionFasterAnimNum(DIR_WEST), 4);
+    return MovementAction_WalkInPlace_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkInPlaceFastestRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8094554(eventObject, sprite, DIR_EAST, GetMoveDirectionFasterAnimNum(DIR_EAST), 4);
+    return MovementAction_WalkInPlace_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_RideWaterCurrentDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    do_go_anim(eventObject, sprite, DIR_SOUTH, 2);
+    return MovementAction_RideWaterCurrentDown_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_RideWaterCurrentDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_RideWaterCurrentUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    do_go_anim(eventObject, sprite, DIR_NORTH, 2);
+    return MovementAction_RideWaterCurrentUp_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_RideWaterCurrentUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_RideWaterCurrentLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    do_go_anim(eventObject, sprite, DIR_WEST, 2);
+    return MovementAction_RideWaterCurrentLeft_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_RideWaterCurrentLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_RideWaterCurrentRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    do_go_anim(eventObject, sprite, DIR_EAST, 2);
+    return MovementAction_RideWaterCurrentRight_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_RideWaterCurrentRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_WalkFastestDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    do_go_anim(eventObject, sprite, DIR_SOUTH, 3);
+    return MovementAction_WalkFastestDown_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkFastestDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_WalkFastestUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    do_go_anim(eventObject, sprite, DIR_NORTH, 3);
+    return MovementAction_WalkFastestUp_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkFastestUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_WalkFastestLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    do_go_anim(eventObject, sprite, DIR_WEST, 3);
+    return MovementAction_WalkFastestLeft_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkFastestLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_WalkFastestRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    do_go_anim(eventObject, sprite, DIR_EAST, 3);
+    return MovementAction_WalkFastestRight_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkFastestRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_SlideDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    do_go_anim(eventObject, sprite, DIR_SOUTH, 4);
+    return MovementAction_SlideDown_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_SlideDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_SlideUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    do_go_anim(eventObject, sprite, DIR_NORTH, 4);
+    return MovementAction_SlideUp_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_SlideUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_SlideLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    do_go_anim(eventObject, sprite, DIR_WEST, 4);
+    return MovementAction_SlideLeft_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_SlideLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_SlideRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    do_go_anim(eventObject, sprite, DIR_EAST, 4);
+    return MovementAction_SlideRight_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_SlideRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_PlayerRunDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    StartRunningAnim(eventObject, sprite, DIR_SOUTH);
+    return MovementAction_PlayerRunDown_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_PlayerRunDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_PlayerRunUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    StartRunningAnim(eventObject, sprite, DIR_NORTH);
+    return MovementAction_PlayerRunUp_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_PlayerRunUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_PlayerRunLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    StartRunningAnim(eventObject, sprite, DIR_WEST);
+    return MovementAction_PlayerRunLeft_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_PlayerRunLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_PlayerRunRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    StartRunningAnim(eventObject, sprite, DIR_EAST);
+    return MovementAction_PlayerRunRight_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_PlayerRunRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+void StartSpriteAnimInDirection(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 animNum)
+{
+    SetAndStartSpriteAnim(sprite, animNum, 0);
+    SetEventObjectDirection(eventObject, direction);
+    sprite->data[2] = 1;
+}
+
+bool8 MovementAction_StartAnimInDirection_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    StartSpriteAnimInDirection(eventObject, sprite, eventObject->movementDirection, sprite->animNum);
+    return FALSE;
+}
+
+bool8 MovementAction_WaitSpriteAnim(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (SpriteAnimEnded(sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+void sub_8094DE4(struct EventObject *eventObject, struct Sprite *sprite, u8 direction)
+{
+    sub_8093FC4(eventObject, sprite, direction, 1, 0);
+    StartSpriteAnim(sprite, GetJumpSpecialDirectionAnimNum(direction));
+}
+
+bool8 MovementAction_JumpSpecialDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8094DE4(eventObject, sprite, DIR_SOUTH);
+    return MovementAction_JumpSpecialDown_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_JumpSpecialDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (sub_80941C8(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        eventObject->landingJump = FALSE;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_JumpSpecialUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8094DE4(eventObject, sprite, DIR_NORTH);
+    return MovementAction_JumpSpecialUp_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_JumpSpecialUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (sub_80941C8(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        eventObject->landingJump = FALSE;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_JumpSpecialLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8094DE4(eventObject, sprite, DIR_WEST);
+    return MovementAction_JumpSpecialLeft_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_JumpSpecialLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (sub_80941C8(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        eventObject->landingJump = FALSE;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_JumpSpecialRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8094DE4(eventObject, sprite, DIR_EAST);
+    return MovementAction_JumpSpecialRight_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_JumpSpecialRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (sub_80941C8(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        eventObject->landingJump = FALSE;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_FacePlayer_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 playerObjectId;
+
+    if (!TryGetEventObjectIdByLocalIdAndMap(0xFF, 0, 0, &playerObjectId))
+    {
+        FaceDirection(eventObject, sprite, GetDirectionToFace(eventObject->currentCoords.x, eventObject->currentCoords.y, gEventObjects[playerObjectId].currentCoords.x, gEventObjects[playerObjectId].currentCoords.y));
+    }
+    sprite->data[2] = 1;
+    return TRUE;
+}
+
+bool8 MovementAction_FaceAwayPlayer_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u8 playerObjectId;
+
+    if (!TryGetEventObjectIdByLocalIdAndMap(0xFF, 0, 0, &playerObjectId))
+    {
+        FaceDirection(eventObject, sprite, GetOppositeDirection(GetDirectionToFace(eventObject->currentCoords.x, eventObject->currentCoords.y, gEventObjects[playerObjectId].currentCoords.x, gEventObjects[playerObjectId].currentCoords.y)));
+    }
+    sprite->data[2] = 1;
+    return TRUE;
+}
+
+bool8 MovementAction_LockFacingDirection_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    eventObject->facingDirectionLocked = TRUE;
+    sprite->data[2] = 1;
+    return TRUE;
+}
+
+bool8 MovementAction_UnlockFacingDirection_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    eventObject->facingDirectionLocked = FALSE;
+    sprite->data[2] = 1;
+    return TRUE;
+}
+
+bool8 MovementAction_JumpDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    maybe_shadow_1(eventObject, sprite, DIR_SOUTH, 1, 2);
+    return MovementAction_JumpDown_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_JumpDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (sub_80941B0(eventObject, sprite))
+    {
+        eventObject->hasShadow = 0;
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_JumpUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    maybe_shadow_1(eventObject, sprite, DIR_NORTH, 1, 2);
+    return MovementAction_JumpUp_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_JumpUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (sub_80941B0(eventObject, sprite))
+    {
+        eventObject->hasShadow = 0;
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_JumpLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    maybe_shadow_1(eventObject, sprite, DIR_WEST, 1, 2);
+    return MovementAction_JumpLeft_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_JumpLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (sub_80941B0(eventObject, sprite))
+    {
+        eventObject->hasShadow = 0;
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_JumpRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    maybe_shadow_1(eventObject, sprite, DIR_EAST, 1, 2);
+    return MovementAction_JumpRight_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_JumpRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (sub_80941B0(eventObject, sprite))
+    {
+        eventObject->hasShadow = 0;
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_JumpInPlaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    maybe_shadow_1(eventObject, sprite, DIR_SOUTH, 0, 0);
+    return MovementAction_JumpInPlaceDown_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_JumpInPlaceDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (sub_80941B0(eventObject, sprite))
+    {
+        eventObject->hasShadow = 0;
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_JumpInPlaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    maybe_shadow_1(eventObject, sprite, DIR_NORTH, 0, 0);
+    return MovementAction_JumpInPlaceUp_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_JumpInPlaceUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (sub_80941B0(eventObject, sprite))
+    {
+        eventObject->hasShadow = 0;
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_JumpInPlaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    maybe_shadow_1(eventObject, sprite, DIR_WEST, 0, 0);
+    return MovementAction_JumpInPlaceLeft_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_JumpInPlaceLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (sub_80941B0(eventObject, sprite))
+    {
+        eventObject->hasShadow = 0;
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_JumpInPlaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    maybe_shadow_1(eventObject, sprite, DIR_EAST, 0, 0);
+    return MovementAction_JumpInPlaceRight_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_JumpInPlaceRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (sub_80941B0(eventObject, sprite))
+    {
+        eventObject->hasShadow = 0;
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_JumpInPlaceDownUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    maybe_shadow_1(eventObject, sprite, DIR_SOUTH, 0, 2);
+    return MovementAction_JumpInPlaceDownUp_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_JumpInPlaceDownUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (sub_80941E0(eventObject, sprite))
+    {
+        eventObject->hasShadow = 0;
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_JumpInPlaceUpDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    maybe_shadow_1(eventObject, sprite, DIR_NORTH, 0, 2);
+    return MovementAction_JumpInPlaceUpDown_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_JumpInPlaceUpDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (sub_80941E0(eventObject, sprite))
+    {
+        eventObject->hasShadow = 0;
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_JumpInPlaceLeftRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    maybe_shadow_1(eventObject, sprite, DIR_WEST, 0, 2);
+    return MovementAction_JumpInPlaceLeftRight_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_JumpInPlaceLeftRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (sub_80941E0(eventObject, sprite))
+    {
+        eventObject->hasShadow = 0;
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_JumpInPlaceRightLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    maybe_shadow_1(eventObject, sprite, DIR_EAST, 0, 2);
+    return MovementAction_JumpInPlaceRightLeft_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_JumpInPlaceRightLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (sub_80941E0(eventObject, sprite))
+    {
+        eventObject->hasShadow = 0;
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_FaceOriginalDirection_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    FaceDirection(eventObject, sprite, gInitialMovementTypeFacingDirections[eventObject->movementType]);
+    return TRUE;
+}
+
+bool8 MovementAction_NurseJoyBowDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    StartSpriteAnimInDirection(eventObject, sprite, DIR_SOUTH, 0x14);
+    return FALSE;
+}
+
+bool8 MovementAction_EnableJumpLandingGroundEffect_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    eventObject->disableJumpLandingGroundEffect = FALSE;
+    sprite->data[2] = 1;
+    return TRUE;
+}
+
+bool8 MovementAction_DisableJumpLandingGroundEffect_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    eventObject->disableJumpLandingGroundEffect = TRUE;
+    sprite->data[2] = 1;
+    return TRUE;
+}
+
+bool8 MovementAction_DisableAnimation_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    eventObject->inanimate = TRUE;
+    sprite->data[2] = 1;
+    return TRUE;
+}
+
+bool8 MovementAction_RestoreAnimation_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    eventObject->inanimate = GetEventObjectGraphicsInfo(eventObject->graphicsId)->inanimate;
+    sprite->data[2] = 1;
+    return TRUE;
+}
+
+bool8 MovementAction_SetInvisible_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    eventObject->invisible = TRUE;
+    sprite->data[2] = 1;
+    return TRUE;
+}
+
+bool8 MovementAction_SetVisible_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    eventObject->invisible = FALSE;
+    sprite->data[2] = 1;
+    return TRUE;
+}
+
+bool8 MovementAction_EmoteExclamationMark_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
+    FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON);
+    sprite->data[2] = 1;
+    return TRUE;
+}
+
+bool8 MovementAction_EmoteQuestionMark_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
+    FieldEffectStart(FLDEFF_QUESTION_MARK_ICON);
+    sprite->data[2] = 1;
+    return TRUE;
+}
+
+bool8 MovementAction_EmoteHeart_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
+    FieldEffectStart(FLDEFF_HEART_ICON);
+    sprite->data[2] = 1;
+    return TRUE;
+}
+
+bool8 MovementAction_RevealTrainer_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (eventObject->movementType == MOVEMENT_TYPE_HIDDEN)
+    {
+        sub_80B4578(eventObject);
+        return FALSE;
+    }
+    if (eventObject->movementType != MOVEMENT_TYPE_TREE_DISGUISE && eventObject->movementType != MOVEMENT_TYPE_MOUNTAIN_DISGUISE)
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    sub_8155D78(eventObject);
+    sprite->data[2] = 1;
+    return MovementAction_RevealTrainer_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_RevealTrainer_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (sub_8155DA0(eventObject))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_RockSmashBreak_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    SetAndStartSpriteAnim(sprite, 1, 0);
+    sprite->data[2] = 1;
+    return FALSE;
+}
+
+bool8 MovementAction_RockSmashBreak_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (SpriteAnimEnded(sprite))
+    {
+        SetMovementDelay(sprite, 32);
+        sprite->data[2] = 2;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_RockSmashBreak_Step2(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    eventObject->invisible ^= TRUE;
+    if (WaitForMovementDelay(sprite))
+    {
+        eventObject->invisible = TRUE;
+        sprite->data[2] = 3;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_CutTree_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    SetAndStartSpriteAnim(sprite, 1, 0);
+    sprite->data[2] = 1;
+    return FALSE;
+}
+
+bool8 MovementAction_CutTree_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (SpriteAnimEnded(sprite))
+    {
+        SetMovementDelay(sprite, 32);
+        sprite->data[2] = 2;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_CutTree_Step2(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    eventObject->invisible ^= TRUE;
+    if (WaitForMovementDelay(sprite))
+    {
+        eventObject->invisible = TRUE;
+        sprite->data[2] = 3;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_SetFixedPriority_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    eventObject->fixedPriority = TRUE;
+    sprite->data[2] = 1;
+    return TRUE;
+}
+
+bool8 MovementAction_ClearFixedPriority_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    eventObject->fixedPriority = FALSE;
+    sprite->data[2] = 1;
+    return TRUE;
+}
+
+bool8 MovementAction_InitAffineAnim_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sprite->oam.affineMode = ST_OAM_AFFINE_DOUBLE;
+    InitSpriteAffineAnim(sprite);
+    sprite->affineAnimPaused = TRUE;
+    sprite->subspriteMode = 0;
+    return TRUE;
+}
+
+bool8 MovementAction_ClearAffineAnim_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    FreeOamMatrix(sprite->oam.matrixNum);
+    sprite->oam.affineMode = ST_OAM_AFFINE_OFF;
+    CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, sprite->oam.affineMode);
+    return TRUE;
+}
+
+bool8 MovementAction_Unknown1_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    eventObject->unk3_3 = TRUE;
+    return TRUE;
+}
+
+bool8 MovementAction_Unknown2_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    eventObject->unk3_3 = FALSE;
+    return TRUE;
+}
+
+bool8 MovementAction_WalkDownStartAffine_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8093B60(eventObject, sprite, DIR_SOUTH);
+    sprite->affineAnimPaused = FALSE;
+    StartSpriteAffineAnimIfDifferent(sprite, 0);
+    return MovementAction_WalkDownStartAffine_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkDownStartAffine_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (an_walk_any_2(eventObject, sprite))
+    {
+        sprite->affineAnimPaused = TRUE;
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_WalkDownAffine_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8093B60(eventObject, sprite, DIR_SOUTH);
+    sprite->affineAnimPaused = FALSE;
+    ChangeSpriteAffineAnimIfDifferent(sprite, 1);
+    return MovementAction_WalkDownAffine_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkDownAffine_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (an_walk_any_2(eventObject, sprite))
+    {
+        sprite->affineAnimPaused = TRUE;
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_WalkLeftAffine_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    do_go_anim(eventObject, sprite, DIR_WEST, 1);
+    sprite->affineAnimPaused = FALSE;
+    ChangeSpriteAffineAnimIfDifferent(sprite, 2);
+    return MovementAction_WalkLeftAffine_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkLeftAffine_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
+    {
+        sprite->affineAnimPaused = TRUE;
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_WalkRightAffine_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    do_go_anim(eventObject, sprite, DIR_EAST, 1);
+    sprite->affineAnimPaused = FALSE;
+    ChangeSpriteAffineAnimIfDifferent(sprite, 3);
+    return MovementAction_WalkRightAffine_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_WalkRightAffine_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
+    {
+        sprite->affineAnimPaused = TRUE;
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+static void sub_80958C0(struct EventObject *eventObject, struct Sprite *sprite, u8 direction)
+{
+    SetEventObjectDirection(eventObject, direction);
+    ShiftStillEventObjectCoords(eventObject);
+    obj_npc_animation_step(eventObject, sprite, GetAcroWheeliePedalDirectionAnimNum(direction));
+    sprite->animPaused = TRUE;
+    sprite->data[2] = 1;
+}
+
+bool8 MovementAction_AcroWheelieFaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_80958C0(eventObject, sprite, DIR_SOUTH);
+    return TRUE;
+}
+
+bool8 MovementAction_AcroWheelieFaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_80958C0(eventObject, sprite, DIR_NORTH);
+    return TRUE;
+}
+
+bool8 MovementAction_AcroWheelieFaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_80958C0(eventObject, sprite, DIR_WEST);
+    return TRUE;
+}
+
+bool8 MovementAction_AcroWheelieFaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_80958C0(eventObject, sprite, DIR_EAST);
+    return TRUE;
+}
+
+bool8 MovementAction_AcroPopWheelieDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    StartSpriteAnimInDirection(eventObject, sprite, DIR_SOUTH, GetAcroWheelieDirectionAnimNum(DIR_SOUTH));
+    return FALSE;
+}
+
+bool8 MovementAction_AcroPopWheelieUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    StartSpriteAnimInDirection(eventObject, sprite, DIR_NORTH, GetAcroWheelieDirectionAnimNum(DIR_NORTH));
+    return FALSE;
+}
+
+bool8 MovementAction_AcroPopWheelieLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    StartSpriteAnimInDirection(eventObject, sprite, DIR_WEST, GetAcroWheelieDirectionAnimNum(DIR_WEST));
+    return FALSE;
+}
+
+bool8 MovementAction_AcroPopWheelieRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    StartSpriteAnimInDirection(eventObject, sprite, DIR_EAST, GetAcroWheelieDirectionAnimNum(DIR_EAST));
+    return FALSE;
+}
+
+bool8 MovementAction_AcroEndWheelieFaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    StartSpriteAnimInDirection(eventObject, sprite, DIR_SOUTH, GetAcroEndWheelieDirectionAnimNum(DIR_SOUTH));
+    return FALSE;
+}
+
+bool8 MovementAction_AcroEndWheelieFaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    StartSpriteAnimInDirection(eventObject, sprite, DIR_NORTH, GetAcroEndWheelieDirectionAnimNum(DIR_NORTH));
+    return FALSE;
+}
+
+bool8 MovementAction_AcroEndWheelieFaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    StartSpriteAnimInDirection(eventObject, sprite, DIR_WEST, GetAcroEndWheelieDirectionAnimNum(DIR_WEST));
+    return FALSE;
+}
+
+bool8 MovementAction_AcroEndWheelieFaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    StartSpriteAnimInDirection(eventObject, sprite, DIR_EAST, GetAcroEndWheelieDirectionAnimNum(DIR_EAST));
+    return FALSE;
+}
+
+bool8 MovementAction_UnusedAcroActionDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    StartSpriteAnimInDirection(eventObject, sprite, DIR_SOUTH, GetAcroUnusedActionDirectionAnimNum(DIR_SOUTH));
+    return FALSE;
+}
+
+bool8 MovementAction_UnusedAcroActionUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    StartSpriteAnimInDirection(eventObject, sprite, DIR_NORTH, GetAcroUnusedActionDirectionAnimNum(DIR_NORTH));
+    return FALSE;
+}
+
+bool8 MovementAction_UnusedAcroActionLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    StartSpriteAnimInDirection(eventObject, sprite, DIR_WEST, GetAcroUnusedActionDirectionAnimNum(DIR_WEST));
+    return FALSE;
+}
+
+bool8 MovementAction_UnusedAcroActionRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    StartSpriteAnimInDirection(eventObject, sprite, DIR_EAST, GetAcroUnusedActionDirectionAnimNum(DIR_EAST));
+    return FALSE;
+}
+
+void sub_8095AF0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8097750(sprite);
+    sprite->animPaused = FALSE;
+}
+
+bool8 sub_8095B0C(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (sub_8097758(sprite))
+    {
+        ShiftStillEventObjectCoords(eventObject);
+        eventObject->triggerGroundEffectsOnStop = TRUE;
+        sprite->animPaused = TRUE;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_Figure8_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8095AF0(eventObject, sprite);
+    sprite->data[2] = 1;
+    return MovementAction_Figure8_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_Figure8_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (sub_8095B0C(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+void sub_8095B84(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed, u8 a4)
+{
+    sub_8093FC4(eventObject, sprite, direction, speed, a4);
+    StartSpriteAnimIfDifferent(sprite, GetAcroWheelieDirectionAnimNum(direction));
+    DoShadowFieldEffect(eventObject);
+}
+
+bool8 MovementAction_AcroWheelieHopFaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8095B84(eventObject, sprite, DIR_SOUTH, 0, 1);
+    return MovementAction_AcroWheelieHopFaceDown_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_AcroWheelieHopFaceDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (sub_80941B0(eventObject, sprite))
+    {
+        eventObject->hasShadow = FALSE;
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_AcroWheelieHopFaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8095B84(eventObject, sprite, DIR_NORTH, 0, 1);
+    return MovementAction_AcroWheelieHopFaceUp_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_AcroWheelieHopFaceUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (sub_80941B0(eventObject, sprite))
+    {
+        eventObject->hasShadow = FALSE;
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_AcroWheelieHopFaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8095B84(eventObject, sprite, DIR_WEST,  0, 1);
+    return MovementAction_AcroWheelieHopFaceLeft_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_AcroWheelieHopFaceLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (sub_80941B0(eventObject, sprite))
+    {
+        eventObject->hasShadow = FALSE;
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_AcroWheelieHopFaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8095B84(eventObject, sprite, DIR_EAST,  0, 1);
+    return MovementAction_AcroWheelieHopFaceRight_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_AcroWheelieHopFaceRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (sub_80941B0(eventObject, sprite))
+    {
+        eventObject->hasShadow = FALSE;
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_AcroWheelieHopDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8095B84(eventObject, sprite, DIR_SOUTH, 1, 1);
+    return MovementAction_AcroWheelieHopDown_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_AcroWheelieHopDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (sub_80941B0(eventObject, sprite))
+    {
+        eventObject->hasShadow = FALSE;
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_AcroWheelieHopUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8095B84(eventObject, sprite, DIR_NORTH, 1, 1);
+    return MovementAction_AcroWheelieHopUp_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_AcroWheelieHopUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (sub_80941B0(eventObject, sprite))
+    {
+        eventObject->hasShadow = FALSE;
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_AcroWheelieHopLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8095B84(eventObject, sprite, DIR_WEST,  1, 1);
+    return MovementAction_AcroWheelieHopLeft_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_AcroWheelieHopLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (sub_80941B0(eventObject, sprite))
+    {
+        eventObject->hasShadow = FALSE;
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_AcroWheelieHopRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8095B84(eventObject, sprite, DIR_EAST,  1, 1);
+    return MovementAction_AcroWheelieHopRight_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_AcroWheelieHopRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (sub_80941B0(eventObject, sprite))
+    {
+        eventObject->hasShadow = FALSE;
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_AcroWheelieJumpDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8095B84(eventObject, sprite, DIR_SOUTH, 2, 0);
+    return MovementAction_AcroWheelieJumpDown_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_AcroWheelieJumpDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (sub_80941B0(eventObject, sprite))
+    {
+        eventObject->hasShadow = FALSE;
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_AcroWheelieJumpUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8095B84(eventObject, sprite, DIR_NORTH, 2, 0);
+    return MovementAction_AcroWheelieJumpUp_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_AcroWheelieJumpUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (sub_80941B0(eventObject, sprite))
+    {
+        eventObject->hasShadow = FALSE;
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_AcroWheelieJumpLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8095B84(eventObject, sprite, DIR_WEST,  2, 0);
+    return MovementAction_AcroWheelieJumpLeft_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_AcroWheelieJumpLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (sub_80941B0(eventObject, sprite))
+    {
+        eventObject->hasShadow = FALSE;
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_AcroWheelieJumpRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8095B84(eventObject, sprite, DIR_EAST,  2, 0);
+    return MovementAction_AcroWheelieJumpRight_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_AcroWheelieJumpRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (sub_80941B0(eventObject, sprite))
+    {
+        eventObject->hasShadow = FALSE;
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_AcroWheelieInPlaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8094554(eventObject, sprite, DIR_SOUTH, GetAcroWheeliePedalDirectionAnimNum(DIR_SOUTH), 8);
+    return MovementAction_WalkInPlace_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_AcroWheelieInPlaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8094554(eventObject, sprite, DIR_NORTH, GetAcroWheeliePedalDirectionAnimNum(DIR_NORTH), 8);
+    return MovementAction_WalkInPlace_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_AcroWheelieInPlaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8094554(eventObject, sprite, DIR_WEST, GetAcroWheeliePedalDirectionAnimNum(DIR_WEST), 8);
+    return MovementAction_WalkInPlace_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_AcroWheelieInPlaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8094554(eventObject, sprite, DIR_EAST, GetAcroWheeliePedalDirectionAnimNum(DIR_EAST), 8);
+    return MovementAction_WalkInPlace_Step1(eventObject, sprite);
+}
+
+void sub_80960C8(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed)
+{
+    npc_apply_direction(eventObject, sprite, direction, speed);
+    StartSpriteAnim(sprite, GetAcroWheelieDirectionAnimNum(eventObject->facingDirection));
+    SeekSpriteAnim(sprite, 0);
+}
+
+bool8 MovementAction_AcroPopWheelieMoveDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_80960C8(eventObject, sprite, DIR_SOUTH, 1);
+    return MovementAction_AcroPopWheelieMoveDown_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_AcroPopWheelieMoveDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_AcroPopWheelieMoveUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_80960C8(eventObject, sprite, DIR_NORTH, 1);
+    return MovementAction_AcroPopWheelieMoveUp_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_AcroPopWheelieMoveUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_AcroPopWheelieMoveLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_80960C8(eventObject, sprite, DIR_WEST,  1);
+    return MovementAction_AcroPopWheelieMoveLeft_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_AcroPopWheelieMoveLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_AcroPopWheelieMoveRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_80960C8(eventObject, sprite, DIR_EAST,  1);
+    return MovementAction_AcroPopWheelieMoveRight_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_AcroPopWheelieMoveRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+void sub_8096200(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed)
+{
+    npc_apply_direction(eventObject, sprite, direction, speed);
+    npc_apply_anim_looping(eventObject, sprite, GetAcroWheeliePedalDirectionAnimNum(eventObject->facingDirection));
+}
+
+bool8 MovementAction_AcroWheelieMoveDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8096200(eventObject, sprite, DIR_SOUTH, 1);
+    return MovementAction_AcroWheelieMoveDown_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_AcroWheelieMoveDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_AcroWheelieMoveUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8096200(eventObject, sprite, DIR_NORTH, 1);
+    return MovementAction_AcroWheelieMoveUp_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_AcroWheelieMoveUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_AcroWheelieMoveLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8096200(eventObject, sprite, DIR_WEST,  1);
+    return MovementAction_AcroWheelieMoveLeft_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_AcroWheelieMoveLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_AcroWheelieMoveRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8096200(eventObject, sprite, DIR_EAST,  1);
+    return MovementAction_AcroWheelieMoveRight_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_AcroWheelieMoveRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+void sub_8096330(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed)
+{
+    npc_apply_direction(eventObject, sprite, direction, speed);
+    StartSpriteAnim(sprite, GetAcroEndWheelieDirectionAnimNum(eventObject->facingDirection));
+    SeekSpriteAnim(sprite, 0);
+}
+
+bool8 MovementAction_AcroEndWheelieMoveDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8096330(eventObject, sprite, DIR_SOUTH, 1);
+    return MovementAction_AcroEndWheelieMoveDown_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_AcroEndWheelieMoveDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_AcroEndWheelieMoveUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8096330(eventObject, sprite, DIR_NORTH, 1);
+    return MovementAction_AcroEndWheelieMoveUp_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_AcroEndWheelieMoveUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_AcroEndWheelieMoveLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8096330(eventObject, sprite, DIR_WEST,  1);
+    return MovementAction_AcroEndWheelieMoveLeft_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_AcroEndWheelieMoveLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_AcroEndWheelieMoveRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8096330(eventObject, sprite, DIR_EAST,  1);
+    return MovementAction_AcroEndWheelieMoveRight_Step1(eventObject, sprite);
+}
+
+bool8 MovementAction_AcroEndWheelieMoveRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
+    {
+        sprite->data[2] = 2;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 MovementAction_Levitate_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    CreateLevitateMovementTask(eventObject);
+    sprite->data[2] = 1;
+    return TRUE;
+}
+
+bool8 MovementAction_StopLevitate_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    DestroyExtraMovementTask(eventObject->warpArrowSpriteId);
+    sprite->pos2.y = 0;
+    sprite->data[2] = 1;
+    return TRUE;
+}
+
+bool8 MovementAction_DestroyExtraTaskIfAtTop_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (sprite->pos2.y == 0)
+    {
+        DestroyExtraMovementTask(eventObject->warpArrowSpriteId);
+        sprite->data[2] = 1;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+u8 MovementAction_Finish(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    return TRUE;
+}
+
+bool8 MovementAction_PauseSpriteAnim(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sprite->animPaused = TRUE;
+    return TRUE;
+}
+
+static void UpdateEventObjectSpriteAnimPause(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (eventObject->disableAnim)
+    {
+        sprite->animPaused = TRUE;
+    }
+}
+
+static void TryEnableEventObjectAnim(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    if (eventObject->enableAnim)
+    {
+        sprite->animPaused = FALSE;
+        eventObject->disableAnim = FALSE;
+        eventObject->enableAnim = FALSE;
+    }
+}
+
+static void UpdateEventObjectVisibility(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sub_8096530(eventObject, sprite);
+    npc_update_obj_anim_flag(eventObject, sprite);
+}
+
+static void sub_8096530(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u16 x;
+    u16 y;
+    u16 x2;
+    u16 y2;
+    const struct EventObjectGraphicsInfo *graphicsInfo;
+
+    eventObject->offScreen = FALSE;
+    graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId);
+    if (sprite->coordOffsetEnabled)
+    {
+        x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX + gSpriteCoordOffsetX;
+        y = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY;
+    }
+    else
+    {
+        x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX;
+        y = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY;
+    }
+    x2 = graphicsInfo->width;
+    x2 += x;
+    y2 = y;
+    y2 += graphicsInfo->height;
+    if ((s16)x >= 0x100 || (s16)x2 < -0x10)
+    {
+        eventObject->offScreen = TRUE;
+    }
+    if ((s16)y >= 0xB0 || (s16)y2 < -0x10)
+    {
+        eventObject->offScreen = TRUE;
+    }
+}
+
+static void npc_update_obj_anim_flag(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sprite->invisible = FALSE;
+    if (eventObject->invisible || eventObject->offScreen)
+    {
+        sprite->invisible = TRUE;
+    }
+}
+
+/*static*/ void GetAllGroundEffectFlags_OnSpawn(struct EventObject *eventObj, u32 *flags)
+{
+    EventObjectUpdateMetatileBehaviors(eventObj);
+    GetGroundEffectFlags_Reflection(eventObj, flags);
+    GetGroundEffectFlags_TallGrassOnSpawn(eventObj, flags);
+    GetGroundEffectFlags_LongGrassOnSpawn(eventObj, flags);
+    GetGroundEffectFlags_SandHeap(eventObj, flags);
+    GetGroundEffectFlags_ShallowFlowingWater(eventObj, flags);
+    GetGroundEffectFlags_ShortGrass(eventObj, flags);
+    GetGroundEffectFlags_HotSprings(eventObj, flags);
+}
+
+static void GetAllGroundEffectFlags_OnBeginStep(struct EventObject *eventObj, u32 *flags)
+{
+    EventObjectUpdateMetatileBehaviors(eventObj);
+    GetGroundEffectFlags_Reflection(eventObj, flags);
+    GetGroundEffectFlags_TallGrassOnBeginStep(eventObj, flags);
+    GetGroundEffectFlags_LongGrassOnBeginStep(eventObj, flags);
+    GetGroundEffectFlags_Tracks(eventObj, flags);
+    GetGroundEffectFlags_SandHeap(eventObj, flags);
+    GetGroundEffectFlags_ShallowFlowingWater(eventObj, flags);
+    GetGroundEffectFlags_Puddle(eventObj, flags);
+    GetGroundEffectFlags_ShortGrass(eventObj, flags);
+    GetGroundEffectFlags_HotSprings(eventObj, flags);
+}
+
+/*static*/ void GetAllGroundEffectFlags_OnFinishStep(struct EventObject *eventObj, u32 *flags)
+{
+    EventObjectUpdateMetatileBehaviors(eventObj);
+    GetGroundEffectFlags_ShallowFlowingWater(eventObj, flags);
+    GetGroundEffectFlags_SandHeap(eventObj, flags);
+    GetGroundEffectFlags_Puddle(eventObj, flags);
+    GetGroundEffectFlags_Ripple(eventObj, flags);
+    GetGroundEffectFlags_ShortGrass(eventObj, flags);
+    GetGroundEffectFlags_HotSprings(eventObj, flags);
+    GetGroundEffectFlags_Seaweed(eventObj, flags);
+    GetGroundEffectFlags_JumpLanding(eventObj, flags);
+}
+
+static void EventObjectUpdateMetatileBehaviors(struct EventObject *eventObj)
+{
+    eventObj->previousMetatileBehavior = MapGridGetMetatileBehaviorAt(eventObj->previousCoords.x, eventObj->previousCoords.y);
+    eventObj->currentMetatileBehavior = MapGridGetMetatileBehaviorAt(eventObj->currentCoords.x, eventObj->currentCoords.y);
+}
+
+static void GetGroundEffectFlags_Reflection(struct EventObject *eventObj, u32 *flags)
+{
+    u32 reflectionFlags[2] = { GROUND_EFFECT_FLAG_REFLECTION, GROUND_EFFECT_FLAG_ICE_REFLECTION };
+    u8 type = EventObjectCheckForReflectiveSurface(eventObj);
+
+    if (type)
+    {
+        if (!eventObj->hasReflection)
+        {
+            eventObj->hasReflection = 0;
+            eventObj->hasReflection = 1;
+            *flags |= reflectionFlags[type - 1];
+        }
+    }
+    else
+    {
+        eventObj->hasReflection = 0;
+    }
+}
+
+static void GetGroundEffectFlags_TallGrassOnSpawn(struct EventObject *eventObj, u32 *flags)
+{
+    if (MetatileBehavior_IsTallGrass(eventObj->currentMetatileBehavior))
+        *flags |= GROUND_EFFECT_FLAG_TALL_GRASS_ON_SPAWN;
+}
+
+static void GetGroundEffectFlags_TallGrassOnBeginStep(struct EventObject *eventObj, u32 *flags)
+{
+    if (MetatileBehavior_IsTallGrass(eventObj->currentMetatileBehavior))
+        *flags |= GROUND_EFFECT_FLAG_TALL_GRASS_ON_MOVE;
+}
+
+static void GetGroundEffectFlags_LongGrassOnSpawn(struct EventObject *eventObj, u32 *flags)
+{
+    if (MetatileBehavior_IsLongGrass(eventObj->currentMetatileBehavior))
+        *flags |= GROUND_EFFECT_FLAG_LONG_GRASS_ON_SPAWN;
+}
+
+static void GetGroundEffectFlags_LongGrassOnBeginStep(struct EventObject *eventObj, u32 *flags)
+{
+    if (MetatileBehavior_IsLongGrass(eventObj->currentMetatileBehavior))
+        *flags |= GROUND_EFFECT_FLAG_LONG_GRASS_ON_MOVE;
+}
+
+static void GetGroundEffectFlags_Tracks(struct EventObject *eventObj, u32 *flags)
+{
+    if (MetatileBehavior_IsDeepSand(eventObj->previousMetatileBehavior))
+    {
+        *flags |= GROUND_EFFECT_FLAG_DEEP_SAND;
+    }
+    else if (MetatileBehavior_IsSandOrDeepSand(eventObj->previousMetatileBehavior)
+             || MetatileBehavior_IsUnusedFootprintMetatile(eventObj->previousMetatileBehavior))
+    {
+        *flags |= GROUND_EFFECT_FLAG_SAND;
+    }
+}
+
+static void GetGroundEffectFlags_SandHeap(struct EventObject *eventObj, u32 *flags)
+{
+    if (MetatileBehavior_IsDeepSand(eventObj->currentMetatileBehavior)
+        && MetatileBehavior_IsDeepSand(eventObj->previousMetatileBehavior))
+    {
+        if (!eventObj->inSandPile)
+        {
+            eventObj->inSandPile = 0;
+            eventObj->inSandPile = 1;
+            *flags |= GROUND_EFFECT_FLAG_SAND_PILE;
+        }
+    }
+    else
+    {
+        eventObj->inSandPile = 0;
+    }
+}
+
+static void GetGroundEffectFlags_ShallowFlowingWater(struct EventObject *eventObj, u32 *flags)
+{
+    if ((MetatileBehavior_IsShallowFlowingWater(eventObj->currentMetatileBehavior)
+         && MetatileBehavior_IsShallowFlowingWater(eventObj->previousMetatileBehavior))
+        || (MetatileBehavior_IsPacifidlogLog(eventObj->currentMetatileBehavior)
+            && MetatileBehavior_IsPacifidlogLog(eventObj->previousMetatileBehavior)))
+    {
+        if (!eventObj->inShallowFlowingWater)
+        {
+            eventObj->inShallowFlowingWater = 0;
+            eventObj->inShallowFlowingWater = 1;
+            *flags |= GROUND_EFFECT_FLAG_SHALLOW_FLOWING_WATER;
+        }
+    }
+    else
+    {
+        eventObj->inShallowFlowingWater = 0;
+    }
+}
+
+static void GetGroundEffectFlags_Puddle(struct EventObject *eventObj, u32 *flags)
+{
+    if (MetatileBehavior_IsPuddle(eventObj->currentMetatileBehavior)
+        && MetatileBehavior_IsPuddle(eventObj->previousMetatileBehavior))
+    {
+        *flags |= GROUND_EFFECT_FLAG_PUDDLE;
+    }
+}
+
+static void GetGroundEffectFlags_Ripple(struct EventObject *eventObj, u32 *flags)
+{
+    if (MetatileBehavior_HasRipples(eventObj->currentMetatileBehavior))
+        *flags |= GROUND_EFFECT_FLAG_RIPPLES;
+}
+
+static void GetGroundEffectFlags_ShortGrass(struct EventObject *eventObj, u32 *flags)
+{
+    if (MetatileBehavior_IsShortGrass(eventObj->currentMetatileBehavior)
+        && MetatileBehavior_IsShortGrass(eventObj->previousMetatileBehavior))
+    {
+        if (!eventObj->inShortGrass)
+        {
+            eventObj->inShortGrass = 0;
+            eventObj->inShortGrass = 1;
+            *flags |= GROUND_EFFECT_FLAG_SHORT_GRASS;
+        }
+    }
+    else
+    {
+        eventObj->inShortGrass = 0;
+    }
+}
+
+static void GetGroundEffectFlags_HotSprings(struct EventObject *eventObj, u32 *flags)
+{
+    if (MetatileBehavior_IsHotSprings(eventObj->currentMetatileBehavior)
+        && MetatileBehavior_IsHotSprings(eventObj->previousMetatileBehavior))
+    {
+        if (!eventObj->inHotSprings)
+        {
+            eventObj->inHotSprings = 0;
+            eventObj->inHotSprings = 1;
+            *flags |= GROUND_EFFECT_FLAG_HOT_SPRINGS;
+        }
+    }
+    else
+    {
+        eventObj->inHotSprings = 0;
+    }
+}
+
+static void GetGroundEffectFlags_Seaweed(struct EventObject *eventObj, u32 *flags)
+{
+    if (MetatileBehavior_IsSeaweed(eventObj->currentMetatileBehavior))
+        *flags |= GROUND_EFFECT_FLAG_SEAWEED;
+}
+
+static void GetGroundEffectFlags_JumpLanding(struct EventObject *eventObj, u32 *flags)
+{
+    typedef bool8 (*MetatileFunc)(u8);
+
+    static const MetatileFunc metatileFuncs[] = {
+        MetatileBehavior_IsTallGrass,
+        MetatileBehavior_IsLongGrass,
+        MetatileBehavior_IsPuddle,
+        MetatileBehavior_IsSurfableWaterOrUnderwater,
+        MetatileBehavior_IsShallowFlowingWater,
+        MetatileBehavior_IsATile,
+    };
+
+    static const u32 jumpLandingFlags[] = {
+        GROUND_EFFECT_FLAG_LAND_IN_TALL_GRASS,
+        GROUND_EFFECT_FLAG_LAND_IN_LONG_GRASS,
+        GROUND_EFFECT_FLAG_LAND_IN_SHALLOW_WATER,
+        GROUND_EFFECT_FLAG_LAND_IN_DEEP_WATER,
+        GROUND_EFFECT_FLAG_LAND_IN_SHALLOW_WATER,
+        GROUND_EFFECT_FLAG_LAND_ON_NORMAL_GROUND,
+    };
+
+    if (eventObj->landingJump && !eventObj->disableJumpLandingGroundEffect)
+    {
+        u8 i;
+
+        for (i = 0; i < ARRAY_COUNT(metatileFuncs); i++)
+        {
+            if (metatileFuncs[i](eventObj->currentMetatileBehavior))
+            {
+                *flags |= jumpLandingFlags[i];
+                return;
+            }
+        }
+    }
+}
+
+static u8 EventObjectCheckForReflectiveSurface(struct EventObject *eventObj)
+{
+    const struct EventObjectGraphicsInfo *info = GetEventObjectGraphicsInfo(eventObj->graphicsId);
+
+    // ceil div by tile width?
+    s16 width = (info->width + 8) >> 4;
+    s16 height = (info->height + 8) >> 4;
+    s16 i;
+    s16 j;
+    u8 result;
+    u8 b;
+    s16 one;
+
+#define RETURN_REFLECTION_TYPE_AT(x, y)              \
+    b = MapGridGetMetatileBehaviorAt(x, y);          \
+    result = GetReflectionTypeByMetatileBehavior(b); \
+    if (result != 0)                                 \
+        return result;
+
+    for (i = 0, one = 1; i < height; i++)
+    {
+        RETURN_REFLECTION_TYPE_AT(eventObj->currentCoords.x, eventObj->currentCoords.y + one + i)
+        RETURN_REFLECTION_TYPE_AT(eventObj->previousCoords.x, eventObj->previousCoords.y + one + i)
+        for (j = 1; j < width; j++)
+        {
+            RETURN_REFLECTION_TYPE_AT(eventObj->currentCoords.x + j, eventObj->currentCoords.y + one + i)
+            RETURN_REFLECTION_TYPE_AT(eventObj->currentCoords.x - j, eventObj->currentCoords.y + one + i)
+            RETURN_REFLECTION_TYPE_AT(eventObj->previousCoords.x + j, eventObj->previousCoords.y + one + i)
+            RETURN_REFLECTION_TYPE_AT(eventObj->previousCoords.x - j, eventObj->previousCoords.y + one + i)
+        }
+    }
+    return 0;
+
+#undef RETURN_REFLECTION_TYPE_AT
+}
+
+static u8 GetReflectionTypeByMetatileBehavior(u32 behavior)
+{
+    if (MetatileBehavior_IsIce(behavior))
+        return 1;
+    else if (MetatileBehavior_IsReflective(behavior))
+        return 2;
+    else
+        return 0;
+}
+
+u8 GetLedgeJumpDirection(s16 x, s16 y, u8 z)
+{
+    static bool8 (*const unknown_08376040[])(u8) = {
+        MetatileBehavior_IsJumpSouth,
+        MetatileBehavior_IsJumpNorth,
+        MetatileBehavior_IsJumpWest,
+        MetatileBehavior_IsJumpEast,
+    };
+
+    u8 b;
+    u8 index = z;
+
+    if (index == 0)
+        return 0;
+    else if (index > 4)
+        index -= 4;
+
+    index--;
+    b = MapGridGetMetatileBehaviorAt(x, y);
+
+    if (unknown_08376040[index](b) == 1)
+        return index + 1;
+
+    return 0;
+}
+
+void EventObjectSetSpriteOamTableForLongGrass(struct EventObject *eventObj, struct Sprite *sprite)
+{
+    if (eventObj->disableCoveringGroundEffects)
+        return;
+
+    if (!MetatileBehavior_IsLongGrass(eventObj->currentMetatileBehavior))
+        return;
+
+    if (!MetatileBehavior_IsLongGrass(eventObj->previousMetatileBehavior))
+        return;
+
+    sprite->subspriteTableNum = 4;
+
+    if (ZCoordToPriority(eventObj->previousElevation) == 1)
+        sprite->subspriteTableNum = 5;
+}
+
+bool8 IsZCoordMismatchAt(u8 z, s16 x, s16 y)
+{
+    u8 mapZ;
+
+    if (z == 0)
+        return FALSE;
+
+    mapZ = MapGridGetZCoordAt(x, y);
+
+    if (mapZ == 0 || mapZ == 0xF)
+        return FALSE;
+
+    if (mapZ != z)
+        return TRUE;
+
+    return FALSE;
+}
+
+static const u8 sUnknown_08376050[] = {
+    0x73, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x00, 0x00, 0x73
+};
+
+// Each byte corresponds to a sprite priority for an event object.
+// This is directly the inverse of gEventObjectPriorities_08376070.
+static const u8 sEventObjectPriorities_08376060[] = {
+    2, 2, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 0, 0, 2
+};
+
+// Each byte corresponds to a sprite priority for an event object.
+// This is the inverse of gEventObjectPriorities_08376060.
+// 1 = Above player sprite
+// 2 = Below player sprite
+static const u8 sEventObjectPriorities_08376070[] = {
+    1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 0, 0, 1,
+};
+
+void EventObjectUpdateZCoordAndPriority(struct EventObject *eventObj, struct Sprite *sprite)
+{
+    if (eventObj->fixedPriority)
+        return;
+
+    EventObjectUpdateZCoord(eventObj);
+
+    sprite->subspriteTableNum = sEventObjectPriorities_08376070[eventObj->previousElevation];
+    sprite->oam.priority = sEventObjectPriorities_08376060[eventObj->previousElevation];
+}
+
+static void InitObjectPriorityByZCoord(struct Sprite *sprite, u8 z)
+{
+    sprite->subspriteTableNum = sEventObjectPriorities_08376070[z];
+    sprite->oam.priority = sEventObjectPriorities_08376060[z];
+}
+
+u8 ZCoordToPriority(u8 z)
+{
+    return sEventObjectPriorities_08376060[z];
+}
+
+void EventObjectUpdateZCoord(struct EventObject *eventObj)
+{
+    u8 z = MapGridGetZCoordAt(eventObj->currentCoords.x, eventObj->currentCoords.y);
+    u8 z2 = MapGridGetZCoordAt(eventObj->previousCoords.x, eventObj->previousCoords.y);
+
+    if (z == 0xF || z2 == 0xF)
+        return;
+
+    eventObj->currentElevation = z;
+
+    if (z != 0 && z != 0xF)
+        eventObj->previousElevation = z;
+}
+
+void SetObjectSubpriorityByZCoord(u8 a, struct Sprite *sprite, u8 b)
+{
+    s32 tmp = sprite->centerToCornerVecY;
+    u32 tmpa = *(u16 *)&sprite->pos1.y;
+    u32 tmpb = *(u16 *)&gSpriteCoordOffsetY;
+    s32 tmp2 = (tmpa - tmp) + tmpb;
+    u16 tmp3 = (0x10 - ((((u32)tmp2 + 8) & 0xFF) >> 4)) * 2;
+    sprite->subpriority = tmp3 + sUnknown_08376050[a] + b;
+}
+
+static void EventObjectUpdateSubpriority(struct EventObject *eventObj, struct Sprite *sprite)
+{
+    if (eventObj->fixedPriority)
+        return;
+
+    SetObjectSubpriorityByZCoord(eventObj->previousElevation, sprite, 1);
+}
+
+bool8 AreZCoordsCompatible(u8 a, u8 b)
+{
+    if (a == 0 || b == 0)
+        return TRUE;
+
+    if (a != b)
+        return FALSE;
+
+    return TRUE;
+}
+
+void GroundEffect_SpawnOnTallGrass(struct EventObject *eventObj, struct Sprite *sprite)
+{
+    gFieldEffectArguments[0] = eventObj->currentCoords.x;
+    gFieldEffectArguments[1] = eventObj->currentCoords.y;
+    gFieldEffectArguments[2] = eventObj->previousElevation;
+    gFieldEffectArguments[3] = 2;
+    gFieldEffectArguments[4] = eventObj->localId << 8 | eventObj->mapNum;
+    gFieldEffectArguments[5] = eventObj->mapGroup;
+    gFieldEffectArguments[6] = (u8)gSaveBlock1Ptr->location.mapNum << 8 | (u8)gSaveBlock1Ptr->location.mapGroup;
+    gFieldEffectArguments[7] = 1;
+    FieldEffectStart(FLDEFF_TALL_GRASS);
+}
+
+void GroundEffect_StepOnTallGrass(struct EventObject *eventObj, struct Sprite *sprite)
+{
+    gFieldEffectArguments[0] = eventObj->currentCoords.x;
+    gFieldEffectArguments[1] = eventObj->currentCoords.y;
+    gFieldEffectArguments[2] = eventObj->previousElevation;
+    gFieldEffectArguments[3] = 2;
+    gFieldEffectArguments[4] = eventObj->localId << 8 | eventObj->mapNum;
+    gFieldEffectArguments[5] = eventObj->mapGroup;
+    gFieldEffectArguments[6] = (u8)gSaveBlock1Ptr->location.mapNum << 8 | (u8)gSaveBlock1Ptr->location.mapGroup;
+    gFieldEffectArguments[7] = 0;
+    FieldEffectStart(FLDEFF_TALL_GRASS);
+}
+
+void GroundEffect_SpawnOnLongGrass(struct EventObject *eventObj, struct Sprite *sprite)
+{
+    gFieldEffectArguments[0] = eventObj->currentCoords.x;
+    gFieldEffectArguments[1] = eventObj->currentCoords.y;
+    gFieldEffectArguments[2] = eventObj->previousElevation;
+    gFieldEffectArguments[3] = 2;
+    gFieldEffectArguments[4] = eventObj->localId << 8 | eventObj->mapNum;
+    gFieldEffectArguments[5] = eventObj->mapGroup;
+    gFieldEffectArguments[6] = (u8)gSaveBlock1Ptr->location.mapNum << 8 | (u8)gSaveBlock1Ptr->location.mapGroup;
+    gFieldEffectArguments[7] = 1;
+    FieldEffectStart(FLDEFF_LONG_GRASS);
+}
+
+void GroundEffect_StepOnLongGrass(struct EventObject *eventObj, struct Sprite *sprite)
+{
+    gFieldEffectArguments[0] = eventObj->currentCoords.x;
+    gFieldEffectArguments[1] = eventObj->currentCoords.y;
+    gFieldEffectArguments[2] = eventObj->previousElevation;
+    gFieldEffectArguments[3] = 2;
+    gFieldEffectArguments[4] = (eventObj->localId << 8) | eventObj->mapNum;
+    gFieldEffectArguments[5] = eventObj->mapGroup;
+    gFieldEffectArguments[6] = (u8)gSaveBlock1Ptr->location.mapNum << 8 | (u8)gSaveBlock1Ptr->location.mapGroup;
+    gFieldEffectArguments[7] = 0;
+    FieldEffectStart(FLDEFF_LONG_GRASS);
+}
+
+void GroundEffect_WaterReflection(struct EventObject *eventObj, struct Sprite *sprite)
+{
+    SetUpReflection(eventObj, sprite, 0);
+}
+
+void GroundEffect_IceReflection(struct EventObject *eventObj, struct Sprite *sprite)
+{
+    SetUpReflection(eventObj, sprite, 1);
+}
+
+void GroundEffect_FlowingWater(struct EventObject *eventObj, struct Sprite *sprite)
+{
+    StartFieldEffectForEventObject(FLDEFF_FEET_IN_FLOWING_WATER, eventObj);
+}
+
+static void (*const sGroundEffectTracksFuncs[])(struct EventObject *eventObj, struct Sprite *sprite, u8 a) = {
+    DoTracksGroundEffect_None,
+    DoTracksGroundEffect_Footprints,
+    DoTracksGroundEffect_BikeTireTracks,
+};
+
+void GroundEffect_SandTracks(struct EventObject *eventObj, struct Sprite *sprite)
+{
+    const struct EventObjectGraphicsInfo *info = GetEventObjectGraphicsInfo(eventObj->graphicsId);
+    sGroundEffectTracksFuncs[info->tracks](eventObj, sprite, 0);
+}
+
+void GroundEffect_DeepSandTracks(struct EventObject *eventObj, struct Sprite *sprite)
+{
+    const struct EventObjectGraphicsInfo *info = GetEventObjectGraphicsInfo(eventObj->graphicsId);
+    sGroundEffectTracksFuncs[info->tracks](eventObj, sprite, 1);
+}
+
+static void DoTracksGroundEffect_None(struct EventObject *eventObj, struct Sprite *sprite, u8 a)
+{
+}
+
+static void DoTracksGroundEffect_Footprints(struct EventObject *eventObj, struct Sprite *sprite, u8 a)
+{
+    // First half-word is a Field Effect script id. (gFieldEffectScriptPointers)
+    u16 sandFootprints_FieldEffectData[2] = {
+        FLDEFF_SAND_FOOTPRINTS,
+        FLDEFF_DEEP_SAND_FOOTPRINTS
+    };
+
+    gFieldEffectArguments[0] = eventObj->previousCoords.x;
+    gFieldEffectArguments[1] = eventObj->previousCoords.y;
+    gFieldEffectArguments[2] = 149;
+    gFieldEffectArguments[3] = 2;
+    gFieldEffectArguments[4] = eventObj->facingDirection;
+    FieldEffectStart(sandFootprints_FieldEffectData[a]);
+}
+
+static void DoTracksGroundEffect_BikeTireTracks(struct EventObject *eventObj, struct Sprite *sprite, u8 a)
+{
+    //  Specifies which bike track shape to show next.
+    //  For example, when the bike turns from up to right, it will show
+    //  a track that curves to the right.
+    //  Each 4-byte row corresponds to the initial direction of the bike, and
+    //  each byte in that row is for the next direction of the bike in the order
+    //  of down, up, left, right.
+    static const u8 bikeTireTracks_Transitions[4][4] = {
+        1, 2, 7, 8,
+        1, 2, 6, 5,
+        5, 8, 3, 4,
+        6, 7, 3, 4,
+    };
+
+    if (eventObj->currentCoords.x != eventObj->previousCoords.x || eventObj->currentCoords.y != eventObj->previousCoords.y)
+    {
+        gFieldEffectArguments[0] = eventObj->previousCoords.x;
+        gFieldEffectArguments[1] = eventObj->previousCoords.y;
+        gFieldEffectArguments[2] = 149;
+        gFieldEffectArguments[3] = 2;
+        gFieldEffectArguments[4] =
+            bikeTireTracks_Transitions[eventObj->previousMovementDirection][eventObj->facingDirection - 5];
+        FieldEffectStart(FLDEFF_BIKE_TIRE_TRACKS);
+    }
+}
+
+void GroundEffect_Ripple(struct EventObject *eventObj, struct Sprite *sprite)
+{
+    DoRippleFieldEffect(eventObj, sprite);
+}
+
+void GroundEffect_StepOnPuddle(struct EventObject *eventObj, struct Sprite *sprite)
+{
+    StartFieldEffectForEventObject(FLDEFF_SPLASH, eventObj);
+}
+
+void GroundEffect_SandHeap(struct EventObject *eventObj, struct Sprite *sprite)
+{
+    StartFieldEffectForEventObject(FLDEFF_SAND_PILE, eventObj);
+}
+
+void GroundEffect_JumpOnTallGrass(struct EventObject *eventObj, struct Sprite *sprite)
+{
+    u8 spriteId;
+
+    gFieldEffectArguments[0] = eventObj->currentCoords.x;
+    gFieldEffectArguments[1] = eventObj->currentCoords.y;
+    gFieldEffectArguments[2] = eventObj->previousElevation;
+    gFieldEffectArguments[3] = 2;
+    FieldEffectStart(FLDEFF_JUMP_TALL_GRASS);
+
+    spriteId = sub_81546C8(
+        eventObj->localId, eventObj->mapNum, eventObj->mapGroup, eventObj->currentCoords.x, eventObj->currentCoords.y);
+
+    if (spriteId == MAX_SPRITES)
+        GroundEffect_SpawnOnTallGrass(eventObj, sprite);
+}
+
+void GroundEffect_JumpOnLongGrass(struct EventObject *eventObj, struct Sprite *sprite)
+{
+    gFieldEffectArguments[0] = eventObj->currentCoords.x;
+    gFieldEffectArguments[1] = eventObj->currentCoords.y;
+    gFieldEffectArguments[2] = eventObj->previousElevation;
+    gFieldEffectArguments[3] = 2;
+    FieldEffectStart(FLDEFF_JUMP_LONG_GRASS);
+}
+
+void GroundEffect_JumpOnShallowWater(struct EventObject *eventObj, struct Sprite *sprite)
+{
+    gFieldEffectArguments[0] = eventObj->currentCoords.x;
+    gFieldEffectArguments[1] = eventObj->currentCoords.y;
+    gFieldEffectArguments[2] = eventObj->previousElevation;
+    gFieldEffectArguments[3] = sprite->oam.priority;
+    FieldEffectStart(FLDEFF_JUMP_SMALL_SPLASH);
+}
+
+void GroundEffect_JumpOnWater(struct EventObject *eventObj, struct Sprite *sprite)
+{
+    gFieldEffectArguments[0] = eventObj->currentCoords.x;
+    gFieldEffectArguments[1] = eventObj->currentCoords.y;
+    gFieldEffectArguments[2] = eventObj->previousElevation;
+    gFieldEffectArguments[3] = sprite->oam.priority;
+    FieldEffectStart(FLDEFF_JUMP_BIG_SPLASH);
+}
+
+void GroundEffect_JumpLandingDust(struct EventObject *eventObj, struct Sprite *sprite)
+{
+    gFieldEffectArguments[0] = eventObj->currentCoords.x;
+    gFieldEffectArguments[1] = eventObj->currentCoords.y;
+    gFieldEffectArguments[2] = eventObj->previousElevation;
+    gFieldEffectArguments[3] = sprite->oam.priority;
+    FieldEffectStart(FLDEFF_DUST);
+}
+
+void GroundEffect_ShortGrass(struct EventObject *eventObj, struct Sprite *sprite)
+{
+    StartFieldEffectForEventObject(FLDEFF_SHORT_GRASS, eventObj);
+}
+
+void GroundEffect_HotSprings(struct EventObject *eventObj, struct Sprite *sprite)
+{
+    StartFieldEffectForEventObject(FLDEFF_HOT_SPRINGS_WATER, eventObj);
+}
+
+void GroundEffect_Seaweed(struct EventObject *eventObj, struct Sprite *sprite)
+{
+    gFieldEffectArguments[0] = eventObj->currentCoords.x;
+    gFieldEffectArguments[1] = eventObj->currentCoords.y;
+    FieldEffectStart(FLDEFF_BUBBLES);
+}
+
+static void (*const sGroundEffectFuncs[])(struct EventObject *eventObj, struct Sprite *sprite) = {
+    GroundEffect_SpawnOnTallGrass,
+    GroundEffect_StepOnTallGrass,
+    GroundEffect_SpawnOnLongGrass,
+    GroundEffect_StepOnLongGrass,
+    GroundEffect_WaterReflection,
+    GroundEffect_IceReflection,
+    GroundEffect_FlowingWater,
+    GroundEffect_SandTracks,
+    GroundEffect_DeepSandTracks,
+    GroundEffect_Ripple,
+    GroundEffect_StepOnPuddle,
+    GroundEffect_SandHeap,
+    GroundEffect_JumpOnTallGrass,
+    GroundEffect_JumpOnLongGrass,
+    GroundEffect_JumpOnShallowWater,
+    GroundEffect_JumpOnWater,
+    GroundEffect_JumpLandingDust,
+    GroundEffect_ShortGrass,
+    GroundEffect_HotSprings,
+    GroundEffect_Seaweed
+};
+
+/*static*/ void DoFlaggedGroundEffects(struct EventObject *eventObj, struct Sprite *sprite, u32 flags)
+{
+    u8 i;
+
+    if (EventObjectIsFarawayIslandMew(eventObj) == TRUE && !sub_81D4A58(eventObj))
+        return;
+
+    for (i = 0; i < ARRAY_COUNT(sGroundEffectFuncs); i++, flags >>= 1)
+        if (flags & 1)
+            sGroundEffectFuncs[i](eventObj, sprite);
+}
+
+void filters_out_some_ground_effects(struct EventObject *eventObj, u32 *flags)
+{
+    if (eventObj->disableCoveringGroundEffects)
+    {
+        eventObj->inShortGrass = 0;
+        eventObj->inSandPile = 0;
+        eventObj->inShallowFlowingWater = 0;
+        eventObj->inHotSprings = 0;
+        *flags &= ~(GROUND_EFFECT_FLAG_HOT_SPRINGS
+                  | GROUND_EFFECT_FLAG_SHORT_GRASS
+                  | GROUND_EFFECT_FLAG_SAND_PILE
+                  | GROUND_EFFECT_FLAG_SHALLOW_FLOWING_WATER
+                  | GROUND_EFFECT_FLAG_TALL_GRASS_ON_MOVE);
+    }
+}
+
+void FilterOutStepOnPuddleGroundEffectIfJumping(struct EventObject *eventObj, u32 *flags)
+{
+    if (eventObj->landingJump)
+        *flags &= ~GROUND_EFFECT_FLAG_PUDDLE;
+}
+
+static void DoGroundEffects_OnSpawn(struct EventObject *eventObj, struct Sprite *sprite)
+{
+    u32 flags;
+
+    if (eventObj->triggerGroundEffectsOnMove)
+    {
+        flags = 0;
+        EventObjectUpdateZCoordAndPriority(eventObj, sprite);
+        GetAllGroundEffectFlags_OnSpawn(eventObj, &flags);
+        EventObjectSetSpriteOamTableForLongGrass(eventObj, sprite);
+        DoFlaggedGroundEffects(eventObj, sprite, flags);
+        eventObj->triggerGroundEffectsOnMove = 0;
+        eventObj->disableCoveringGroundEffects = 0;
+    }
+}
+
+static void DoGroundEffects_OnBeginStep(struct EventObject *eventObj, struct Sprite *sprite)
+{
+    u32 flags;
+
+    if (eventObj->triggerGroundEffectsOnMove)
+    {
+        flags = 0;
+        EventObjectUpdateZCoordAndPriority(eventObj, sprite);
+        GetAllGroundEffectFlags_OnBeginStep(eventObj, &flags);
+        EventObjectSetSpriteOamTableForLongGrass(eventObj, sprite);
+        filters_out_some_ground_effects(eventObj, &flags);
+        DoFlaggedGroundEffects(eventObj, sprite, flags);
+        eventObj->triggerGroundEffectsOnMove = 0;
+        eventObj->disableCoveringGroundEffects = 0;
+    }
+}
+
+static void DoGroundEffects_OnFinishStep(struct EventObject *eventObj, struct Sprite *sprite)
+{
+    u32 flags;
+
+    if (eventObj->triggerGroundEffectsOnStop)
+    {
+        flags = 0;
+        EventObjectUpdateZCoordAndPriority(eventObj, sprite);
+        GetAllGroundEffectFlags_OnFinishStep(eventObj, &flags);
+        EventObjectSetSpriteOamTableForLongGrass(eventObj, sprite);
+        FilterOutStepOnPuddleGroundEffectIfJumping(eventObj, &flags);
+        DoFlaggedGroundEffects(eventObj, sprite, flags);
+        eventObj->triggerGroundEffectsOnStop = 0;
+        eventObj->landingJump = 0;
+    }
+}
+
+bool8 FreezeEventObject(struct EventObject *eventObject)
+{
+    if (eventObject->heldMovementActive || eventObject->frozen)
+    {
+        return TRUE;
+    }
+    else
+    {
+        eventObject->frozen = 1;
+        eventObject->spriteAnimPausedBackup = gSprites[eventObject->spriteId].animPaused;
+        eventObject->spriteAffineAnimPausedBackup = gSprites[eventObject->spriteId].affineAnimPaused;
+        gSprites[eventObject->spriteId].animPaused = 1;
+        gSprites[eventObject->spriteId].affineAnimPaused = 1;
+        return FALSE;
+    }
+}
+
+void FreezeEventObjects(void)
+{
+    u8 i;
+    for (i = 0; i < EVENT_OBJECTS_COUNT; i++)
+        if (gEventObjects[i].active && i != gPlayerAvatar.eventObjectId)
+            FreezeEventObject(&gEventObjects[i]);
+}
+
+void FreezeEventObjectsExceptOne(u8 a1)
+{
+    u8 i;
+    for (i = 0; i < EVENT_OBJECTS_COUNT; i++)
+        if (i != a1 && gEventObjects[i].active && i != gPlayerAvatar.eventObjectId)
+            FreezeEventObject(&gEventObjects[i]);
+}
+
+void UnfreezeEventObject(struct EventObject *eventObject)
+{
+    if (eventObject->active && eventObject->frozen)
+    {
+        eventObject->frozen = 0;
+        gSprites[eventObject->spriteId].animPaused = eventObject->spriteAnimPausedBackup;
+        gSprites[eventObject->spriteId].affineAnimPaused = eventObject->spriteAffineAnimPausedBackup;
+    }
+}
+
+void UnfreezeEventObjects(void)
+{
+    u8 i;
+    for (i = 0; i < EVENT_OBJECTS_COUNT; i++)
+        if (gEventObjects[i].active)
+            UnfreezeEventObject(&gEventObjects[i]);
+}
+
+void Step1(struct Sprite *sprite, u8 dir)
+{
+    sprite->pos1.x += gDirectionToVectors[dir].x;
+    sprite->pos1.y += gDirectionToVectors[dir].y;
+}
+
+void Step2(struct Sprite *sprite, u8 dir)
+{
+    sprite->pos1.x += 2 * (u16) gDirectionToVectors[dir].x;
+    sprite->pos1.y += 2 * (u16) gDirectionToVectors[dir].y;
+}
+
+void Step3(struct Sprite *sprite, u8 dir)
+{
+    sprite->pos1.x += 2 * (u16) gDirectionToVectors[dir].x + (u16) gDirectionToVectors[dir].x;
+    sprite->pos1.y += 2 * (u16) gDirectionToVectors[dir].y + (u16) gDirectionToVectors[dir].y;
+}
+
+void Step4(struct Sprite *sprite, u8 dir)
+{
+    sprite->pos1.x += 4 * (u16) gDirectionToVectors[dir].x;
+    sprite->pos1.y += 4 * (u16) gDirectionToVectors[dir].y;
+}
+
+void Step8(struct Sprite *sprite, u8 dir)
+{
+    sprite->pos1.x += 8 * (u16) gDirectionToVectors[dir].x;
+    sprite->pos1.y += 8 * (u16) gDirectionToVectors[dir].y;
+}
+
+void oamt_npc_ministep_reset(struct Sprite *sprite, u8 a2, u8 a3)
+{
+    sprite->data[3] = a2;
+    sprite->data[4] = a3;
+    sprite->data[5] = 0;
+}
+
+typedef void (*SpriteStepFunc)(struct Sprite *sprite, u8 dir);
+
+static const SpriteStepFunc gUnknown_0850E6C4[] = {
+    Step1,
+    Step1,
+    Step1,
+    Step1,
+    Step1,
+    Step1,
+    Step1,
+    Step1,
+    Step1,
+    Step1,
+    Step1,
+    Step1,
+    Step1,
+    Step1,
+    Step1,
+    Step1,
+};
+
+static const SpriteStepFunc gUnknown_0850E704[] = {
+    Step2,
+    Step2,
+    Step2,
+    Step2,
+    Step2,
+    Step2,
+    Step2,
+    Step2,
+};
+
+static const SpriteStepFunc gUnknown_0850E724[] = {
+    Step2,
+    Step3,
+    Step3,
+    Step2,
+    Step3,
+    Step3,
+};
+
+static const SpriteStepFunc gUnknown_0850E73C[] = {
+    Step4,
+    Step4,
+    Step4,
+    Step4,
+};
+
+static const SpriteStepFunc gUnknown_0850E74C[] = {
+    Step8,
+    Step8,
+};
+
+static const SpriteStepFunc *const gUnknown_0850E754[] = {
+    gUnknown_0850E6C4,
+    gUnknown_0850E704,
+    gUnknown_0850E724,
+    gUnknown_0850E73C,
+    gUnknown_0850E74C,
+};
+
+static const s16 gUnknown_0850E768[] = {
+    16, 8, 6, 4, 2
+};
+
+bool8 obj_npc_ministep(struct Sprite *sprite)
+{
+    if (sprite->data[5] >= gUnknown_0850E768[sprite->data[4]])
+        return FALSE;
+
+    gUnknown_0850E754[sprite->data[4]][sprite->data[5]](sprite, sprite->data[3]);
+
+    sprite->data[5]++;
+
+    if (sprite->data[5] < gUnknown_0850E768[sprite->data[4]])
+        return FALSE;
+
+    return TRUE;
+}
+
+void sub_80976DC(struct Sprite *sprite, u8 a2)
+{
+    sprite->data[3] = a2;
+    sprite->data[4] = 0;
+    sprite->data[5] = 0;
+}
+
+bool8 sub_80976EC(struct Sprite *sprite)
+{
+    if (!(sprite->data[4] & 1))
+    {
+        Step1(sprite, sprite->data[3]);
+        sprite->data[5]++;
+    }
+
+    sprite->data[4]++;
+
+    if (sprite->data[5] > 15)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+const s8 gUnknown_0850E772[] = {
+    1, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 1, 2, 2, 1, 2,
+    2, 1, 2, 2, 1, 2, 1, 1,
+    2, 1, 1, 2, 1, 1, 2, 1,
+    1, 2, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1,
+    0, 1, 1, 1, 0, 1, 1, 0,
+    1, 0, 1, 0, 1, 0, 0, 0,
+    0, 1, 0, 0, 0, 0, 0, 0,
+};
+
+const s8 gUnknown_0850E7BA[] = {
+     0,  0,  1,  0,  0,  1,  0,  0,
+     1,  0,  1,  1,  0,  1,  1,  0,
+     1,  1,  0,  1,  1,  0,  1,  1,
+     0,  0,  1,  0,  0,  1,  0,  0,
+     1,  0,  0,  0,  0,  0,  0,  0,
+     0,  0,  0,  0,  0,  0,  0,  0,
+     0,  0, -1,  0,  0, -1,  0,  0,
+    -1,  0, -1, -1,  0, -1, -1,  0,
+    -1, -1, -1, -1, -1, -1, -1, -2,
+};
+
+s16 sub_8097728(s16 a1)
+{
+    return gUnknown_0850E7BA[a1];
+}
+
+s16 sub_809773C(s16 a1)
+{
+    return gUnknown_0850E772[a1];
+}
+
+void sub_8097750(struct Sprite *sprite)
+{
+    sprite->data[6] = 0;
+    sprite->data[7] = 0;
+}
+
+bool8 sub_8097758(struct Sprite *sprite)
+{
+    bool8 result = FALSE;
+
+    switch(sprite->data[7])
+    {
+        case 0:
+            sprite->pos2.x += sub_809773C(sprite->data[6]);
+            sprite->pos2.y += sub_8097728(sprite->data[6]);
+            break;
+        case 1:
+            sprite->pos2.x -= sub_809773C(0x47 - sprite->data[6]);
+            sprite->pos2.y += sub_8097728(0x47 - sprite->data[6]);
+            break;
+        case 2:
+            sprite->pos2.x -= sub_809773C(sprite->data[6]);
+            sprite->pos2.y += sub_8097728(sprite->data[6]);
+            break;
+        case 3:
+            sprite->pos2.x += sub_809773C(0x47 - sprite->data[6]);
+            sprite->pos2.y += sub_8097728(0x47 - sprite->data[6]);
+            break;
+    }
+    if(++sprite->data[6] == 0x48)
+    {
+        sprite->data[6] = 0;
+        sprite->data[7]++;
+    }
+    if(sprite->data[7] == 0x4)
+    {
+        sprite->pos2.y = 0;
+        sprite->pos2.x = 0;
+        result = TRUE;
+    }
+    return result;
+}
+
+static const s8 gUnknown_0850E802[] = {
+    -4,  -6,  -8, -10, -11, -12, -12, -12, -11, -10,  -9,  -8,  -6,  -4,   0,   0
+};
+
+static const s8 gUnknown_0850E812[] = {
+    0,  -2,  -3,  -4,  -5,  -6,  -6,  -6,  -5,  -5,  -4,  -3,  -2,   0,   0,   0
+};
+
+static const s8 gUnknown_0850E822[] = {
+    -2,  -4,  -6,  -8,  -9, -10, -10, -10,  -9,  -8,  -6,  -5,  -3,  -2,   0,   0
+};
+
+static const s8 *const gUnknown_0850E834[] = {
+    gUnknown_0850E802,
+    gUnknown_0850E812,
+    gUnknown_0850E822
+};
+
+s16 sub_8097820(s16 a1, u8 a2)
+{
+    return gUnknown_0850E834[a2][a1];
+}
+
+void sub_809783C(struct Sprite *sprite, u8 a2, u8 a3, u8 a4)
+{
+    sprite->data[3] = a2;
+    sprite->data[4] = a3;
+    sprite->data[5] = a4;
+    sprite->data[6] = 0;
+}
+
+static const s16 gUnknown_0850E840[] = {
+    16, 16, 32,
+};
+
+static const u8 gUnknown_0850E846[] = {
+    0, 0, 1,
+};
+
+u8 sub_809785C(struct Sprite *sprite)
+{
+    s16 v5[3];
+    u8 v6[3];
+    u8 v2;
+
+    memcpy(v5, gUnknown_0850E840, 6); // TODO: get rid of memcpy
+    memcpy(v6, gUnknown_0850E846, 3);
+    v2 = 0;
+
+    if (sprite->data[4])
+        Step1(sprite, sprite->data[3]);
+
+    sprite->pos2.y = sub_8097820(sprite->data[6] >> v6[sprite->data[4]], sprite->data[5]);
+
+    sprite->data[6]++;
+
+    if (sprite->data[6] == (v5[sprite->data[4]] >> 1))
+        v2 = 1;
+
+    if (sprite->data[6] >= v5[sprite->data[4]])
+    {
+        sprite->pos2.y = 0;
+        v2 = -1;
+    }
+
+    return v2;
+}
+
+static const s16 gUnknown_0850E84A[] = {
+    32, 32, 64,
+};
+
+static const u8 gUnknown_0850E850[] = {
+    1, 1, 2,
+};
+
+u8 sub_80978E4(struct Sprite *sprite)
+{
+    s16 v5[3];
+    u8 v6[3];
+    u8 v2;
+
+    memcpy(v5, gUnknown_0850E84A, 6);
+    memcpy(v6, gUnknown_0850E850, 3);
+    v2 = 0;
+
+    if (sprite->data[4] && !(sprite->data[6] & 1))
+        Step1(sprite, sprite->data[3]);
+
+    sprite->pos2.y = sub_8097820(sprite->data[6] >> v6[sprite->data[4]], sprite->data[5]);
+
+    sprite->data[6]++;
+
+    if (sprite->data[6] == (v5[sprite->data[4]] >> 1))
+        v2 = 1;
+
+    if (sprite->data[6] >= v5[sprite->data[4]])
+    {
+        sprite->pos2.y = 0;
+        v2 = -1;
+    }
+
+    return v2;
+}
+
+void SetMovementDelay(struct Sprite *sprite, s16 timer)
+{
+    sprite->data[3] = timer;
+}
+
+static bool8 WaitForMovementDelay(struct Sprite *sprite)
+{
+    sprite->data[3]--;
+
+    if (sprite->data[3] == 0)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+void SetAndStartSpriteAnim(struct Sprite *sprite, u8 a2, u8 a3)
+{
+    sprite->animNum = a2;
+    sprite->animPaused = 0 ;
+    SeekSpriteAnim(sprite, a3);
+}
+
+bool8 SpriteAnimEnded(struct Sprite *sprite)
+{
+    if (sprite->animEnded)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+void UpdateEventObjectSpriteVisibility(struct Sprite *sprite, bool8 invisible)
+{
+    u16 x, y;
+    s16 x2, y2;
+
+    sprite->invisible = invisible;
+
+    if (sprite->coordOffsetEnabled)
+    {
+        x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX + gSpriteCoordOffsetX;
+        y = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY;
+    }
+    else
+    {
+        x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX;
+        y = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY;
+    }
+
+    x2 = x - (sprite->centerToCornerVecX >> 1);
+    y2 = y - (sprite->centerToCornerVecY >> 1);
+
+    if ((s16)x > 255 || x2 < -16)
+        sprite->invisible = 1;
+    if ((s16)y > 175 || y2 < -16)
+        sprite->invisible = 1;
+}
+
+void UpdateEventObjectSpriteSubpriorityAndVisibility(struct Sprite *sprite)
+{
+    sub_8097D68(sprite);
+    SetObjectSubpriorityByZCoord(sprite->data[1], sprite, 1);
+    UpdateEventObjectSpriteVisibility(sprite, sprite->data[2]);
+}
+
+void sub_8097AF0(void)
+{
+    int i;
+
+    for(i = 0; i < MAX_SPRITES; i++)
+    {
+        struct Sprite *sprite = &gSprites[i];
+        if(sprite->inUse && sprite->callback == UpdateEventObjectSpriteSubpriorityAndVisibility)
+            DestroySprite(sprite);
+    }
+}
+
+int sub_8097B2C(u8 var) // this should return a u8, because all that call this shifts to u8, but it wont match because it doesnt shift u8 at the end.
+{
+    int i;
+
+    for(i = 0; i < MAX_SPRITES; i++)
+    {
+        struct Sprite *sprite = &gSprites[i];
+        if(sprite->inUse && sprite->callback == UpdateEventObjectSpriteSubpriorityAndVisibility && (u8)sprite->data[0] == var)
+            return i;
+    }
+    return MAX_SPRITES;
+}
+
+void sub_8097B78(u8 var1, u8 var2)
+{
+    u8 spriteId = sub_8097B2C(var1);
+
+    if(spriteId != MAX_SPRITES)
+        StartSpriteAnim(&gSprites[spriteId], GetFaceDirectionAnimNum(var2));
+}
+
+void sub_8097BB4(u8 var1, u8 var2)
+{
+    int spriteId = sub_8097B2C(var1);
+
+    if(spriteId != MAX_SPRITES)
+    {
+        struct Sprite *sprite = &gSprites[spriteId];
+        const struct EventObjectGraphicsInfo *gfxInfo = GetEventObjectGraphicsInfo(var2);
+        u16 tileNum = sprite->oam.tileNum;
+
+        sprite->oam = *gfxInfo->oam;
+        sprite->oam.tileNum = tileNum;
+        sprite->oam.paletteNum = gfxInfo->paletteSlot;
+        sprite->images = gfxInfo->images;
+
+        if(gfxInfo->subspriteTables == NULL)
+        {
+            sprite->subspriteTables = NULL;
+            sprite->subspriteTableNum = 0;
+            sprite->subspriteMode = 0;
+        }
+        else
+        {
+            SetSubspriteTables(sprite, gfxInfo->subspriteTables);
+            sprite->subspriteMode = 2;
+        }
+        StartSpriteAnim(sprite, 0);
+    }
+}
+
+void sub_8097C44(u8 var, bool32 var2)
+{
+    u8 spriteId = sub_8097B2C(var);
+
+    if(spriteId == MAX_SPRITES)
+        return;
+
+    if(var2)
+        gSprites[spriteId].data[2] = 1;
+    else
+        gSprites[spriteId].data[2] = 0;
+}
+
+bool32 sub_8097C8C(u8 var)
+{
+    u8 spriteId = sub_8097B2C(var);
+
+    if(spriteId == MAX_SPRITES)
+        return FALSE;
+
+    return (gSprites[spriteId].data[2] == TRUE);
+}
+
+void sub_8097CC4(u8 var1, u8 var2)
+{
+    u8 spriteId = sub_8097B2C(var1);
+
+    if(spriteId != MAX_SPRITES)
+    {
+        gSprites[spriteId].data[3] = var2;
+        gSprites[spriteId].data[4] = 0;
+    }
+}
+
+void sub_8097CF4(struct Sprite *sprite)
+{
+    switch(sprite->data[4])
+    {
+        case 0:
+            sprite->pos2.y = 0;
+            sprite->data[4]++;
+        case 1:
+            sprite->pos2.y -= 8;
+            if(sprite->pos2.y == -160)
+            {
+                sprite->pos2.y = 0;
+                sprite->data[2] = 1;
+                sprite->data[3] = 0;
+                sprite->data[4] = 0;
+            }
+    }
+}
+
+void sub_8097D30(struct Sprite *sprite)
+{
+    switch(sprite->data[4])
+    {
+        case 0:
+            sprite->pos2.y = -160;
+            sprite->data[4]++;
+        case 1:
+            sprite->pos2.y += 8;
+            if(sprite->pos2.y == 0)
+            {
+                sprite->data[3] = 0;
+                sprite->data[4] = 0;
+            }
+    }
+}
+
+static void sub_8097D68(struct Sprite *sprite)
+{
+    switch(sprite->data[3])
+    {
+        case 1:
+            sub_8097D30(sprite);
+            break;
+        case 2:
+            sub_8097CF4(sprite);
+            break;
+        case 0:
+            break;
+        default:
+            sprite->data[3] = 0;
+            break;
+    }
+}
+
+bool32 sub_8097D9C(u8 var)
+{
+    u8 spriteId = sub_8097B2C(var);
+
+    if(spriteId == MAX_SPRITES)
+        return FALSE;
+
+    if(gSprites[spriteId].data[3] != FALSE)
+        return TRUE;
+
+    return FALSE;
+}
+
+u32 StartFieldEffectForEventObject(u8 fieldEffectId, struct EventObject *eventObject)
+{
+    EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
+    return FieldEffectStart(fieldEffectId);
+}
+
+void DoShadowFieldEffect(struct EventObject *eventObject)
+{
+    if (!eventObject->hasShadow)
+    {
+        eventObject->hasShadow = 1;
+        StartFieldEffectForEventObject(FLDEFF_SHADOW, eventObject);
+    }
+}
+
+static void DoRippleFieldEffect(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    const struct EventObjectGraphicsInfo *gfxInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId);
+    gFieldEffectArguments[0] = sprite->pos1.x;
+    gFieldEffectArguments[1] = sprite->pos1.y + (gfxInfo->height >> 1) - 2;
+    gFieldEffectArguments[2] = 151;
+    gFieldEffectArguments[3] = 3;
+    FieldEffectStart(FLDEFF_RIPPLE);
+}
+
+u8 (*const gMovementActionFuncs_StoreAndLockAnim[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_StoreAndLockAnim_Step0,
+    MovementAction_Finish,
+};
+
+u8 (*const gMovementActionFuncs_FreeAndUnlockAnim[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_FreeAndUnlockAnim_Step0,
+    MovementAction_Finish,
+};
+
+u8 (*const gMovementActionFuncs_FlyUp[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_FlyUp_Step0,
+    MovementAction_FlyUp_Step1,
+    MovementAction_Fly_Finish,
+};
+
+u8 (*const gMovementActionFuncs_FlyDown[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_FlyDown_Step0,
+    MovementAction_FlyDown_Step1,
+    MovementAction_Fly_Finish,
+};
+
+u8 MovementAction_StoreAndLockAnim_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u32 one;
+    bool32 ableToStore = FALSE;
+    if (gLockedAnimEventObjects == NULL)
+    {
+        gLockedAnimEventObjects = AllocZeroed(sizeof(struct LockedAnimEventObjects));
+        gLockedAnimEventObjects->eventObjectIds[0] = eventObject->localId;
+        // needed to match
+        gLockedAnimEventObjects->count = (one = 1);
+        ableToStore = one;
+    }
+    else
+    {
+        u8 i;
+        u8 firstFreeSlot;
+        bool32 found;
+        for (firstFreeSlot = 16, found = FALSE, i = 0; i < 16; i++)
+        {
+            if (firstFreeSlot == 16 && gLockedAnimEventObjects->eventObjectIds[i] == 0)
+                firstFreeSlot = i;
+
+            if (gLockedAnimEventObjects->eventObjectIds[i] == eventObject->localId)
+            {
+                found = TRUE;
+                break;
+            }
+        }
+
+        if (!found && firstFreeSlot != 16)
+        {
+            gLockedAnimEventObjects->eventObjectIds[firstFreeSlot] = eventObject->localId;
+            gLockedAnimEventObjects->count++;
+            ableToStore = TRUE;
+        }
+    }
+
+    if (ableToStore == TRUE)
+    {
+        eventObject->inanimate = TRUE;
+        eventObject->facingDirectionLocked = TRUE;
+    }
+
+    sprite->data[2] = 1;
+    return TRUE;
+}
+
+u8 MovementAction_FreeAndUnlockAnim_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    bool32 ableToStore;
+    u8 index;
+
+    sprite->data[2] = 1;
+    if (gLockedAnimEventObjects != NULL)
+    {
+        ableToStore = FALSE;
+        index = FindLockedEventObjectIndex(eventObject);
+        if (index != 16)
+        {
+            gLockedAnimEventObjects->eventObjectIds[index] = 0;
+            gLockedAnimEventObjects->count--;
+            ableToStore = TRUE;
+        }
+        if (gLockedAnimEventObjects->count == 0)
+            FREE_AND_SET_NULL(gLockedAnimEventObjects);
+        if (ableToStore == TRUE)
+        {
+            eventObject->inanimate = GetEventObjectGraphicsInfo(eventObject->graphicsId)->inanimate;
+            eventObject->facingDirectionLocked = FALSE;
+            sprite->animPaused = 0;
+        }
+    }
+
+    return TRUE;
+}
+
+u8 FindLockedEventObjectIndex(struct EventObject *eventObject)
+{
+    u8 i;
+
+    for (i = 0; i < EVENT_OBJECTS_COUNT; i++)
+    {
+        if (gLockedAnimEventObjects->eventObjectIds[i] == eventObject->localId)
+            return i;
+    }
+    return EVENT_OBJECTS_COUNT;
+}
+
+void CreateLevitateMovementTask(struct EventObject *eventObject)
+{
+    u8 taskId = CreateTask(ApplyLevitateMovement, 0xFF);
+    struct Task *task = &gTasks[taskId];
+
+    StoreWordInTwoHalfwords(&task->data[0], (u32)eventObject);
+    eventObject->warpArrowSpriteId = taskId;
+    task->data[3] = 0xFFFF;
+}
+
+static void ApplyLevitateMovement(u8 taskId)
+{
+    struct EventObject *eventObject;
+    struct Sprite *sprite;
+    struct Task *task = &gTasks[taskId];
+
+    LoadWordFromTwoHalfwords(&task->data[0], (u32 *)&eventObject); // load the map object pointer.
+    sprite = &gSprites[eventObject->spriteId];
+
+    if(!(task->data[2] & 0x3))
+        sprite->pos2.y += task->data[3];
+
+    if(!(task->data[2] & 0xF))
+        task->data[3] = -task->data[3];
+
+    task->data[2]++;
+}
+
+void DestroyExtraMovementTask(u8 taskId)
+{
+    struct EventObject *eventObject;
+    struct Task *task = &gTasks[taskId];
+
+    LoadWordFromTwoHalfwords(&task->data[0], (u32 *)&eventObject); // unused eventObject
+    DestroyTask(taskId);
+}
+
+void sub_8098074(u8 var1, u8 var2)
+{
+    u8 i;
+
+    for(i = 0; i < EVENT_OBJECTS_COUNT; i++)
+    {
+        if(i != var1 && i != var2 &&
+            gEventObjects[i].active && i != gPlayerAvatar.eventObjectId)
+                FreezeEventObject(&gEventObjects[i]);
+    }
+}
+
+u8 MovementAction_FlyUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sprite->pos2.y = 0;
+    sprite->data[2]++;
+    return FALSE;
+}
+
+u8 MovementAction_FlyUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sprite->pos2.y -= 8;
+
+    if(sprite->pos2.y == -160)
+        sprite->data[2]++;
+    return FALSE;
+}
+
+u8 MovementAction_FlyDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sprite->pos2.y = -160;
+    sprite->data[2]++;
+    return FALSE;
+}
+
+u8 MovementAction_FlyDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    sprite->pos2.y += 8;
+
+    if(!sprite->pos2.y)
+        sprite->data[2]++;
+    return FALSE;
+}
+
+// though this function returns TRUE without doing anything, this header is required due to being in an array of functions which needs it.
+u8 MovementAction_Fly_Finish(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    return TRUE;
+}
diff --git a/src/field_camera.c b/src/field_camera.c
index 95167ee10..d7063bd89 100644
--- a/src/field_camera.c
+++ b/src/field_camera.c
@@ -4,7 +4,7 @@
 #include "field_camera.h"
 #include "field_player_avatar.h"
 #include "fieldmap.h"
-#include "field_map_obj.h"
+#include "event_object_movement.h"
 #include "gpu_regs.h"
 #include "menu.h"
 #include "overworld.h"
@@ -406,7 +406,7 @@ void CameraUpdate(void)
     if (deltaX != 0 || deltaY != 0)
     {
         CameraMove(deltaX, deltaY);
-        UpdateFieldObjectsForCameraUpdate(deltaX, deltaY);
+        UpdateEventObjectsForCameraUpdate(deltaX, deltaY);
         RotatingGatePuzzleCameraUpdate(deltaX, deltaY);
         ResetBerryTreeSparkleFlags();
         tilemap_move_something(&gUnknown_03000E20, deltaX * 2, deltaY * 2);
@@ -421,7 +421,7 @@ void CameraUpdate(void)
 void camera_move_and_redraw(int a, int b) //unused
 {
     CameraMove(a, b);
-    UpdateFieldObjectsForCameraUpdate(a, b);
+    UpdateEventObjectsForCameraUpdate(a, b);
     DrawWholeMapView();
     gUnknown_03005DEC -= a * 16;
     gUnknown_03005DE8 -= b * 16;
@@ -477,7 +477,7 @@ static void CameraPanningCB_PanAhead(void)
             gUnknown_03000E2C = 0;
         }
 
-        var = player_get_direction_upper_nybble();
+        var = GetPlayerMovementDirection();
         if (var == 2)
         {
             if (gUnknown_03000E2A > -8)
diff --git a/src/field_effect.c b/src/field_effect.c
index 692090779..00814192e 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -6,8 +6,7 @@
 #include "decompress.h"
 #include "field_camera.h"
 #include "field_effect_helpers.h"
-#include "field_map_obj.h"
-#include "field_map_obj_helpers.h"
+#include "event_object_movement.h"
 #include "field_player_avatar.h"
 #include "field_screen.h"
 #include "field_weather.h"
@@ -49,12 +48,12 @@ const u32 gNewGameBirchPic[] = INCBIN_U32("graphics/birch_speech/birch.4bpp");
 const u32 gUnusedBirchBeauty[] = INCBIN_U32("graphics/unused/intro_birch_beauty.4bpp");
 const u16 gNewGameBirchPalette[16] = INCBIN_U16("graphics/birch_speech/birch.gbapal");
 const u32 gSpriteImage_855A970[] = INCBIN_U32("graphics/misc/pokeball_glow.4bpp");
-const u16 gFieldEffectObjectPalette4[16] = INCBIN_U16("graphics/map_objects/palettes/field_effect_object_palette_04.gbapal");
+const u16 gFieldEffectObjectPalette4[16] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_04.gbapal");
 const u32 gSpriteImage_855A9B0[] = INCBIN_U32("graphics/misc/pokecenter_monitor/0.4bpp");
 const u32 gSpriteImage_855AA70[] = INCBIN_U32("graphics/misc/pokecenter_monitor/1.4bpp");
 const u32 gSpriteImage_855AB30[] = INCBIN_U32("graphics/misc/big_hof_monitor.4bpp");
 const u8 gSpriteImage_855AD30[] = INCBIN_U8("graphics/misc/small_hof_monitor.4bpp");
-const u16 gFieldEffectObjectPalette5[16] = INCBIN_U16("graphics/map_objects/palettes/field_effect_object_palette_05.gbapal");
+const u16 gFieldEffectObjectPalette5[16] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_05.gbapal");
 
 // Graphics for the lights streaking past your Pokemon when it uses a field move.
 const u32 gFieldMoveStreaksTiles[] = INCBIN_U32("graphics/misc/field_move_streaks.4bpp");
@@ -287,7 +286,7 @@ bool8 (*const gUnknown_0855C3FC[])(struct Task *) = {
     sub_80B72F4,
 };
 
-bool8 (*const gUnknown_0855C418[])(struct Task *, struct MapObject *) = {
+bool8 (*const gUnknown_0855C418[])(struct Task *, struct EventObject *) = {
     sub_80B73D0,
     waterfall_1_do_anim_probably,
     waterfall_2_wait_anim_finish_probably,
@@ -301,7 +300,7 @@ bool8 (*const gUnknown_0855C42C[])(struct Task *) = {
     dive_3_unknown,
 };
 
-bool8 (*const gUnknown_0855C438[])(struct Task *, struct MapObject *, struct Sprite *) = {
+bool8 (*const gUnknown_0855C438[])(struct Task *, struct EventObject *, struct Sprite *) = {
     sub_80B764C,
     sub_80B7684,
     sub_80B76B8,
@@ -310,14 +309,14 @@ bool8 (*const gUnknown_0855C438[])(struct Task *, struct MapObject *, struct Spr
     sub_80B7814,
 };
 
-bool8 (*const gUnknown_0855C450[])(struct Task *, struct MapObject *, struct Sprite *) = {
+bool8 (*const gUnknown_0855C450[])(struct Task *, struct EventObject *, struct Sprite *) = {
     sub_80B78EC,
     sub_80B791C,
     sub_80B7968,
     sub_80B79BC,
 };
 
-bool8 (*const gUnknown_0855C460[])(struct Task *, struct MapObject *, struct Sprite *) = {
+bool8 (*const gUnknown_0855C460[])(struct Task *, struct EventObject *, struct Sprite *) = {
     sub_80B7AE8,
     sub_80B7B18,
     sub_80B7B94,
@@ -1148,7 +1147,7 @@ void mapldr_080842E8(void)
     pal_fill_black();
     CreateTask(task00_8084310, 0);
     ScriptContext2_Enable();
-    FreezeMapObjects();
+    FreezeEventObjects();
     gFieldCallback = NULL;
 }
 
@@ -1185,13 +1184,13 @@ void mapldr_08084390(void)
     Overworld_PlaySpecialMapMusic();
     pal_fill_black();
     CreateTask(c3_080843F8, 0);
-    gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_13 = 1;
+    gEventObjects[gPlayerAvatar.eventObjectId].invisible = 1;
     if (gPlayerAvatar.flags & 0x08)
     {
-        FieldObjectTurn(&gMapObjects[gPlayerAvatar.mapObjectId], DIR_WEST);
+        EventObjectTurn(&gEventObjects[gPlayerAvatar.eventObjectId], DIR_WEST);
     }
     ScriptContext2_Enable();
-    FreezeMapObjects();
+    FreezeEventObjects();
     gFieldCallback = NULL;
 }
 
@@ -1211,7 +1210,7 @@ void c3_080843F8(u8 taskId)
     if (!FieldEffectActiveListContains(FLDEFF_FLY_IN))
     {
         ScriptContext2_Disable();
-        UnfreezeMapObjects();
+        UnfreezeEventObjects();
         DestroyTask(taskId);
     }
 }
@@ -1226,7 +1225,7 @@ void sub_80B6B68(void)
     Overworld_PlaySpecialMapMusic();
     pal_fill_for_maplights();
     ScriptContext2_Enable();
-    FreezeMapObjects();
+    FreezeEventObjects();
     CreateTask(sub_80B6B94, 0);
     gFieldCallback = NULL;
 }
@@ -1240,16 +1239,16 @@ void sub_80B6B94(u8 taskId)
 
 bool8 sub_80B6BCC(struct Task *task) // gUnknown_0855C3C8[0]
 {
-    struct MapObject *playerObject;
+    struct EventObject *playerObject;
     struct Sprite *playerSprite;
-    playerObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+    playerObject = &gEventObjects[gPlayerAvatar.eventObjectId];
     playerSprite = &gSprites[gPlayerAvatar.spriteId];
     CameraObjectReset2();
-    gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_13 = 1;
+    gEventObjects[gPlayerAvatar.eventObjectId].invisible = 1;
     gPlayerAvatar.preventStep = TRUE;
-    FieldObjectSetSpecialAnim(playerObject, GetFaceDirectionAnimId(player_get_direction_lower_nybble()));
+    EventObjectSetHeldMovement(playerObject, GetFaceDirectionMovementAction(GetPlayerFacingDirection()));
     task->data[4] = playerSprite->subspriteMode;
-    playerObject->mapobj_bit_26 = 1;
+    playerObject->fixedPriority = 1;
     playerSprite->oam.priority = 1;
     playerSprite->subspriteMode = 2;
     task->data[0]++;
@@ -1274,7 +1273,7 @@ bool8 sub_80B6C90(struct Task *task) // gUnknown_0855C3C8[2]
     sprite->pos2.y = -(sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY);
     task->data[1] = 1;
     task->data[2] = 0;
-    gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_13 = 0;
+    gEventObjects[gPlayerAvatar.eventObjectId].invisible = 0;
     PlaySE(SE_RU_HYUU);
     task->data[0]++;
     return FALSE;
@@ -1282,10 +1281,10 @@ bool8 sub_80B6C90(struct Task *task) // gUnknown_0855C3C8[2]
 
 bool8 sub_80B6D04(struct Task *task)
 {
-    struct MapObject *mapObject;
+    struct EventObject *eventObject;
     struct Sprite *sprite;
 
-    mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+    eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
     sprite = &gSprites[gPlayerAvatar.spriteId];
     sprite->pos2.y += task->data[1];
     if (task->data[1] < 8)
@@ -1299,15 +1298,15 @@ bool8 sub_80B6D04(struct Task *task)
     if (task->data[3] == 0 && sprite->pos2.y >= -16)
     {
         task->data[3]++;
-        mapObject->mapobj_bit_26 = 0;
+        eventObject->fixedPriority = 0;
         sprite->subspriteMode = task->data[4];
-        mapObject->mapobj_bit_2 = 1;
+        eventObject->triggerGroundEffectsOnMove = 1;
     }
     if (sprite->pos2.y >= 0)
     {
         PlaySE(SE_W070);
-        mapObject->mapobj_bit_3 = 1;
-        mapObject->mapobj_bit_5 = 1;
+        eventObject->triggerGroundEffectsOnStop = 1;
+        eventObject->landingJump = 1;
         sprite->pos2.y = 0;
         task->data[0]++;
     }
@@ -1344,7 +1343,7 @@ bool8 sub_80B6E18(struct Task *task)
     gPlayerAvatar.preventStep = FALSE;
     ScriptContext2_Disable();
     CameraObjectReset1();
-    UnfreezeMapObjects();
+    UnfreezeEventObjects();
     InstallCameraPanAheadCallback();
     DestroyTask(FindTaskIdByFunc(sub_80B6B94));
     return FALSE;
@@ -1383,7 +1382,7 @@ void sub_80B6E88(u8 taskId)
 
 bool8 sub_80B6EC0(struct Task *task)
 {
-    FreezeMapObjects();
+    FreezeEventObjects();
     CameraObjectReset2();
     sub_80E1558(task->data[1]);
     task->data[0]++;
@@ -1392,11 +1391,11 @@ bool8 sub_80B6EC0(struct Task *task)
 
 bool8 sub_80B6EE0(struct Task *task)
 {
-    struct MapObject *mapObject;
-    mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
-    if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject) || FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
+    struct EventObject *eventObject;
+    eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
+    if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject))
     {
-        FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(player_get_direction_lower_nybble()));
+        EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(GetPlayerFacingDirection()));
         task->data[0]++;
         task->data[2] = 0;
         task->data[3] = 0;
@@ -1507,13 +1506,13 @@ void sub_80B70DC(u8 taskId)
 
 bool8 sub_80B7114(struct Task *task)
 {
-    struct MapObject *mapObject;
+    struct EventObject *eventObject;
     s16 x;
     s16 y;
     u8 behavior;
     CameraObjectReset2();
-    mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
-    FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(DIR_EAST));
+    eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
+    EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(DIR_EAST));
     PlayerGetDestCoords(&x, &y);
     behavior = MapGridGetMetatileBehaviorAt(x, y);
     task->data[0]++;
@@ -1605,13 +1604,13 @@ bool8 sub_80B72D0(struct Task *task)
 
 bool8 sub_80B72F4(struct Task *task)
 {
-    struct MapObject *mapObject;
-    mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
-    if (FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
+    struct EventObject *eventObject;
+    eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
+    if (EventObjectClearHeldMovementIfFinished(eventObject))
     {
         CameraObjectReset1();
         ScriptContext2_Disable();
-        FieldObjectSetSpecialAnim(mapObject, GetGoSpeed0AnimId(DIR_EAST));
+        EventObjectSetHeldMovement(eventObject, GetWalkNormalMovementAction(DIR_EAST));
         DestroyTask(FindTaskIdByFunc(sub_80B70DC));
     }
     return FALSE;
@@ -1630,10 +1629,10 @@ bool8 FldEff_UseWaterfall(void)
 
 void sub_80B7384(u8 taskId)
 {
-    while (gUnknown_0855C418[gTasks[taskId].data[0]](&gTasks[taskId], &gMapObjects[gPlayerAvatar.mapObjectId]));
+    while (gUnknown_0855C418[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId]));
 }
 
-bool8 sub_80B73D0(struct Task *task, struct MapObject *mapObject)
+bool8 sub_80B73D0(struct Task *task, struct EventObject *eventObject)
 {
     ScriptContext2_Enable();
     gPlayerAvatar.preventStep = TRUE;
@@ -1641,12 +1640,12 @@ bool8 sub_80B73D0(struct Task *task, struct MapObject *mapObject)
     return FALSE;
 }
 
-bool8 waterfall_1_do_anim_probably(struct Task *task, struct MapObject *mapObject)
+bool8 waterfall_1_do_anim_probably(struct Task *task, struct EventObject *eventObject)
 {
     ScriptContext2_Enable();
-    if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject))
+    if (!EventObjectIsMovementOverridden(eventObject))
     {
-        FieldObjectClearAnimIfSpecialAnimFinished(mapObject);
+        EventObjectClearHeldMovementIfFinished(eventObject);
         gFieldEffectArguments[0] = task->data[1];
         FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
         task->data[0]++;
@@ -1654,7 +1653,7 @@ bool8 waterfall_1_do_anim_probably(struct Task *task, struct MapObject *mapObjec
     return FALSE;
 }
 
-bool8 waterfall_2_wait_anim_finish_probably(struct Task *task, struct MapObject *mapObject)
+bool8 waterfall_2_wait_anim_finish_probably(struct Task *task, struct EventObject *eventObject)
 {
     if (FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON))
     {
@@ -1664,20 +1663,20 @@ bool8 waterfall_2_wait_anim_finish_probably(struct Task *task, struct MapObject
     return TRUE;
 }
 
-bool8 sub_80B7450(struct Task *task, struct MapObject *mapObject)
+bool8 sub_80B7450(struct Task *task, struct EventObject *eventObject)
 {
-    FieldObjectSetSpecialAnim(mapObject, GetSimpleGoAnimId(DIR_NORTH));
+    EventObjectSetHeldMovement(eventObject, GetWalkSlowMovementAction(DIR_NORTH));
     task->data[0]++;
     return FALSE;
 }
 
-bool8 sub_80B7478(struct Task *task, struct MapObject *mapObject)
+bool8 sub_80B7478(struct Task *task, struct EventObject *eventObject)
 {
-    if (!FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
+    if (!EventObjectClearHeldMovementIfFinished(eventObject))
     {
         return FALSE;
     }
-    if (MetatileBehavior_IsWaterfall(mapObject->mapobj_unk_1E))
+    if (MetatileBehavior_IsWaterfall(eventObject->currentMetatileBehavior))
     {
         task->data[0] = 3;
         return TRUE;
@@ -1729,7 +1728,7 @@ bool8 dive_3_unknown(struct Task *task)
     PlayerGetDestCoords(&mapPosition.x, &mapPosition.y);
     if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON))
     {
-        dive_warp(&mapPosition, gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1E);
+        dive_warp(&mapPosition, gEventObjects[gPlayerAvatar.eventObjectId].currentMetatileBehavior);
         DestroyTask(FindTaskIdByFunc(Task_Dive));
         FieldEffectActiveListRemove(FLDEFF_USE_DIVE);
     }
@@ -1746,22 +1745,22 @@ void sub_80B75D8(u8 priority)
 
 void sub_80B75F0(u8 taskId)
 {
-    while (gUnknown_0855C438[gTasks[taskId].data[0]](&gTasks[taskId], &gMapObjects[gPlayerAvatar.mapObjectId], &gSprites[gPlayerAvatar.spriteId]));
+    while (gUnknown_0855C438[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId], &gSprites[gPlayerAvatar.spriteId]));
 }
 
-bool8 sub_80B764C(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80B764C(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
 {
-    FreezeMapObjects();
+    FreezeEventObjects();
     CameraObjectReset2();
     SetCameraPanningCallback(NULL);
     gPlayerAvatar.preventStep = TRUE;
-    mapObject->mapobj_bit_26 = 1;
+    eventObject->fixedPriority = 1;
     task->data[1] = 1;
     task->data[0]++;
     return TRUE;
 }
 
-bool8 sub_80B7684(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80B7684(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
 {
     SetCameraPanning(0, task->data[1]);
     task->data[1] = -task->data[1];
@@ -1774,12 +1773,12 @@ bool8 sub_80B7684(struct Task *task, struct MapObject *mapObject, struct Sprite
     return FALSE;
 }
 
-bool8 sub_80B76B8(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80B76B8(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
 {
     sprite->pos2.y = 0;
     task->data[3] = 1;
-    gFieldEffectArguments[0] = mapObject->coords2.x;
-    gFieldEffectArguments[1] = mapObject->coords2.y;
+    gFieldEffectArguments[0] = eventObject->currentCoords.x;
+    gFieldEffectArguments[1] = eventObject->currentCoords.y;
     gFieldEffectArguments[2] = sprite->subpriority - 1;
     gFieldEffectArguments[3] = sprite->oam.priority;
     FieldEffectStart(FLDEFF_LAVARIDGE_GYM_WARP);
@@ -1788,7 +1787,7 @@ bool8 sub_80B76B8(struct Task *task, struct MapObject *mapObject, struct Sprite
     return TRUE;
 }
 
-bool8 sub_80B7704(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80B7704(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
 {
     s16 centerToCornerVecY;
     SetCameraPanning(0, task->data[1]);
@@ -1820,7 +1819,7 @@ bool8 sub_80B7704(struct Task *task, struct MapObject *mapObject, struct Sprite
     if (task->data[5] == 0 && sprite->pos2.y < -0x10)
     {
         task->data[5]++;
-        mapObject->mapobj_bit_26 = 1;
+        eventObject->fixedPriority = 1;
         sprite->oam.priority = 1;
         sprite->subspriteMode = 2;
     }
@@ -1831,7 +1830,7 @@ bool8 sub_80B7704(struct Task *task, struct MapObject *mapObject, struct Sprite
     return FALSE;
 }
 
-bool8 sub_80B77F8(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80B77F8(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
 {
     music_something();
     sub_80AF0B4();
@@ -1839,7 +1838,7 @@ bool8 sub_80B77F8(struct Task *task, struct MapObject *mapObject, struct Sprite
     return FALSE;
 }
 
-bool8 sub_80B7814(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80B7814(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
 {
     if (!gPaletteFade.active && sub_80859A0() == TRUE)
     {
@@ -1864,25 +1863,25 @@ void mapldr_080851BC(void)
 
 void sub_80B7890(u8 taskId)
 {
-    while (gUnknown_0855C450[gTasks[taskId].data[0]](&gTasks[taskId], &gMapObjects[gPlayerAvatar.mapObjectId], &gSprites[gPlayerAvatar.spriteId]));
+    while (gUnknown_0855C450[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId], &gSprites[gPlayerAvatar.spriteId]));
 }
 
-bool8 sub_80B78EC(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80B78EC(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
 {
     CameraObjectReset2();
-    FreezeMapObjects();
+    FreezeEventObjects();
     gPlayerAvatar.preventStep = TRUE;
-    mapObject->mapobj_bit_13 = 1;
+    eventObject->invisible = 1;
     task->data[0]++;
     return FALSE;
 }
 
-bool8 sub_80B791C(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80B791C(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
 {
     if (IsWeatherNotFadingIn())
     {
-        gFieldEffectArguments[0] = mapObject->coords2.x;
-        gFieldEffectArguments[1] = mapObject->coords2.y;
+        gFieldEffectArguments[0] = eventObject->currentCoords.x;
+        gFieldEffectArguments[1] = eventObject->currentCoords.y;
         gFieldEffectArguments[2] = sprite->subpriority - 1;
         gFieldEffectArguments[3] = sprite->oam.priority;
         task->data[1] = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH);
@@ -1891,27 +1890,27 @@ bool8 sub_80B791C(struct Task *task, struct MapObject *mapObject, struct Sprite
     return FALSE;
 }
 
-bool8 sub_80B7968(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80B7968(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
 {
     sprite = &gSprites[task->data[1]];
     if (sprite->animCmdIndex > 1)
     {
         task->data[0]++;
-        mapObject->mapobj_bit_13 = 0;
+        eventObject->invisible = 0;
         CameraObjectReset1();
         PlaySE(SE_W091);
-        FieldObjectSetSpecialAnim(mapObject, sub_8093514(DIR_EAST));
+        EventObjectSetHeldMovement(eventObject, GetJumpMovementAction(DIR_EAST));
     }
     return FALSE;
 }
 
-bool8 sub_80B79BC(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80B79BC(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
+    if (EventObjectClearHeldMovementIfFinished(eventObject))
     {
         gPlayerAvatar.preventStep = FALSE;
         ScriptContext2_Disable();
-        UnfreezeMapObjects();
+        UnfreezeEventObjects();
         DestroyTask(FindTaskIdByFunc(sub_80B7890));
     }
     return FALSE;
@@ -1946,27 +1945,27 @@ void sub_80B7A74(u8 priority)
 
 void sub_80B7A8C(u8 taskId)
 {
-    while(gUnknown_0855C460[gTasks[taskId].data[0]](&gTasks[taskId], &gMapObjects[gPlayerAvatar.mapObjectId], &gSprites[gPlayerAvatar.spriteId]));
+    while(gUnknown_0855C460[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId], &gSprites[gPlayerAvatar.spriteId]));
 }
 
-bool8 sub_80B7AE8(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80B7AE8(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
 {
-    FreezeMapObjects();
+    FreezeEventObjects();
     CameraObjectReset2();
     gPlayerAvatar.preventStep = TRUE;
-    mapObject->mapobj_bit_26 = 1;
+    eventObject->fixedPriority = 1;
     task->data[0]++;
     return FALSE;
 }
 
-bool8 sub_80B7B18(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80B7B18(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
+    if (EventObjectClearHeldMovementIfFinished(eventObject))
     {
         if (task->data[1] > 3)
         {
-            gFieldEffectArguments[0] = mapObject->coords2.x;
-            gFieldEffectArguments[1] = mapObject->coords2.y;
+            gFieldEffectArguments[0] = eventObject->currentCoords.x;
+            gFieldEffectArguments[1] = eventObject->currentCoords.y;
             gFieldEffectArguments[2] = sprite->subpriority - 1;
             gFieldEffectArguments[3] = sprite->oam.priority;
             task->data[1] = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH);
@@ -1974,24 +1973,24 @@ bool8 sub_80B7B18(struct Task *task, struct MapObject *mapObject, struct Sprite
         } else
         {
             task->data[1]++;
-            FieldObjectSetSpecialAnim(mapObject, GetStepInPlaceDelay4AnimId(mapObject->mapobj_unk_18));
+            EventObjectSetHeldMovement(eventObject, GetWalkInPlaceFastestMovementAction(eventObject->facingDirection));
             PlaySE(SE_FU_ZUZUZU);
         }
     }
     return FALSE;
 }
 
-bool8 sub_80B7B94(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80B7B94(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
 {
     if (gSprites[task->data[1]].animCmdIndex == 2)
     {
-        mapObject->mapobj_bit_13 = 1;
+        eventObject->invisible = 1;
         task->data[0]++;
     }
     return FALSE;
 }
 
-bool8 sub_80B7BCC(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80B7BCC(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
 {
     if (!FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH))
     {
@@ -2005,7 +2004,7 @@ bool8 sub_80B7BCC(struct Task *task, struct MapObject *mapObject, struct Sprite
 void sub_80B7CE4(u8);
 void mapldr_080859D4(void);
 
-bool8 sub_80B7BF4(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80B7BF4(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
 {
     if (!gPaletteFade.active && sub_80859A0() == TRUE)
     {
@@ -2038,7 +2037,7 @@ void sub_80B7CAC(struct Sprite *sprite)
 void sub_80B7CC8(void)
 {
     ScriptContext2_Enable();
-    FreezeMapObjects();
+    FreezeEventObjects();
     CreateTask(sub_80B7CE4, 0x50);
 }
 
@@ -2051,24 +2050,24 @@ void sub_80B7D14(struct Task *task)
 {
     task->data[0]++;
     task->data[14] = 64;
-    task->data[15] = player_get_direction_lower_nybble();
+    task->data[15] = GetPlayerFacingDirection();
 }
 
 void sub_80B7D34(struct Task *task)
 {
-    struct MapObject *mapObject;
+    struct EventObject *eventObject;
     u8 spinDirections[5] = {1, 3, 4, 2, 1};
     if (task->data[14] != 0 && (--task->data[14]) == 0)
     {
         music_something();
         sub_80AF0B4();
     }
-    mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
-    if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject) || FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
+    eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
+    if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject))
     {
         if (task->data[14] == 0 && !gPaletteFade.active && sub_80859A0() == TRUE)
         {
-            FieldObjectSetDirection(mapObject, task->data[15]);
+            SetEventObjectDirection(eventObject, task->data[15]);
             sub_8084E14();
             warp_in();
             gFieldCallback = mapldr_080859D4;
@@ -2076,7 +2075,7 @@ void sub_80B7D34(struct Task *task)
             DestroyTask(FindTaskIdByFunc(sub_80B7CE4));
         } else if (task->data[1] == 0 || (--task->data[1]) == 0)
         {
-            FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(spinDirections[mapObject->mapobj_unk_18]));
+            EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(spinDirections[eventObject->facingDirection]));
             if (task->data[2] < 12)
             {
                 task->data[2]++;
@@ -2098,9 +2097,9 @@ void mapldr_080859D4(void)
     Overworld_PlaySpecialMapMusic();
     pal_fill_for_maplights();
     ScriptContext2_Enable();
-    FreezeMapObjects();
+    FreezeEventObjects();
     gFieldCallback = NULL;
-    gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_13 = 1;
+    gEventObjects[gPlayerAvatar.eventObjectId].invisible = 1;
     CreateTask(sub_80B7E94, 0);
 }
 
@@ -2114,36 +2113,36 @@ void sub_80B7EC4(struct Task *task)
     if (IsWeatherNotFadingIn())
     {
         task->data[0]++;
-        task->data[15] = player_get_direction_lower_nybble();
+        task->data[15] = GetPlayerFacingDirection();
     }
 }
 
 void sub_80B7EE8(struct Task *task)
 {
     u8 spinDirections[5] = {1, 3, 4, 2, 1};
-    struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
     if (task->data[1] == 0 || (--task->data[1]) == 0)
     {
-        if (FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject) && !FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
+        if (EventObjectIsMovementOverridden(eventObject) && !EventObjectClearHeldMovementIfFinished(eventObject))
         {
             return;
         }
-        if (task->data[2] >= 32 && task->data[15] == player_get_direction_lower_nybble())
+        if (task->data[2] >= 32 && task->data[15] == GetPlayerFacingDirection())
         {
-            mapObject->mapobj_bit_13 = 0;
+            eventObject->invisible = 0;
             ScriptContext2_Disable();
-            UnfreezeMapObjects();
+            UnfreezeEventObjects();
             DestroyTask(FindTaskIdByFunc(sub_80B7E94));
             return;
         }
-        FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(spinDirections[mapObject->mapobj_unk_18]));
+        EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(spinDirections[eventObject->facingDirection]));
         if (task->data[2] < 32)
         {
             task->data[2]++;
         }
         task->data[1] = task->data[2] >> 2;
     }
-    mapObject->mapobj_bit_13 ^= 1;
+    eventObject->invisible ^= 1;
 }
 
 static void ExecuteTeleportFieldEffectTask(u8);
@@ -2173,23 +2172,23 @@ static void ExecuteTeleportFieldEffectTask(u8 taskId)
 static void TeleportFieldEffectTask1(struct Task *task)
 {
     ScriptContext2_Enable();
-    FreezeMapObjects();
+    FreezeEventObjects();
     CameraObjectReset2();
-    task->data[15] = player_get_direction_lower_nybble();
+    task->data[15] = GetPlayerFacingDirection();
     task->data[0]++;
 }
 
 static void TeleportFieldEffectTask2(struct Task *task)
 {
     u8 spinDirections[5] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH};
-    struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
     if (task->data[1] == 0 || (--task->data[1]) == 0)
     {
-        FieldObjectTurn(mapObject, spinDirections[mapObject->mapobj_unk_18]);
+        EventObjectTurn(eventObject, spinDirections[eventObject->facingDirection]);
         task->data[1] = 8;
         task->data[2]++;
     }
-    if (task->data[2] > 7 && task->data[15] == mapObject->mapobj_unk_18)
+    if (task->data[2] > 7 && task->data[15] == eventObject->facingDirection)
     {
         task->data[0]++;
         task->data[1] = 4;
@@ -2202,12 +2201,12 @@ static void TeleportFieldEffectTask2(struct Task *task)
 static void TeleportFieldEffectTask3(struct Task *task)
 {
     u8 spinDirections[5] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH};
-    struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
     struct Sprite *sprite = &gSprites[gPlayerAvatar.spriteId];
     if ((--task->data[1]) <= 0)
     {
         task->data[1] = 4;
-        FieldObjectTurn(mapObject, spinDirections[mapObject->mapobj_unk_18]);
+        EventObjectTurn(eventObject, spinDirections[eventObject->facingDirection]);
     }
     sprite->pos1.y -= task->data[3];
     task->data[4] += task->data[3];
@@ -2255,9 +2254,9 @@ static void mapldr_08085D88(void)
     Overworld_PlaySpecialMapMusic();
     pal_fill_for_maplights();
     ScriptContext2_Enable();
-    FreezeMapObjects();
+    FreezeEventObjects();
     gFieldCallback = NULL;
-    gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_13 = 1;
+    gEventObjects[gPlayerAvatar.eventObjectId].invisible = 1;
     CameraObjectReset2();
     CreateTask(sub_80B8250, 0);
 }
@@ -2282,12 +2281,12 @@ void sub_80B8280(struct Task *task)
         sprite = &gSprites[gPlayerAvatar.spriteId];
         centerToCornerVecY = -(sprite->centerToCornerVecY << 1);
         sprite->pos2.y = -(sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY);
-        gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_13 = 0;
+        gEventObjects[gPlayerAvatar.eventObjectId].invisible = 0;
         task->data[0]++;
         task->data[1] = 8;
         task->data[2] = 1;
         task->data[14] = sprite->subspriteMode;
-        task->data[15] = player_get_direction_lower_nybble();
+        task->data[15] = GetPlayerFacingDirection();
         PlaySE(SE_TK_WARPIN);
     }
 }
@@ -2295,14 +2294,14 @@ void sub_80B8280(struct Task *task)
 void sub_80B830C(struct Task *task)
 {
     u8 spinDirections[5] = {1, 3, 4, 2, 1};
-    struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
     struct Sprite *sprite = &gSprites[gPlayerAvatar.spriteId];
     if ((sprite->pos2.y += task->data[1]) >= -8)
     {
         if (task->data[13] == 0)
         {
             task->data[13]++;
-            mapObject->mapobj_bit_2 = 1;
+            eventObject->triggerGroundEffectsOnMove = 1;
             sprite->subspriteMode = task->data[14];
         }
     } else
@@ -2320,7 +2319,7 @@ void sub_80B830C(struct Task *task)
     if ((--task->data[2]) == 0)
     {
         task->data[2] = 4;
-        FieldObjectTurn(mapObject, spinDirections[mapObject->mapobj_unk_18]);
+        EventObjectTurn(eventObject, spinDirections[eventObject->facingDirection]);
     }
     if (sprite->pos2.y >= 0)
     {
@@ -2334,16 +2333,16 @@ void sub_80B830C(struct Task *task)
 void sub_80B8410(struct Task *task)
 {
     u8 spinDirections[5] = {1, 3, 4, 2, 1};
-    struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
     if ((--task->data[1]) == 0)
     {
-        FieldObjectTurn(mapObject, spinDirections[mapObject->mapobj_unk_18]);
+        EventObjectTurn(eventObject, spinDirections[eventObject->facingDirection]);
         task->data[1] = 8;
-        if ((++task->data[2]) > 4 && task->data[14] == mapObject->mapobj_unk_18)
+        if ((++task->data[2]) > 4 && task->data[14] == eventObject->facingDirection)
         {
             ScriptContext2_Disable();
             CameraObjectReset1();
-            UnfreezeMapObjects();
+            UnfreezeEventObjects();
             DestroyTask(FindTaskIdByFunc(sub_80B8250));
         }
     }
@@ -2893,31 +2892,31 @@ void sub_80B8D84(u8 taskId)
 void sub_80B8DB4(struct Task *task)
 {
     ScriptContext2_Enable();
-    FreezeMapObjects();
+    FreezeEventObjects();
     gPlayerAvatar.preventStep = TRUE;
     SetPlayerAvatarStateMask(8);
     PlayerGetDestCoords(&task->data[1], &task->data[2]);
-    MoveCoords(gMapObjects[gPlayerAvatar.mapObjectId].placeholder18, &task->data[1], &task->data[2]);
+    MoveCoords(gEventObjects[gPlayerAvatar.eventObjectId].movementDirection, &task->data[1], &task->data[2]);
     task->data[0]++;
 }
 
 void sub_80B8E14(struct Task *task)
 {
-    struct MapObject *mapObject;
-    mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
-    if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject) || FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
+    struct EventObject *eventObject;
+    eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
+    if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject))
     {
         sub_808C114();
-        FieldObjectSetSpecialAnim(mapObject, 0x39);
+        EventObjectSetHeldMovement(eventObject, 0x39);
         task->data[0]++;
     }
 }
 
 void sub_80B8E60(struct Task *task)
 {
-    struct MapObject *mapObject;
-    mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
-    if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(mapObject))
+    struct EventObject *eventObject;
+    eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
+    if (EventObjectCheckHeldMovementStatus(eventObject))
     {
         gFieldEffectArguments[0] = task->data[15] | 0x80000000;
         FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
@@ -2927,32 +2926,32 @@ void sub_80B8E60(struct Task *task)
 
 void sub_80B8EA8(struct Task *task)
 {
-    struct MapObject *mapObject;
+    struct EventObject *eventObject;
     if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON))
     {
-        mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
-        FieldObjectSetGraphicsId(mapObject, GetPlayerAvatarGraphicsIdByStateId(3));
-        FieldObjectClearAnimIfSpecialAnimFinished(mapObject);
-        FieldObjectSetSpecialAnim(mapObject, sub_8093540(mapObject->placeholder18));
+        eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
+        EventObjectSetGraphicsId(eventObject, GetPlayerAvatarGraphicsIdByStateId(3));
+        EventObjectClearHeldMovementIfFinished(eventObject);
+        EventObjectSetHeldMovement(eventObject, GetJumpSpecialMovementAction(eventObject->movementDirection));
         gFieldEffectArguments[0] = task->data[1];
         gFieldEffectArguments[1] = task->data[2];
-        gFieldEffectArguments[2] = gPlayerAvatar.mapObjectId;
-        mapObject->mapobj_unk_1A = FieldEffectStart(FLDEFF_SURF_BLOB);
+        gFieldEffectArguments[2] = gPlayerAvatar.eventObjectId;
+        eventObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_SURF_BLOB);
         task->data[0]++;
     }
 }
 
 void sub_80B8F24(struct Task *task)
 {
-    struct MapObject *mapObject;
-    mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
-    if (FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
+    struct EventObject *eventObject;
+    eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
+    if (EventObjectClearHeldMovementIfFinished(eventObject))
     {
         gPlayerAvatar.preventStep = FALSE;
         gPlayerAvatar.flags &= 0xdf;
-        FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(mapObject->placeholder18));
-        sub_81555AC(mapObject->mapobj_unk_1A, 1);
-        UnfreezeMapObjects();
+        EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(eventObject->movementDirection));
+        sub_81555AC(eventObject->fieldEffectSpriteId, 1);
+        UnfreezeEventObjects();
         ScriptContext2_Disable();
         FieldEffectActiveListRemove(FLDEFF_USE_SURF);
         DestroyTask(FindTaskIdByFunc(sub_80B8D84));
@@ -3205,24 +3204,24 @@ void sub_80B91D4(u8 taskId)
 
 void sub_80B9204(struct Task *task)
 {
-    struct MapObject *mapObject;
-    mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
-    if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject) || FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
+    struct EventObject *eventObject;
+    eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
+    if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject))
     {
         task->data[15] = gPlayerAvatar.flags;
         gPlayerAvatar.preventStep = TRUE;
         SetPlayerAvatarStateMask(1);
         sub_808C114();
-        FieldObjectSetSpecialAnim(mapObject, 0x39);
+        EventObjectSetHeldMovement(eventObject, 0x39);
         task->data[0]++;
     }
 }
 
 void sub_80B925C(struct Task *task)
 {
-    struct MapObject *mapObject;
-    mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
-    if (FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
+    struct EventObject *eventObject;
+    eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
+    if (EventObjectClearHeldMovementIfFinished(eventObject))
     {
         task->data[0]++;
         gFieldEffectArguments[0] = task->data[1];
@@ -3232,14 +3231,14 @@ void sub_80B925C(struct Task *task)
 
 void sub_80B92A0(struct Task *task)
 {
-    struct MapObject *mapObject;
+    struct EventObject *eventObject;
     if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON))
     {
-        mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+        eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
         if (task->data[15] & 0x08)
         {
-            sub_81555AC(mapObject->mapobj_unk_1A, 2);
-            sub_81555D8(mapObject->mapobj_unk_1A, 0);
+            sub_81555AC(eventObject->fieldEffectSpriteId, 2);
+            sub_81555D8(eventObject->fieldEffectSpriteId, 0);
         }
         task->data[1] = sub_80B94C4();
         task->data[0]++;
@@ -3253,15 +3252,15 @@ void sub_80B92F8(struct Task *task)
         task->data[0]++;
         task->data[2] = 16;
         SetPlayerAvatarTransitionFlags(PLAYER_AVATAR_FLAG_ON_FOOT);
-        FieldObjectSetSpecialAnim(&gMapObjects[gPlayerAvatar.mapObjectId], 0x02);
+        EventObjectSetHeldMovement(&gEventObjects[gPlayerAvatar.eventObjectId], 0x02);
     }
 }
 
 void sub_80B933C(struct Task *task)
 {
-    struct MapObject *mapObject;
-    mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
-    if ((task->data[2] == 0 || (--task->data[2]) == 0) && FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
+    struct EventObject *eventObject;
+    eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
+    if ((task->data[2] == 0 || (--task->data[2]) == 0) && EventObjectClearHeldMovementIfFinished(eventObject))
     {
         task->data[0]++;
         PlaySE(SE_W019);
@@ -3271,17 +3270,17 @@ void sub_80B933C(struct Task *task)
 
 void sub_80B9390(struct Task *task)
 {
-    struct MapObject *mapObject;
+    struct EventObject *eventObject;
     if ((++task->data[2]) >= 8)
     {
-        mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
-        FieldObjectSetGraphicsId(mapObject, GetPlayerAvatarGraphicsIdByStateId(0x03));
-        StartSpriteAnim(&gSprites[mapObject->spriteId], 0x16);
-        mapObject->mapobj_bit_12 = 1;
-        FieldObjectSetSpecialAnim(mapObject, 0x48);
+        eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
+        EventObjectSetGraphicsId(eventObject, GetPlayerAvatarGraphicsIdByStateId(0x03));
+        StartSpriteAnim(&gSprites[eventObject->spriteId], 0x16);
+        eventObject->inanimate = 1;
+        EventObjectSetHeldMovement(eventObject, 0x48);
         if (task->data[15] & 0x08)
         {
-            DestroySprite(&gSprites[mapObject->mapobj_unk_1A]);
+            DestroySprite(&gSprites[eventObject->fieldEffectSpriteId]);
         }
         task->data[0]++;
         task->data[2] = 0;
@@ -3290,14 +3289,14 @@ void sub_80B9390(struct Task *task)
 
 void sub_80B9418(struct Task *task)
 {
-    struct MapObject *mapObject;
+    struct EventObject *eventObject;
     if ((++task->data[2]) >= 10)
     {
-        mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
-        FieldObjectClearAnimIfSpecialAnimActive(mapObject);
-        mapObject->mapobj_bit_12 = 0;
-        mapObject->mapobj_bit_22 = 0;
-        sub_80B9560(task->data[1], mapObject->spriteId);
+        eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
+        EventObjectClearHeldMovementIfActive(eventObject);
+        eventObject->inanimate = 0;
+        eventObject->hasShadow = 0;
+        sub_80B9560(task->data[1], eventObject->spriteId);
         CameraObjectReset2();
         task->data[0]++;
     }
@@ -3502,9 +3501,9 @@ void sub_80B97D4(u8 taskId)
 
 void sub_80B9804(struct Task *task)
 {
-    struct MapObject *mapObject;
-    mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
-    if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject) || FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
+    struct EventObject *eventObject;
+    eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
+    if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject))
     {
         task->data[0]++;
         task->data[2] = 17;
@@ -3513,27 +3512,27 @@ void sub_80B9804(struct Task *task)
         SetPlayerAvatarStateMask(0x01);
         if (task->data[15] & 0x08)
         {
-            sub_81555AC(mapObject->mapobj_unk_1A, 0);
+            sub_81555AC(eventObject->fieldEffectSpriteId, 0);
         }
-        FieldObjectSetGraphicsId(mapObject, GetPlayerAvatarGraphicsIdByStateId(0x3));
+        EventObjectSetGraphicsId(eventObject, GetPlayerAvatarGraphicsIdByStateId(0x3));
         CameraObjectReset2();
-        FieldObjectTurn(mapObject, DIR_WEST);
-        StartSpriteAnim(&gSprites[mapObject->spriteId], 0x16);
-        mapObject->mapobj_bit_13 = 0;
+        EventObjectTurn(eventObject, DIR_WEST);
+        StartSpriteAnim(&gSprites[eventObject->spriteId], 0x16);
+        eventObject->invisible = 0;
         task->data[1] = sub_80B94C4();
         sub_80B9524(task->data[1]);
-        sub_80B9560(task->data[1], mapObject->spriteId);
+        sub_80B9560(task->data[1], eventObject->spriteId);
     }
 }
 
 void sub_80B98B8(struct Task *task)
 {
-    struct MapObject *mapObject;
+    struct EventObject *eventObject;
     struct Sprite *sprite;
     if (task->data[2] == 0 || (--task->data[2]) == 0)
     {
-        mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
-        sprite = &gSprites[mapObject->spriteId];
+        eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
+        sprite = &gSprites[eventObject->spriteId];
         sub_80B9560(task->data[1], 0x40);
         sprite->pos1.x += sprite->pos2.x;
         sprite->pos1.y += sprite->pos2.y;
@@ -3576,26 +3575,26 @@ void sub_80B9924(struct Task *task)
 
 void sub_80B9978(struct Task *task)
 {
-    struct MapObject *mapObject;
+    struct EventObject *eventObject;
     struct Sprite *sprite;
     if (sub_80B9508(task->data[1]))
     {
-        mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
-        sprite = &gSprites[mapObject->spriteId];
-        mapObject->mapobj_bit_12 = 0;
-        sub_808EB08(mapObject, mapObject->coords2.x, mapObject->coords2.y);
+        eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
+        sprite = &gSprites[eventObject->spriteId];
+        eventObject->inanimate = 0;
+        sub_808EB08(eventObject, eventObject->currentCoords.x, eventObject->currentCoords.y);
         sprite->pos2.x = 0;
         sprite->pos2.y = 0;
         sprite->coordOffsetEnabled = 1;
         sub_808C114();
-        FieldObjectSetSpecialAnim(mapObject, 0x39);
+        EventObjectSetHeldMovement(eventObject, 0x39);
         task->data[0]++;
     }
 }
 
 void sub_80B99F0(struct Task *task)
 {
-    if (FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[gPlayerAvatar.mapObjectId]))
+    if (EventObjectClearHeldMovementIfFinished(&gEventObjects[gPlayerAvatar.eventObjectId]))
     {
         task->data[0]++;
         sub_80B9794(task->data[1]);
@@ -3615,18 +3614,18 @@ void sub_80B9A28(struct Task *task)
 void sub_80B9A60(struct Task *task)
 {
     u8 state;
-    struct MapObject *mapObject;
+    struct EventObject *eventObject;
     if ((--task->data[1]) == 0)
     {
-        mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+        eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
         state = 0;
         if (task->data[15] & 0x08)
         {
             state = 3;
-            sub_81555AC(mapObject->mapobj_unk_1A, 1);
+            sub_81555AC(eventObject->fieldEffectSpriteId, 1);
         }
-        FieldObjectSetGraphicsId(mapObject, GetPlayerAvatarGraphicsIdByStateId(state));
-        FieldObjectTurn(mapObject, DIR_SOUTH);
+        EventObjectSetGraphicsId(eventObject, GetPlayerAvatarGraphicsIdByStateId(state));
+        EventObjectTurn(eventObject, DIR_SOUTH);
         gPlayerAvatar.flags = task->data[15];
         gPlayerAvatar.preventStep = FALSE;
         FieldEffectActiveListRemove(FLDEFF_FLY_IN);
@@ -3639,11 +3638,11 @@ void sub_80B9BE8(u8 taskId);
 bool8 sub_80B9ADC(void)
 {
     u8 taskId;
-    u8 mapObjectIdBuffer;
-    if (!TryGetFieldObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &mapObjectIdBuffer))
+    u8 eventObjectIdBuffer;
+    if (!TryGetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &eventObjectIdBuffer))
     {
         taskId = CreateTask(sub_80B9BE8, 0x50);
-        gTasks[taskId].data[2] = mapObjectIdBuffer;
+        gTasks[taskId].data[2] = eventObjectIdBuffer;
         gTasks[taskId].data[6] = gFieldEffectArguments[0];
         gTasks[taskId].data[7] = gFieldEffectArguments[1];
         gTasks[taskId].data[8] = gFieldEffectArguments[2];
@@ -3722,8 +3721,8 @@ void sub_80B9C54(s16* data, u8 taskId)
 {
     if (++data[3] > 0x78)
     {
-        struct Sprite *sprite = &gSprites[gMapObjects[data[2]].spriteId];
-        gMapObjects[data[2]].mapobj_bit_13 = TRUE;
+        struct Sprite *sprite = &gSprites[gEventObjects[data[2]].spriteId];
+        gEventObjects[data[2]].invisible = TRUE;
         BlendPalettes(0x0000FFFF, 0x10, RGB_WHITE);
         BeginNormalPaletteFade(0x0000FFFF, 0, 0x10, 0, RGB_WHITE);
         sub_80B9D24(sprite);
@@ -3739,7 +3738,7 @@ void sub_80B9CDC(s16* a0, u8 taskId)
     if (!gPaletteFade.active && !FuncIsActiveTask(sub_80B9B3C))
     {
         InstallCameraPanAheadCallback();
-        RemoveFieldObjectByLocalIdAndMap(a0[6], a0[7], a0[8]);
+        RemoveEventObjectByLocalIdAndMap(a0[6], a0[7], a0[8]);
         FieldEffectActiveListRemove(0x41);
         DestroyTask(taskId);
     }
@@ -3838,24 +3837,24 @@ void sub_80B9EDC(u8 taskId);
 
 bool8 sub_80B9E28(struct Sprite* sprite)
 {
-    u8 mapObjectIdBuffer;
-    if (!TryGetFieldObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &mapObjectIdBuffer))
+    u8 eventObjectIdBuffer;
+    if (!TryGetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &eventObjectIdBuffer))
     {
-        struct MapObject *object;
+        struct EventObject *object;
         int xPos, yPos;
         u8 taskId;
-        object = &gMapObjects[mapObjectIdBuffer];
-        xPos = object->coords2.x - 7;
-        yPos = object->coords2.y - 7;
+        object = &gEventObjects[eventObjectIdBuffer];
+        xPos = object->currentCoords.x - 7;
+        yPos = object->currentCoords.y - 7;
         xPos = (gFieldEffectArguments[3] - xPos) * 16;
         yPos = (gFieldEffectArguments[4] - yPos) * 16;
-        npc_coords_shift(object, gFieldEffectArguments[3] + 7, gFieldEffectArguments[4] + 7);
+        ShiftEventObjectCoords(object, gFieldEffectArguments[3] + 7, gFieldEffectArguments[4] + 7);
         taskId = CreateTask(sub_80B9EDC, 0x50);
         gTasks[taskId].data[1] = object->spriteId;
         gTasks[taskId].data[2] = gSprites[object->spriteId].pos1.x + xPos;
         gTasks[taskId].data[3] = gSprites[object->spriteId].pos1.y + yPos;
         gTasks[taskId].data[8] = gFieldEffectArguments[5];
-        gTasks[taskId].data[9] = mapObjectIdBuffer;
+        gTasks[taskId].data[9] = eventObjectIdBuffer;
     }
     return FALSE;
 }
@@ -3884,11 +3883,11 @@ void sub_80B9EDC(u8 taskId)
             }
             else
             {
-                struct MapObject *object = &gMapObjects[data[9]];
+                struct EventObject *object = &gEventObjects[data[9]];
                 sprite->pos1.x = data[2];
                 sprite->pos1.y = data[3];
-                npc_coords_shift_still(object);
-                object->mapobj_bit_3 = TRUE;
+                ShiftStillEventObjectCoords(object);
+                object->triggerGroundEffectsOnStop = TRUE;
                 FieldEffectActiveListRemove(0x42);
                 DestroyTask(taskId);
             }
diff --git a/src/field_map_obj.c b/src/field_map_obj.c
deleted file mode 100644
index af018eb16..000000000
--- a/src/field_map_obj.c
+++ /dev/null
@@ -1,5119 +0,0 @@
-// Includes
-
-#include "global.h"
-#include "malloc.h"
-#include "sprite.h"
-#include "overworld.h"
-#include "random.h"
-#include "event_scripts.h"
-#include "berry.h"
-#include "palette.h"
-#include "field_player_avatar.h"
-#include "fieldmap.h"
-#include "event_data.h"
-#include "rom_818CFC8.h"
-#include "rom_81BE66C.h"
-#include "field_ground_effect.h"
-#include "field_map_obj_helpers.h"
-#include "mauville_old_man.h"
-#include "metatile_behavior.h"
-#include "field_effect.h"
-#include "field_effect_helpers.h"
-#include "field_camera.h"
-#include "trainer_see.h"
-#include "decoration.h"
-#include "field_map_obj.h"
-
-#define NUM_FIELD_MAP_OBJECT_TEMPLATES 0x51
-
-#define null_object_step(name, retval) \
-bool8 FieldObjectCB2_##name(struct MapObject *, struct Sprite *);\
-void FieldObjectCB_##name(struct Sprite *sprite)\
-{\
-    FieldObjectStep(&gMapObjects[sprite->data[0]], sprite, FieldObjectCB2_##name);\
-}\
-bool8 FieldObjectCB2_##name(struct MapObject *mapObject, struct Sprite *sprite)\
-{\
-    return (retval);\
-}
-
-#define field_object_step(name, table) \
-extern bool8 (*const (table)[])(struct MapObject *, struct Sprite *);\
-bool8 FieldObjectCB2_##name(struct MapObject *, struct Sprite *);\
-void FieldObjectCB_##name(struct Sprite *sprite)\
-{\
-    FieldObjectStep(&gMapObjects[sprite->data[0]], sprite, FieldObjectCB2_##name);\
-}\
-bool8 FieldObjectCB2_##name(struct MapObject *mapObject, struct Sprite *sprite)\
-{\
-    return (table)[sprite->data[1]](mapObject, sprite);\
-}
-
-#define field_object_path(idx, table, sub, path, catch, coord)\
-field_object_step(GoInDirectionSequence##idx, table)\
-extern const u8 path[4];\
-bool8 sub(struct MapObject *mapObject, struct Sprite *sprite)\
-{\
-    u8 route[sizeof(path)];\
-    memcpy(route, path, sizeof(path));\
-    if (mapObject->mapobj_unk_21 == (catch) && mapObject->coords1.coord == mapObject->coords2.coord)\
-    {\
-        mapObject->mapobj_unk_21 = (catch) + 1;\
-    }\
-    return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, route);\
-}\
-
-// Static struct declarations
-
-// Static RAM declarations
-
-extern u8 gUnknown_020375B4;
-extern u16 gUnknown_020375B6;
-
-// Static ROM declarations
-
-static void sub_808D450(void);
-static u8 GetFieldObjectIdByLocalId(u8);
-static u8 GetFieldObjectIdByLocalIdAndMapInternal(u8, u8, u8);
-static bool8 GetAvailableFieldObjectSlot(u16, u8, u8, u8 *);
-static void FieldObjectHandleDynamicGraphicsId(struct MapObject *);
-static void RemoveFieldObjectInternal (struct MapObject *);
-/*static*/ u16 GetFieldObjectFlagIdByFieldObjectId(u8);
-void sub_8096518(struct MapObject *, struct Sprite *);
-static void MakeObjectTemplateFromFieldObjectTemplate(struct MapObjectTemplate *, struct SpriteTemplate *, const struct SubspriteTable **);
-/*static*/ void GetFieldObjectMovingCameraOffset(s16 *, s16 *);
-/*static*/ struct MapObjectTemplate *GetFieldObjectTemplateByLocalIdAndMap(u8, u8, u8);
-static void sub_808E894(u16);
-static void RemoveFieldObjectIfOutsideView(struct MapObject *);
-static void sub_808E1B8(u8, s16, s16);
-static void SetPlayerAvatarFieldObjectIdAndObjectId(u8, u8);
-/*static*/ void sub_808E38C(struct MapObject *);
-static u8 sub_808E8F4(const struct SpritePalette *);
-static u8 FindFieldObjectPaletteIndexByTag(u16);
-static void sub_808EAB0(u16, u8);
-static bool8 FieldObjectDoesZCoordMatch(struct MapObject *, u8);
-//static void CameraObject_0(struct Sprite *);
-/*static*/ void CameraObject_1(struct Sprite *);
-//static void CameraObject_2(struct Sprite *);
-/*static*/ struct MapObjectTemplate *FindFieldObjectTemplateInArrayByLocalId(u8 localId, struct MapObjectTemplate *templates, u8 count);
-void npc_reset(struct MapObject *, struct Sprite *);
-void FieldObjectSetRegularAnim(struct MapObject *, struct Sprite *, u8);
-
-u8 GetFaceDirectionAnimId(u32);
-u8 GetGoSpeed0AnimId(u32);
-u8 GetGoSpeed1AnimId(u32);
-u8 GetGoSpeed3AnimId(u32);
-u8 sub_8093438(u32);
-u8 sub_80934BC(u32);
-u8 sub_8093514(u32);
-u8 GetJumpLedgeAnimId(u32);
-void sub_8092F88(u32, s16 *, s16 *, s16, s16);
-
-bool8 FieldObjectExecRegularAnim(struct MapObject *, struct Sprite *);
-void SetFieldObjectStepTimer(struct Sprite *, s16);
-bool8 RunFieldObjectStepTimer(struct Sprite *);
-bool8 npc_block_way__next_tile(struct MapObject *, u8);
-static u32 state_to_direction(u8, u32, u32);
-/*static*/ void sub_80964E8(struct MapObject *, struct Sprite *);
-static void FieldObjectExecSpecialAnim(struct MapObject *, struct Sprite *);
-/*static*/ void npc_obj_transfer_image_anim_pause_flag(struct MapObject *, struct Sprite *);
-
-static bool8 IsCoordOutsideFieldObjectMovementRect(struct MapObject *, s16, s16);
-static bool8 IsMetatileDirectionallyImpassable(struct MapObject *, s16, s16, u8);
-static bool8 CheckForCollisionBetweenFieldObjects(struct MapObject *, s16, s16);
-bool8 sub_809558C(struct MapObject *, struct Sprite *);
-bool8 sub_8095B64(struct MapObject *, struct Sprite *);
-static void sub_8096530(struct MapObject *, struct Sprite *);
-static void npc_update_obj_anim_flag(struct MapObject *, struct Sprite *);
-
-// ROM data
-
-extern void (*const gUnknown_08505438[NUM_FIELD_MAP_OBJECT_TEMPLATES])(struct Sprite *);
-extern const u8 gUnknown_0850557C[NUM_FIELD_MAP_OBJECT_TEMPLATES];
-extern const u8 gUnknown_085055CD[NUM_FIELD_MAP_OBJECT_TEMPLATES];
-extern const struct MapObjectGraphicsInfo *const gMauvilleOldManGraphicsInfoPointers[7];
-extern const struct MapObjectGraphicsInfo *const gFieldObjectGraphicsInfoPointers[0xEF];
-extern u8 (*const gUnknown_0850D714[11])(s16, s16, s16, s16);
-
-struct PairedPalettes {
-    u16 tag;
-    const u16 *data;
-};
-
-extern const u8 gUnknown_084975C4[0x10];
-extern const struct SpriteTemplate gUnknown_084975D4;
-extern void (*const gUnknown_084975EC[3])(struct Sprite *);
-extern const struct SpritePalette gUnknown_0850BBC8[39];
-extern const struct PairedPalettes gUnknown_0850BD00[4];
-extern const struct PairedPalettes gUnknown_0850BD78[14];
-extern const u16 *const gUnknown_0850BE38[2];
-extern const s16 gUnknown_0850D6DC[4]; // {0x20, 0x40, 0x60, 0x80}
-extern const s16 gUnknown_0850D6EC[4];
-extern const u8 gUnknown_0850D710[4]; // {DIR_SOUTH, DIR_NORTH, DIR_WEST, DIR_EAST}
-extern const u8 gUnknown_0850D770[2]; // {DIR_SOUTH, DIR_NORTH}
-extern const u8 gUnknown_0850D790[2]; // {DIR_WEST, DIR_EAST}
-extern const u8 gUnknown_0850D7F0[2]; // {DIR_NORTH, DIR_WEST}
-extern const u8 gUnknown_0850D808[2]; // {DIR_NORTH, DIR_EAST}
-extern const u8 gUnknown_0850D820[2]; // {DIR_SOUTH, DIR_WEST}
-extern const u8 gUnknown_0850D838[2]; // {DIR_SOUTH, DIR_EAST}
-extern const u8 gUnknown_0850D850[4];
-extern const u8 gUnknown_0850D868[4];
-extern const u8 gUnknown_0850D880[4];
-extern const u8 gUnknown_0850D898[4];
-extern const u8 gUnknown_0850D8AC[5];
-extern const u8 gUnknown_0850D8C4[5];
-extern const u8 gUnknown_0850D8E8[4];
-extern bool8 (*const gUnknown_0850DA64[11])(struct MapObject *, struct Sprite *, u8, bool8(u8));
-extern bool8 (*const gUnknown_0850DB5C[4])(u8);
-extern bool8 (*const gUnknown_0850DB6C[4])(u8);
-extern const struct Coords16 gUnknown_0850DB7C[4];
-extern const u8 gUnknown_0850DC2F[4][4];
-extern const u8 gUnknown_0850DC3F[4][4];
-extern const u8 gUnknown_0850DBA0[5];
-extern bool8 (*const *const gUnknown_0850DC50[166])(struct MapObject *, struct Sprite *);
-extern u8 (*const gUnknown_0850DEE8[5])(u8);
-extern const s16 gUnknown_0850DFBC[3];
-extern const s16 gUnknown_0850DFC2[3];
-
-// Code
-
-static void npc_clear_ids_and_state(struct MapObject *mapObject)
-{
-    *mapObject = (struct MapObject){};
-    mapObject->localId = 0xFF;
-    mapObject->mapNum = -1;
-    mapObject->mapGroup = -1;
-    mapObject->mapobj_unk_1C = -1;
-}
-
-static void npcs_clear_ids_and_state(void)
-{
-    u8 i;
-
-    for (i = 0; i < NUM_FIELD_OBJECTS; i ++)
-    {
-        npc_clear_ids_and_state(&gMapObjects[i]);
-    }
-}
-
-void sub_808D438(void)
-{
-    ZeroAllLinkPlayerMapObjects();
-    npcs_clear_ids_and_state();
-    ClearPlayerAvatarInfo();
-    sub_808D450();
-}
-
-static void sub_808D450(void)
-{
-    u8 spriteIdx;
-
-    spriteIdx = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[21], 0, 0, 31);
-    gSprites[spriteIdx].oam.affineMode = 1;
-    InitSpriteAffineAnim(&gSprites[spriteIdx]);
-    StartSpriteAffineAnim(&gSprites[spriteIdx], 0);
-    gSprites[spriteIdx].invisible = TRUE;
-
-    spriteIdx = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[21], 0, 0, 31);
-    gSprites[spriteIdx].oam.affineMode = 1;
-    InitSpriteAffineAnim(&gSprites[spriteIdx]);
-    StartSpriteAffineAnim(&gSprites[spriteIdx], 1);
-    gSprites[spriteIdx].invisible = TRUE;
-}
-
-u8 sub_808D4F4(void)
-{
-    u8 i;
-
-    for (i = 0; i < NUM_FIELD_OBJECTS; i ++)
-    {
-        if (!gMapObjects[i].active)
-        {
-            break;
-        }
-    }
-    return i;
-}
-
-u8 GetFieldObjectIdByLocalIdAndMap(u8 localId, u8 mapId, u8 mapGroupId)
-{
-    if (localId < 0xff)
-    {
-        return GetFieldObjectIdByLocalIdAndMapInternal(localId, mapId, mapGroupId);
-    }
-    return GetFieldObjectIdByLocalId(localId);
-}
-
-bool8 TryGetFieldObjectIdByLocalIdAndMap(u8 localId, u8 mapId, u8 mapGroupId, u8 *fieldObjectId)
-{
-    *fieldObjectId = GetFieldObjectIdByLocalIdAndMap(localId, mapId, mapGroupId);
-    if (*fieldObjectId == NUM_FIELD_OBJECTS)
-    {
-        return TRUE;
-    }
-    return FALSE;
-}
-
-u8 GetFieldObjectIdByXY(s16 x, s16 y)
-{
-    u8 i;
-
-    for (i = 0; i < NUM_FIELD_OBJECTS; i ++)
-    {
-        if (gMapObjects[i].active && gMapObjects[i].coords2.x == x && gMapObjects[i].coords2.y == y)
-        {
-            break;
-        }
-    }
-    return i;
-}
-
-static u8 GetFieldObjectIdByLocalIdAndMapInternal(u8 localId, u8 mapId, u8 mapGroupId)
-{
-    u8 i;
-
-    for (i = 0; i < NUM_FIELD_OBJECTS; i ++)
-    {
-        if (gMapObjects[i].active && gMapObjects[i].localId == localId && gMapObjects[i].mapNum == mapId && gMapObjects[i].mapGroup == mapGroupId)
-        {
-            return i;
-        }
-    }
-    return NUM_FIELD_OBJECTS;
-}
-
-static u8 GetFieldObjectIdByLocalId(u8 localId)
-{
-    u8 i;
-
-    for (i = 0; i < NUM_FIELD_OBJECTS; i ++)
-    {
-        if (gMapObjects[i].active && gMapObjects[i].localId == localId)
-        {
-            return i;
-        }
-    }
-    return NUM_FIELD_OBJECTS;
-}
-
-// This function has the same nonmatching quirk as in Ruby/Sapphire.
-#ifdef NONMATCHING
-static u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *template, u8 mapNum, u8 mapGroup)
-{
-    struct MapObject *mapObject;
-    s16 x;
-    s16 y;
-    u8 slot;
-
-    // mapNum and mapGroup are in the wrong registers (r7/r6 instead of r6/r7)
-    if (GetAvailableFieldObjectSlot(template->localId, mapNum, mapGroup, &slot))
-    {
-        return NUM_FIELD_OBJECTS;
-    }
-    mapObject = &gMapObjects[slot];
-    npc_clear_ids_and_state(mapObject);
-    x = template->x + 7;
-    y = template->y + 7;
-    mapObject->active = TRUE;
-    mapObject->mapobj_bit_2 = TRUE;
-    mapObject->graphicsId = template->graphicsId;
-    mapObject->animPattern = template->movementType;
-    mapObject->localId = template->localId;
-    mapObject->mapNum = mapNum;
-    mapObject->mapGroup = mapGroup;
-    mapObject->coords1.x = x;
-    mapObject->coords1.y = y;
-    mapObject->coords2.x = x;
-    mapObject->coords2.y = y;
-    mapObject->coords3.x = x;
-    mapObject->coords3.y = y;
-    mapObject->mapobj_unk_0B_0 = template->elevation;
-    mapObject->elevation = template->elevation;
-    // For some reason, 0x0F is placed in r9, to be used later
-    mapObject->range.as_nybbles.x = template->unkA_0;
-    mapObject->range.as_nybbles.y = template->unkA_4;
-    mapObject->trainerType = template->unkC;
-    mapObject->trainerRange_berryTreeId = template->unkE;
-    mapObject->mapobj_unk_20 = gUnknown_085055CD[template->movementType];
-    FieldObjectSetDirection(mapObject, mapObject->mapobj_unk_20);
-    FieldObjectHandleDynamicGraphicsId(mapObject);
-
-    if (gUnknown_0850557C[mapObject->animPattern])
-    {
-        if ((mapObject->range.as_nybbles.x) == 0)
-        {
-            // r9 is invoked here
-            mapObject->range.as_nybbles.x ++;
-        }
-        if ((mapObject->range.as_nybbles.y) == 0)
-        {
-            mapObject->range.as_nybbles.y ++;
-        }
-    }
-    return slot;
-}
-#else
-static NAKED u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *template, u8 mapId, u8 mapGroupId)
-{
-    asm_unified("\tpush {r4-r7,lr}\n"
-                "\tmov r7, r9\n"
-                "\tmov r6, r8\n"
-                "\tpush {r6,r7}\n"
-                "\tsub sp, 0x4\n"
-                "\tadds r5, r0, 0\n"
-                "\tlsls r1, 24\n"
-                "\tlsrs r6, r1, 24\n"
-                "\tlsls r2, 24\n"
-                "\tlsrs r7, r2, 24\n"
-                "\tldrb r0, [r5]\n"
-                "\tadds r1, r6, 0\n"
-                "\tadds r2, r7, 0\n"
-                "\tmov r3, sp\n"
-                "\tbl GetAvailableFieldObjectSlot\n"
-                "\tlsls r0, 24\n"
-                "\tcmp r0, 0\n"
-                "\tbeq _0808D66E\n"
-                "\tmovs r0, 0x10\n"
-                "\tb _0808D762\n"
-                "_0808D66E:\n"
-                "\tmov r0, sp\n"
-                "\tldrb r1, [r0]\n"
-                "\tlsls r0, r1, 3\n"
-                "\tadds r0, r1\n"
-                "\tlsls r0, 2\n"
-                "\tldr r1, =gMapObjects\n"
-                "\tadds r4, r0, r1\n"
-                "\tadds r0, r4, 0\n"
-                "\tbl npc_clear_ids_and_state\n"
-                "\tldrh r3, [r5, 0x4]\n"
-                "\tadds r3, 0x7\n"
-                "\tlsls r3, 16\n"
-                "\tlsrs r3, 16\n"
-                "\tldrh r2, [r5, 0x6]\n"
-                "\tadds r2, 0x7\n"
-                "\tlsls r2, 16\n"
-                "\tlsrs r2, 16\n"
-                "\tldrb r0, [r4]\n"
-                "\tmovs r1, 0x1\n"
-                "\torrs r0, r1\n"
-                "\tmovs r1, 0x4\n"
-                "\torrs r0, r1\n"
-                "\tstrb r0, [r4]\n"
-                "\tldrb r0, [r5, 0x1]\n"
-                "\tstrb r0, [r4, 0x5]\n"
-                "\tldrb r0, [r5, 0x9]\n"
-                "\tstrb r0, [r4, 0x6]\n"
-                "\tldrb r0, [r5]\n"
-                "\tstrb r0, [r4, 0x8]\n"
-                "\tstrb r6, [r4, 0x9]\n"
-                "\tstrb r7, [r4, 0xA]\n"
-                "\tstrh r3, [r4, 0xC]\n"
-                "\tstrh r2, [r4, 0xE]\n"
-                "\tstrh r3, [r4, 0x10]\n"
-                "\tstrh r2, [r4, 0x12]\n"
-                "\tstrh r3, [r4, 0x14]\n"
-                "\tstrh r2, [r4, 0x16]\n"
-                "\tldrb r0, [r5, 0x8]\n"
-                "\tmovs r7, 0xF\n"
-                "\tadds r1, r7, 0\n"
-                "\tands r1, r0\n"
-                "\tldrb r2, [r4, 0xB]\n"
-                "\tmovs r0, 0x10\n"
-                "\tnegs r0, r0\n"
-                "\tmov r8, r0\n"
-                "\tands r0, r2\n"
-                "\torrs r0, r1\n"
-                "\tstrb r0, [r4, 0xB]\n"
-                "\tldrb r1, [r5, 0x8]\n"
-                "\tlsls r1, 4\n"
-                "\tands r0, r7\n"
-                "\torrs r0, r1\n"
-                "\tstrb r0, [r4, 0xB]\n"
-                "\tldrb r1, [r5, 0xA]\n"
-                "\tlsls r1, 28\n"
-                "\tmovs r0, 0xF\n"
-                "\tmov r9, r0\n"
-                "\tlsrs r1, 28\n"
-                "\tldrb r2, [r4, 0x19]\n"
-                "\tmov r0, r8\n"
-                "\tands r0, r2\n"
-                "\torrs r0, r1\n"
-                "\tstrb r0, [r4, 0x19]\n"
-                "\tldrb r1, [r5, 0xA]\n"
-                "\tlsrs r1, 4\n"
-                "\tlsls r1, 4\n"
-                "\tands r0, r7\n"
-                "\torrs r0, r1\n"
-                "\tstrb r0, [r4, 0x19]\n"
-                "\tldrh r0, [r5, 0xC]\n"
-                "\tstrb r0, [r4, 0x7]\n"
-                "\tldrh r0, [r5, 0xE]\n"
-                "\tstrb r0, [r4, 0x1D]\n"
-                "\tldr r1, =gUnknown_085055CD\n"
-                "\tldrb r0, [r5, 0x9]\n"
-                "\tadds r0, r1\n"
-                "\tldrb r1, [r0]\n"
-                "\tadds r0, r4, 0\n"
-                "\tadds r0, 0x20\n"
-                "\tstrb r1, [r0]\n"
-                "\tldrb r1, [r0]\n"
-                "\tadds r0, r4, 0\n"
-                "\tbl FieldObjectSetDirection\n"
-                "\tadds r0, r4, 0\n"
-                "\tbl FieldObjectHandleDynamicGraphicsId\n"
-                "\tldr r1, =gUnknown_0850557C\n"
-                "\tldrb r0, [r4, 0x6]\n"
-                "\tadds r0, r1\n"
-                "\tldrb r0, [r0]\n"
-                "\tcmp r0, 0\n"
-                "\tbeq _0808D75E\n"
-                "\tldrb r2, [r4, 0x19]\n"
-                "\tadds r0, r7, 0\n"
-                "\tands r0, r2\n"
-                "\tcmp r0, 0\n"
-                "\tbne _0808D746\n"
-                "\tlsls r0, r2, 28\n"
-                "\tlsrs r0, 28\n"
-                "\tadds r0, 0x1\n"
-                "\tmov r1, r9\n"
-                "\tands r0, r1\n"
-                "\tmov r1, r8\n"
-                "\tands r1, r2\n"
-                "\torrs r1, r0\n"
-                "\tstrb r1, [r4, 0x19]\n"
-                "_0808D746:\n"
-                "\tldrb r2, [r4, 0x19]\n"
-                "\tmovs r0, 0xF0\n"
-                "\tands r0, r2\n"
-                "\tcmp r0, 0\n"
-                "\tbne _0808D75E\n"
-                "\tlsrs r1, r2, 4\n"
-                "\tadds r1, 0x1\n"
-                "\tlsls r1, 4\n"
-                "\tadds r0, r7, 0\n"
-                "\tands r0, r2\n"
-                "\torrs r0, r1\n"
-                "\tstrb r0, [r4, 0x19]\n"
-                "_0808D75E:\n"
-                "\tmov r0, sp\n"
-                "\tldrb r0, [r0]\n"
-                "_0808D762:\n"
-                "\tadd sp, 0x4\n"
-                "\tpop {r3,r4}\n"
-                "\tmov r8, r3\n"
-                "\tmov r9, r4\n"
-                "\tpop {r4-r7}\n"
-                "\tpop {r1}\n"
-                "\tbx r1\n"
-                ".pool");
-}
-#endif
-
-u8 unref_sub_808D77C(u8 localId)
-{
-    u8 i;
-    u8 nObjects;
-    struct MapObjectTemplate *template;
-
-    if (gMapHeader.events != NULL)
-    {
-        if (InBattlePyramid())
-        {
-            nObjects = sub_81AAA40();
-        }
-        else if (InTrainerHill())
-        {
-            nObjects = 2;
-        }
-        else
-        {
-            nObjects = gMapHeader.events->mapObjectCount;
-        }
-        for (i = 0; i < nObjects; i ++)
-        {
-            template = &gSaveBlock1Ptr->mapObjectTemplates[i];
-            if (template->localId == localId && !FlagGet(template->flagId))
-            {
-                return InitFieldObjectStateFromTemplate(template, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
-            }
-        }
-    }
-    return NUM_FIELD_OBJECTS;
-}
-
-static bool8 GetAvailableFieldObjectSlot(u16 localId, u8 mapNum, u8 mapGroup, u8 *result)
-// Looks for an empty slot.
-// Returns FALSE and the location of the available slot
-// in *result.
-// If no slots are available, or if the object is already
-// loaded, returns TRUE.
-{
-    u8 i = 0;
-
-    for (i = 0; i < NUM_FIELD_OBJECTS; i ++)
-    {
-        if (!gMapObjects[i].active)
-            break;
-        if (gMapObjects[i].localId == localId && gMapObjects[i].mapNum == mapNum && gMapObjects[i].mapGroup == mapGroup)
-            return TRUE;
-    }
-    if (i >= NUM_FIELD_OBJECTS)
-        return TRUE;
-    *result = i;
-    do
-    {
-        if (gMapObjects[i].active && gMapObjects[i].localId == localId && gMapObjects[i].mapNum == mapNum && gMapObjects[i].mapGroup == mapGroup)
-            return TRUE;
-        i ++;
-    } while (i < NUM_FIELD_OBJECTS);
-    return FALSE;
-}
-
-static void RemoveFieldObject(struct MapObject *mapObject)
-{
-    mapObject->active = FALSE;
-    RemoveFieldObjectInternal(mapObject);
-}
-
-void RemoveFieldObjectByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup)
-{
-    u8 index;
-    if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &index))
-    {
-        FlagSet(GetFieldObjectFlagIdByFieldObjectId(index));
-        RemoveFieldObject(&gMapObjects[index]);
-    }
-}
-
-static void RemoveFieldObjectInternal(struct MapObject *mapObject)
-{
-    struct SpriteFrameImage image;
-    image.size = GetFieldObjectGraphicsInfo(mapObject->graphicsId)->size;
-    gSprites[mapObject->spriteId].images = &image;
-    DestroySprite(&gSprites[mapObject->spriteId]);
-}
-
-void unref_sub_808D958(void)
-{
-    u8 i;
-
-    for (i = 0; i < NUM_FIELD_OBJECTS; i ++)
-    {
-        if (i != gPlayerAvatar.mapObjectId)
-        {
-            RemoveFieldObject(&gMapObjects[i]);
-        }
-    }
-}
-
-static u8 SpawnFieldObjectInternal(struct MapObjectTemplate *mapObjectTemplate, struct SpriteTemplate *spriteTemplate, u8 mapNum, u8 mapGroup, s16 cameraX, s16 cameraY)
-{
-    struct MapObject *mapObject;
-    const struct MapObjectGraphicsInfo *graphicsInfo;
-    struct Sprite *sprite;
-    u8 mapObjectId;
-    u8 paletteSlot;
-    u8 spriteId;
-
-    mapObjectId = InitFieldObjectStateFromTemplate(mapObjectTemplate, mapNum, mapGroup);
-    if (mapObjectId == NUM_FIELD_OBJECTS)
-    {
-        return NUM_FIELD_OBJECTS;
-    }
-    mapObject = &gMapObjects[mapObjectId];
-    graphicsInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId);
-    paletteSlot = graphicsInfo->paletteSlot;
-    if (paletteSlot == 0)
-    {
-        npc_load_two_palettes__no_record(graphicsInfo->paletteTag1, 0);
-    }
-    else if (paletteSlot == 10)
-    {
-        npc_load_two_palettes__and_record(graphicsInfo->paletteTag1, 10);
-    }
-    else if (paletteSlot >= 16)
-    {
-        paletteSlot -= 16;
-        sub_808EAB0(graphicsInfo->paletteTag1, paletteSlot);
-    }
-    if (mapObject->animPattern == 0x4c)
-    {
-        mapObject->mapobj_bit_13 = TRUE;
-    }
-    *(u16 *)&spriteTemplate->paletteTag = 0xFFFF;
-    spriteId = CreateSprite(spriteTemplate, 0, 0, 0);
-    if (spriteId == MAX_SPRITES)
-    {
-        gMapObjects[mapObjectId].active = FALSE;
-        return NUM_FIELD_OBJECTS;
-    }
-    sprite = &gSprites[spriteId];
-    sub_8092FF0(mapObject->coords2.x + cameraX, mapObject->coords2.y + cameraY, &sprite->pos1.x, &sprite->pos1.y);
-    sprite->centerToCornerVecX = -(graphicsInfo->width >> 1);
-    sprite->centerToCornerVecY = -(graphicsInfo->height >> 1);
-    sprite->pos1.x += 8;
-    sprite->pos1.y += 16 + sprite->centerToCornerVecY;
-    sprite->oam.paletteNum = paletteSlot;
-    sprite->coordOffsetEnabled = TRUE;
-    sprite->data[0] = mapObjectId;
-    mapObject->spriteId = spriteId;
-    mapObject->mapobj_bit_12 = graphicsInfo->inanimate;
-    if (!mapObject->mapobj_bit_12)
-    {
-        StartSpriteAnim(sprite, FieldObjectDirectionToImageAnimId(mapObject->mapobj_unk_18));
-    }
-    SetObjectSubpriorityByZCoord(mapObject->elevation, sprite, 1);
-    sub_8096518(mapObject, sprite);
-    return mapObjectId;
-}
-
-static u8 SpawnFieldObject(struct MapObjectTemplate *mapObjectTemplate, u8 mapNum, u8 mapGroup, s16 cameraX, s16 cameraY)
-{
-    const struct MapObjectGraphicsInfo *graphicsInfo;
-    struct SpriteTemplate spriteTemplate;
-    const struct SubspriteTable *subspriteTables;
-    struct SpriteFrameImage spriteFrameImage;
-    u8 mapObjectId;
-
-    subspriteTables = NULL;
-    graphicsInfo = GetFieldObjectGraphicsInfo(mapObjectTemplate->graphicsId);
-    MakeObjectTemplateFromFieldObjectTemplate(mapObjectTemplate, &spriteTemplate, &subspriteTables);
-    spriteFrameImage.size = graphicsInfo->size;
-    spriteTemplate.images = &spriteFrameImage;
-    mapObjectId = SpawnFieldObjectInternal(mapObjectTemplate, &spriteTemplate, mapNum, mapGroup, cameraX, cameraY);
-    if (mapObjectId == NUM_FIELD_OBJECTS)
-    {
-        return NUM_FIELD_OBJECTS;
-    }
-    gSprites[gMapObjects[mapObjectId].spriteId].images = graphicsInfo->images;
-    if (subspriteTables != NULL)
-    {
-        SetSubspriteTables(&gSprites[gMapObjects[mapObjectId].spriteId], subspriteTables);
-    }
-    return mapObjectId;
-}
-
-u8 SpawnSpecialFieldObject(struct MapObjectTemplate *mapObjectTemplate)
-{
-    s16 cameraX;
-    s16 cameraY;
-
-    GetFieldObjectMovingCameraOffset(&cameraX, &cameraY);
-    return SpawnFieldObject(mapObjectTemplate, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, cameraX, cameraY);
-}
-
-u8 SpawnSpecialFieldObjectParametrized(u8 graphicsId, u8 movementBehavior, u8 localId, s16 x, s16 y, u8 z)
-{
-    struct MapObjectTemplate mapObjectTemplate;
-
-    x -= 7;
-    y -= 7;
-    mapObjectTemplate.localId = localId;
-    mapObjectTemplate.graphicsId = graphicsId;
-    mapObjectTemplate.unk2 = 0;
-    mapObjectTemplate.x = x;
-    mapObjectTemplate.y = y;
-    mapObjectTemplate.elevation = z;
-    mapObjectTemplate.movementType = movementBehavior;
-    mapObjectTemplate.unkA_0 = 0;
-    mapObjectTemplate.unkA_4 = 0;
-    mapObjectTemplate.unkC = 0;
-    mapObjectTemplate.unkE = 0;
-    return SpawnSpecialFieldObject(&mapObjectTemplate);
-}
-
-u8 show_sprite(u8 localId, u8 mapNum, u8 mapGroup)
-{
-    struct MapObjectTemplate *mapObjectTemplate;
-    s16 cameraX;
-    s16 cameraY;
-
-    mapObjectTemplate = GetFieldObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup);
-    if (mapObjectTemplate == NULL)
-    {
-        return NUM_FIELD_OBJECTS;
-    }
-    GetFieldObjectMovingCameraOffset(&cameraX, &cameraY);
-    return SpawnFieldObject(mapObjectTemplate, mapNum, mapGroup, cameraX, cameraY);
-}
-
-static void MakeObjectTemplateFromFieldObjectGraphicsInfo(u16 graphicsId, void (*callback)(struct Sprite *), struct SpriteTemplate *sprTemplate, const struct SubspriteTable **subspriteTables)
-{
-    const struct MapObjectGraphicsInfo *gfxInfo = GetFieldObjectGraphicsInfo(graphicsId);
-
-    sprTemplate->tileTag = gfxInfo->tileTag;
-    sprTemplate->paletteTag = gfxInfo->paletteTag1;
-    sprTemplate->oam = gfxInfo->oam;
-    sprTemplate->anims = gfxInfo->anims;
-    sprTemplate->images = gfxInfo->images;
-    sprTemplate->affineAnims = gfxInfo->affineAnims;
-    sprTemplate->callback = callback;
-    *subspriteTables = gfxInfo->subspriteTables;
-}
-
-static void MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex(u16 graphicsId, u16 callbackIndex, struct SpriteTemplate *sprTemplate, const struct SubspriteTable **subspriteTables)
-{
-    MakeObjectTemplateFromFieldObjectGraphicsInfo(graphicsId, gUnknown_08505438[callbackIndex], sprTemplate, subspriteTables);
-}
-
-static void MakeObjectTemplateFromFieldObjectTemplate(struct MapObjectTemplate *mapObjectTemplate, struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables)
-{
-    MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex(mapObjectTemplate->graphicsId, mapObjectTemplate->movementType, spriteTemplate, subspriteTables);
-}
-
-u8 AddPseudoFieldObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority)
-{
-    struct SpriteTemplate *spriteTemplate;
-    const struct SubspriteTable *subspriteTables;
-    struct Sprite *sprite;
-    u8 spriteIdx;
-
-    spriteTemplate = malloc(sizeof(struct SpriteTemplate));
-    MakeObjectTemplateFromFieldObjectGraphicsInfo(graphicsId, callback, spriteTemplate, &subspriteTables);
-    if (spriteTemplate->paletteTag != 0xffff)
-    {
-        sub_808E894(spriteTemplate->paletteTag);
-    }
-    spriteIdx = CreateSprite(spriteTemplate, x, y, subpriority);
-    free(spriteTemplate);
-
-    if (spriteIdx != MAX_SPRITES && subspriteTables != NULL)
-    {
-        sprite = &gSprites[spriteIdx];
-        SetSubspriteTables(sprite, subspriteTables);
-        sprite->subspriteMode = 2;
-    }
-    return spriteIdx;
-}
-
-u8 sprite_new(u8 graphicsId, u8 a1, s16 x, s16 y, u8 z, u8 direction)
-{
-    const struct MapObjectGraphicsInfo *graphicsInfo;
-    struct SpriteTemplate spriteTemplate;
-    const struct SubspriteTable *subspriteTables;
-    u8 spriteId;
-    struct Sprite *sprite;
-
-    graphicsInfo = GetFieldObjectGraphicsInfo(graphicsId);
-    MakeObjectTemplateFromFieldObjectGraphicsInfo(graphicsId, sub_8097AC8, &spriteTemplate, &subspriteTables);
-    *(u16 *)&spriteTemplate.paletteTag = 0xffff;
-    x += 7;
-    y += 7;
-    sub_80930E0(&x, &y, 8, 16);
-    spriteId = CreateSpriteAtEnd(&spriteTemplate, x, y, 0);
-    if (spriteId != MAX_SPRITES)
-    {
-        sprite = &gSprites[spriteId];
-        sprite->centerToCornerVecX = -(graphicsInfo->width >> 1);
-        sprite->centerToCornerVecY = -(graphicsInfo->height >> 1);
-        sprite->pos1.y += sprite->centerToCornerVecY;
-        sprite->oam.paletteNum = graphicsInfo->paletteSlot;
-        if (sprite->oam.paletteNum >= 16)
-        {
-            sprite->oam.paletteNum -= 16;
-        }
-        sprite->coordOffsetEnabled = TRUE;
-        sprite->data[0] = a1;
-        sprite->data[1] = z;
-        if (graphicsInfo->paletteSlot == 10)
-        {
-            npc_load_two_palettes__and_record(graphicsInfo->paletteTag1, graphicsInfo->paletteSlot);
-        }
-        else if (graphicsInfo->paletteSlot >= 16)
-        {
-            sub_808EAB0(graphicsInfo->paletteTag1, graphicsInfo->paletteSlot | 0xf0);
-        }
-        if (subspriteTables != NULL)
-        {
-            SetSubspriteTables(sprite, subspriteTables);
-            sprite->subspriteMode = 2;
-        }
-        InitObjectPriorityByZCoord(sprite, z);
-        SetObjectSubpriorityByZCoord(z, sprite, 1);
-        StartSpriteAnim(sprite, FieldObjectDirectionToImageAnimId(direction));
-    }
-    return spriteId;
-}
-
-void SpawnFieldObjectsInView(s16 cameraX, s16 cameraY)
-{
-    u8 i;
-    s16 left;
-    s16 right;
-    s16 top;
-    s16 bottom;
-    u8 objectCount;
-    s16 npcX;
-    s16 npcY;
-
-    if (gMapHeader.events != NULL)
-    {
-        left = gSaveBlock1Ptr->pos.x - 2;
-        right = gSaveBlock1Ptr->pos.x + 17;
-        top = gSaveBlock1Ptr->pos.y;
-        bottom = gSaveBlock1Ptr->pos.y + 16;
-
-        if (InBattlePyramid())
-        {
-            objectCount = sub_81AAA40();
-        }
-        else if (InTrainerHill())
-        {
-            objectCount = 2;
-        }
-        else
-        {
-            objectCount = gMapHeader.events->mapObjectCount;
-        }
-
-        for (i = 0; i < objectCount; i++)
-        {
-            struct MapObjectTemplate *template = &gSaveBlock1Ptr->mapObjectTemplates[i];
-            npcX = template->x + 7;
-            npcY = template->y + 7;
-
-            if (top <= npcY && bottom >= npcY && left <= npcX && right >= npcX
-                && !FlagGet(template->flagId))
-                SpawnFieldObject(template, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, cameraX, cameraY);
-        }
-    }
-}
-
-/*static*/ void RemoveFieldObjectsOutsideView(void)
-{
-    u8 i;
-    u8 j;
-    bool8 isActiveLinkPlayer;
-    struct MapObject *mapObject;
-
-    for (i = 0; i < NUM_FIELD_OBJECTS; i ++)
-    {
-        for (j = 0, isActiveLinkPlayer = FALSE; j < ARRAY_COUNT(gLinkPlayerMapObjects); j ++)
-        {
-            if (gLinkPlayerMapObjects[j].active && i == gLinkPlayerMapObjects[j].mapObjId)
-                isActiveLinkPlayer = TRUE;
-        }
-        if (!isActiveLinkPlayer)
-        {
-            mapObject = &gMapObjects[i];
-
-            if (mapObject->active && !mapObject->mapobj_bit_16)
-                RemoveFieldObjectIfOutsideView(mapObject);
-        }
-    }
-}
-
-static void RemoveFieldObjectIfOutsideView(struct MapObject *mapObject)
-{
-    s16 left;
-    s16 right;
-    s16 top;
-    s16 bottom;
-
-    left = gSaveBlock1Ptr->pos.x - 2;
-    right = gSaveBlock1Ptr->pos.x + 17;
-    top = gSaveBlock1Ptr->pos.y;
-    bottom = gSaveBlock1Ptr->pos.y + 16;
-
-    if (mapObject->coords2.x >= left && mapObject->coords2.x <= right
-        && mapObject->coords2.y >= top && mapObject->coords2.y <= bottom)
-        return;
-    if (mapObject->coords1.x >= left && mapObject->coords1.x <= right
-        && mapObject->coords1.y >= top && mapObject->coords1.y <= bottom)
-        return;
-    RemoveFieldObject(mapObject);
-}
-
-void sub_808E16C(s16 x, s16 y)
-{
-    u8 i;
-
-    ClearPlayerAvatarInfo();
-    for (i = 0; i < NUM_FIELD_OBJECTS; i ++)
-    {
-        if (gMapObjects[i].active)
-        {
-            sub_808E1B8(i, x, y);
-        }
-    }
-    sub_808D450();
-}
-
-static void sub_808E1B8(u8 mapObjectId, s16 x, s16 y)
-{
-    u8 spriteId;
-    u8 paletteSlot;
-    struct MapObject *mapObject;
-    const struct SubspriteTable *subspriteTables;
-    const struct MapObjectGraphicsInfo *graphicsInfo;
-    struct SpriteFrameImage spriteFrameImage;
-    struct SpriteTemplate spriteTemplate;
-    struct Sprite *sprite;
-
-#define i spriteId
-    for (i = 0; i < ARRAY_COUNT(gLinkPlayerMapObjects); i ++)
-    {
-        if (gLinkPlayerMapObjects[i].active && mapObjectId == gLinkPlayerMapObjects[i].mapObjId)
-        {
-            return;
-        }
-    }
-#undef i
-
-    mapObject = &gMapObjects[mapObjectId];
-    subspriteTables = NULL;
-    graphicsInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId);
-    spriteFrameImage.size = graphicsInfo->size;
-    MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex(mapObject->graphicsId, mapObject->animPattern, &spriteTemplate, &subspriteTables);
-    spriteTemplate.images = &spriteFrameImage;
-    *(u16 *)&spriteTemplate.paletteTag = 0xffff;
-    paletteSlot = graphicsInfo->paletteSlot;
-    if (paletteSlot == 0)
-    {
-        npc_load_two_palettes__no_record(graphicsInfo->paletteTag1, graphicsInfo->paletteSlot);
-    }
-    else if (paletteSlot == 10)
-    {
-        npc_load_two_palettes__and_record(graphicsInfo->paletteTag1, graphicsInfo->paletteSlot);
-    }
-    else if (paletteSlot >= 16)
-    {
-        paletteSlot -= 16;
-        sub_808EAB0(graphicsInfo->paletteTag1, paletteSlot);
-    }
-    *(u16 *)&spriteTemplate.paletteTag = 0xffff;
-    spriteId = CreateSprite(&spriteTemplate, 0, 0, 0);
-    if (spriteId != MAX_SPRITES)
-    {
-        sprite = &gSprites[spriteId];
-        sub_8092FF0(x + mapObject->coords2.x, y + mapObject->coords2.y, &sprite->pos1.x, &sprite->pos1.y);
-        sprite->centerToCornerVecX = -(graphicsInfo->width >> 1);
-        sprite->centerToCornerVecY = -(graphicsInfo->height >> 1);
-        sprite->pos1.x += 8;
-        sprite->pos1.y += 16 + sprite->centerToCornerVecY;
-        sprite->images = graphicsInfo->images;
-        if (mapObject->animPattern == 0x0b)
-        {
-            SetPlayerAvatarFieldObjectIdAndObjectId(mapObjectId, spriteId);
-            mapObject->mapobj_unk_1B = sub_8154228();
-        }
-        if (subspriteTables != NULL)
-        {
-            SetSubspriteTables(sprite, subspriteTables);
-        }
-        sprite->oam.paletteNum = paletteSlot;
-        sprite->coordOffsetEnabled = TRUE;
-        sprite->data[0] = mapObjectId;
-        mapObject->spriteId = spriteId;
-        if (!mapObject->mapobj_bit_12 && mapObject->animPattern != 0x0b)
-        {
-            StartSpriteAnim(sprite, FieldObjectDirectionToImageAnimId(mapObject->mapobj_unk_18));
-        }
-        sub_808E38C(mapObject);
-        SetObjectSubpriorityByZCoord(mapObject->elevation, sprite, 1);
-    }
-}
-
-/*static*/ void sub_808E38C(struct MapObject *mapObject)
-{
-    mapObject->mapobj_bit_1 = FALSE;
-    mapObject->mapobj_bit_2 = TRUE;
-    mapObject->mapobj_bit_22 = FALSE;
-    mapObject->mapobj_bit_17 = FALSE;
-    mapObject->mapobj_bit_18 = FALSE;
-    mapObject->mapobj_bit_19 = FALSE;
-    mapObject->mapobj_bit_20 = FALSE;
-    mapObject->mapobj_bit_21 = FALSE;
-    FieldObjectClearAnim(mapObject);
-}
-
-static void SetPlayerAvatarFieldObjectIdAndObjectId(u8 mapObjectId, u8 spriteId)
-{
-    gPlayerAvatar.mapObjectId = mapObjectId;
-    gPlayerAvatar.spriteId = spriteId;
-    gPlayerAvatar.gender = GetPlayerAvatarGenderByGraphicsId(gMapObjects[mapObjectId].graphicsId);
-    SetPlayerAvatarExtraStateTransition(gMapObjects[mapObjectId].graphicsId, 0x20);
-}
-
-void FieldObjectSetGraphicsId(struct MapObject *mapObject, u8 graphicsId)
-{
-    const struct MapObjectGraphicsInfo *graphicsInfo;
-    struct Sprite *sprite;
-    u8 paletteSlot;
-
-    graphicsInfo = GetFieldObjectGraphicsInfo(graphicsId);
-    sprite = &gSprites[mapObject->spriteId];
-    paletteSlot = graphicsInfo->paletteSlot;
-    if (paletteSlot == 0)
-    {
-        pal_patch_for_npc(graphicsInfo->paletteTag1, graphicsInfo->paletteSlot);
-    }
-    else if (paletteSlot == 10)
-    {
-        npc_load_two_palettes__and_record(graphicsInfo->paletteTag1, graphicsInfo->paletteSlot);
-    }
-    else if (paletteSlot >= 16)
-    {
-        paletteSlot -= 16;
-        sub_808EAB0(graphicsInfo->paletteTag1, paletteSlot);
-    }
-    sprite->oam.shape = graphicsInfo->oam->shape;
-    sprite->oam.size = graphicsInfo->oam->size;
-    sprite->images = graphicsInfo->images;
-    sprite->anims = graphicsInfo->anims;
-    sprite->subspriteTables = graphicsInfo->subspriteTables;
-    sprite->oam.paletteNum = paletteSlot;
-    mapObject->mapobj_bit_12 = graphicsInfo->inanimate;
-    mapObject->graphicsId = graphicsId;
-    sub_8093038(mapObject->coords2.x, mapObject->coords2.y, &sprite->pos1.x, &sprite->pos1.y);
-    sprite->centerToCornerVecX = -(graphicsInfo->width >> 1);
-    sprite->centerToCornerVecY = -(graphicsInfo->height >> 1);
-    sprite->pos1.x += 8;
-    sprite->pos1.y += 16 + sprite->centerToCornerVecY;
-    if (mapObject->mapobj_bit_15)
-    {
-        CameraObjectReset1();
-    }
-}
-
-void FieldObjectSetGraphicsIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 graphicsId)
-{
-    u8 mapObjectId;
-
-    if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId))
-    {
-        FieldObjectSetGraphicsId(&gMapObjects[mapObjectId], graphicsId);
-    }
-}
-
-void FieldObjectTurn(struct MapObject *mapObject, u8 direction)
-{
-    FieldObjectSetDirection(mapObject, direction);
-    if (!mapObject->mapobj_bit_12)
-    {
-        StartSpriteAnim(&gSprites[mapObject->spriteId], FieldObjectDirectionToImageAnimId(mapObject->mapobj_unk_18));
-        SeekSpriteAnim(&gSprites[mapObject->spriteId], 0);
-    }
-}
-
-void FieldObjectTurnByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 direction)
-{
-    u8 mapObjectId;
-
-    if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId))
-    {
-        FieldObjectTurn(&gMapObjects[mapObjectId], direction);
-    }
-}
-
-void PlayerObjectTurn(struct PlayerAvatar *playerAvatar, u8 direction)
-{
-    FieldObjectTurn(&gMapObjects[playerAvatar->mapObjectId], direction);
-}
-
-/*static*/ void get_berry_tree_graphics(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    u8 berryStage;
-    u8 berryId;
-
-    mapObject->mapobj_bit_13 = TRUE;
-    sprite->invisible = TRUE;
-    berryStage = GetStageByBerryTreeId(mapObject->trainerRange_berryTreeId);
-    if (berryStage != 0)
-    {
-        mapObject->mapobj_bit_13 = FALSE;
-        sprite->invisible = FALSE;
-        berryId = GetBerryTypeByBerryTreeId(mapObject->trainerRange_berryTreeId) - 1;
-        berryStage -= 1;
-        if (berryId >= NUM_BERRIES)
-        {
-            berryId = 0;
-        }
-        FieldObjectSetGraphicsId(mapObject, gBerryTreeFieldObjectGraphicsIdTablePointers[berryId][berryStage]);
-        sprite->images = gBerryTreePicTablePointers[berryId];
-        sprite->oam.paletteNum = gBerryTreePaletteSlotTablePointers[berryId][berryStage];
-        StartSpriteAnim(sprite, berryStage);
-    }
-}
-
-const struct MapObjectGraphicsInfo *GetFieldObjectGraphicsInfo(u8 graphicsId)
-{
-    u8 bard;
-
-    if (graphicsId >= SPRITE_VAR)
-    {
-        graphicsId = VarGetFieldObjectGraphicsId(graphicsId - SPRITE_VAR);
-    }
-    if (graphicsId == 0x45)
-    {
-        bard = GetCurrentMauvilleOldMan();
-        return gMauvilleOldManGraphicsInfoPointers[bard];
-    }
-    if (graphicsId >= NUM_OBJECT_GRAPHICS_INFO)
-    {
-        graphicsId = 0x05; // LittleBoy1
-    }
-    return gFieldObjectGraphicsInfoPointers[graphicsId];
-}
-
-static void FieldObjectHandleDynamicGraphicsId(struct MapObject *mapObject)
-{
-    if (mapObject->graphicsId >= SPRITE_VAR)
-    {
-        mapObject->graphicsId = VarGetFieldObjectGraphicsId(mapObject->graphicsId - SPRITE_VAR);
-    }
-}
-
-void npc_by_local_id_and_map_set_field_1_bit_x20(u8 localId, u8 mapNum, u8 mapGroup, u8 state)
-{
-    u8 mapObjectId;
-
-    if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId))
-    {
-        gMapObjects[mapObjectId].mapobj_bit_13 = state;
-    }
-}
-
-void FieldObjectGetLocalIdAndMap(struct MapObject *mapObject, void *localId, void *mapNum, void *mapGroup)
-{
-    *(u8*)(localId) = mapObject->localId;
-    *(u8*)(mapNum) = mapObject->mapNum;
-    *(u8*)(mapGroup) = mapObject->mapGroup;
-}
-
-void sub_808E75C(s16 x, s16 y)
-{
-    u8 mapObjectId;
-    struct MapObject *mapObject;
-
-    mapObjectId = GetFieldObjectIdByXY(x, y);
-    if (mapObjectId != NUM_FIELD_OBJECTS)
-    {
-        mapObject = &gMapObjects[mapObjectId];
-        mapObject->mapobj_bit_2 = TRUE;
-    }
-}
-
-void sub_808E78C(u8 localId, u8 mapNum, u8 mapGroup, u8 subpriority)
-{
-    u8 mapObjectId;
-    struct MapObject *mapObject;
-    struct Sprite *sprite;
-
-    if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId))
-    {
-        mapObject = &gMapObjects[mapObjectId];
-        sprite = &gSprites[mapObject->spriteId];
-        mapObject->mapobj_bit_26 = TRUE;
-        sprite->subpriority = subpriority;
-    }
-}
-
-void sub_808E7E4(u8 localId, u8 mapNum, u8 mapGroup)
-{
-    u8 mapObjectId;
-    struct MapObject *mapObject;
-
-    if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId))
-    {
-        mapObject = &gMapObjects[mapObjectId];
-        mapObject->mapobj_bit_26 = FALSE;
-        mapObject->mapobj_bit_2 = TRUE;
-    }
-}
-
-void sub_808E82C(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y)
-{
-    u8 mapObjectId;
-    struct Sprite *sprite;
-
-    if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId))
-    {
-        sprite = &gSprites[gMapObjects[mapObjectId].spriteId];
-        sprite->pos2.x = x;
-        sprite->pos2.y = y;
-    }
-}
-
-void gpu_pal_allocator_reset__manage_upper_four(void)
-{
-    FreeAllSpritePalettes();
-    gReservedSpritePaletteCount = 12;
-}
-
-static void sub_808E894(u16 paletteTag)
-{
-    u16 paletteSlot;
-
-    paletteSlot = FindFieldObjectPaletteIndexByTag(paletteTag);
-    if (paletteSlot != 0x11ff) // always true
-    {
-        sub_808E8F4(&gUnknown_0850BBC8[paletteSlot]);
-    }
-}
-
-void sub_808E8C0(u16 *paletteTags)
-{
-    u8 i;
-
-    for (i = 0; paletteTags[i] != 0x11ff; i ++)
-    {
-        sub_808E894(paletteTags[i]);
-    }
-}
-
-static u8 sub_808E8F4(const struct SpritePalette *spritePalette)
-{
-    if (IndexOfSpritePaletteTag(spritePalette->tag) != 0xff)
-    {
-        return 0xff;
-    }
-    return LoadSpritePalette(spritePalette);
-}
-
-void pal_patch_for_npc(u16 paletteTag, u8 paletteSlot)
-{
-    u16 paletteIdx;
-
-    paletteIdx = FindFieldObjectPaletteIndexByTag(paletteTag);
-    LoadPalette(gUnknown_0850BBC8[paletteIdx].data, 16 * paletteSlot + 256, 0x20);
-}
-
-void pal_patch_for_npc_range(const u16 *paletteTags, u8 minSlot, u8 maxSlot)
-{
-    while (minSlot < maxSlot)
-    {
-        pal_patch_for_npc(*paletteTags, minSlot);
-        paletteTags ++;
-        minSlot ++;
-    }
-}
-
-static u8 FindFieldObjectPaletteIndexByTag(u16 tag)
-{
-    u8 i;
-
-    for (i = 0; gUnknown_0850BBC8[i].tag != 0x11ff; i ++)
-    {
-        if (gUnknown_0850BBC8[i].tag == tag)
-        {
-            return i;
-        }
-    }
-    return 0xff;
-}
-
-void npc_load_two_palettes__no_record(u16 tag, u8 slot)
-{
-    u8 i;
-
-    pal_patch_for_npc(tag, slot);
-    for (i = 0; gUnknown_0850BD00[i].tag != 0x11ff; i ++)
-    {
-        if (gUnknown_0850BD00[i].tag == tag)
-        {
-            pal_patch_for_npc(gUnknown_0850BD00[i].data[gUnknown_020375B4], gUnknown_084975C4[slot]);
-            return;
-        }
-    }
-}
-
-void npc_load_two_palettes__and_record(u16 tag, u8 slot)
-{
-    u8 i;
-
-    gUnknown_020375B6 = tag;
-    pal_patch_for_npc(tag, slot);
-    for (i = 0; gUnknown_0850BD78[i].tag != 0x11ff; i ++)
-    {
-        if (gUnknown_0850BD78[i].tag == tag)
-        {
-            pal_patch_for_npc(gUnknown_0850BD78[i].data[gUnknown_020375B4], gUnknown_084975C4[slot]);
-            return;
-        }
-    }
-}
-
-static void sub_808EAB0(u16 tag, u8 slot)
-{
-    pal_patch_for_npc(tag, slot);
-}
-
-void unref_sub_808EAC4(struct MapObject *mapObject, s16 x, s16 y)
-{
-    mapObject->coords3.x = mapObject->coords2.x;
-    mapObject->coords3.y = mapObject->coords2.y;
-    mapObject->coords2.x += x;
-    mapObject->coords2.y += y;
-}
-
-void npc_coords_shift(struct MapObject *mapObject, s16 x, s16 y)
-{
-    mapObject->coords3.x = mapObject->coords2.x;
-    mapObject->coords3.y = mapObject->coords2.y;
-    mapObject->coords2.x = x;
-    mapObject->coords2.y = y;
-}
-
-/*static*/ void npc_coords_set(struct MapObject *mapObject, s16 x, s16 y)
-{
-    mapObject->coords3.x = x;
-    mapObject->coords3.y = y;
-    mapObject->coords2.x = x;
-    mapObject->coords2.y = y;
-}
-
-void sub_808EB08(struct MapObject *mapObject, s16 x, s16 y)
-{
-    struct Sprite *sprite;
-    const struct MapObjectGraphicsInfo *graphicsInfo;
-
-    sprite = &gSprites[mapObject->spriteId];
-    graphicsInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId);
-    npc_coords_set(mapObject, x, y);
-    sub_8093038(mapObject->coords2.x, mapObject->coords2.y, &sprite->pos1.x, &sprite->pos1.y);
-    sprite->centerToCornerVecX = -(graphicsInfo->width >> 1);
-    sprite->centerToCornerVecY = -(graphicsInfo->height >> 1);
-    sprite->pos1.x += 8;
-    sprite->pos1.y += 16 + sprite->centerToCornerVecY;
-    sub_808E38C(mapObject);
-    if (mapObject->mapobj_bit_15)
-    {
-        CameraObjectReset1();
-    }
-}
-
-void sub_808EBA8(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y)
-{
-    u8 mapObjectId;
-
-    if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId))
-    {
-        x += 7;
-        y += 7;
-        sub_808EB08(&gMapObjects[mapObjectId], x, y);
-    }
-}
-
-void npc_coords_shift_still(struct MapObject *mapObject)
-{
-    npc_coords_shift(mapObject, mapObject->coords2.x, mapObject->coords2.y);
-}
-
-void UpdateFieldObjectCoordsForCameraUpdate(void)
-{
-    u8 i;
-    s16 dx;
-    s16 dy;
-
-    if (gCamera.active)
-    {
-        dx = gCamera.x;
-        dy = gCamera.y;
-        for (i = 0; i < NUM_FIELD_OBJECTS; i ++)
-        {
-            if (gMapObjects[i].active)
-            {
-                gMapObjects[i].coords1.x -= dx;
-                gMapObjects[i].coords1.y -= dy;
-                gMapObjects[i].coords2.x -= dx;
-                gMapObjects[i].coords2.y -= dy;
-                gMapObjects[i].coords3.x -= dx;
-                gMapObjects[i].coords3.y -= dy;
-            }
-        }
-    }
-}
-
-u8 GetFieldObjectIdByXYZ(u16 x, u16 y, u8 z)
-{
-    u8 i;
-    for (i = 0; i < NUM_FIELD_OBJECTS; i ++)
-    {
-        if (gMapObjects[i].active)
-        {
-            if (gMapObjects[i].coords2.x == x && gMapObjects[i].coords2.y == y && FieldObjectDoesZCoordMatch(&gMapObjects[i], z))
-            {
-                return i;
-            }
-        }
-    }
-    return NUM_FIELD_OBJECTS;
-}
-
-static bool8 FieldObjectDoesZCoordMatch(struct MapObject *mapObject, u8 z)
-{
-    if (mapObject->mapobj_unk_0B_0 != 0 && z != 0 && mapObject->mapobj_unk_0B_0 != z)
-    {
-        return FALSE;
-    }
-    return TRUE;
-}
-
-void UpdateFieldObjectsForCameraUpdate(s16 x, s16 y)
-{
-    UpdateFieldObjectCoordsForCameraUpdate();
-    SpawnFieldObjectsInView(x, y);
-    RemoveFieldObjectsOutsideView();
-}
-
-u8 AddCameraObject(u8 linkedSpriteId)
-{
-    u8 spriteId;
-
-    spriteId = CreateSprite(&gUnknown_084975D4, 0, 0, 4);
-    gSprites[spriteId].invisible = TRUE;
-    gSprites[spriteId].data[0] = linkedSpriteId;
-    return spriteId;
-}
-
-void ObjectCB_CameraObject(struct Sprite *sprite)
-{
-    void (*callbacks[ARRAY_COUNT(gUnknown_084975EC)])(struct Sprite *);
-
-    memcpy(callbacks, gUnknown_084975EC, sizeof gUnknown_084975EC);
-    callbacks[sprite->data[1]](sprite);
-}
-
-/*static*/ void CameraObject_0(struct Sprite *sprite)
-{
-    sprite->pos1.x = gSprites[sprite->data[0]].pos1.x;
-    sprite->pos1.y = gSprites[sprite->data[0]].pos1.y;
-    sprite->invisible = TRUE;
-    sprite->data[1] = 1;
-    CameraObject_1(sprite);
-}
-
-/*static*/ void CameraObject_1(struct Sprite *sprite)
-{
-    s16 x;
-    s16 y;
-
-    y = gSprites[sprite->data[0]].pos1.y;
-    x = gSprites[sprite->data[0]].pos1.x;
-    sprite->data[2] = x - sprite->pos1.x;
-    sprite->data[3] = y - sprite->pos1.y;
-    sprite->pos1.x = x;
-    sprite->pos1.y = y;
-}
-
-/*static*/ void CameraObject_2(struct Sprite *sprite)
-{
-    sprite->pos1.x = gSprites[sprite->data[0]].pos1.x;
-    sprite->pos1.y = gSprites[sprite->data[0]].pos1.y;
-    sprite->data[2] = 0;
-    sprite->data[3] = 0;
-}
-
-static struct Sprite *FindCameraObject(void)
-{
-    u8 spriteId;
-
-    for (spriteId = 0; spriteId < MAX_SPRITES; spriteId ++)
-    {
-        if (gSprites[spriteId].inUse && gSprites[spriteId].callback == ObjectCB_CameraObject)
-        {
-            return &gSprites[spriteId];
-        }
-    }
-    return NULL;
-}
-
-void CameraObjectReset1(void)
-{
-    struct Sprite *cameraObject;
-
-    cameraObject = FindCameraObject();
-    if (cameraObject != NULL)
-    {
-        cameraObject->data[1] = 0;
-        cameraObject->callback(cameraObject);
-    }
-}
-
-void CameraObjectSetFollowedObjectId(u8 objectId)
-{
-    struct Sprite *cameraObject;
-
-    cameraObject = FindCameraObject();
-    if (cameraObject != NULL)
-    {
-        cameraObject->data[0] = objectId;
-        CameraObjectReset1();
-    }
-}
-
-u8 CameraObjectGetFollowedObjectId(void)
-{
-    struct Sprite *cameraObject;
-
-    cameraObject = FindCameraObject();
-    if (cameraObject == NULL)
-    {
-        return MAX_SPRITES;
-    }
-    return cameraObject->data[0];
-}
-
-void CameraObjectReset2(void)
-{
-    FindCameraObject()->data[1] = 2;
-}
-
-u8 CopySprite(struct Sprite *sprite, s16 x, s16 y, u8 subpriority)
-{
-    u8 i;
-
-    for (i = 0; i < MAX_SPRITES; i ++)
-    {
-        if (!gSprites[i].inUse)
-        {
-            gSprites[i] = *sprite;
-            gSprites[i].pos1.x = x;
-            gSprites[i].pos1.y = y;
-            gSprites[i].subpriority = subpriority;
-            break;
-        }
-    }
-    return i;
-}
-
-u8 obj_unfreeze(struct Sprite *sprite, s16 x, s16 y, u8 subpriority)
-{
-    s16 i;
-
-    for (i = MAX_SPRITES - 1; i > -1; i --)
-    {
-        if (!gSprites[i].inUse)
-        {
-            gSprites[i] = *sprite;
-            gSprites[i].pos1.x = x;
-            gSprites[i].pos1.y = y;
-            gSprites[i].subpriority = subpriority;
-            return i;
-        }
-    }
-    return MAX_SPRITES;
-}
-
-void FieldObjectSetDirection(struct MapObject *mapObject, u8 direction)
-{
-    s8 d2;
-    mapObject->mapobj_unk_20 = mapObject->mapobj_unk_18;
-    if (!mapObject->mapobj_bit_9)
-    {
-        d2 = direction;
-        mapObject->mapobj_unk_18 = d2;
-    }
-    mapObject->placeholder18 = direction;
-}
-
-static const u8 *GetFieldObjectScriptPointerByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup)
-{
-    return GetFieldObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->script;
-}
-
-const u8 *GetFieldObjectScriptPointerByFieldObjectId(u8 mapObjectId)
-{
-    return GetFieldObjectScriptPointerByLocalIdAndMap(gMapObjects[mapObjectId].localId, gMapObjects[mapObjectId].mapNum, gMapObjects[mapObjectId].mapGroup);
-}
-
-static u16 GetFieldObjectFlagIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup)
-{
-    return GetFieldObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->flagId;
-}
-
-u16 GetFieldObjectFlagIdByFieldObjectId(u8 mapObjectId)
-{
-    return GetFieldObjectFlagIdByLocalIdAndMap(gMapObjects[mapObjectId].localId, gMapObjects[mapObjectId].mapNum, gMapObjects[mapObjectId].mapGroup);
-}
-
-u8 sub_808F080(u8 localId, u8 mapNum, u8 mapGroup)
-{
-    u8 mapObjectId;
-
-    if (TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId))
-    {
-        return 0xFF;
-    }
-    return gMapObjects[mapObjectId].trainerType;
-}
-
-u8 sub_808F0BC(u8 mapObjectId)
-{
-    return gMapObjects[mapObjectId].trainerType;
-}
-
-u8 sub_808F0D4(u8 localId, u8 mapNum, u8 mapGroup)
-{
-    u8 mapObjectId;
-
-    if (TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId))
-    {
-        return 0xFF;
-    }
-    return gMapObjects[mapObjectId].trainerRange_berryTreeId;
-}
-
-u8 FieldObjectGetBerryTreeId(u8 mapObjectId)
-{
-    return gMapObjects[mapObjectId].trainerRange_berryTreeId;
-}
-
-struct MapObjectTemplate *GetFieldObjectTemplateByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup)
-{
-    struct MapObjectTemplate *templates;
-    const struct MapHeader *mapHeader;
-    u8 count;
-
-    if (gSaveBlock1Ptr->location.mapNum == mapNum && gSaveBlock1Ptr->location.mapGroup == mapGroup)
-    {
-        templates = gSaveBlock1Ptr->mapObjectTemplates;
-        count = gMapHeader.events->mapObjectCount;
-    }
-    else
-    {
-        mapHeader = Overworld_GetMapHeaderByGroupAndId(mapGroup, mapNum);
-        templates = mapHeader->events->mapObjects;
-        count = mapHeader->events->mapObjectCount;
-    }
-    return FindFieldObjectTemplateInArrayByLocalId(localId, templates, count);
-}
-
-struct MapObjectTemplate *FindFieldObjectTemplateInArrayByLocalId(u8 localId, struct MapObjectTemplate *templates, u8 count)
-{
-    u8 i;
-
-    for (i = 0; i < count; i ++)
-    {
-        if (templates[i].localId == localId)
-        {
-            return &templates[i];
-        }
-    }
-    return NULL;
-}
-
-struct MapObjectTemplate *sub_808F1B4(const struct MapObject *mapObject)
-{
-    int i;
-
-    if (mapObject->mapNum != gSaveBlock1Ptr->location.mapNum || mapObject->mapGroup != gSaveBlock1Ptr->location.mapGroup)
-    {
-        return NULL;
-    }
-    for (i = 0; i < 64; i ++) // Using ARRAY_COUNT here results in the wrong conditional branch instruction (bls instead of ble)
-    {
-        if (mapObject->localId == gSaveBlock1Ptr->mapObjectTemplates[i].localId)
-        {
-            return &gSaveBlock1Ptr->mapObjectTemplates[i];
-        }
-    }
-    return NULL;
-}
-
-void sub_808F208(const struct MapObject *mapObject)
-{
-    struct MapObjectTemplate *mapObjectTemplate;
-
-    mapObjectTemplate = sub_808F1B4(mapObject);
-    if (mapObjectTemplate != NULL)
-    {
-        mapObjectTemplate->x = mapObject->coords2.x - 7;
-        mapObjectTemplate->y = mapObject->coords2.y - 7;
-    }
-}
-
-void sub_808F228(const struct MapObject *mapObject, const u8 *script)
-{
-    struct MapObjectTemplate *mapObjectTemplate;
-
-    mapObjectTemplate = sub_808F1B4(mapObject);
-    if (mapObjectTemplate != NULL)
-    {
-        mapObjectTemplate->script = script;
-    }
-}
-
-void sub_808F23C(const struct MapObject *mapObject, u8 movementType)
-{
-    struct MapObjectTemplate *mapObjectTemplate;
-
-    mapObjectTemplate = sub_808F1B4(mapObject);
-    if (mapObjectTemplate != NULL)
-    {
-        mapObjectTemplate->movementType = movementType;
-    }
-}
-
-void sub_808F254(u8 localId, u8 mapNum, u8 mapGroup)
-{
-    u8 mapObjectId;
-
-    if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId))
-    {
-        sub_808F208(&gMapObjects[mapObjectId]);
-    }
-}
-
-void sub_808F28C(u8 localId, u8 mapNum, u8 mapGroup, u8 decorCat)
-{
-    u8 mapObjectId;
-
-    if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId))
-    {
-        switch (decorCat)
-        {
-            case DECORCAT_DOLL:
-                sub_808F228(&gMapObjects[mapObjectId], EventScript_2766A2);
-                break;
-            case DECORCAT_CUSHION:
-                sub_808F228(&gMapObjects[mapObjectId], EventScript_2766A6);
-                break;
-        }
-    }
-}
-
-void npc_paltag_set_load(u8 palSlot)
-{
-    gpu_pal_allocator_reset__manage_upper_four();
-    gUnknown_020375B6 = 0x11ff;
-    gUnknown_020375B4 = palSlot;
-    if (palSlot == 1)
-    {
-        pal_patch_for_npc_range(gUnknown_0850BE38[gUnknown_020375B4], 0, 6);
-        gReservedSpritePaletteCount = 8;
-    }
-    else
-    {
-        pal_patch_for_npc_range(gUnknown_0850BE38[gUnknown_020375B4], 0, 10);
-    }
-}
-
-u16 npc_paltag_by_palslot(u8 palSlot)
-{
-    u8 i;
-
-    if (palSlot < 10)
-    {
-        return gUnknown_0850BE38[gUnknown_020375B4][palSlot];
-    }
-    for (i = 0; gUnknown_0850BD78[i].tag != 0x11ff; i ++)
-    {
-        if (gUnknown_0850BD78[i].tag == gUnknown_020375B6)
-        {
-            return gUnknown_0850BD78[i].data[gUnknown_020375B4];
-        }
-    }
-    return 0x11ff;
-}
-
-// Map Object Step Callbacks
-// file boundary?
-
-null_object_step(NoMovement1, FALSE)
-
-field_object_step(GoRandomDirections, gUnknown_0850D6F4)
-
-bool8 sub_808F44C(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    npc_reset(mapObject, sprite);
-    sprite->data[1] = 1;
-    return TRUE;
-}
-
-bool8 sub_808F460(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data[1] = 2;
-    return TRUE;
-}
-
-bool8 sub_808F48C(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (!FieldObjectExecRegularAnim(mapObject, sprite))
-    {
-        return FALSE;
-    }
-    SetFieldObjectStepTimer(sprite, gUnknown_0850D6DC[Random() & 0x03]);
-    sprite->data[1] = 3;
-    return TRUE;
-}
-
-bool8 sub_808F4C8(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (RunFieldObjectStepTimer(sprite))
-    {
-        sprite->data[1] = 4;
-        return TRUE;
-    }
-    return FALSE;
-}
-
-bool8 sub_808F4E8(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    u8 directions[4];
-    u8 chosenDirection;
-
-    memcpy(directions, gUnknown_0850D710, sizeof directions);
-    chosenDirection = directions[Random() & 0x03];
-    FieldObjectSetDirection(mapObject, chosenDirection);
-    sprite->data[1] = 5;
-    if (npc_block_way__next_tile(mapObject, chosenDirection))
-    {
-        sprite->data[1] = 1;
-    }
-    return TRUE;
-}
-
-bool8 sub_808F534(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(mapObject->placeholder18));
-    mapObject->mapobj_bit_1 = TRUE;
-    sprite->data[1] = 6;
-    return TRUE;
-}
-
-bool8 sub_808F564(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
-    {
-        mapObject->mapobj_bit_1 = FALSE;
-        sprite->data[1] = 1;
-    }
-    return FALSE;
-}
-
-bool8 FieldObjectIsTrainerAndCloseToPlayer(struct MapObject *mapObject)
-{
-    s16 playerX;
-    s16 playerY;
-    s16 objX;
-    s16 objY;
-    s16 minX;
-    s16 maxX;
-    s16 minY;
-    s16 maxY;
-
-    if (!TestPlayerAvatarFlags(0x80))
-    {
-        return FALSE;
-    }
-    if (mapObject->trainerType != 1 && mapObject->trainerType != 3)
-    {
-        return FALSE;
-    }
-    PlayerGetDestCoords(&playerX, &playerY);
-    objX = mapObject->coords2.x;
-    objY = mapObject->coords2.y;
-    minX = objX - mapObject->trainerRange_berryTreeId;
-    minY = objY - mapObject->trainerRange_berryTreeId;
-    maxX = objX + mapObject->trainerRange_berryTreeId;
-    maxY = objY + mapObject->trainerRange_berryTreeId;
-    if (minX > playerX || maxX < playerX || minY > playerY || maxY < playerY)
-    {
-        return FALSE;
-    }
-    return TRUE;
-}
-
-u8 GetRegularRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy)
-{
-    u8 direction;
-
-    if (absdx > absdy)
-    {
-        direction = DIR_EAST;
-        if (dx < 0)
-        {
-            direction = DIR_WEST;
-        }
-    }
-    else
-    {
-        direction = DIR_SOUTH;
-        if (dy < 0)
-        {
-            direction = DIR_NORTH;
-        }
-    }
-    return direction;
-}
-
-u8 GetNorthSouthRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy)
-{
-    u8 direction;
-
-    direction = DIR_SOUTH;
-    if (dy < 0)
-    {
-        direction = DIR_NORTH;
-    }
-    return direction;
-}
-
-u8 GetEastWestRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy)
-{
-    u8 direction;
-
-    direction = DIR_EAST;
-    if (dx < 0)
-    {
-        direction = DIR_WEST;
-    }
-    return direction;
-}
-
-u8 GetNorthEastRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy)
-{
-    u8 direction;
-
-    direction = GetRegularRunningPastFacingDirection(dx, dy, absdx, absdy);
-    if (direction == DIR_SOUTH)
-    {
-        direction = GetEastWestRunningPastFacingDirection(dx, dy, absdx, absdy);
-        if (direction == DIR_EAST)
-        {
-            direction = DIR_NORTH;
-        }
-    }
-    else if (direction == DIR_EAST)
-    {
-        direction = GetNorthSouthRunningPastFacingDirection(dx, dy, absdx, absdy);
-        if (direction == DIR_SOUTH)
-        {
-            direction = DIR_NORTH;
-        }
-    }
-    return direction;
-}
-
-u8 GetNorthWestRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy)
-{
-    u8 direction;
-
-    direction = GetRegularRunningPastFacingDirection(dx, dy, absdx, absdy);
-    if (direction == DIR_SOUTH)
-    {
-        direction = GetEastWestRunningPastFacingDirection(dx, dy, absdx, absdy);
-        if (direction == DIR_WEST)
-        {
-            direction = DIR_NORTH;
-        }
-    }
-    else if (direction == DIR_WEST)
-    {
-        direction = GetNorthSouthRunningPastFacingDirection(dx, dy, absdx, absdy);
-        if (direction == DIR_SOUTH)
-        {
-            direction = DIR_NORTH;
-        }
-    }
-    return direction;
-}
-
-u8 GetSouthEastRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy)
-{
-    u8 direction;
-
-    direction = GetRegularRunningPastFacingDirection(dx, dy, absdx, absdy);
-    if (direction == DIR_NORTH)
-    {
-        direction = GetEastWestRunningPastFacingDirection(dx, dy, absdx, absdy);
-        if (direction == DIR_EAST)
-        {
-            direction = DIR_SOUTH;
-        }
-    }
-    else if (direction == DIR_EAST)
-    {
-        direction = GetNorthSouthRunningPastFacingDirection(dx, dy, absdx, absdy);
-        if (direction == DIR_NORTH)
-        {
-            direction = DIR_SOUTH;
-        }
-    }
-    return direction;
-}
-
-u8 GetSouthWestRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy)
-{
-    u8 direction;
-
-    direction = GetRegularRunningPastFacingDirection(dx, dy, absdx, absdy);
-    if (direction == DIR_NORTH)
-    {
-        direction = GetEastWestRunningPastFacingDirection(dx, dy, absdx, absdy);
-        if (direction == DIR_WEST)
-        {
-            direction = DIR_SOUTH;
-        }
-    }
-    else if (direction == DIR_WEST)
-    {
-        direction = GetNorthSouthRunningPastFacingDirection(dx, dy, absdx, absdy);
-        if (direction == DIR_NORTH)
-        {
-            direction = DIR_SOUTH;
-        }
-    }
-    return direction;
-}
-
-u8 GetNonEastRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy)
-{
-    u8 direction;
-
-    direction = GetRegularRunningPastFacingDirection(dx, dy, absdx, absdy);
-    if (direction == DIR_EAST)
-    {
-        direction = GetNorthSouthRunningPastFacingDirection(dx, dy, absdx, absdy);
-    }
-    return direction;
-}
-
-u8 GetNonWestRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy)
-{
-    u8 direction;
-
-    direction = GetRegularRunningPastFacingDirection(dx, dy, absdx, absdy);
-    if (direction == DIR_WEST)
-    {
-        direction = GetNorthSouthRunningPastFacingDirection(dx, dy, absdx, absdy);
-    }
-    return direction;
-}
-
-u8 GetNonSouthRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy)
-{
-    u8 direction;
-
-    direction = GetRegularRunningPastFacingDirection(dx, dy, absdx, absdy);
-    if (direction == DIR_SOUTH)
-    {
-        direction = GetEastWestRunningPastFacingDirection(dx, dy, absdx, absdy);
-    }
-    return direction;
-}
-
-u8 GetNonNorthRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy)
-{
-    u8 direction;
-
-    direction = GetRegularRunningPastFacingDirection(dx, dy, absdx, absdy);
-    if (direction == DIR_NORTH)
-    {
-        direction = GetEastWestRunningPastFacingDirection(dx, dy, absdx, absdy);
-    }
-    return direction;
-}
-
-u8 GetRunningPastFacingDirection(struct MapObject *mapObject, u8 movementType)
-{
-    s16 dx;
-    s16 dy;
-    s16 absdx;
-    s16 absdy;
-
-    if (!FieldObjectIsTrainerAndCloseToPlayer(mapObject))
-    {
-        return 0;
-    }
-    PlayerGetDestCoords(&dx, &dy);
-    dx -= mapObject->coords2.x;
-    dy -= mapObject->coords2.y;
-    absdx = dx;
-    absdy = dy;
-    if (absdx < 0)
-    {
-        absdx = -absdx;
-    }
-    if (absdy < 0)
-    {
-        absdy = -absdy;
-    }
-    return gUnknown_0850D714[movementType](dx, dy, absdx, absdy);
-}
-
-field_object_step(LookRandomDirections, gUnknown_0850D740)
-
-bool8 sub_808F988(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    npc_reset(mapObject, sprite);
-    sprite->data[1] = 1;
-    return TRUE;
-}
-
-bool8 sub_808F99C(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data[1] = 2;
-    return TRUE;
-}
-
-bool8 sub_808F9C8(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
-    {
-        SetFieldObjectStepTimer(sprite, gUnknown_0850D6DC[Random() & 0x03]);
-        mapObject->mapobj_bit_1 = FALSE;
-        sprite->data[1] = 3;
-    }
-    return FALSE;
-}
-
-bool8 sub_808FA0C(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
-    {
-        sprite->data[1] = 4;
-        return TRUE;
-    }
-    return FALSE;
-}
-
-bool8 sub_808FA3C(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    u8 directions[4];
-    u8 direction;
-
-    memcpy(directions, gUnknown_0850D710, sizeof directions);
-    direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_ANY);
-    if (direction == 0)
-    {
-        direction = directions[Random() & 0x03];
-    }
-    FieldObjectSetDirection(mapObject, direction);
-    sprite->data[1] = 1;
-    return TRUE;
-}
-
-field_object_step(RandomlyGoNorthOrSouth, gUnknown_0850D754)
-
-bool8 sub_808FAC8(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    npc_reset(mapObject, sprite);
-    sprite->data[1] = 1;
-    return TRUE;
-}
-
-bool8 sub_808FADC(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data[1] = 2;
-    return TRUE;
-}
-
-bool8 sub_808FB08(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (!FieldObjectExecRegularAnim(mapObject, sprite))
-    {
-        return FALSE;
-    }
-    SetFieldObjectStepTimer(sprite, gUnknown_0850D6DC[Random() & 0x03]);
-    sprite->data[1] = 3;
-    return TRUE;
-}
-
-bool8 sub_808FB44(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (RunFieldObjectStepTimer(sprite))
-    {
-        sprite->data[1] = 4;
-        return TRUE;
-    }
-    return FALSE;
-}
-
-bool8 sub_808FB64(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    u8 directions[2];
-    u8 direction;
-
-    memcpy(directions, gUnknown_0850D770, sizeof directions);
-    direction = directions[Random() & 0x01];
-    FieldObjectSetDirection(mapObject, direction);
-    sprite->data[1] = 5;
-    if (npc_block_way__next_tile(mapObject, direction))
-    {
-        sprite->data[1] = 1;
-    }
-    return TRUE;
-}
-
-bool8 sub_808FBB0(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(mapObject->placeholder18));
-    mapObject->mapobj_bit_1 = TRUE;
-    sprite->data[1] = 6;
-    return TRUE;
-}
-
-bool8 sub_808FBE0(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
-    {
-        mapObject->mapobj_bit_1 = FALSE;
-        sprite->data[1] = 1;
-    }
-    return FALSE;
-}
-
-field_object_step(RandomlyGoEastOrWest, gUnknown_0850D774)
-
-bool8 sub_808FC4C(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    npc_reset(mapObject, sprite);
-    sprite->data[1] = 1;
-    return TRUE;
-}
-
-bool8 sub_808FC60(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data[1] = 2;
-    return TRUE;
-}
-
-bool8 sub_808FC8C(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (!FieldObjectExecRegularAnim(mapObject, sprite))
-    {
-        return FALSE;
-    }
-    SetFieldObjectStepTimer(sprite, gUnknown_0850D6DC[Random() & 0x03]);
-    sprite->data[1] = 3;
-    return TRUE;
-}
-
-bool8 sub_808FCC8(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (RunFieldObjectStepTimer(sprite))
-    {
-        sprite->data[1] = 4;
-        return TRUE;
-    }
-    return FALSE;
-}
-
-bool8 sub_808FCE8(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    u8 directions[2];
-    u8 direction;
-
-    memcpy(directions, gUnknown_0850D790, sizeof directions);
-    direction = directions[Random() & 0x01];
-    FieldObjectSetDirection(mapObject, direction);
-    sprite->data[1] = 5;
-    if (npc_block_way__next_tile(mapObject, direction))
-    {
-        sprite->data[1] = 1;
-    }
-    return TRUE;
-}
-
-bool8 sub_808FD34(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(mapObject->placeholder18));
-    mapObject->mapobj_bit_1 = TRUE;
-    sprite->data[1] = 6;
-    return TRUE;
-}
-
-bool8 sub_808FD64(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
-    {
-        mapObject->mapobj_bit_1 = FALSE;
-        sprite->data[1] = 1;
-    }
-    return FALSE;
-}
-
-field_object_step(FaceFixedDirection, gUnknown_0850D794)
-
-bool8 sub_808FDD0(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    npc_reset(mapObject, sprite);
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data[1] = 1;
-    return TRUE;
-}
-
-bool8 sub_808FDFC(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
-    {
-        sprite->data[1] = 2;
-        return TRUE;
-    }
-    return FALSE;
-}
-
-bool8 sub_808FE1C(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    mapObject->mapobj_bit_1 = FALSE;
-    return FALSE;
-}
-
-static bool8 FieldObjectCB2_BerryTree(struct MapObject *mapObject, struct Sprite *sprite);
-extern bool8 (*const gUnknown_0850D7A0[])(struct MapObject *mapObject, struct Sprite *sprite);
-void FieldObjectCB_BerryTree(struct Sprite *sprite)
-{
-    struct MapObject *mapObject;
-
-    mapObject = &gMapObjects[sprite->data[0]];
-    if (!(sprite->data[7] & 0x0001))
-    {
-        get_berry_tree_graphics(mapObject, sprite);
-        sprite->data[7] |= 0x0001;
-    }
-    FieldObjectStep(mapObject, sprite, FieldObjectCB2_BerryTree);
-}
-static bool8 FieldObjectCB2_BerryTree(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    return gUnknown_0850D7A0[sprite->data[1]](mapObject, sprite);
-}
-
-bool8 do_berry_tree_growth_sparkle_1 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    u8 berryStage;
-
-    npc_reset(mapObject, sprite);
-    mapObject->mapobj_bit_13 = TRUE;
-    sprite->invisible = TRUE;
-    berryStage = GetStageByBerryTreeId(mapObject->trainerRange_berryTreeId);
-    if (berryStage == 0)
-    {
-        if (!(sprite->data[7] & 0x0004) && sprite->animNum == 4)
-        {
-            gFieldEffectArguments[0] = mapObject->coords2.x;
-            gFieldEffectArguments[1] = mapObject->coords2.y;
-            gFieldEffectArguments[2] = sprite->subpriority - 1;
-            gFieldEffectArguments[3] = sprite->oam.priority;
-            FieldEffectStart(FLDEFF_BERRY_TREE_GROWTH_SPARKLE);
-            sprite->animNum = berryStage;
-        }
-        return FALSE;
-    }
-    mapObject->mapobj_bit_13 = FALSE;
-    sprite->invisible = FALSE;
-    berryStage --;
-    if (sprite->animNum != berryStage)
-    {
-        sprite->data[1] = 2;
-        return TRUE;
-    }
-    get_berry_tree_graphics(mapObject, sprite);
-    FieldObjectSetRegularAnim(mapObject, sprite, 0x39);
-    sprite->data[1] = 1;
-    return TRUE;
-}
-
-bool8 sub_808FF48 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
-    {
-        sprite->data[1] = 0;
-        return TRUE;
-    }
-    return FALSE;
-}
-
-bool8 do_berry_tree_growth_sparkle_2 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    mapObject->mapobj_bit_1 = TRUE;
-    sprite->data[1] = 3;
-    sprite->data[2] = 0;
-    sprite->data[7] |= 0x0002;
-    gFieldEffectArguments[0] = mapObject->coords2.x;
-    gFieldEffectArguments[1] = mapObject->coords2.y;
-    gFieldEffectArguments[2] = sprite->subpriority - 1;
-    gFieldEffectArguments[3] = sprite->oam.priority;
-    FieldEffectStart(FLDEFF_BERRY_TREE_GROWTH_SPARKLE);
-    return TRUE;
-}
-
-bool8 sub_808FFB4 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    sprite->data[2] ++;
-    mapObject->mapobj_bit_13 = (sprite->data[2] & 0x02) >> 1;
-    sprite->animPaused = TRUE;
-    if (sprite->data[2] > 64)
-    {
-        get_berry_tree_graphics(mapObject, sprite);
-        sprite->data[1] = 4;
-        sprite->data[2] = 0;
-        return TRUE;
-    }
-    return FALSE;
-}
-
-bool8 sub_8090004 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    sprite->data[2] ++;
-    mapObject->mapobj_bit_13 = (sprite->data[2] & 0x02) >> 1;
-    sprite->animPaused = TRUE;
-    if (sprite->data[2] > 64)
-    {
-        sprite->data[1] = 0;
-        sprite->data[7] &= ~0x0002;
-        return TRUE;
-    }
-    return FALSE;
-}
-
-field_object_step(RandomlyLookNorthOrSouth, gUnknown_0850D7B4)
-
-bool8 sub_8090094 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    npc_reset(mapObject, sprite);
-    sprite->data[1] = 1;
-    return TRUE;
-}
-
-bool8 sub_80900A8 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data[1] = 2;
-    return TRUE;
-}
-
-bool8 sub_80900D4 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
-    {
-        SetFieldObjectStepTimer(sprite, gUnknown_0850D6DC[Random() & 0x03]);
-        mapObject->mapobj_bit_1 = FALSE;
-        sprite->data[1] = 3;
-    }
-    return FALSE;
-}
-
-bool8 sub_8090118 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
-    {
-        sprite->data[1] = 4;
-        return TRUE;
-    }
-    return FALSE;
-}
-
-bool8 sub_8090148 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    u8 directions[2];
-    u8 direction;
-
-    memcpy(directions, gUnknown_0850D770, sizeof gUnknown_0850D770);
-    direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_NORTH_SOUTH);
-    if (direction == 0)
-    {
-        direction = directions[Random() & 0x01];
-    }
-    FieldObjectSetDirection(mapObject, direction);
-    sprite->data[1] = 1;
-    return TRUE;
-}
-
-field_object_step(RandomlyLookEastOrWest, gUnknown_0850D7C8)
-
-bool8 sub_80901D4 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    npc_reset(mapObject, sprite);
-    sprite->data[1] = 1;
-    return TRUE;
-}
-
-bool8 sub_80901E8 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data[1] = 2;
-    return TRUE;
-}
-
-bool8 sub_8090214 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
-    {
-        SetFieldObjectStepTimer(sprite, gUnknown_0850D6DC[Random() & 0x03]);
-        mapObject->mapobj_bit_1 = FALSE;
-        sprite->data[1] = 3;
-    }
-    return FALSE;
-}
-
-bool8 sub_8090258 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
-    {
-        sprite->data[1] = 4;
-        return TRUE;
-    }
-    return FALSE;
-}
-
-bool8 sub_8090288 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    u8 directions[2];
-    u8 direction;
-
-    memcpy(directions, gUnknown_0850D790, sizeof gUnknown_0850D790);
-    direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_EAST_WEST);
-    if (direction == 0)
-    {
-        direction = directions[Random() & 0x01];
-    }
-    FieldObjectSetDirection(mapObject, direction);
-    sprite->data[1] = 1;
-    return TRUE;
-}
-
-field_object_step(RandomlyLookNorthOrWest, gUnknown_0850D7DC)
-
-bool8 sub_8090314 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    npc_reset(mapObject, sprite);
-    sprite->data[1] = 1;
-    return TRUE;
-}
-
-bool8 sub_8090328 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data[1] = 2;
-    return TRUE;
-}
-
-bool8 sub_8090354 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
-    {
-        SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]);
-        mapObject->mapobj_bit_1 = FALSE;
-        sprite->data[1] = 3;
-    }
-    return FALSE;
-}
-
-bool8 sub_8090398 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
-    {
-        sprite->data[1] = 4;
-        return TRUE;
-    }
-    return FALSE;
-}
-
-bool8 sub_80903C8 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    u8 directions[2];
-    u8 direction;
-
-    memcpy(directions, gUnknown_0850D7F0, sizeof gUnknown_0850D7F0);
-    direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_NORTH_WEST);
-    if (direction == 0)
-    {
-        direction = directions[Random() & 0x01];
-    }
-    FieldObjectSetDirection(mapObject, direction);
-    sprite->data[1] = 1;
-    return TRUE;
-}
-
-field_object_step(RandomlyLookNorthOrEast, gUnknown_0850D7F4)
-
-bool8 sub_8090454 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    npc_reset(mapObject, sprite);
-    sprite->data[1] = 1;
-    return TRUE;
-}
-
-bool8 sub_8090468 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data[1] = 2;
-    return TRUE;
-}
-
-bool8 sub_8090494 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
-    {
-        SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]);
-        mapObject->mapobj_bit_1 = FALSE;
-        sprite->data[1] = 3;
-    }
-    return FALSE;
-}
-
-bool8 sub_80904D8 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
-    {
-        sprite->data[1] = 4;
-        return TRUE;
-    }
-    return FALSE;
-}
-
-bool8 sub_8090508 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    u8 directions[2];
-    u8 direction;
-
-    memcpy(directions, gUnknown_0850D808, sizeof gUnknown_0850D808);
-    direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_NORTH_EAST);
-    if (direction == 0)
-    {
-        direction = directions[Random() & 0x01];
-    }
-    FieldObjectSetDirection(mapObject, direction);
-    sprite->data[1] = 1;
-    return TRUE;
-}
-
-field_object_step(RandomlyLookSouthOrWest, gUnknown_0850D80C)
-
-bool8 sub_8090594 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    npc_reset(mapObject, sprite);
-    sprite->data[1] = 1;
-    return TRUE;
-}
-
-bool8 sub_80905A8 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data[1] = 2;
-    return TRUE;
-}
-
-bool8 sub_80905D4 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
-    {
-        SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]);
-        mapObject->mapobj_bit_1 = FALSE;
-        sprite->data[1] = 3;
-    }
-    return FALSE;
-}
-
-bool8 sub_8090618 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
-    {
-        sprite->data[1] = 4;
-        return TRUE;
-    }
-    return FALSE;
-}
-
-bool8 sub_8090648 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    u8 directions[2];
-    u8 direction;
-
-    memcpy(directions, gUnknown_0850D820, sizeof gUnknown_0850D820);
-    direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_SOUTH_WEST);
-    if (direction == 0)
-    {
-        direction = directions[Random() & 0x01];
-    }
-    FieldObjectSetDirection(mapObject, direction);
-    sprite->data[1] = 1;
-    return TRUE;
-}
-
-field_object_step(RandomlyLookSouthOrEast, gUnknown_0850D824)
-
-bool8 sub_80906D4 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    npc_reset(mapObject, sprite);
-    sprite->data[1] = 1;
-    return TRUE;
-}
-
-bool8 sub_80906E8 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data[1] = 2;
-    return TRUE;
-}
-
-bool8 sub_8090714 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
-    {
-        SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]);
-        mapObject->mapobj_bit_1 = FALSE;
-        sprite->data[1] = 3;
-    }
-    return FALSE;
-}
-
-bool8 sub_8090758 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
-    {
-        sprite->data[1] = 4;
-        return TRUE;
-    }
-    return FALSE;
-}
-
-bool8 sub_8090788 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    u8 directions[2];
-    u8 direction;
-
-    memcpy(directions, gUnknown_0850D838, sizeof gUnknown_0850D838);
-    direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_SOUTH_EAST);
-    if (direction == 0)
-    {
-        direction = directions[Random() & 0x01];
-    }
-    FieldObjectSetDirection(mapObject, direction);
-    sprite->data[1] = 1;
-    return TRUE;
-}
-
-field_object_step(RandomlyLookNorthOrSouthOrWest, gUnknown_0850D83C)
-
-bool8 sub_8090814 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    npc_reset(mapObject, sprite);
-    sprite->data[1] = 1;
-    return TRUE;
-}
-
-bool8 sub_8090828 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data[1] = 2;
-    return TRUE;
-}
-
-bool8 sub_8090854 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
-    {
-        SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]);
-        mapObject->mapobj_bit_1 = FALSE;
-        sprite->data[1] = 3;
-    }
-    return FALSE;
-}
-
-bool8 sub_8090898 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
-    {
-        sprite->data[1] = 4;
-        return TRUE;
-    }
-    return FALSE;
-}
-
-bool8 sub_80908C8 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    u8 directions[4];
-    u8 direction;
-
-    memcpy(directions, gUnknown_0850D850, sizeof gUnknown_0850D850);
-    direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_NORTH_SOUTH_WEST);
-    if (direction == 0)
-    {
-        direction = directions[Random() & 0x03];
-    }
-    FieldObjectSetDirection(mapObject, direction);
-    sprite->data[1] = 1;
-    return TRUE;
-}
-
-field_object_step(RandomlyLookNorthOrSouthOrEast, gUnknown_0850D854)
-
-bool8 sub_8090954 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    npc_reset(mapObject, sprite);
-    sprite->data[1] = 1;
-    return TRUE;
-}
-
-bool8 sub_8090968 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data[1] = 2;
-    return TRUE;
-}
-
-bool8 sub_8090994 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
-    {
-        SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]);
-        mapObject->mapobj_bit_1 = FALSE;
-        sprite->data[1] = 3;
-    }
-    return FALSE;
-}
-
-bool8 sub_80909D8 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
-    {
-        sprite->data[1] = 4;
-        return TRUE;
-    }
-    return FALSE;
-}
-
-bool8 sub_8090A08 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    u8 directions[4];
-    u8 direction;
-
-    memcpy(directions, gUnknown_0850D868, sizeof gUnknown_0850D868);
-    direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_NORTH_SOUTH_EAST);
-    if (direction == 0)
-    {
-        direction = directions[Random() & 0x03];
-    }
-    FieldObjectSetDirection(mapObject, direction);
-    sprite->data[1] = 1;
-    return TRUE;
-}
-
-field_object_step(RandomlyLookNorthOrEastOrWest, gUnknown_0850D86C)
-
-bool8 sub_8090A94 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    npc_reset(mapObject, sprite);
-    sprite->data[1] = 1;
-    return TRUE;
-}
-
-bool8 sub_8090AA8 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data[1] = 2;
-    return TRUE;
-}
-
-bool8 sub_8090AD4 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
-    {
-        SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]);
-        mapObject->mapobj_bit_1 = FALSE;
-        sprite->data[1] = 3;
-    }
-    return FALSE;
-}
-
-bool8 sub_8090B18 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
-    {
-        sprite->data[1] = 4;
-        return TRUE;
-    }
-    return FALSE;
-}
-
-bool8 sub_8090B48 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    u8 directions[4];
-    u8 direction;
-
-    memcpy(directions, gUnknown_0850D880, sizeof gUnknown_0850D880);
-    direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_NORTH_EAST_WEST);
-    if (direction == 0)
-    {
-        direction = directions[Random() & 0x03];
-    }
-    FieldObjectSetDirection(mapObject, direction);
-    sprite->data[1] = 1;
-    return TRUE;
-}
-
-field_object_step(RandomlyLookSouthOrEastOrWest, gUnknown_0850D884)
-
-bool8 sub_8090BD4 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    npc_reset(mapObject, sprite);
-    sprite->data[1] = 1;
-    return TRUE;
-}
-
-bool8 sub_8090BE8 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data[1] = 2;
-    return TRUE;
-}
-
-bool8 sub_8090C14 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
-    {
-        SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]);
-        mapObject->mapobj_bit_1 = FALSE;
-        sprite->data[1] = 3;
-    }
-    return FALSE;
-}
-
-bool8 sub_8090C58 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
-    {
-        sprite->data[1] = 4;
-        return TRUE;
-    }
-    return FALSE;
-}
-
-bool8 sub_8090C88 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    u8 directions[4];
-    u8 direction;
-
-    memcpy(directions, gUnknown_0850D898, sizeof gUnknown_0850D898);
-    direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_SOUTH_EAST_WEST);
-    if (direction == 0)
-    {
-        direction = directions[Random() & 0x03];
-    }
-    FieldObjectSetDirection(mapObject, direction);
-    sprite->data[1] = 1;
-    return TRUE;
-}
-
-field_object_step(LookAroundCounterclockwise, gUnknown_0850D89C)
-
-bool8 sub_8090D14 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    npc_reset(mapObject, sprite);
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data[1] = 1;
-    return TRUE;
-}
-
-bool8 sub_8090D40 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
-    {
-        SetFieldObjectStepTimer(sprite, 48);
-        sprite->data[1] = 2;
-    }
-    return FALSE;
-}
-
-bool8 sub_8090D64 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
-    {
-        sprite->data[1] = 3;
-    }
-    return FALSE;
-}
-
-bool8 sub_8090D90 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    u8 directions[5];
-    u8 direction;
-
-    memcpy(directions, gUnknown_0850D8AC, sizeof gUnknown_0850D8AC);
-    direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_ANY);
-    if (direction == 0)
-    {
-        direction = directions[mapObject->mapobj_unk_18];
-    }
-    FieldObjectSetDirection(mapObject, direction);
-    sprite->data[1] = 0;
-    return TRUE;
-}
-
-field_object_step(LookAroundClockwise, gUnknown_0850D8B4)
-
-bool8 sub_8090E18 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    npc_reset(mapObject, sprite);
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data[1] = 1;
-    return TRUE;
-}
-
-bool8 sub_8090E44 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
-    {
-        SetFieldObjectStepTimer(sprite, 48);
-        sprite->data[1] = 2;
-    }
-    return FALSE;
-}
-
-bool8 sub_8090E68 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
-    {
-        sprite->data[1] = 3;
-    }
-    return FALSE;
-}
-
-bool8 sub_8090E94 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    u8 directions[5];
-    u8 direction;
-
-    memcpy(directions, gUnknown_0850D8C4, sizeof gUnknown_0850D8C4);
-    direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_ANY);
-    if (direction == 0)
-    {
-        direction = directions[mapObject->mapobj_unk_18];
-    }
-    FieldObjectSetDirection(mapObject, direction);
-    sprite->data[1] = 0;
-    return TRUE;
-}
-
-field_object_step(AlternatelyGoInOppositeDirections, gUnknown_0850D8CC)
-
-bool8 sub_8090F1C (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    npc_reset(mapObject, sprite);
-    sprite->data[1] = 1;
-    return TRUE;
-}
-
-bool8 sub_8090F30 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    u8 direction;
-
-    direction = gUnknown_085055CD[mapObject->animPattern];
-    if (mapObject->mapobj_unk_21)
-    {
-        direction = GetOppositeDirection(direction);
-    }
-    FieldObjectSetDirection(mapObject, direction);
-    sprite->data[1] = 2;
-    return TRUE;
-}
-
-bool8 sub_8090F68 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    bool8 blockingWay;
-    u8 animId;
-
-    if (mapObject->mapobj_unk_21 && mapObject->coords1.x == mapObject->coords2.x && mapObject->coords1.y == mapObject->coords2.y)
-    {
-        mapObject->mapobj_unk_21 = 0;
-        FieldObjectSetDirection(mapObject, GetOppositeDirection(mapObject->placeholder18));
-    }
-    blockingWay = npc_block_way__next_tile(mapObject, mapObject->placeholder18);
-    animId = GetGoSpeed0AnimId(mapObject->placeholder18);
-    if (blockingWay == TRUE)
-    {
-        mapObject->mapobj_unk_21 ++;
-        FieldObjectSetDirection(mapObject, GetOppositeDirection(mapObject->placeholder18));
-        animId = GetGoSpeed0AnimId(mapObject->placeholder18);
-        blockingWay = npc_block_way__next_tile(mapObject, mapObject->placeholder18);
-    }
-    if (blockingWay)
-    {
-        animId = GetStepInPlaceDelay16AnimId(mapObject->mapobj_unk_18);
-    }
-    FieldObjectSetRegularAnim(mapObject, sprite, animId);
-    mapObject->mapobj_bit_1 = TRUE;
-    sprite->data[1] = 3;
-    return TRUE;
-}
-
-bool8 sub_8091020 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
-    {
-        mapObject->mapobj_bit_1 = FALSE;
-        sprite->data[1] = 1;
-    }
-    return FALSE;
-}
-
-bool8 sub_8091048(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    npc_reset(mapObject, sprite);
-    sprite->data[1] = 1;
-    return TRUE;
-}
-
-bool8 MoveFieldObjectInNextDirectionInSequence(struct MapObject *mapObject, struct Sprite *sprite, u8 *route)
-{
-    u8 blockingWay;
-    u8 animId;
-
-    if (mapObject->mapobj_unk_21 == 3 && mapObject->coords1.x == mapObject->coords2.x && mapObject->coords1.y == mapObject->coords2.y)
-    {
-        mapObject->mapobj_unk_21 = 0;
-    }
-    FieldObjectSetDirection(mapObject, route[mapObject->mapobj_unk_21]);
-    animId = GetGoSpeed0AnimId(mapObject->placeholder18);
-    blockingWay = npc_block_way__next_tile(mapObject, mapObject->placeholder18);
-    if (blockingWay == TRUE)
-    {
-        mapObject->mapobj_unk_21 ++;
-        FieldObjectSetDirection(mapObject, route[mapObject->mapobj_unk_21]);
-        animId = GetGoSpeed0AnimId(mapObject->placeholder18);
-        blockingWay = npc_block_way__next_tile(mapObject, mapObject->placeholder18);
-    }
-    if (blockingWay)
-    {
-        animId = GetStepInPlaceDelay16AnimId(mapObject->mapobj_unk_18);
-    }
-    FieldObjectSetRegularAnim(mapObject, sprite, animId);
-    mapObject->mapobj_bit_1 = TRUE;
-    sprite->data[1] = 2;
-    return TRUE;
-}
-
-bool8 sub_8091110(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
-    {
-        mapObject->mapobj_bit_1 = FALSE;
-        sprite->data[1] = 1;
-    }
-    return FALSE;
-}
-
-field_object_path( 1, gUnknown_0850D8DC, sub_809117C, gUnknown_0850D8E8, 2, x)
-field_object_path( 2, gUnknown_0850D8EC, sub_8091208, gUnknown_0850D8F8, 1, x)
-field_object_path( 3, gUnknown_0850D8FC, sub_8091294, gUnknown_0850D908, 1, y)
-field_object_path( 4, gUnknown_0850D90C, sub_8091320, gUnknown_0850D918, 2, y)
-field_object_path( 5, gUnknown_0850D91C, sub_80913AC, gUnknown_0850D928, 2, x)
-field_object_path( 6, gUnknown_0850D92C, sub_8091438, gUnknown_0850D938, 1, x)
-field_object_path( 7, gUnknown_0850D93C, sub_80914C4, gUnknown_0850D710, 1, y)
-field_object_path( 8, gUnknown_0850D948, sub_8091550, gUnknown_0850D954, 2, y)
-field_object_path( 9, gUnknown_0850D958, sub_80915DC, gUnknown_0850D964, 2, y)
-field_object_path(10, gUnknown_0850D968, sub_8091668, gUnknown_0850D974, 1, y)
-field_object_path(11, gUnknown_0850D978, sub_80916F4, gUnknown_0850D984, 1, x)
-field_object_path(12, gUnknown_0850D988, sub_8091780, gUnknown_0850D994, 2, x)
-field_object_path(13, gUnknown_0850D998, sub_809180C, gUnknown_0850D9A4, 2, y)
-field_object_path(14, gUnknown_0850D9A8, sub_8091898, gUnknown_0850D9B4, 1, y)
-field_object_path(15, gUnknown_0850D9B8, sub_8091924, gUnknown_0850D9C4, 1, x)
-field_object_path(16, gUnknown_0850D9C8, sub_80919B0, gUnknown_0850D9D4, 2, x)
-field_object_path(17, gUnknown_0850D9D8, sub_8091A3C, gUnknown_0850D9E4, 2, y)
-field_object_path(18, gUnknown_0850D9E8, sub_8091AC8, gUnknown_0850D9F4, 2, y)
-field_object_path(19, gUnknown_0850D9F8, sub_8091B54, gUnknown_0850DA04, 2, x)
-field_object_path(20, gUnknown_0850DA08, sub_8091BE0, gUnknown_0850DA14, 2, x)
-field_object_path(21, gUnknown_0850DA18, sub_8091C6C, gUnknown_0850DA24, 2, y)
-field_object_path(22, gUnknown_0850DA28, sub_8091CF8, gUnknown_0850DA34, 2, y)
-field_object_path(23, gUnknown_0850DA38, sub_8091D84, gUnknown_0850DA44, 2, x)
-field_object_path(24, gUnknown_0850DA48, sub_8091E10, gUnknown_0850DA54, 2, x)
-
-field_object_step(CopyPlayer1, gUnknown_0850DA58)
-
-bool8 mss_npc_reset_oampriv3_1_unk2_unk3(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    npc_reset(mapObject, sprite);
-    if (mapObject->mapobj_unk_21 == 0)
-    {
-        mapObject->mapobj_unk_21 = player_get_direction_lower_nybble();
-    }
-    sprite->data[1] = 1;
-    return TRUE;
-}
-
-bool8 sub_8091EC0(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1C == 0xFF || gPlayerAvatar.tileTransitionState == 2)
-    {
-        return FALSE;
-    }
-    return gUnknown_0850DA64[player_get_x22()](mapObject, sprite, player_get_direction_upper_nybble(), NULL);
-}
-
-bool8 sub_8091F20(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
-    {
-        mapObject->mapobj_bit_1 = FALSE;
-        sprite->data[1] = 1;
-    }
-    return FALSE;
-}
-
-bool8 sub_8091F48(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8))
-{
-    return FALSE;
-}
-
-bool8 sub_8091F4C(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8))
-{
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(state_to_direction(gUnknown_085055CD[mapObject->animPattern], mapObject->mapobj_unk_21, playerDirection)));
-    mapObject->mapobj_bit_1 = TRUE;
-    sprite->data[1] = 2;
-    return TRUE;
-}
-
-bool8 sub_8091F94(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8))
-{
-    u32 direction;
-    s16 x;
-    s16 y;
-
-    direction = playerDirection;
-    if (FieldObjectIsFarawayIslandMew(mapObject))
-    {
-        direction = sub_81D427C();
-        if (direction == 0)
-        {
-            direction = playerDirection;
-            direction = state_to_direction(gUnknown_085055CD[mapObject->animPattern], mapObject->mapobj_unk_21, direction);
-            FieldObjectMoveDestCoords(mapObject, direction, &x, &y);
-            FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction));
-            mapObject->mapobj_bit_1 = TRUE;
-            sprite->data[1] = 2;
-            return TRUE;
-        }
-    }
-    else
-    {
-        direction = state_to_direction(gUnknown_085055CD[mapObject->animPattern], mapObject->mapobj_unk_21, direction);
-    }
-    FieldObjectMoveDestCoords(mapObject, direction, &x, &y);
-    FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(direction));
-    if (npc_block_way(mapObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y))))
-    {
-        FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction));
-    }
-    mapObject->mapobj_bit_1 = TRUE;
-    sprite->data[1] = 2;
-    return TRUE;
-}
-
-bool8 sub_80920A4(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8))
-{
-    u32 direction;
-    s16 x;
-    s16 y;
-
-    direction = playerDirection;
-    direction = state_to_direction(gUnknown_085055CD[mapObject->animPattern], mapObject->mapobj_unk_21, direction);
-    FieldObjectMoveDestCoords(mapObject, direction, &x, &y);
-    FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed1AnimId(direction));
-    if (npc_block_way(mapObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y))))
-    {
-        FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction));
-    }
-    mapObject->mapobj_bit_1 = TRUE;
-    sprite->data[1] = 2;
-    return TRUE;
-}
-
-bool8 sub_809215C(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8))
-{
-    u32 direction;
-    s16 x;
-    s16 y;
-
-    direction = playerDirection;
-    direction = state_to_direction(gUnknown_085055CD[mapObject->animPattern], mapObject->mapobj_unk_21, direction);
-    FieldObjectMoveDestCoords(mapObject, direction, &x, &y);
-    FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed3AnimId(direction));
-    if (npc_block_way(mapObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y))))
-    {
-        FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction));
-    }
-    mapObject->mapobj_bit_1 = TRUE;
-    sprite->data[1] = 2;
-    return TRUE;
-}
-
-bool8 sub_8092214(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8))
-{
-    u32 direction;
-    s16 x;
-    s16 y;
-
-    direction = playerDirection;
-    direction = state_to_direction(gUnknown_085055CD[mapObject->animPattern], mapObject->mapobj_unk_21, direction);
-    FieldObjectMoveDestCoords(mapObject, direction, &x, &y);
-    FieldObjectSetRegularAnim(mapObject, sprite, sub_8093438(direction));
-    if (npc_block_way(mapObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y))))
-    {
-        FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction));
-    }
-    mapObject->mapobj_bit_1 = TRUE;
-    sprite->data[1] = 2;
-    return TRUE;
-}
-
-bool8 cph_IM_DIFFERENT(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8))
-{
-    u32 direction;
-
-    direction = playerDirection;
-    direction = state_to_direction(gUnknown_085055CD[mapObject->animPattern], mapObject->mapobj_unk_21, direction);
-    FieldObjectSetRegularAnim(mapObject, sprite, sub_80934BC(direction));
-    mapObject->mapobj_bit_1 = TRUE;
-    sprite->data[1] = 2;
-    return TRUE;
-}
-
-bool8 sub_8092314(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8))
-{
-    u32 direction;
-    s16 x;
-    s16 y;
-
-    direction = playerDirection;
-    direction = state_to_direction(gUnknown_085055CD[mapObject->animPattern], mapObject->mapobj_unk_21, direction);
-    FieldObjectMoveDestCoords(mapObject, direction, &x, &y);
-    FieldObjectSetRegularAnim(mapObject, sprite, sub_8093514(direction));
-    if (npc_block_way(mapObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y))))
-    {
-        FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction));
-    }
-    mapObject->mapobj_bit_1 = TRUE;
-    sprite->data[1] = 2;
-    return TRUE;
-}
-
-bool8 oac_hopping(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8))
-{
-    u32 direction;
-    s16 x;
-    s16 y;
-
-    direction = playerDirection;
-    direction = state_to_direction(gUnknown_085055CD[mapObject->animPattern], mapObject->mapobj_unk_21, direction);
-    x = mapObject->coords2.x;
-    y = mapObject->coords2.y;
-    sub_8092F88(direction, &x, &y, 2, 2);
-    FieldObjectSetRegularAnim(mapObject, sprite, GetJumpLedgeAnimId(direction));
-    if (npc_block_way(mapObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y))))
-    {
-        FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction));
-    }
-    mapObject->mapobj_bit_1 = TRUE;
-    sprite->data[1] = 2;
-    return TRUE;
-}
-
-field_object_step(CopyPlayer2, gUnknown_0850DA90)
-
-bool8 mss_08062EA4(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1C == 0xFF || gPlayerAvatar.tileTransitionState == 2)
-    {
-        return FALSE;
-    }
-    return gUnknown_0850DA64[player_get_x22()](mapObject, sprite, player_get_direction_upper_nybble(), MetatileBehavior_IsPokeGrass);
-}
-
-bool8 sub_80925AC(struct MapObject *, struct Sprite *);
-
-void FieldObjectCB_TreeDisguise(struct Sprite *sprite)
-{
-    struct MapObject *mapObject;
-
-    mapObject = &gMapObjects[sprite->data[0]];
-    if (mapObject->mapobj_unk_21 == 0 || (mapObject->mapobj_unk_21 == 1 && !sprite->data[7]))
-    {
-        FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
-        mapObject->mapobj_unk_1A = FieldEffectStart(FLDEFF_TREE_DISGUISE);
-        mapObject->mapobj_unk_21 = 1;
-        sprite->data[7] ++;
-    }
-    FieldObjectStep(&gMapObjects[sprite->data[0]], sprite, sub_80925AC);
-}
-
-bool8 sub_80925AC(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    npc_reset(mapObject, sprite);
-    return FALSE;
-}
-
-void FieldObjectCB_MountainDisguise(struct Sprite *sprite)
-{
-    struct MapObject *mapObject;
-
-    mapObject = &gMapObjects[sprite->data[0]];
-    if (mapObject->mapobj_unk_21 == 0 || (mapObject->mapobj_unk_21 == 1 && !sprite->data[7]))
-    {
-        FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
-        mapObject->mapobj_unk_1A = FieldEffectStart(FLDEFF_MOUNTAIN_DISGUISE);
-        mapObject->mapobj_unk_21 = 1;
-        sprite->data[7] ++;
-    }
-    FieldObjectStep(&gMapObjects[sprite->data[0]], sprite, sub_80925AC);
-}
-
-extern bool8 (*const gUnknown_0850DA9C[])(struct MapObject *, struct Sprite *);
-bool8 sub_809268C(struct MapObject *, struct Sprite *);
-
-void FieldObjectCB_Hidden1(struct Sprite *sprite)
-{
-    if (!sprite->data[7])
-    {
-        gMapObjects[sprite->data[0]].mapobj_bit_26 = TRUE;
-        sprite->subspriteMode = 2;
-        sprite->oam.priority = 3;
-        sprite->data[7] ++;
-    }
-    FieldObjectStep(&gMapObjects[sprite->data[0]], sprite, sub_809268C);
-}
-
-bool8 sub_809268C(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    return gUnknown_0850DA9C[sprite->data[1]](mapObject, sprite);
-}
-
-bool8 sub_80926AC (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    npc_reset(mapObject, sprite);
-    return FALSE;
-}
-bool8 sub_80926B8 (struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
-    {
-        sprite->data[1] = 0;
-    }
-    return FALSE;
-}
-
-field_object_step(WalkInPlace1, gUnknown_0850DAA0)
-
-bool8 sub_8092718(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    npc_reset(mapObject, sprite);
-    FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay16AnimId(mapObject->mapobj_unk_18));
-    sprite->data[1] = 1;
-    return TRUE;
-}
-
-field_object_step(WalkInPlace4, gUnknown_0850DAA8)
-
-bool8 sub_8092788(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    npc_reset(mapObject, sprite);
-    FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay32AnimId(mapObject->mapobj_unk_18));
-    sprite->data[1] = 1;
-    return TRUE;
-}
-
-field_object_step(WalkInPlace2, gUnknown_0850DAB0)
-
-bool8 sub_80927F8(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    npc_reset(mapObject, sprite);
-    FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay8AnimId(mapObject->mapobj_unk_18));
-    sprite->data[1] = 1;
-    return TRUE;
-}
-
-field_object_step(WalkInPlace3, gUnknown_0850DAB8)
-
-bool8 sub_8092868(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    npc_reset(mapObject, sprite);
-    FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay4AnimId(mapObject->mapobj_unk_18));
-    sprite->data[1] = 1;
-    return TRUE;
-}
-
-field_object_step(Hidden2, gUnknown_0850DAC0)
-
-bool8 sub_80928D8(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    npc_reset(mapObject, sprite);
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    mapObject->mapobj_bit_13 = TRUE;
-    sprite->data[1] = 1;
-    return TRUE;
-}
-bool8 sub_809290C(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
-    {
-        sprite->data[1] = 2;
-        return TRUE;
-    }
-    return FALSE;
-}
-
-bool8 sub_809292C(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    mapObject->mapobj_bit_1 = FALSE;
-    return FALSE;
-}
-
-void npc_reset(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    mapObject->mapobj_bit_1 = FALSE;
-    mapObject->mapobj_bit_6 = FALSE;
-    mapObject->mapobj_bit_7 = FALSE;
-    mapObject->mapobj_unk_1C = 0xFF;
-    sprite->data[1] = 0;
-}
-
-#define dirn2anim(name, table)\
-extern const u8 table[4];\
-u8 name(u8 direction)\
-{\
-    return table[direction];\
-}
-
-dirn2anim(FieldObjectDirectionToImageAnimId, gUnknown_0850DACC)
-dirn2anim(get_go_image_anim_num, gUnknown_0850DAD5)
-dirn2anim(get_go_fast_image_anim_num, gUnknown_0850DADE)
-dirn2anim(get_go_faster_image_anim_num, gUnknown_0850DAE7)
-dirn2anim(get_go_fastest_image_anim_num, gUnknown_0850DAF0)
-dirn2anim(sub_80929AC, gUnknown_0850DAF9)
-dirn2anim(sub_80929BC, gUnknown_0850DB02)
-dirn2anim(sub_80929CC, gUnknown_0850DB0B)
-dirn2anim(sub_80929DC, gUnknown_0850DB14)
-dirn2anim(sub_80929EC, gUnknown_0850DB1D)
-dirn2anim(sub_80929FC, gUnknown_0850DB26)
-dirn2anim(sub_8092A0C, gUnknown_0850DB2F)
-dirn2anim(sub_8092A1C, gUnknown_0850DB38)
-dirn2anim(sub_8092A2C, gUnknown_0850DB41)
-dirn2anim(get_run_image_anim_num, gUnknown_0850DB4A)
-
-// file boundary?
-
-struct UnkStruct_085094AC {
-    const union AnimCmd *const *anims;
-    u8 animPos[4];
-};
-
-extern const struct UnkStruct_085094AC gUnknown_085094AC[];
-
-static const struct UnkStruct_085094AC *sub_8092A4C(const union AnimCmd *const *anims)
-{
-    const struct UnkStruct_085094AC *retval;
-
-    for (retval = gUnknown_085094AC; retval->anims != NULL; retval ++)
-    {
-        if (retval->anims == anims)
-        {
-            return retval;
-        }
-    }
-    return NULL;
-}
-
-void npc_apply_anim_looping(struct MapObject *mapObject, struct Sprite *sprite, u8 animNum)
-{
-    const struct UnkStruct_085094AC *unk85094AC;
-
-    if (!mapObject->mapobj_bit_12)
-    {
-        sprite->animNum = animNum;
-        unk85094AC = sub_8092A4C(sprite->anims);
-        if (unk85094AC != NULL)
-        {
-            if (sprite->animCmdIndex == unk85094AC->animPos[0])
-            {
-                sprite->animCmdIndex = unk85094AC->animPos[3];
-            }
-            else if (sprite->animCmdIndex == unk85094AC->animPos[1])
-            {
-                sprite->animCmdIndex = unk85094AC->animPos[2];
-            }
-        }
-        SeekSpriteAnim(sprite, sprite->animCmdIndex);
-    }
-}
-
-void obj_npc_animation_step(struct MapObject *mapObject, struct Sprite *sprite, u8 animNum)
-{
-    const struct UnkStruct_085094AC *unk85094AC;
-
-    if (!mapObject->mapobj_bit_12)
-    {
-        u8 animPos;
-
-        sprite->animNum = animNum;
-        unk85094AC = sub_8092A4C(sprite->anims);
-        if (unk85094AC != NULL)
-        {
-            animPos = unk85094AC->animPos[1];
-            if (sprite->animCmdIndex <= unk85094AC->animPos[0])
-            {
-                animPos = unk85094AC->animPos[0];
-            }
-            SeekSpriteAnim(sprite, animPos);
-        }
-    }
-}
-
-// file boundary?
-
-u8 sub_8092AF8(s16 x1, s16 y1, s16 x2, s16 y2)
-{
-    if (x1 > x2)
-    {
-        return DIR_WEST;
-    }
-    if (x1 < x2)
-    {
-        return DIR_EAST;
-    }
-    if (y1 > y2)
-    {
-        return DIR_NORTH;
-    }
-    return DIR_SOUTH;
-}
-
-void npc_set_running_behaviour_etc(struct MapObject *mapObject, u8 animPattern)
-{
-    mapObject->animPattern = animPattern;
-    mapObject->mapobj_unk_21 = 0;
-    mapObject->animId = 0;
-    gSprites[mapObject->spriteId].callback = gUnknown_08505438[animPattern];
-    gSprites[mapObject->spriteId].data[1] = 0;
-}
-
-dirn2anim(npc_running_behaviour_by_direction, gUnknown_0850DB53)
-
-u8 npc_block_way__next_tile(struct MapObject *mapObject, u8 direction)
-{
-    s16 x;
-    s16 y;
-
-    x = mapObject->coords2.x;
-    y = mapObject->coords2.y;
-    MoveCoords(direction, &x, &y);
-    return npc_block_way(mapObject, x, y, direction);
-}
-
-u8 npc_block_way(struct MapObject *mapObject, s16 x, s16 y, u32 dirn)
-{
-    u8 direction;
-
-    direction = dirn;
-    if (IsCoordOutsideFieldObjectMovementRect(mapObject, x, y))
-    {
-        return 1;
-    }
-    if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(mapObject, x, y, direction))
-    {
-        return 2;
-    }
-    if (mapObject->mapobj_bit_15 && !CanCameraMoveInDirection(direction))
-    {
-        return 2;
-    }
-    if (IsZCoordMismatchAt(mapObject->mapobj_unk_0B_0, x, y))
-    {
-        return 3;
-    }
-    if (CheckForCollisionBetweenFieldObjects(mapObject, x, y))
-    {
-        return 4;
-    }
-    return 0;
-}
-
-u8 sub_8092C8C(struct MapObject *mapObject, s16 x, s16 y, u8 direction)
-{
-    u8 retval;
-
-    retval = 0x00;
-    if (IsCoordOutsideFieldObjectMovementRect(mapObject, x, y))
-    {
-        retval |= 1;
-    }
-    if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(mapObject, x, y, direction) || (mapObject->mapobj_bit_15 && !CanCameraMoveInDirection(direction)))
-    {
-        retval |= 2;
-    }
-    if (IsZCoordMismatchAt(mapObject->mapobj_unk_0B_0, x, y))
-    {
-        retval |= 4;
-    }
-    if (CheckForCollisionBetweenFieldObjects(mapObject, x, y))
-    {
-        retval |= 8;
-    }
-    return retval;
-}
-
-static bool8 IsCoordOutsideFieldObjectMovementRect(struct MapObject *mapObject, s16 x, s16 y)
-{
-    s16 left;
-    s16 right;
-    s16 top;
-    s16 bottom;
-
-    if (mapObject->range.as_nybbles.x != 0)
-    {
-        left = mapObject->coords1.x - mapObject->range.as_nybbles.x;
-        right = mapObject->coords1.x + mapObject->range.as_nybbles.x;
-        if (left > x || right < x)
-        {
-            return TRUE;
-        }
-    }
-    if (mapObject->range.as_nybbles.y != 0)
-    {
-        top = mapObject->coords1.y - mapObject->range.as_nybbles.y;
-        bottom = mapObject->coords1.y + mapObject->range.as_nybbles.y;
-        if (top > y || bottom < y)
-        {
-            return TRUE;
-        }
-    }
-    return FALSE;
-}
-
-static bool8 IsMetatileDirectionallyImpassable(struct MapObject *mapObject, s16 x, s16 y, u8 direction)
-{
-    if (gUnknown_0850DB5C[direction - 1](mapObject->mapobj_unk_1E) || gUnknown_0850DB6C[direction - 1](MapGridGetMetatileBehaviorAt(x, y)))
-    {
-        return TRUE;
-    }
-    return FALSE;
-}
-
-static bool8 CheckForCollisionBetweenFieldObjects(struct MapObject *mapObject, s16 x, s16 y)
-{
-    u8 i;
-    struct MapObject *curObject;
-
-    for (i = 0; i < NUM_FIELD_OBJECTS; i ++)
-    {
-        curObject = &gMapObjects[i];
-        if (curObject->active && curObject != mapObject)
-        {
-            if ((curObject->coords2.x == x && curObject->coords2.y == y) || (curObject->coords3.x == x && curObject->coords3.y == y))
-            {
-                if (AreZCoordsCompatible(mapObject->mapobj_unk_0B_0, curObject->mapobj_unk_0B_0))
-                {
-                    return TRUE;
-                }
-            }
-        }
-    }
-    return FALSE;
-}
-
-bool8 sub_8092E9C(u8 localId, u8 mapNum, u8 mapGroup)
-{
-    u8 mapObjectId;
-
-    if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId) && gSprites[gMapObjects[mapObjectId].spriteId].data[7] & 0x02)
-    {
-        return TRUE;
-    }
-    return FALSE;
-}
-
-void sub_8092EF0(u8 localId, u8 mapNum, u8 mapGroup)
-{
-    u8 mapObjectId;
-
-    if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId))
-    {
-        gSprites[gMapObjects[mapObjectId].spriteId].data[7] |= 0x04;
-    }
-}
-
-void MoveCoords(u8 direction, s16 *x, s16 *y)
-{
-    *x += gUnknown_0850DB7C[direction].x;
-    *y += gUnknown_0850DB7C[direction].y;
-}
-
-void sub_8092F60(u8 direction, s16 *x, s16 *y)
-{
-    *x += gUnknown_0850DB7C[direction].x << 4;
-    *y += gUnknown_0850DB7C[direction].y << 4;
-}
-
-void sub_8092F88(u32 dirn, s16 *x, s16 *y, s16 dx, s16 dy)
-{
-    u8 direction;
-    s16 dx_2;
-    s16 dy_2;
-    s16 cur_x;
-    s16 cur_y;
-
-    direction = dirn;
-    dx_2 = dx;
-    dy_2 = dy;
-    cur_x = gUnknown_0850DB7C[direction].x;
-    if (cur_x > 0)
-    {
-        *x += dx_2;
-    }
-    if (cur_x < 0)
-    {
-        *x -= dx_2;
-    }
-    cur_y = gUnknown_0850DB7C[direction].y;
-    if (cur_y > 0)
-    {
-        *y += dy_2;
-    }
-    if (cur_y < 0)
-    {
-        *y -= dy_2;
-    }
-}
-
-void sub_8092FF0(s16 x, s16 y, s16 *dest_x, s16 *dest_y)
-{
-    *dest_x = (x - gSaveBlock1Ptr->pos.x) << 4;
-    *dest_y = (y - gSaveBlock1Ptr->pos.y) << 4;
-    *dest_x -= gUnknown_03005DEC;
-    *dest_y -= gUnknown_03005DE8;
-}
-
-void sub_8093038(s16 x, s16 y, s16 *dest_x, s16 *dest_y)
-{
-    s16 dx;
-    s16 dy;
-
-    dx = -gUnknown_03005DEC - gUnknown_03005DD0.x;
-    dy = -gUnknown_03005DE8 - gUnknown_03005DD0.y;
-    if (gUnknown_03005DD0.x > 0)
-    {
-        dx += 0x10;
-    }
-    if (gUnknown_03005DD0.x < 0)
-    {
-        dx -= 0x10;
-    }
-    if (gUnknown_03005DD0.y > 0)
-    {
-        dy += 0x10;
-    }
-    if (gUnknown_03005DD0.y < 0)
-    {
-        dy -= 0x10;
-    }
-    *dest_x = ((x - gSaveBlock1Ptr->pos.x) << 4) + dx;
-    *dest_y = ((y - gSaveBlock1Ptr->pos.y) << 4) + dy;
-}
-
-void sub_80930E0(s16 *x, s16 *y, s16 dx, s16 dy)
-{
-    sub_8093038(*x, *y, x, y);
-    *x += dx;
-    *y += dy;
-}
-
-void GetFieldObjectMovingCameraOffset(s16 *x, s16 *y)
-{
-    *x = 0;
-    *y = 0;
-    if (gUnknown_03005DD0.x > 0)
-    {
-        (*x) ++;
-    }
-    if (gUnknown_03005DD0.x < 0)
-    {
-        (*x) --;
-    }
-    if (gUnknown_03005DD0.y > 0)
-    {
-        (*y) ++;
-    }
-    if (gUnknown_03005DD0.y < 0)
-    {
-        (*y) --;
-    }
-}
-
-void FieldObjectMoveDestCoords(struct MapObject *mapObject, u32 dirn, s16 *x, s16 *y)
-{
-    u8 direction;
-
-    direction = dirn;
-    *x = mapObject->coords2.x;
-    *y = mapObject->coords2.y;
-    MoveCoords(direction, x, y);
-}
-
-// file boundary?
-
-bool8 FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(struct MapObject *mapObject)
-{
-    if (mapObject->mapobj_bit_1 || mapObject->mapobj_bit_6)
-    {
-        return TRUE;
-    }
-    return FALSE;
-}
-
-bool8 FieldObjectIsSpecialAnimActive(struct MapObject *mapObject)
-{
-    if (mapObject->mapobj_bit_6 && mapObject->mapobj_unk_1C != 0xFF)
-    {
-        return TRUE;
-    }
-    return FALSE;
-}
-
-bool8 FieldObjectSetSpecialAnim(struct MapObject *mapObject, u8 specialAnimId)
-{
-    if (FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject))
-    {
-        return TRUE;
-    }
-    npc_sync_anim_pause_bits(mapObject);
-    mapObject->mapobj_unk_1C = specialAnimId;
-    mapObject->mapobj_bit_6 = TRUE;
-    mapObject->mapobj_bit_7 = FALSE;
-    gSprites[mapObject->spriteId].data[2] = 0;
-    return FALSE;
-}
-
-void FieldObjectForceSetSpecialAnim(struct MapObject *mapObject, u8 specialAnimId)
-{
-    FieldObjectClearAnimIfSpecialAnimActive(mapObject);
-    FieldObjectSetSpecialAnim(mapObject, specialAnimId);
-}
-
-void FieldObjectClearAnimIfSpecialAnimActive(struct MapObject *mapObject)
-{
-    if (mapObject->mapobj_bit_6)
-    {
-        FieldObjectClearAnim(mapObject);
-    }
-}
-
-void FieldObjectClearAnim(struct MapObject *mapObject)
-{
-    mapObject->mapobj_unk_1C = 0xFF;
-    mapObject->mapobj_bit_6 = FALSE;
-    mapObject->mapobj_bit_7 = FALSE;
-    gSprites[mapObject->spriteId].data[1] = 0;
-    gSprites[mapObject->spriteId].data[2] = 0;
-}
-
-u8 FieldObjectCheckIfSpecialAnimFinishedOrInactive(struct MapObject *mapObject)
-{
-    if (mapObject->mapobj_bit_6)
-    {
-        return mapObject->mapobj_bit_7;
-    }
-    return 0x10;
-}
-
-u8 FieldObjectClearAnimIfSpecialAnimFinished(struct MapObject *mapObject)
-{
-    u8 specialAnimState;
-
-    specialAnimState = FieldObjectCheckIfSpecialAnimFinishedOrInactive(mapObject);
-    if (specialAnimState != 0 && specialAnimState != 16)
-    {
-        FieldObjectClearAnimIfSpecialAnimActive(mapObject);
-    }
-    return specialAnimState;
-}
-
-u8 FieldObjectGetSpecialAnim(struct MapObject *mapObject)
-{
-    if (mapObject->mapobj_bit_6)
-    {
-        return mapObject->mapobj_unk_1C;
-    }
-    return 0xFF;
-}
-
-void FieldObjectStep(struct MapObject *mapObject, struct Sprite *sprite, bool8 (*callback)(struct MapObject *, struct Sprite *))
-{
-    DoGroundEffects_OnSpawn(mapObject, sprite);
-    sub_80964E8(mapObject, sprite);
-    if (FieldObjectIsSpecialAnimActive(mapObject))
-    {
-        FieldObjectExecSpecialAnim(mapObject, sprite);
-    }
-    else if (!mapObject->mapobj_bit_8)
-    {
-        while (callback(mapObject, sprite));
-    }
-    DoGroundEffects_OnBeginStep(mapObject, sprite);
-    DoGroundEffects_OnFinishStep(mapObject, sprite);
-    npc_obj_transfer_image_anim_pause_flag(mapObject, sprite);
-    sub_8096518(mapObject, sprite);
-    FieldObjectUpdateSubpriority(mapObject, sprite);
-}
-
-#define dirn2anim_2(name, table) \
-extern const u8 table[5];      \
-u8 name(u32 direction)         \
-{                              \
-    u8 dirn2;                  \
-    u8 animIds[5];             \
-    dirn2 = direction;         \
-    memcpy(animIds, table, 5); \
-    if (dirn2 > DIR_EAST)      \
-    {                          \
-        dirn2 = 0;             \
-    }                          \
-    return animIds[dirn2];     \
-}
-
-dirn2anim_2(GetFaceDirectionAnimId, gUnknown_0850DBA0);
-dirn2anim_2(GetSimpleGoAnimId, gUnknown_0850DBA5);
-dirn2anim_2(GetGoSpeed0AnimId, gUnknown_0850DBAA);
-dirn2anim_2(GetGoSpeed1AnimId, gUnknown_0850DBAF);
-dirn2anim_2(GetGoSpeed2AnimId, gUnknown_0850DBB4);
-dirn2anim_2(GetGoSpeed3AnimId, gUnknown_0850DBB9);
-dirn2anim_2(sub_8093438, gUnknown_0850DBBE);
-dirn2anim_2(GetRunAnimId, gUnknown_0850DBC3);
-dirn2anim_2(GetJumpLedgeAnimId, gUnknown_0850DBC8);
-dirn2anim_2(sub_80934BC, gUnknown_0850DBCD);
-dirn2anim_2(sub_80934E8, gUnknown_0850DBD2);
-dirn2anim_2(sub_8093514, gUnknown_0850DBD7);
-dirn2anim_2(sub_8093540, gUnknown_0850DBDC);
-dirn2anim_2(GetStepInPlaceDelay32AnimId, gUnknown_0850DBE1);
-dirn2anim_2(GetStepInPlaceDelay16AnimId, gUnknown_0850DBE6);
-dirn2anim_2(GetStepInPlaceDelay8AnimId, gUnknown_0850DBEB);
-dirn2anim_2(GetStepInPlaceDelay4AnimId, gUnknown_0850DBF0);
-
-bool8 FieldObjectFaceOppositeDirection(struct MapObject *mapObject, u8 direction)
-{
-    return FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(GetOppositeDirection(direction)));
-}
-
-dirn2anim_2(sub_8093648, gUnknown_0850DBF5);
-dirn2anim_2(sub_8093674, gUnknown_0850DBFA);
-dirn2anim_2(sub_80936A0, gUnknown_0850DBFF);
-dirn2anim_2(sub_80936CC, gUnknown_0850DC04);
-dirn2anim_2(sub_80936F8, gUnknown_0850DC09);
-dirn2anim_2(sub_8093724, gUnknown_0850DC0E);
-dirn2anim_2(sub_8093750, gUnknown_0850DC13);
-dirn2anim_2(sub_809377C, gUnknown_0850DC18);
-dirn2anim_2(sub_80937A8, gUnknown_0850DC1D);
-dirn2anim_2(d2s_08064034, gUnknown_0850DC22);
-
-extern const u8 gUnknown_0850DC27[8];
-
-u8 GetOppositeDirection(u8 direction)
-{
-    u8 directions[sizeof gUnknown_0850DC27];
-
-    memcpy(directions, gUnknown_0850DC27, sizeof gUnknown_0850DC27);
-    if (direction < 1 || direction > (sizeof gUnknown_0850DC27))
-    {
-        return direction;
-    }
-    return directions[direction - 1];
-}
-
-static u32 zffu_offset_calc(u8 a0, u8 a1)
-{
-    return gUnknown_0850DC2F[a0 - 1][a1 - 1];
-}
-
-static u32 state_to_direction(u8 a0, u32 a1, u32 a2)
-{
-    u32 zffuOffset;
-    u8 a1_2;
-    u8 a2_2;
-
-    a1_2 = a1;
-    a2_2 = a2;
-    if (a1_2 == 0 || a2_2 == 0 || a1_2 > DIR_EAST || a2_2 > DIR_EAST)
-    {
-        return 0;
-    }
-    zffuOffset = zffu_offset_calc(a1_2, a2);
-    return gUnknown_0850DC3F[a0 - 1][zffuOffset - 1];
-}
-
-static void FieldObjectExecSpecialAnim(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (gUnknown_0850DC50[mapObject->mapobj_unk_1C][sprite->data[2]](mapObject, sprite))
-    {
-        mapObject->mapobj_bit_7 = TRUE;
-    }
-}
-
-bool8 FieldObjectExecRegularAnim(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (gUnknown_0850DC50[mapObject->mapobj_unk_1C][sprite->data[2]](mapObject, sprite))
-    {
-        mapObject->mapobj_unk_1C = 0xFF;
-        sprite->data[2] = 0;
-        return TRUE;
-    }
-    return FALSE;
-}
-
-void FieldObjectSetRegularAnim(struct MapObject *mapObject, struct Sprite *sprite, u8 animId)
-{
-    mapObject->mapobj_unk_1C = animId;
-    sprite->data[2] = 0;
-}
-
-// file boundary?
-
-void an_look_any(struct MapObject *mapObject, struct Sprite *sprite, u8 direction)
-{
-    FieldObjectSetDirection(mapObject, direction);
-    npc_coords_shift_still(mapObject);
-    obj_npc_animation_step(mapObject, sprite, get_go_image_anim_num(mapObject->mapobj_unk_18));
-    sprite->animPaused = TRUE;
-    sprite->data[2] = 1;
-}
-
-bool8 sub_8093950(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    an_look_any(mapObject, sprite, DIR_SOUTH);
-    return TRUE;
-}
-
-bool8 sub_8093960(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    an_look_any(mapObject, sprite, DIR_NORTH);
-    return TRUE;
-}
-
-bool8 sub_8093970(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    an_look_any(mapObject, sprite, DIR_WEST);
-    return TRUE;
-}
-
-bool8 sub_8093980(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    an_look_any(mapObject, sprite, DIR_EAST);
-    return TRUE;
-}
-
-void npc_apply_direction(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 speed)
-{
-    s16 x;
-    s16 y;
-
-    x = mapObject->coords2.x;
-    y = mapObject->coords2.y;
-    FieldObjectSetDirection(mapObject, direction);
-    MoveCoords(direction, &x, &y);
-    npc_coords_shift(mapObject, x, y);
-    oamt_npc_ministep_reset(sprite, direction, speed);
-    sprite->animPaused = FALSE;
-    if (gUnknown_020375B8 != NULL && sub_8097F78(mapObject) != 0x10)
-    {
-        sprite->animPaused = TRUE;
-    }
-    mapObject->mapobj_bit_2 = TRUE;
-    sprite->data[2] = 1;
-}
-
-void do_go_anim(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 speed)
-{
-    u8 (*functions[ARRAY_COUNT(gUnknown_0850DEE8)])(u8);
-
-    memcpy(functions, gUnknown_0850DEE8, sizeof gUnknown_0850DEE8);
-    npc_apply_direction(mapObject, sprite, direction, speed);
-    npc_apply_anim_looping(mapObject, sprite, functions[speed](mapObject->mapobj_unk_18));
-}
-
-void do_run_anim(struct MapObject *mapObject, struct Sprite *sprite, u8 direction)
-{
-    npc_apply_direction(mapObject, sprite, direction, 1);
-    npc_apply_anim_looping(mapObject, sprite, get_run_image_anim_num(mapObject->mapobj_unk_18));
-}
-
-bool8 npc_obj_ministep_stop_on_arrival(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (obj_npc_ministep(sprite))
-    {
-        npc_coords_shift_still(mapObject);
-        mapObject->mapobj_bit_3 = TRUE;
-        sprite->animPaused = TRUE;
-        return TRUE;
-    }
-    return FALSE;
-}
-
-void sub_8093AF0(struct MapObject *mapObject, struct Sprite *sprite, u8 direction)
-{
-    s16 x;
-    s16 y;
-
-    x = mapObject->coords2.x;
-    y = mapObject->coords2.y;
-    FieldObjectSetDirection(mapObject, direction);
-    MoveCoords(direction, &x, &y);
-    npc_coords_shift(mapObject, x, y);
-    sub_80976DC(sprite, direction);
-    sprite->animPaused = FALSE;
-    mapObject->mapobj_bit_2 = TRUE;
-    sprite->data[2] = 1;
-}
-
-void sub_8093B60(struct MapObject *mapObject, struct Sprite *sprite, u8 direction)
-{
-    sub_8093AF0(mapObject, sprite, direction);
-    npc_apply_anim_looping(mapObject, sprite, get_go_image_anim_num(mapObject->mapobj_unk_18));
-}
-
-bool8 an_walk_any_2(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (sub_80976EC(sprite))
-    {
-        npc_coords_shift_still(mapObject);
-        mapObject->mapobj_bit_3 = TRUE;
-        sprite->animPaused = TRUE;
-        return TRUE;
-    }
-    return FALSE;
-}
-
-#define an_walk_any_2_macro(name, fn1, fn2, ...) \
-bool8 name##_2(struct MapObject *, struct Sprite *);\
-bool8 name(struct MapObject *mapObject, struct Sprite *sprite)\
-{\
-    fn1(mapObject, sprite, __VA_ARGS__);\
-    return name##_2(mapObject, sprite);\
-}\
-bool8 name##_2(struct MapObject *mapObject, struct Sprite *sprite)\
-{\
-    if (fn2(mapObject, sprite))\
-    {\
-        sprite->data[2] = 2;\
-        return TRUE;\
-    }\
-    return FALSE;\
-}
-
-an_walk_any_2_macro(sub_8093BC4, sub_8093B60, an_walk_any_2, 7)
-an_walk_any_2_macro(sub_8093C04, sub_8093B60, an_walk_any_2, 8)
-an_walk_any_2_macro(sub_8093C44, sub_8093B60, an_walk_any_2, 5)
-an_walk_any_2_macro(sub_8093C84, sub_8093B60, an_walk_any_2, 6)
-an_walk_any_2_macro(sub_8093CC4, sub_8093B60, an_walk_any_2, 1)
-an_walk_any_2_macro(sub_8093D04, sub_8093B60, an_walk_any_2, 2)
-an_walk_any_2_macro(sub_8093D44, sub_8093B60, an_walk_any_2, 3)
-an_walk_any_2_macro(sub_8093D84, sub_8093B60, an_walk_any_2, 4)
-an_walk_any_2_macro(sub_8093DC4, do_go_anim, npc_obj_ministep_stop_on_arrival, 7, 0)
-an_walk_any_2_macro(sub_8093E04, do_go_anim, npc_obj_ministep_stop_on_arrival, 8, 0)
-an_walk_any_2_macro(sub_8093E44, do_go_anim, npc_obj_ministep_stop_on_arrival, 5, 0)
-an_walk_any_2_macro(sub_8093E84, do_go_anim, npc_obj_ministep_stop_on_arrival, 6, 0)
-an_walk_any_2_macro(sub_8093EC4, do_go_anim, npc_obj_ministep_stop_on_arrival, 1, 0)
-an_walk_any_2_macro(sub_8093F04, do_go_anim, npc_obj_ministep_stop_on_arrival, 2, 0)
-an_walk_any_2_macro(sub_8093F44, do_go_anim, npc_obj_ministep_stop_on_arrival, 3, 0)
-an_walk_any_2_macro(sub_8093F84, do_go_anim, npc_obj_ministep_stop_on_arrival, 4, 0)
-
-void sub_8093FC4(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 speed, u8 a5)
-{
-    s16 displacements[ARRAY_COUNT(gUnknown_0850DFBC)];
-    s16 x;
-    s16 y;
-
-    memcpy(displacements, gUnknown_0850DFBC, sizeof gUnknown_0850DFBC);
-    x = 0;
-    y = 0;
-    FieldObjectSetDirection(mapObject, direction);
-    sub_8092F88(direction, &x, &y, displacements[speed], displacements[speed]);
-    npc_coords_shift(mapObject, mapObject->coords2.x + x, mapObject->coords2.y + y);
-    sub_809783C(sprite, direction, speed, a5);
-    sprite->data[2] = 1;
-    sprite->animPaused = 0;
-    mapObject->mapobj_bit_2 = 1;
-    mapObject->mapobj_bit_4 = 1;
-}
-
-void maybe_shadow_1(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 speed, u8 a4)
-{
-    sub_8093FC4(mapObject, sprite, direction, speed, a4);
-    npc_apply_anim_looping(mapObject, sprite, get_go_image_anim_num(mapObject->mapobj_unk_18));
-    DoShadowFieldEffect(mapObject);
-}
-
-u8 sub_80940C4(struct MapObject *mapObject, struct Sprite *sprite, u8 callback(struct Sprite *))
-{
-    s16 displacements[ARRAY_COUNT(gUnknown_0850DFC2)];
-    s16 x;
-    s16 y;
-    u8 result;
-
-    memcpy(displacements, gUnknown_0850DFC2, sizeof gUnknown_0850DFC2);
-    result = callback(sprite);
-    if (result == 1 && displacements[sprite->data[4]] != 0)
-    {
-        x = 0;
-        y = 0;
-        sub_8092F88(mapObject->placeholder18, &x, &y, displacements[sprite->data[4]], displacements[sprite->data[4]]);
-        npc_coords_shift(mapObject, mapObject->coords2.x + x, mapObject->coords2.y + y);
-        mapObject->mapobj_bit_2 = TRUE;
-        mapObject->mapobj_bit_4 = TRUE;
-    }
-    else if (result == 0xFF)
-    {
-        npc_coords_shift_still(mapObject);
-        mapObject->mapobj_bit_3 = TRUE;
-        mapObject->mapobj_bit_5 = TRUE;
-        sprite->animPaused = TRUE;
-    }
-    return result;
-}
-
-u8 sub_8094188(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    return sub_80940C4(mapObject, sprite, sub_809785C);
-}
-
-u8 sub_809419C(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    return sub_80940C4(mapObject, sprite, sub_80978E4);
-}
-
-bool8 sub_80941B0(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (sub_8094188(mapObject, sprite) == 0xFF)
-    {
-        return TRUE;
-    }
-    return FALSE;
-}
-
-bool8 sub_80941C8(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (sub_809419C(mapObject, sprite) == 0xFF)
-    {
-        return TRUE;
-    }
-    return FALSE;
-}
-
-bool8 sub_80941E0(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    switch (sub_8094188(mapObject, sprite))
-    {
-        case 255:
-            return TRUE;
-        case   1:
-            FieldObjectSetDirection(mapObject, GetOppositeDirection(mapObject->placeholder18));
-            obj_npc_animation_step(mapObject, sprite, get_go_image_anim_num(mapObject->mapobj_unk_18));
-        default:
-            return FALSE;
-    }
-}
-
-#define maybe_shadow_1_macro(name, fn1, fn2, ...) \
-bool8 name##_2(struct MapObject *, struct Sprite *);\
-bool8 name(struct MapObject *mapObject, struct Sprite *sprite)\
-{\
-    fn1(mapObject, sprite, __VA_ARGS__);\
-    return name##_2(mapObject, sprite);\
-}\
-bool8 name##_2(struct MapObject *mapObject, struct Sprite *sprite)\
-{\
-    if (fn2(mapObject, sprite))\
-    {\
-        mapObject->mapobj_bit_22 = FALSE;\
-        sprite->data[2] = 2;\
-        return TRUE;\
-    }\
-    return FALSE;\
-}
-
-maybe_shadow_1_macro(sub_8094230, maybe_shadow_1, sub_80941B0, DIR_SOUTH, 2, 0)
-maybe_shadow_1_macro(sub_8094288, maybe_shadow_1, sub_80941B0, DIR_NORTH, 2, 0)
-maybe_shadow_1_macro(sub_80942E0, maybe_shadow_1, sub_80941B0, DIR_WEST,  2, 0)
-maybe_shadow_1_macro(sub_8094338, maybe_shadow_1, sub_80941B0, DIR_EAST,  2, 0)
-
-void sub_8094390(struct Sprite *sprite, u16 duration)
-{
-    sprite->data[2] = 1;
-    sprite->data[3] = duration;
-}
-
-bool8 sub_8094398(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (-- sprite->data[3] == 0)
-    {
-        sprite->data[2] = 2;
-        return TRUE;
-    }
-    return FALSE;
-}
-
-#define special_anim_with_timer(name, duration)\
-bool8 name(struct MapObject *mapObject, struct Sprite *sprite)\
-{\
-    sub_8094390(sprite, duration);\
-    return sub_8094398(mapObject, sprite);\
-}
-
-special_anim_with_timer(sub_80943B4,  1)
-special_anim_with_timer(sub_80943D4,  2)
-special_anim_with_timer(sub_80943F4,  4)
-special_anim_with_timer(sub_8094414,  8)
-special_anim_with_timer(sub_8094434, 16)
-
-an_walk_any_2_macro(sub_8094454, do_go_anim, npc_obj_ministep_stop_on_arrival, 1, 1)
-an_walk_any_2_macro(sub_8094494, do_go_anim, npc_obj_ministep_stop_on_arrival, 2, 1)
-an_walk_any_2_macro(sub_80944D4, do_go_anim, npc_obj_ministep_stop_on_arrival, 3, 1)
-an_walk_any_2_macro(sub_8094514, do_go_anim, npc_obj_ministep_stop_on_arrival, 4, 1)
-
-void sub_8094554(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 animNum, u16 duration)
-{
-    FieldObjectSetDirection(mapObject, direction);
-    npc_apply_anim_looping(mapObject, sprite, animNum);
-    sprite->animPaused = FALSE;
-    sprite->data[2] = 1;
-    sprite->data[3] = duration;
-}
-
-bool8 sub_809459C(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (-- sprite->data[3] == 0)
-    {
-        sprite->data[2] = 2;
-        sprite->animPaused = TRUE;
-        return TRUE;
-    }
-    return FALSE;
-}
-
-bool8 sub_80945C4(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (sprite->data[3] & 1)
-    {
-        sprite->animDelayCounter ++;
-    }
-    return sub_809459C(mapObject, sprite);
-}
-
-#define special_anim_with_timer_2(name, direction, images, duration, timer) \
-bool8 name(struct MapObject *mapObject, struct Sprite *sprite)\
-{\
-    u8 animId;\
-    animId = images(DIR_##direction);\
-    sub_8094554(mapObject, sprite, DIR_##direction, animId, duration);\
-    return timer(mapObject, sprite);\
-}
-
-special_anim_with_timer_2(sub_8094600, SOUTH, get_go_image_anim_num,        32, sub_80945C4)
-special_anim_with_timer_2(sub_8094638, NORTH, get_go_image_anim_num,        32, sub_80945C4)
-special_anim_with_timer_2(sub_8094670, WEST,  get_go_image_anim_num,        32, sub_80945C4)
-special_anim_with_timer_2(sub_80946A8, EAST,  get_go_image_anim_num,        32, sub_80945C4)
-special_anim_with_timer_2(sub_80946E0, SOUTH, get_go_image_anim_num,        16, sub_809459C)
-special_anim_with_timer_2(sub_8094718, NORTH, get_go_image_anim_num,        16, sub_809459C)
-special_anim_with_timer_2(sub_8094750, WEST,  get_go_image_anim_num,        16, sub_809459C)
-special_anim_with_timer_2(sub_8094788, EAST,  get_go_image_anim_num,        16, sub_809459C)
-special_anim_with_timer_2(sub_80947C0, SOUTH, get_go_fast_image_anim_num,    8, sub_809459C)
-special_anim_with_timer_2(sub_80947F8, NORTH, get_go_fast_image_anim_num,    8, sub_809459C)
-special_anim_with_timer_2(sub_8094830, WEST,  get_go_fast_image_anim_num,    8, sub_809459C)
-special_anim_with_timer_2(sub_8094868, EAST,  get_go_fast_image_anim_num,    8, sub_809459C)
-special_anim_with_timer_2(sub_80948A0, SOUTH, get_go_faster_image_anim_num,  4, sub_809459C)
-special_anim_with_timer_2(sub_80948D8, NORTH, get_go_faster_image_anim_num,  4, sub_809459C)
-special_anim_with_timer_2(sub_8094910, WEST,  get_go_faster_image_anim_num,  4, sub_809459C)
-special_anim_with_timer_2(sub_8094948, EAST,  get_go_faster_image_anim_num,  4, sub_809459C)
-
-an_walk_any_2_macro(sub_8094980, do_go_anim, npc_obj_ministep_stop_on_arrival, DIR_SOUTH, 2)
-an_walk_any_2_macro(sub_80949C0, do_go_anim, npc_obj_ministep_stop_on_arrival, DIR_NORTH, 2)
-an_walk_any_2_macro(sub_8094A00, do_go_anim, npc_obj_ministep_stop_on_arrival, DIR_WEST,  2)
-an_walk_any_2_macro(sub_8094A40, do_go_anim, npc_obj_ministep_stop_on_arrival, DIR_EAST,  2)
-an_walk_any_2_macro(sub_8094A80, do_go_anim, npc_obj_ministep_stop_on_arrival, DIR_SOUTH, 3)
-an_walk_any_2_macro(sub_8094AC0, do_go_anim, npc_obj_ministep_stop_on_arrival, DIR_NORTH, 3)
-an_walk_any_2_macro(sub_8094B00, do_go_anim, npc_obj_ministep_stop_on_arrival, DIR_WEST,  3)
-an_walk_any_2_macro(sub_8094B40, do_go_anim, npc_obj_ministep_stop_on_arrival, DIR_EAST,  3)
-an_walk_any_2_macro(sub_8094B80, do_go_anim, npc_obj_ministep_stop_on_arrival, DIR_SOUTH, 4)
-an_walk_any_2_macro(sub_8094BC0, do_go_anim, npc_obj_ministep_stop_on_arrival, DIR_NORTH, 4)
-an_walk_any_2_macro(sub_8094C00, do_go_anim, npc_obj_ministep_stop_on_arrival, DIR_WEST,  4)
-an_walk_any_2_macro(sub_8094C40, do_go_anim, npc_obj_ministep_stop_on_arrival, DIR_EAST,  4)
-an_walk_any_2_macro(sub_8094C80, do_run_anim, npc_obj_ministep_stop_on_arrival, DIR_SOUTH)
-an_walk_any_2_macro(sub_8094CC0, do_run_anim, npc_obj_ministep_stop_on_arrival, DIR_NORTH)
-an_walk_any_2_macro(sub_8094D00, do_run_anim, npc_obj_ministep_stop_on_arrival, DIR_WEST)
-an_walk_any_2_macro(sub_8094D40, do_run_anim, npc_obj_ministep_stop_on_arrival, DIR_EAST)
-
-void npc_set_direction_and_anim__an_proceed(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 animNum)
-{
-    obj_anim_image_set_and_seek(sprite, animNum, 0);
-    FieldObjectSetDirection(mapObject, direction);
-    sprite->data[2] = 1;
-}
-
-bool8 sub_8094DAC(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    npc_set_direction_and_anim__an_proceed(mapObject, sprite, mapObject->placeholder18, sprite->animNum);
-    return FALSE;
-}
-
-bool8 sub_8094DC4(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (sub_80979BC(sprite))
-    {
-        sprite->data[2] = 2;
-        return TRUE;
-    }
-    return FALSE;
-}
-
-void sub_8094DE4(struct MapObject *mapObject, struct Sprite *sprite, u8 direction)
-{
-    sub_8093FC4(mapObject, sprite, direction, 1, 0);
-    StartSpriteAnim(sprite, sub_80929AC(direction));
-}
-
-#define unk_macro_8094E18(name, direction)\
-bool8 name##_2(struct MapObject *, struct Sprite *);\
-bool8 name(struct MapObject *mapObject, struct Sprite *sprite)\
-{\
-    sub_8094DE4(mapObject, sprite, direction);\
-    return name##_2(mapObject, sprite);\
-}\
-bool8 name##_2(struct MapObject *mapObject, struct Sprite *sprite)\
-{\
-    if (sub_80941C8(mapObject, sprite))\
-    {\
-        sprite->data[2] = 2;\
-        mapObject->mapobj_bit_5 = FALSE;\
-        return TRUE;\
-    }\
-    return FALSE;\
-}
-
-unk_macro_8094E18(sub_8094E18, DIR_SOUTH)
-unk_macro_8094E18(sub_8094E60, DIR_NORTH)
-unk_macro_8094E18(sub_8094EB8, DIR_WEST)
-unk_macro_8094E18(sub_8094710, DIR_EAST)
-
-bool8 sub_8094F38(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    u8 mapObjectId;
-
-    if (!TryGetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0, &mapObjectId))
-    {
-        an_look_any(mapObject, sprite, sub_8092AF8(mapObject->coords2.x, mapObject->coords2.y, gMapObjects[mapObjectId].coords2.x, gMapObjects[mapObjectId].coords2.y));
-    }
-    sprite->data[2] = 1;
-    return TRUE;
-}
-
-bool8 sub_8094F94(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    u8 mapObjectId;
-
-    if (!TryGetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0, &mapObjectId))
-    {
-        an_look_any(mapObject, sprite, GetOppositeDirection(sub_8092AF8(mapObject->coords2.x, mapObject->coords2.y, gMapObjects[mapObjectId].coords2.x, gMapObjects[mapObjectId].coords2.y)));
-    }
-    sprite->data[2] = 1;
-    return TRUE;
-}
-
-bool8 sub_8094FF8(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    mapObject->mapobj_bit_9 = TRUE;
-    sprite->data[2] = 1;
-    return TRUE;
-}
-
-bool8 sub_8095008(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    mapObject->mapobj_bit_9 = FALSE;
-    sprite->data[2] = 1;
-    return TRUE;
-}
-
-maybe_shadow_1_macro(sub_8095018, maybe_shadow_1, sub_80941B0, DIR_SOUTH, 1, 2)
-maybe_shadow_1_macro(sub_8095070, maybe_shadow_1, sub_80941B0, DIR_NORTH, 1, 2)
-maybe_shadow_1_macro(sub_80950C8, maybe_shadow_1, sub_80941B0, DIR_WEST,  1, 2)
-maybe_shadow_1_macro(sub_8095120, maybe_shadow_1, sub_80941B0, DIR_EAST,  1, 2)
-maybe_shadow_1_macro(sub_8095178, maybe_shadow_1, sub_80941B0, DIR_SOUTH, 0, 0)
-maybe_shadow_1_macro(sub_80951D0, maybe_shadow_1, sub_80941B0, DIR_NORTH, 0, 0)
-maybe_shadow_1_macro(sub_8095228, maybe_shadow_1, sub_80941B0, DIR_WEST,  0, 0)
-maybe_shadow_1_macro(sub_8095280, maybe_shadow_1, sub_80941B0, DIR_EAST,  0, 0)
-maybe_shadow_1_macro(sub_80952D8, maybe_shadow_1, sub_80941E0, DIR_SOUTH, 0, 2)
-maybe_shadow_1_macro(sub_8095330, maybe_shadow_1, sub_80941E0, DIR_NORTH, 0, 2)
-maybe_shadow_1_macro(sub_8095388, maybe_shadow_1, sub_80941E0, DIR_WEST,  0, 2)
-maybe_shadow_1_macro(sub_80953E0, maybe_shadow_1, sub_80941E0, DIR_EAST,  0, 2)
-
-bool8 sub_8095438(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    an_look_any(mapObject, sprite, gUnknown_085055CD[mapObject->animPattern]);
-    return TRUE;
-}
-
-bool8 sub_8095450(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    npc_set_direction_and_anim__an_proceed(mapObject, sprite, DIR_SOUTH, 0x14);
-    return FALSE;
-}
-
-bool8 sub_8095460(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    mapObject->mapobj_bit_25 = FALSE;
-    sprite->data[2] = 1;
-    return TRUE;
-}
-
-bool8 sub_8095470(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    mapObject->mapobj_bit_25 = TRUE;
-    sprite->data[2] = 1;
-    return TRUE;
-}
-
-bool8 sub_8095480(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    mapObject->mapobj_bit_12 = TRUE;
-    sprite->data[2] = 1;
-    return TRUE;
-}
-
-bool8 sub_8095490(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    mapObject->mapobj_bit_12 = GetFieldObjectGraphicsInfo(mapObject->graphicsId)->inanimate;
-    sprite->data[2] = 1;
-    return TRUE;
-}
-
-bool8 sub_80954BC(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    mapObject->mapobj_bit_13 = TRUE;
-    sprite->data[2] = 1;
-    return TRUE;
-}
-
-bool8 sub_80954CC(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    mapObject->mapobj_bit_13 = FALSE;
-    sprite->data[2] = 1;
-    return TRUE;
-}
-
-bool8 do_exclamation_mark_bubble_1(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
-    FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_1);
-    sprite->data[2] = 1;
-    return TRUE;
-}
-
-bool8 do_exclamation_mark_bubble_2(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
-    FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_2);
-    sprite->data[2] = 1;
-    return TRUE;
-}
-
-bool8 do_heart_bubble(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
-    FieldEffectStart(FLDEFF_HEART_ICON);
-    sprite->data[2] = 1;
-    return TRUE;
-}
-
-bool8 sub_8095548(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (mapObject->animPattern == 0x3F)
-    {
-        sub_80B4578(mapObject);
-        return FALSE;
-    }
-    if (mapObject->animPattern != 0x39 && mapObject->animPattern != 0x3A)
-    {
-        sprite->data[2] = 2;
-        return TRUE;
-    }
-    sub_8155D78(mapObject);
-    sprite->data[2] = 1;
-    return sub_809558C(mapObject, sprite);
-}
-
-bool8 sub_809558C(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (sub_8155DA0(mapObject))
-    {
-        sprite->data[2] = 2;
-        return TRUE;
-    }
-    return FALSE;
-}
-
-bool8 sub_80955AC(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    obj_anim_image_set_and_seek(sprite, 1, 0);
-    sprite->data[2] = 1;
-    return FALSE;
-}
-
-bool8 sub_80955C8(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (sub_80979BC(sprite))
-    {
-        SetFieldObjectStepTimer(sprite, 32);
-        sprite->data[2] = 2;
-    }
-    return FALSE;
-}
-
-bool8 sub_80955EC(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    mapObject->mapobj_bit_13 ^= TRUE;
-    if (RunFieldObjectStepTimer(sprite))
-    {
-        mapObject->mapobj_bit_13 = TRUE;
-        sprite->data[2] = 3;
-    }
-    return FALSE;
-}
-
-bool8 sub_8095628(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    obj_anim_image_set_and_seek(sprite, 1, 0);
-    sprite->data[2] = 1;
-    return FALSE;
-}
-
-bool8 sub_8095644(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (sub_80979BC(sprite))
-    {
-        SetFieldObjectStepTimer(sprite, 32);
-        sprite->data[2] = 2;
-    }
-    return FALSE;
-}
-
-bool8 sub_8095668(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    mapObject->mapobj_bit_13 ^= TRUE;
-    if (RunFieldObjectStepTimer(sprite))
-    {
-        mapObject->mapobj_bit_13 = TRUE;
-        sprite->data[2] = 3;
-    }
-    return FALSE;
-}
-
-bool8 sub_80956A4(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    mapObject->mapobj_bit_26 = TRUE;
-    sprite->data[2] = 1;
-    return TRUE;
-}
-
-bool8 sub_80956B4(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    mapObject->mapobj_bit_26 = FALSE;
-    sprite->data[2] = 1;
-    return TRUE;
-}
-
-bool8 sub_80956C4(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    sprite->oam.affineMode = 3;
-    InitSpriteAffineAnim(sprite);
-    sprite->affineAnimPaused = TRUE;
-    sprite->subspriteMode = 0;
-    return TRUE;
-}
-
-bool8 sub_80956F4(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    FreeOamMatrix(sprite->oam.matrixNum);
-    sprite->oam.affineMode = 0;
-    CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, sprite->oam.affineMode);
-    return TRUE;
-}
-
-bool8 sub_8095724(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    mapObject->mapobj_bit_27 = TRUE;
-    return TRUE;
-}
-
-bool8 sub_8095730(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    mapObject->mapobj_bit_27 = FALSE;
-    return TRUE;
-}
-
-#define affine_an_walk_any_2_macro(name, fn, fn2, action, anim, ...)\
-bool8 name##_2(struct MapObject *, struct Sprite *);\
-bool8 name(struct MapObject *mapObject, struct Sprite *sprite)\
-{\
-    fn(mapObject, sprite, __VA_ARGS__);\
-    sprite->affineAnimPaused = FALSE;\
-    action(sprite, anim);\
-    return name##_2(mapObject, sprite);\
-}\
-bool8 name##_2(struct MapObject *mapObject, struct Sprite *sprite)\
-{\
-    if (fn2(mapObject, sprite))\
-    {\
-        sprite->affineAnimPaused = TRUE;\
-        sprite->data[2] = 2;\
-        return TRUE;\
-    }\
-    return FALSE;\
-}\
-
-affine_an_walk_any_2_macro(sub_8095740, sub_8093B60, an_walk_any_2, StartSpriteAffineAnimIfDifferent, 0, DIR_SOUTH)
-affine_an_walk_any_2_macro(sub_80957A0, sub_8093B60, an_walk_any_2, ChangeSpriteAffineAnimIfDifferent, 1, DIR_SOUTH)
-affine_an_walk_any_2_macro(sub_8095800, do_go_anim, npc_obj_ministep_stop_on_arrival, ChangeSpriteAffineAnimIfDifferent, 2, DIR_WEST, 1)
-affine_an_walk_any_2_macro(sub_8095860, do_go_anim, npc_obj_ministep_stop_on_arrival, ChangeSpriteAffineAnimIfDifferent, 3, DIR_EAST, 1)
-
-static void sub_80958C0(struct MapObject *mapObject, struct Sprite *sprite, u8 direction)
-{
-    FieldObjectSetDirection(mapObject, direction);
-    npc_coords_shift_still(mapObject);
-    obj_npc_animation_step(mapObject, sprite, sub_80929FC(direction));
-    sprite->animPaused = TRUE;
-    sprite->data[2] = 1;
-}
-
-bool8 sub_8095900(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    sub_80958C0(mapObject, sprite, DIR_SOUTH);
-    return TRUE;
-}
-
-bool8 sub_8095910(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    sub_80958C0(mapObject, sprite, DIR_NORTH);
-    return TRUE;
-}
-
-bool8 sub_8095920(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    sub_80958C0(mapObject, sprite, DIR_WEST);
-    return TRUE;
-}
-
-bool8 sub_8095930(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    sub_80958C0(mapObject, sprite, DIR_EAST);
-    return TRUE;
-}
-
-#define set_dirn_and_anim__an_proceed(name, direction, anims)\
-bool8 name(struct MapObject *mapObject, struct Sprite *sprite)\
-{\
-    npc_set_direction_and_anim__an_proceed(mapObject, sprite, direction, anims(direction));\
-    return FALSE;\
-}
-
-set_dirn_and_anim__an_proceed(sub_8095940, DIR_SOUTH, sub_80929BC)
-set_dirn_and_anim__an_proceed(sub_8095964, DIR_NORTH, sub_80929BC)
-set_dirn_and_anim__an_proceed(sub_8095988, DIR_WEST,  sub_80929BC)
-set_dirn_and_anim__an_proceed(sub_80959AC, DIR_EAST,  sub_80929BC)
-set_dirn_and_anim__an_proceed(sub_80959D0, DIR_SOUTH, sub_80929DC)
-set_dirn_and_anim__an_proceed(sub_80959F4, DIR_NORTH, sub_80929DC)
-set_dirn_and_anim__an_proceed(sub_8095A18, DIR_WEST,  sub_80929DC)
-set_dirn_and_anim__an_proceed(sub_8095A3C, DIR_EAST,  sub_80929DC)
-set_dirn_and_anim__an_proceed(sub_8095A60, DIR_SOUTH, sub_80929EC)
-set_dirn_and_anim__an_proceed(sub_8095A84, DIR_NORTH, sub_80929EC)
-set_dirn_and_anim__an_proceed(sub_8095AA8, DIR_WEST,  sub_80929EC)
-set_dirn_and_anim__an_proceed(sub_8095ACC, DIR_EAST,  sub_80929EC)
-
-void sub_8095AF0(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    sub_8097750(sprite);
-    sprite->animPaused = FALSE;
-}
-
-bool8 sub_8095B0C(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (sub_8097758(sprite))
-    {
-        npc_coords_shift_still(mapObject);
-        mapObject->mapobj_bit_3 = TRUE;
-        sprite->animPaused = TRUE;
-        return TRUE;
-    }
-    return FALSE;
-}
-
-bool8 sub_8095B44(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    sub_8095AF0(mapObject, sprite);
-    sprite->data[2] = 1;
-    return sub_8095B64(mapObject, sprite);
-}
-
-bool8 sub_8095B64(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (sub_8095B0C(mapObject, sprite))
-    {
-        sprite->data[2] = 2;
-        return TRUE;
-    }
-    return FALSE;
-}
-
-void sub_8095B84(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 speed, u8 a4)
-{
-    sub_8093FC4(mapObject, sprite, direction, speed, a4);
-    StartSpriteAnimIfDifferent(sprite, sub_80929BC(direction));
-    DoShadowFieldEffect(mapObject);
-}
-
-maybe_shadow_1_macro(sub_8095BC8, sub_8095B84, sub_80941B0, DIR_SOUTH, 0, 1)
-maybe_shadow_1_macro(sub_8095C20, sub_8095B84, sub_80941B0, DIR_NORTH, 0, 1)
-maybe_shadow_1_macro(sub_8095C78, sub_8095B84, sub_80941B0, DIR_WEST,  0, 1)
-maybe_shadow_1_macro(sub_8095CD0, sub_8095B84, sub_80941B0, DIR_EAST,  0, 1)
-maybe_shadow_1_macro(sub_8095D28, sub_8095B84, sub_80941B0, DIR_SOUTH, 1, 1)
-maybe_shadow_1_macro(sub_8095D80, sub_8095B84, sub_80941B0, DIR_NORTH, 1, 1)
-maybe_shadow_1_macro(sub_8095DD8, sub_8095B84, sub_80941B0, DIR_WEST,  1, 1)
-maybe_shadow_1_macro(sub_8095E30, sub_8095B84, sub_80941B0, DIR_EAST,  1, 1)
-maybe_shadow_1_macro(sub_8095E88, sub_8095B84, sub_80941B0, DIR_SOUTH, 2, 0)
-maybe_shadow_1_macro(sub_8095EE0, sub_8095B84, sub_80941B0, DIR_NORTH, 2, 0)
-maybe_shadow_1_macro(sub_8095F38, sub_8095B84, sub_80941B0, DIR_WEST,  2, 0)
-maybe_shadow_1_macro(sub_8095F90, sub_8095B84, sub_80941B0, DIR_EAST,  2, 0)
-
-special_anim_with_timer_2(sub_8095FE8, SOUTH, sub_80929FC, 8, sub_809459C)
-special_anim_with_timer_2(sub_8096020, NORTH, sub_80929FC, 8, sub_809459C)
-special_anim_with_timer_2(sub_8096058, WEST,  sub_80929FC, 8, sub_809459C)
-special_anim_with_timer_2(sub_8096090, EAST,  sub_80929FC, 8, sub_809459C)
-
-void sub_80960C8(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 speed)
-{
-    npc_apply_direction(mapObject, sprite, direction, speed);
-    StartSpriteAnim(sprite, sub_80929BC(mapObject->mapobj_unk_18));
-    SeekSpriteAnim(sprite, 0);
-}
-
-an_walk_any_2_macro(sub_8096100, sub_80960C8, npc_obj_ministep_stop_on_arrival, DIR_SOUTH, 1)
-an_walk_any_2_macro(sub_8096140, sub_80960C8, npc_obj_ministep_stop_on_arrival, DIR_NORTH, 1)
-an_walk_any_2_macro(sub_8096180, sub_80960C8, npc_obj_ministep_stop_on_arrival, DIR_WEST,  1)
-an_walk_any_2_macro(sub_80961C0, sub_80960C8, npc_obj_ministep_stop_on_arrival, DIR_EAST,  1)
-
-void sub_8096200(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 speed)
-{
-    npc_apply_direction(mapObject, sprite, direction, speed);
-    npc_apply_anim_looping(mapObject, sprite, sub_80929FC(mapObject->mapobj_unk_18));
-}
-
-an_walk_any_2_macro(sub_8096230, sub_8096200, npc_obj_ministep_stop_on_arrival, DIR_SOUTH, 1)
-an_walk_any_2_macro(sub_8096270, sub_8096200, npc_obj_ministep_stop_on_arrival, DIR_NORTH, 1)
-an_walk_any_2_macro(sub_80962B0, sub_8096200, npc_obj_ministep_stop_on_arrival, DIR_WEST,  1)
-an_walk_any_2_macro(sub_80962F0, sub_8096200, npc_obj_ministep_stop_on_arrival, DIR_EAST,  1)
-
-void sub_8096330(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 speed)
-{
-    npc_apply_direction(mapObject, sprite, direction, speed);
-    StartSpriteAnim(sprite, sub_80929DC(mapObject->mapobj_unk_18));
-    SeekSpriteAnim(sprite, 0);
-}
-an_walk_any_2_macro(sub_8096368, sub_8096330, npc_obj_ministep_stop_on_arrival, DIR_SOUTH, 1)
-an_walk_any_2_macro(sub_80963A8, sub_8096330, npc_obj_ministep_stop_on_arrival, DIR_NORTH, 1)
-an_walk_any_2_macro(sub_80963E8, sub_8096330, npc_obj_ministep_stop_on_arrival, DIR_WEST,  1)
-an_walk_any_2_macro(sub_8096428, sub_8096330, npc_obj_ministep_stop_on_arrival, DIR_EAST,  1)
-
-bool8 sub_8096468(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    sub_8097FA4(mapObject);
-    sprite->data[2] = 1;
-    return TRUE;
-}
-
-bool8 sub_809647C(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    sub_8098044(mapObject->mapobj_unk_1B);
-    sprite->pos2.y = 0;
-    sprite->data[2] = 1;
-    return TRUE;
-}
-
-bool8 sub_8096494(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (sprite->pos2.y == 0)
-    {
-        sub_8098044(mapObject->mapobj_unk_1B);
-        sprite->data[2] = 1;
-        return TRUE;
-    }
-    return FALSE;
-}
-
-bool8 sub_80964B8(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    return TRUE;
-}
-
-bool8 sub_80964BC(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    sprite->animPaused = TRUE;
-    return TRUE;
-}
-
-void npc_obj_transfer_image_anim_pause_flag(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (mapObject->mapobj_bit_10)
-    {
-        sprite->animPaused = TRUE;
-    }
-}
-
-void sub_80964E8(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    if (mapObject->mapobj_bit_11)
-    {
-        sprite->animPaused = FALSE;
-        mapObject->mapobj_bit_10 = FALSE;
-        mapObject->mapobj_bit_11 = FALSE;
-    }
-}
-
-void sub_8096518(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    sub_8096530(mapObject, sprite);
-    npc_update_obj_anim_flag(mapObject, sprite);
-}
-
-static void sub_8096530(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    u16 x;
-    u16 y;
-    u16 x2;
-    u16 y2;
-    const struct MapObjectGraphicsInfo *graphicsInfo;
-
-    mapObject->mapobj_bit_14 = FALSE;
-    graphicsInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId);
-    if (sprite->coordOffsetEnabled)
-    {
-        x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX + gSpriteCoordOffsetX;
-        y = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY;
-    }
-    else
-    {
-        x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX;
-        y = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY;
-    }
-    x2 = graphicsInfo->width;
-    x2 += x;
-    y2 = y;
-    y2 += graphicsInfo->height;
-    if ((s16)x >= 0x100 || (s16)x2 < -0x10)
-    {
-        mapObject->mapobj_bit_14 = TRUE;
-    }
-    if ((s16)y >= 0xB0 || (s16)y2 < -0x10)
-    {
-        mapObject->mapobj_bit_14 = TRUE;
-    }
-}
-
-static void npc_update_obj_anim_flag(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    sprite->invisible = FALSE;
-    if (mapObject->mapobj_bit_13 || mapObject->mapobj_bit_14)
-    {
-        sprite->invisible = TRUE;
-    }
-}
diff --git a/src/field_map_obj_helpers.c b/src/field_map_obj_helpers.c
deleted file mode 100755
index b8efcfe72..000000000
--- a/src/field_map_obj_helpers.c
+++ /dev/null
@@ -1,705 +0,0 @@
-#include "global.h"
-#include "field_ground_effect.h"
-#include "field_map_obj.h"
-#include "field_effect.h"
-#include "field_map_obj_helpers.h"
-#include "malloc.h"
-#include "task.h"
-#include "util.h"
-
-typedef void (*SpriteStepFunc)(struct Sprite *sprite, u8 dir);
-
-extern const struct Coords16 gUnknown_0850DB7C[4];
-extern s16 gUnknown_0850E768[];
-extern SpriteStepFunc *const gUnknown_0850E754[];
-extern const s8 gUnknown_0850E772[];
-extern const s8 gUnknown_0850E7BA[];
-extern const s8 *const gUnknown_0850E834[];
-extern s16 gUnknown_0850E840[];
-extern u8 gUnknown_0850E846[];
-extern s16 gUnknown_0850E84A[];
-extern u8 gUnknown_0850E850[];
-
-void sub_8097D68(struct Sprite *sprite);
-void sub_8097FE4(u8);
-
-bool8 FreezeMapObject(struct MapObject *mapObject)
-{
-    if (mapObject->mapobj_bit_6 || mapObject->mapobj_bit_8)
-    {
-        return TRUE;
-    }
-    else
-    {
-        mapObject->mapobj_bit_8 = 1;
-        mapObject->mapobj_bit_23 = gSprites[mapObject->spriteId].animPaused;
-        mapObject->mapobj_bit_24 = gSprites[mapObject->spriteId].affineAnimPaused;
-        gSprites[mapObject->spriteId].animPaused = 1;
-        gSprites[mapObject->spriteId].affineAnimPaused = 1;
-        return FALSE;
-    }
-}
-
-void FreezeMapObjects(void)
-{
-    u8 i;
-    for (i = 0; i < MAP_OBJECTS_COUNT; i++)
-        if (gMapObjects[i].active && i != gPlayerAvatar.mapObjectId)
-            FreezeMapObject(&gMapObjects[i]);
-}
-
-void FreezeMapObjectsExceptOne(u8 a1)
-{
-    u8 i;
-    for (i = 0; i < MAP_OBJECTS_COUNT; i++)
-        if (i != a1 && gMapObjects[i].active && i != gPlayerAvatar.mapObjectId)
-            FreezeMapObject(&gMapObjects[i]);
-}
-
-void npc_sync_anim_pause_bits(struct MapObject *mapObject)
-{
-    if (mapObject->active && mapObject->mapobj_bit_8)
-    {
-        mapObject->mapobj_bit_8 = 0;
-        gSprites[mapObject->spriteId].animPaused = mapObject->mapobj_bit_23;
-        gSprites[mapObject->spriteId].affineAnimPaused = mapObject->mapobj_bit_24;
-    }
-}
-
-void UnfreezeMapObjects(void)
-{
-    u8 i;
-    for (i = 0; i < MAP_OBJECTS_COUNT; i++)
-        if (gMapObjects[i].active)
-            npc_sync_anim_pause_bits(&gMapObjects[i]);
-}
-
-void little_step(struct Sprite *sprite, u8 dir)
-{
-    sprite->pos1.x += gUnknown_0850DB7C[dir].x;
-    sprite->pos1.y += gUnknown_0850DB7C[dir].y;
-}
-
-void double_little_steps(struct Sprite *sprite, u8 dir)
-{
-    sprite->pos1.x += 2 * (u16) gUnknown_0850DB7C[dir].x;
-    sprite->pos1.y += 2 * (u16) gUnknown_0850DB7C[dir].y;
-}
-
-void triple_little_steps(struct Sprite *sprite, u8 dir)
-{
-    sprite->pos1.x += 2 * (u16) gUnknown_0850DB7C[dir].x + (u16) gUnknown_0850DB7C[dir].x;
-    sprite->pos1.y += 2 * (u16) gUnknown_0850DB7C[dir].y + (u16) gUnknown_0850DB7C[dir].y;
-}
-
-void quad_little_steps(struct Sprite *sprite, u8 dir)
-{
-    sprite->pos1.x += 4 * (u16) gUnknown_0850DB7C[dir].x;
-    sprite->pos1.y += 4 * (u16) gUnknown_0850DB7C[dir].y;
-}
-
-void oct_little_steps(struct Sprite *sprite, u8 dir)
-{
-    sprite->pos1.x += 8 * (u16) gUnknown_0850DB7C[dir].x;
-    sprite->pos1.y += 8 * (u16) gUnknown_0850DB7C[dir].y;
-}
-
-void oamt_npc_ministep_reset(struct Sprite *sprite, u8 a2, u8 a3)
-{
-    sprite->data[3] = a2;
-    sprite->data[4] = a3;
-    sprite->data[5] = 0;
-}
-
-bool8 obj_npc_ministep(struct Sprite *sprite)
-{
-    if (sprite->data[5] >= gUnknown_0850E768[sprite->data[4]])
-        return FALSE;
-
-    gUnknown_0850E754[sprite->data[4]][sprite->data[5]](sprite, sprite->data[3]);
-
-    sprite->data[5]++;
-
-    if (sprite->data[5] < gUnknown_0850E768[sprite->data[4]])
-        return FALSE;
-
-    return TRUE;
-}
-
-void sub_80976DC(struct Sprite *sprite, u8 a2)
-{
-    sprite->data[3] = a2;
-    sprite->data[4] = 0;
-    sprite->data[5] = 0;
-}
-
-bool8 sub_80976EC(struct Sprite *sprite)
-{
-    if (!(sprite->data[4] & 1))
-    {
-        little_step(sprite, sprite->data[3]);
-        sprite->data[5]++;
-    }
-
-    sprite->data[4]++;
-
-    if (sprite->data[5] > 15)
-        return TRUE;
-    else
-        return FALSE;
-}
-
-// new helper added here in the middle. Perhaps Game Freak kept these organized in alphebetical order or some other heirarchy?
-
-s16 sub_8097728(s16 a1)
-{
-    return gUnknown_0850E7BA[a1];
-}
-
-s16 sub_809773C(s16 a1)
-{
-    return gUnknown_0850E772[a1];
-}
-
-void sub_8097750(struct Sprite *sprite)
-{
-    sprite->data[6] = 0;
-    sprite->data[7] = 0;
-}
-
-bool8 sub_8097758(struct Sprite *sprite)
-{
-    bool8 result = FALSE;
-
-    switch(sprite->data[7])
-    {
-        case 0:
-            sprite->pos2.x += sub_809773C(sprite->data[6]);
-            sprite->pos2.y += sub_8097728(sprite->data[6]);
-            break;
-        case 1:
-            sprite->pos2.x -= sub_809773C(0x47 - sprite->data[6]);
-            sprite->pos2.y += sub_8097728(0x47 - sprite->data[6]);
-            break;
-        case 2:
-            sprite->pos2.x -= sub_809773C(sprite->data[6]);
-            sprite->pos2.y += sub_8097728(sprite->data[6]);
-            break;
-        case 3:
-            sprite->pos2.x += sub_809773C(0x47 - sprite->data[6]);
-            sprite->pos2.y += sub_8097728(0x47 - sprite->data[6]);
-            break;
-    }
-    if(++sprite->data[6] == 0x48)
-    {
-        sprite->data[6] = 0;
-        sprite->data[7]++;
-    }
-    if(sprite->data[7] == 0x4)
-    {
-        sprite->pos2.y = 0;
-        sprite->pos2.x = 0;
-        result = TRUE;
-    }
-    return result;
-}
-
-s16 sub_8097820(s16 a1, u8 a2)
-{
-    return gUnknown_0850E834[a2][a1];
-}
-
-void sub_809783C(struct Sprite *sprite, u8 a2, u8 a3, u8 a4)
-{
-    sprite->data[3] = a2;
-    sprite->data[4] = a3;
-    sprite->data[5] = a4;
-    sprite->data[6] = 0;
-}
-
-u8 sub_809785C(struct Sprite *sprite)
-{
-    s16 v5[3];
-    u8 v6[3];
-    u8 v2;
-
-    memcpy(v5, gUnknown_0850E840, 6); // TODO: get rid of memcpy
-    memcpy(v6, gUnknown_0850E846, 3);
-    v2 = 0;
-
-    if (sprite->data[4])
-        little_step(sprite, sprite->data[3]);
-
-    sprite->pos2.y = sub_8097820(sprite->data[6] >> v6[sprite->data[4]], sprite->data[5]);
-
-    sprite->data[6]++;
-
-    if (sprite->data[6] == (v5[sprite->data[4]] >> 1))
-        v2 = 1;
-
-    if (sprite->data[6] >= v5[sprite->data[4]])
-    {
-        sprite->pos2.y = 0;
-        v2 = -1;
-    }
-
-    return v2;
-}
-
-u8 sub_80978E4(struct Sprite *sprite)
-{
-    s16 v5[3];
-    u8 v6[3];
-    u8 v2;
-
-    memcpy(v5, gUnknown_0850E84A, 6);
-    memcpy(v6, gUnknown_0850E850, 3);
-    v2 = 0;
-
-    if (sprite->data[4] && !(sprite->data[6] & 1))
-        little_step(sprite, sprite->data[3]);
-
-    sprite->pos2.y = sub_8097820(sprite->data[6] >> v6[sprite->data[4]], sprite->data[5]);
-
-    sprite->data[6]++;
-
-    if (sprite->data[6] == (v5[sprite->data[4]] >> 1))
-        v2 = 1;
-
-    if (sprite->data[6] >= v5[sprite->data[4]])
-    {
-        sprite->pos2.y = 0;
-        v2 = -1;
-    }
-
-    return v2;
-}
-
-void SetFieldObjectStepTimer(struct Sprite *sprite, u16 timer)
-{
-    sprite->data[3] = timer;
-}
-
-
-bool8 RunFieldObjectStepTimer(struct Sprite *sprite)
-{
-    sprite->data[3]--;
-
-    if (sprite->data[3] == 0)
-        return TRUE;
-    else
-        return FALSE;
-}
-
-void obj_anim_image_set_and_seek(struct Sprite *sprite, u8 a2, u8 a3)
-{
-    sprite->animNum = a2;
-    sprite->animPaused = 0 ;
-    SeekSpriteAnim(sprite, a3);
-}
-
-bool8 sub_80979BC(struct Sprite *sprite)
-{
-    if (sprite->animEnded)
-        return TRUE;
-    else
-        return FALSE;
-}
-
-void sub_80979D4(struct Sprite *sprite, bool8 invisible)
-{
-    u16 x, y;
-    s16 x2, y2;
-
-    sprite->invisible = invisible;
-
-    if (sprite->coordOffsetEnabled)
-    {
-        x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX + gSpriteCoordOffsetX;
-        y = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY;
-    }
-    else
-    {
-        x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX;
-        y = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY;
-    }
-
-    x2 = x - (sprite->centerToCornerVecX >> 1);
-    y2 = y - (sprite->centerToCornerVecY >> 1);
-
-    if ((s16)x > 255 || x2 < -16)
-        sprite->invisible = 1;
-    if ((s16)y > 175 || y2 < -16)
-        sprite->invisible = 1;
-}
-
-void sub_8097AC8(struct Sprite *sprite)
-{
-    sub_8097D68(sprite);
-    SetObjectSubpriorityByZCoord(sprite->data[1], sprite, 1);
-    sub_80979D4(sprite, sprite->data[2]);
-}
-
-void sub_8097AF0(void)
-{
-    int i;
-
-    for(i = 0; i < MAX_SPRITES; i++)
-    {
-        struct Sprite *sprite = &gSprites[i];
-        if(sprite->inUse && sprite->callback == sub_8097AC8)
-            DestroySprite(sprite);
-    }
-}
-
-int sub_8097B2C(u8 var) // this should return a u8, because all that call this shifts to u8, but it wont match because it doesnt shift u8 at the end.
-{
-    int i;
-
-    for(i = 0; i < MAX_SPRITES; i++)
-    {
-        struct Sprite *sprite = &gSprites[i];
-        if(sprite->inUse && sprite->callback == sub_8097AC8 && (u8)sprite->data[0] == var)
-            return i;
-    }
-    return MAX_SPRITES;
-}
-
-void sub_8097B78(u8 var1, u8 var2)
-{
-    u8 spriteId = sub_8097B2C(var1);
-
-    if(spriteId != MAX_SPRITES)
-        StartSpriteAnim(&gSprites[spriteId], FieldObjectDirectionToImageAnimId(var2));
-}
-
-void sub_8097BB4(u8 var1, u8 var2)
-{
-    int spriteId = sub_8097B2C(var1);
-
-    if(spriteId != MAX_SPRITES)
-    {
-        struct Sprite *sprite = &gSprites[spriteId];
-        const struct MapObjectGraphicsInfo *gfxInfo = GetFieldObjectGraphicsInfo(var2);
-        u16 tileNum = sprite->oam.tileNum;
-
-        sprite->oam = *gfxInfo->oam;
-        sprite->oam.tileNum = tileNum;
-        sprite->oam.paletteNum = gfxInfo->paletteSlot;
-        sprite->images = gfxInfo->images;
-
-        if(gfxInfo->subspriteTables == NULL)
-        {
-            sprite->subspriteTables = NULL;
-            sprite->subspriteTableNum = 0;
-            sprite->subspriteMode = 0;
-        }
-        else
-        {
-            SetSubspriteTables(sprite, gfxInfo->subspriteTables);
-            sprite->subspriteMode = 2;
-        }
-        StartSpriteAnim(sprite, 0);
-    }
-}
-
-void sub_8097C44(u8 var, bool32 var2)
-{
-    u8 spriteId = sub_8097B2C(var);
-
-    if(spriteId == MAX_SPRITES)
-        return;
-
-    if(var2)
-        gSprites[spriteId].data[2] = 1;
-    else
-        gSprites[spriteId].data[2] = 0;
-}
-
-bool32 sub_8097C8C(u8 var)
-{
-    u8 spriteId = sub_8097B2C(var);
-
-    if(spriteId == MAX_SPRITES)
-        return FALSE;
-
-    return (gSprites[spriteId].data[2] == TRUE);
-}
-
-void sub_8097CC4(u8 var1, u8 var2)
-{
-    u8 spriteId = sub_8097B2C(var1);
-
-    if(spriteId != MAX_SPRITES)
-    {
-        gSprites[spriteId].data[3] = var2;
-        gSprites[spriteId].data[4] = 0;
-    }
-}
-
-void sub_8097CF4(struct Sprite *sprite)
-{
-    switch(sprite->data[4])
-    {
-        case 0:
-            sprite->pos2.y = 0;
-            sprite->data[4]++;
-        case 1:
-            sprite->pos2.y -= 8;
-            if(sprite->pos2.y == -160)
-            {
-                sprite->pos2.y = 0;
-                sprite->data[2] = 1;
-                sprite->data[3] = 0;
-                sprite->data[4] = 0;
-            }
-    }
-}
-
-void sub_8097D30(struct Sprite *sprite)
-{
-    switch(sprite->data[4])
-    {
-        case 0:
-            sprite->pos2.y = -160;
-            sprite->data[4]++;
-        case 1:
-            sprite->pos2.y += 8;
-            if(sprite->pos2.y == 0)
-            {
-                sprite->data[3] = 0;
-                sprite->data[4] = 0;
-            }
-    }
-}
-
-void sub_8097D68(struct Sprite *sprite)
-{
-    switch(sprite->data[3])
-    {
-        case 1:
-            sub_8097D30(sprite);
-            break;
-        case 2:
-            sub_8097CF4(sprite);
-            break;
-        case 0:
-            break;
-        default:
-            sprite->data[3] = 0;
-            break;
-    }
-}
-
-bool32 sub_8097D9C(u8 var)
-{
-    u8 spriteId = sub_8097B2C(var);
-
-    if(spriteId == MAX_SPRITES)
-        return FALSE;
-
-    if(gSprites[spriteId].data[3] != FALSE)
-        return TRUE;
-
-    return FALSE;
-}
-
-u32 oe_exec_and_other_stuff(u8 fieldEffectId, struct MapObject *mapObject)
-{
-    FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
-    return FieldEffectStart(fieldEffectId);
-}
-
-void DoShadowFieldEffect(struct MapObject *mapObject)
-{
-    if (!mapObject->mapobj_bit_22)
-    {
-        mapObject->mapobj_bit_22 = 1;
-        oe_exec_and_other_stuff(FLDEFF_SHADOW, mapObject);
-    }
-}
-
-void DoRippleFieldEffect(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    const struct MapObjectGraphicsInfo *gfxInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId);
-    gFieldEffectArguments[0] = sprite->pos1.x;
-    gFieldEffectArguments[1] = sprite->pos1.y + (gfxInfo->height >> 1) - 2;
-    gFieldEffectArguments[2] = 151;
-    gFieldEffectArguments[3] = 3;
-    FieldEffectStart(FLDEFF_RIPPLE);
-}
-
-bool32 sub_8097E50(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    u32 one;
-    bool32 ableToStore = FALSE;
-    if (gUnknown_020375B8 == NULL)
-    {
-        gUnknown_020375B8 = AllocZeroed(0x14);
-        gUnknown_020375B8[0] = mapObject->localId;
-        // needed to match
-        gUnknown_020375B8[16] = (one = 1);
-        ableToStore = one;
-    }
-    else
-    {
-        u8 i;
-        u8 firstFreeSlot;
-        bool32 found;
-        for (firstFreeSlot = 16, found = FALSE, i = 0; i < 16; i++)
-        {
-            if (firstFreeSlot == 16 && gUnknown_020375B8[i] == 0)
-                firstFreeSlot = i;
-
-            if (gUnknown_020375B8[i] == mapObject->localId)
-            {
-                found = TRUE;
-                break;
-            }
-        }
-
-        if (!found && firstFreeSlot != 16)
-        {
-            gUnknown_020375B8[firstFreeSlot] = mapObject->localId;
-            gUnknown_020375B8[16]++;
-            ableToStore = TRUE;
-        }
-    }
-
-    if (ableToStore == TRUE)
-    {
-        mapObject->mapobj_bit_12 = TRUE;
-        mapObject->mapobj_bit_9 = TRUE;
-    }
-
-    sprite->data[2] = 1;
-    return TRUE;
-}
-
-bool32 sub_8097EF0(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    bool32 ableToStore;
-    u8 id;
-
-    sprite->data[2] = 1;
-    if (gUnknown_020375B8 != NULL)
-    {
-        ableToStore = FALSE;
-        id = sub_8097F78(mapObject);
-        if (id != 16)
-        {
-            gUnknown_020375B8[id] = 0;
-            gUnknown_020375B8[16]--;
-            ableToStore = TRUE;
-        }
-        if (gUnknown_020375B8[16] == 0)
-            FREE_AND_SET_NULL(gUnknown_020375B8);
-        if (ableToStore == TRUE)
-        {
-            mapObject->mapobj_bit_12 = GetFieldObjectGraphicsInfo(mapObject->graphicsId)->inanimate;
-            mapObject->mapobj_bit_9 = 0;
-            sprite->animPaused = 0;
-        }
-    }
-
-    return TRUE;
-}
-
-u8 sub_8097F78(struct MapObject *mapObject)
-{
-    u8 i;
-
-    for(i = 0; i < MAP_OBJECTS_COUNT; i++)
-    {
-        if(gUnknown_020375B8[i] == mapObject->localId)
-            return i;
-    }
-    return MAP_OBJECTS_COUNT;
-}
-
-void sub_8097FA4(struct MapObject *mapObject)
-{
-    u8 taskId = CreateTask(sub_8097FE4, 0xFF);
-    struct Task *task = &gTasks[taskId];
-
-    StoreWordInTwoHalfwords(&task->data[0], (u32)mapObject);
-    mapObject->mapobj_unk_1B = taskId;
-    task->data[3] = 0xFFFF;
-}
-
-void sub_8097FE4(u8 taskId)
-{
-    struct MapObject *mapObject;
-    struct Sprite *sprite;
-    struct Task *task = &gTasks[taskId];
-
-    LoadWordFromTwoHalfwords(&task->data[0], (u32 *)&mapObject); // load the map object pointer.
-    sprite = &gSprites[mapObject->spriteId];
-
-    if(!(task->data[2] & 0x3))
-        sprite->pos2.y += task->data[3];
-
-    if(!(task->data[2] & 0xF))
-        task->data[3] = -task->data[3];
-
-    task->data[2]++;
-}
-
-void sub_8098044(u8 taskId)
-{
-    u32 word;
-    struct Task *task = &gTasks[taskId];
-
-    LoadWordFromTwoHalfwords(&task->data[0], &word); // huh??? why does it load a word that never gets used???
-    DestroyTask(taskId);
-}
-
-void sub_8098074(u8 var1, u8 var2)
-{
-    u8 i;
-
-    for(i = 0; i < MAP_OBJECTS_COUNT; i++)
-    {
-        if(i != var1 && i != var2 &&
-            gMapObjects[i].active && i != gPlayerAvatar.mapObjectId)
-                FreezeMapObject(&gMapObjects[i]);
-    }
-}
-
-bool32 sub_80980C0(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    sprite->pos2.y = 0;
-    sprite->data[2]++;
-    return FALSE;
-}
-
-bool32 sub_80980D0(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    sprite->pos2.y -= 8;
-
-    if(sprite->pos2.y == -160)
-        sprite->data[2]++;
-    return FALSE;
-}
-
-bool32 sub_80980F4(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    sprite->pos2.y = -160;
-    sprite->data[2]++;
-    return FALSE;
-}
-
-bool32 sub_8098108(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    sprite->pos2.y += 8;
-
-    if(!sprite->pos2.y)
-        sprite->data[2]++;
-    return FALSE;
-}
-
-// though this function returns TRUE without doing anything, this header is required due to being in an array of functions which needs it.
-bool32 sub_8098124(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    return TRUE;
-}
diff --git a/src/field_special_scene.c b/src/field_special_scene.c
index a704beaab..39977808f 100644
--- a/src/field_special_scene.c
+++ b/src/field_special_scene.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "task.h"
 #include "sprite.h"
-#include "field_map_obj.h"
+#include "event_object_movement.h"
 #include "constants/songs.h"
 #include "sound.h"
 #include "palette.h"
@@ -329,24 +329,24 @@ void Task_HandlePorthole(u8 taskId)
 
 void sub_80FB6EC(void)
 {
-    u8 spriteId = AddPseudoFieldObject(0x8C, SpriteCallbackDummy, 112, 80, 0);
+    u8 spriteId = AddPseudoEventObject(0x8C, SpriteCallbackDummy, 112, 80, 0);
 
     gSprites[spriteId].coordOffsetEnabled = FALSE;
 
     if (VarGet(0x40B4) == 2)
     {
-        StartSpriteAnim(&gSprites[spriteId], FieldObjectDirectionToImageAnimId(4));
+        StartSpriteAnim(&gSprites[spriteId], GetFaceDirectionAnimNum(4));
     }
     else
     {
-        StartSpriteAnim(&gSprites[spriteId], FieldObjectDirectionToImageAnimId(3));
+        StartSpriteAnim(&gSprites[spriteId], GetFaceDirectionAnimNum(3));
     }
 }
 
 void sub_80FB768(void)
 {
     sub_80FB6EC();
-    gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_13 = TRUE;
+    gEventObjects[gPlayerAvatar.eventObjectId].invisible = TRUE;
     pal_fill_black();
     CreateTask(Task_HandlePorthole, 80);
     ScriptContext2_Enable();
diff --git a/src/fldeff_groundshake.c b/src/fldeff_groundshake.c
index bee4d2c4b..60b078982 100644
--- a/src/fldeff_groundshake.c
+++ b/src/fldeff_groundshake.c
@@ -4,7 +4,7 @@
 #include "constants/songs.h"
 #include "event_data.h"
 #include "field_camera.h"
-#include "field_map_obj.h"
+#include "event_object_movement.h"
 #include "malloc.h"
 #include "random.h"
 #include "roulette_util.h"
@@ -179,17 +179,17 @@ void sub_81BE7F4(void)
 
 static void sub_81BE808(u8 taskId)
 {
-    u8 mapObjectIdBuffer;
-    struct MapObject *fieldMapObject;
-    struct MapObject *playerAvatarMapObject;
+    u8 eventObjectIdBuffer;
+    struct EventObject *fieldEventObject;
+    struct EventObject *playerAvatarEventObject;
 
-    TryGetFieldObjectIdByLocalIdAndMap(0x2D, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &mapObjectIdBuffer);
-    fieldMapObject = &(gMapObjects[mapObjectIdBuffer]);
-    gSprites[fieldMapObject->spriteId].pos2.y += 4;
-    playerAvatarMapObject = &(gMapObjects[gPlayerAvatar.mapObjectId]);
+    TryGetEventObjectIdByLocalIdAndMap(0x2D, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &eventObjectIdBuffer);
+    fieldEventObject = &(gEventObjects[eventObjectIdBuffer]);
+    gSprites[fieldEventObject->spriteId].pos2.y += 4;
+    playerAvatarEventObject = &(gEventObjects[gPlayerAvatar.eventObjectId]);
 
-    if((gSprites[fieldMapObject->spriteId].pos1.y + gSprites[fieldMapObject->spriteId].pos2.y) >=
-       (gSprites[playerAvatarMapObject->spriteId].pos1.y + gSprites[playerAvatarMapObject->spriteId].pos2.y))
+    if((gSprites[fieldEventObject->spriteId].pos1.y + gSprites[fieldEventObject->spriteId].pos2.y) >=
+       (gSprites[playerAvatarEventObject->spriteId].pos1.y + gSprites[playerAvatarEventObject->spriteId].pos2.y))
     {
         DestroyTask(taskId);
         EnableBothScriptContexts();
diff --git a/src/fossil_specials.c b/src/fossil_specials.c
index 060915fa6..49db0f5b6 100644
--- a/src/fossil_specials.c
+++ b/src/fossil_specials.c
@@ -4,7 +4,7 @@
 #include "bg.h"
 #include "event_data.h"
 #include "field_camera.h"
-#include "field_map_obj.h"
+#include "event_object_movement.h"
 #include "fieldmap.h"
 #include "global.fieldmap.h"
 #include "gpu_regs.h"
diff --git a/src/item_menu.c b/src/item_menu.c
index c4b4b15b1..0642c771e 100755
--- a/src/item_menu.c
+++ b/src/item_menu.c
@@ -9,7 +9,7 @@
 #include "constants/songs.h"
 #include "decompress.h"
 #include "event_data.h"
-#include "field_map_obj_helpers.h"
+#include "event_object_movement.h"
 #include "field_player_avatar.h"
 #include "field_specials.h"
 #include "graphics.h"
@@ -1716,7 +1716,7 @@ bool8 UseRegisteredKeyItemOnField(void)
         if (CheckBagHasItem(gSaveBlock1Ptr->registeredItem, 1) == TRUE)
         {
             ScriptContext2_Enable();
-            FreezeMapObjects();
+            FreezeEventObjects();
             sub_808B864();
             sub_808BCF4();
             gSpecialVar_ItemId = gSaveBlock1Ptr->registeredItem;
diff --git a/src/item_use.c b/src/item_use.c
index d036da6d3..96f63ee3e 100755
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -12,12 +12,11 @@
 #include "data2.h"
 #include "event_data.h"
 #include "fieldmap.h"
-#include "field_map_obj.h"
+#include "event_object_movement.h"
 #include "field_player_avatar.h"
 #include "field_screen.h"
 #include "field_weather.h"
 #include "item.h"
-#include "field_map_obj_helpers.h"
 #include "mail.h"
 #include "metatile_behavior.h"
 #include "overworld.h"
@@ -338,7 +337,7 @@ void sub_80FD504(u8 taskId)
             }
             else
             {
-                playerDir = player_get_direction_lower_nybble();
+                playerDir = GetPlayerFacingDirection();
                 for (i = 0; i < 4; i++)
                 {
                     if (playerDir == gUnknown_085920E4[i])
@@ -580,15 +579,15 @@ u8 sub_80FD9B0(s16 itemX, s16 itemY)
 
 void sub_80FDA24(u8 direction)
 {
-    FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]);
-    FieldObjectClearAnim(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]);
-    npc_sync_anim_pause_bits(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]);
+    EventObjectClearHeldMovementIfFinished(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]);
+    EventObjectClearHeldMovement(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]);
+    UnfreezeEventObject(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]);
     PlayerTurnInPlace(direction);
 }
 
 void sub_80FDA94(u8 taskId)
 {
-    if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE)
+    if (EventObjectCheckHeldMovementStatus(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE)
         DisplayItemMessageOnField(taskId, gText_ItemFinderNearby, sub_80FD5CC);
 }
 
@@ -596,7 +595,7 @@ void sub_80FDADC(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
 
-    if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE
+    if (EventObjectCheckHeldMovementStatus(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE
     || data[2] == FALSE)
     {
         sub_80FDA24(gUnknown_085920E4[data[5]]);
@@ -728,8 +727,8 @@ bool8 sub_80FDE2C(void)
     u8 objId;
     GetXYCoordsOneStepInFrontOfPlayer(&x, &y);
     z = PlayerGetZCoord();
-    objId = GetFieldObjectIdByXYZ(x, y, z);
-    if (objId == 16 || gMapObjects[objId].graphicsId != 0xE4)
+    objId = GetEventObjectIdByXYZ(x, y, z);
+    if (objId == 16 || gEventObjects[objId].graphicsId != 0xE4)
         return FALSE;
     else
         return TRUE;
diff --git a/src/load_save.c b/src/load_save.c
index 917c1dfe1..0c6df7662 100644
--- a/src/load_save.c
+++ b/src/load_save.c
@@ -180,32 +180,32 @@ void LoadPlayerParty(void)
         gPlayerParty[i] = gSaveBlock1Ptr->playerParty[i];
 }
 
-void SaveMapObjects(void)
+void SaveEventObjects(void)
 {
     int i;
 
-    for (i = 0; i < MAP_OBJECTS_COUNT; i++)
-        gSaveBlock1Ptr->mapObjects[i] = gMapObjects[i];
+    for (i = 0; i < EVENT_OBJECTS_COUNT; i++)
+        gSaveBlock1Ptr->eventObjects[i] = gEventObjects[i];
 }
 
-void LoadMapObjects(void)
+void LoadEventObjects(void)
 {
     int i;
 
-    for (i = 0; i < MAP_OBJECTS_COUNT; i++)
-        gMapObjects[i] = gSaveBlock1Ptr->mapObjects[i];
+    for (i = 0; i < EVENT_OBJECTS_COUNT; i++)
+        gEventObjects[i] = gSaveBlock1Ptr->eventObjects[i];
 }
 
 void SaveSerializedGame(void)
 {
     SavePlayerParty();
-    SaveMapObjects();
+    SaveEventObjects();
 }
 
 void LoadSerializedGame(void)
 {
     LoadPlayerParty();
-    LoadMapObjects();
+    LoadEventObjects();
 }
 
 void LoadPlayerBag(void)
diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c
index 2ce8a271d..591e3ad9a 100644
--- a/src/mauville_old_man.c
+++ b/src/mauville_old_man.c
@@ -2,7 +2,7 @@
 #include "main.h"
 #include "constants/songs.h"
 #include "constants/easy_chat.h"
-#include "constants/map_objects.h"
+#include "constants/event_objects.h"
 #include "constants/vars.h"
 #include "mauville_old_man.h"
 #include "event_data.h"
@@ -136,7 +136,7 @@ void SetMauvilleOldMan(void)
             SetupGiddy();
             break;
     }
-    ScrSpecial_SetMauvilleOldManMapObjGfx();
+    ScrSpecial_SetMauvilleOldManEventObjGfx();
 }
 
 u8 GetCurrentMauvilleOldMan(void)
@@ -406,7 +406,7 @@ void ResetMauvilleOldManFlag(void)
         case MAUVILLE_MAN_GIDDY:
             break;
     }
-    ScrSpecial_SetMauvilleOldManMapObjGfx();
+    ScrSpecial_SetMauvilleOldManEventObjGfx();
 }
 
 
@@ -671,9 +671,9 @@ static void Task_BardSong(u8 taskId)
     sub_8197224();
 }
 
-void ScrSpecial_SetMauvilleOldManMapObjGfx(void)
+void ScrSpecial_SetMauvilleOldManEventObjGfx(void)
 {
-    VarSet(VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_BARD);
+    VarSet(VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_BARD);
 }
 
 // Language fixers?
diff --git a/src/metatile_behavior.c b/src/metatile_behavior.c
index b9760f522..ad0062c20 100644
--- a/src/metatile_behavior.c
+++ b/src/metatile_behavior.c
@@ -252,8 +252,7 @@ static const u8 sTileBitAttributes[] =
     TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // ? 0xEF
 };
 
-// only used as default case for checking jump landing in field_ground_effect.
-bool8 ShouldDoJumpLandingDustEffect(u8 var)
+bool8 MetatileBehavior_IsATile(u8 var)
 {
     return TRUE;
 }
diff --git a/src/naming_screen.c b/src/naming_screen.c
index 0e350aa35..f99d23bc3 100644
--- a/src/naming_screen.c
+++ b/src/naming_screen.c
@@ -11,7 +11,7 @@
 #include "pokemon.h"
 #include "field_specials.h"
 #include "field_player_avatar.h"
-#include "field_map_obj.h"
+#include "event_object_movement.h"
 #include "event_data.h"
 #include "constants/vars.h"
 #include "constants/songs.h"
@@ -25,7 +25,7 @@
 #include "menu.h"
 #include "text_window.h"
 #include "overworld.h"
-#include "constants/map_objects.h"
+#include "constants/event_objects.h"
 
 EWRAM_DATA static struct NamingScreenData *gNamingScreenData = NULL;
 extern u16 gKeyRepeatStartDelay;
@@ -1142,7 +1142,7 @@ static void NamingScreen_CreatePlayerIcon(void)
     u8 spriteId;
 
     rivalGfxId = GetRivalAvatarGraphicsIdByStateIdAndGender(0, gNamingScreenData->monSpecies);
-    spriteId = AddPseudoFieldObject(rivalGfxId, SpriteCallbackDummy, 0x38, 0x25, 0);
+    spriteId = AddPseudoEventObject(rivalGfxId, SpriteCallbackDummy, 0x38, 0x25, 0);
     gSprites[spriteId].oam.priority = 3;
     StartSpriteAnim(&gSprites[spriteId], 4);
 }
@@ -1169,7 +1169,7 @@ static void NamingScreen_CreateWandaDadIcon(void)
 {
     u8 spriteId;
 
-    spriteId = AddPseudoFieldObject(MAP_OBJ_GFX_MAN_1, SpriteCallbackDummy, 0x38, 0x25, 0);
+    spriteId = AddPseudoEventObject(EVENT_OBJ_GFX_MAN_1, SpriteCallbackDummy, 0x38, 0x25, 0);
     gSprites[spriteId].oam.priority = 3;
     StartSpriteAnim(&gSprites[spriteId], 4);
 }
diff --git a/src/overworld.c b/src/overworld.c
index 3d9a1bdc2..1e4116053 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -10,9 +10,7 @@
 #include "field_control_avatar.h"
 #include "field_effect.h"
 #include "field_fadetransition.h"
-#include "field_ground_effect.h"
-#include "field_map_obj.h"
-#include "field_map_obj_helpers.h"
+#include "event_object_movement.h"
 #include "field_message_box.h"
 #include "field_player_avatar.h"
 #include "field_screen_effect.h"
@@ -171,7 +169,7 @@ extern const u8* sub_809C2C8(struct MapPosition *a1, u8, u8);
 extern u8 *sub_809D0F4(void*);
 extern u8 sub_808BD6C(u8);
 extern u8 sub_808BD7C(u8);
-extern void sub_80979D4(struct Sprite*, u8);
+extern void UpdateEventObjectSpriteVisibility(struct Sprite*, u8);
 
 // this file's functions
 static void Overworld_ResetStateAfterWhiteOut(void);
@@ -206,7 +204,7 @@ static void sub_8086C90(void);
 static void sub_8086FA0(u16);
 static void sub_8086F38(u16*, s32);
 static u8 npc_something3(u8 a1, u8 a2);
-static u8 LinkPlayerDetectCollision(u8 selfMapObjId, u8 a2, s16 x, s16 y);
+static u8 LinkPlayerDetectCollision(u8 selfEventObjId, u8 a2, s16 x, s16 y);
 static void CreateLinkPlayerSprite(u8 linkPlayerId, u8 gameVersion);
 static void sub_8087878(u8 linkPlayerId, u16 *x, u16 *y);
 static u8 sub_80878A0(u8 linkPlayerId);
@@ -214,15 +212,15 @@ static u8 sub_80878C0(u8 linkPlayerId);
 static s32 sub_80878E4(u8 linkPlayerId);
 static u8 GetLinkPlayerIdAt(s16 x, s16 y);
 static void sub_808796C(u8 linkPlayerId, u8 a2);
-static void ZeroMapObject(struct MapObject *mapObj);
-static void SpawnLinkPlayerMapObject(u8 linkPlayerId, s16 x, s16 y, u8 a4);
-static void InitLinkPlayerMapObjectPos(struct MapObject *mapObj, s16 x, s16 y);
+static void ZeroEventObject(struct EventObject *eventObj);
+static void SpawnLinkPlayerEventObject(u8 linkPlayerId, s16 x, s16 y, u8 a4);
+static void InitLinkPlayerEventObjectPos(struct EventObject *eventObj, s16 x, s16 y);
 static void sub_80877DC(u8 linkPlayerId, u8 a2);
 static void sub_808780C(u8 linkPlayerId);
 static u8 sub_8087858(u8 linkPlayerId);
 static void sub_8087584(void);
 static u32 sub_8087690(void);
-static void ZeroLinkPlayerMapObject(struct LinkPlayerMapObject *linkPlayerMapObj);
+static void ZeroLinkPlayerEventObject(struct LinkPlayerEventObject *linkPlayerEventObj);
 static const u8 *sub_80873B4(struct UnkStruct_8054FF8 *a1);
 static u16 sub_8087480(const u8 *script);
 static void sub_8087510(void);
@@ -269,7 +267,7 @@ EWRAM_DATA static u16 sLastMapSectionId = 0;
 EWRAM_DATA static struct UnkPlayerStruct sUnknown_02032300 = {0};
 EWRAM_DATA static u16 sAmbientCrySpecies = 0;
 EWRAM_DATA static bool8 sIsAmbientCryWaterMon = FALSE;
-EWRAM_DATA struct LinkPlayerMapObject gLinkPlayerMapObjects[4] = {0};
+EWRAM_DATA struct LinkPlayerEventObject gLinkPlayerEventObjects[4] = {0};
 
 // const rom data
 static const struct WarpData sDummyWarpData =
@@ -354,22 +352,22 @@ static const struct ScanlineEffectParams gUnknown_08339DBC =
     0,
 };
 
-static u8 sub_80879D8(struct LinkPlayerMapObject *, struct MapObject *, u8);
-static u8 sub_80879F8(struct LinkPlayerMapObject *, struct MapObject *, u8);
-static u8 sub_80879FC(struct LinkPlayerMapObject *, struct MapObject *, u8);
+static u8 sub_80879D8(struct LinkPlayerEventObject *, struct EventObject *, u8);
+static u8 sub_80879F8(struct LinkPlayerEventObject *, struct EventObject *, u8);
+static u8 sub_80879FC(struct LinkPlayerEventObject *, struct EventObject *, u8);
 
-static u8 (*const gUnknown_08339DC8[])(struct LinkPlayerMapObject *, struct MapObject *, u8) =
+static u8 (*const gUnknown_08339DC8[])(struct LinkPlayerEventObject *, struct EventObject *, u8) =
 {
     sub_80879D8,
     sub_80879F8,
     sub_80879FC,
 };
 
-static u8 sub_8087A1C(struct LinkPlayerMapObject *, struct MapObject *, u8);
-static u8 sub_8087A20(struct LinkPlayerMapObject *, struct MapObject *, u8);
-static u8 sub_8087A88(struct LinkPlayerMapObject *, struct MapObject *, u8);
+static u8 sub_8087A1C(struct LinkPlayerEventObject *, struct EventObject *, u8);
+static u8 sub_8087A20(struct LinkPlayerEventObject *, struct EventObject *, u8);
+static u8 sub_8087A88(struct LinkPlayerEventObject *, struct EventObject *, u8);
 
-static u8 (*const gUnknown_08339DD4[])(struct LinkPlayerMapObject *, struct MapObject *, u8) =
+static u8 (*const gUnknown_08339DD4[])(struct LinkPlayerEventObject *, struct EventObject *, u8) =
 {
     sub_8087A1C,
     sub_8087A20,
@@ -384,10 +382,10 @@ static u8 (*const gUnknown_08339DD4[])(struct LinkPlayerMapObject *, struct MapO
     sub_8087A88,
 };
 
-static void sub_8087AA0(struct LinkPlayerMapObject *, struct MapObject *);
-static void sub_8087AA8(struct LinkPlayerMapObject *, struct MapObject *);
+static void sub_8087AA0(struct LinkPlayerEventObject *, struct EventObject *);
+static void sub_8087AA8(struct LinkPlayerEventObject *, struct EventObject *);
 
-static void (*const gUnknown_08339E00[])(struct LinkPlayerMapObject *, struct MapObject *) =
+static void (*const gUnknown_08339E00[])(struct LinkPlayerEventObject *, struct EventObject *) =
 {
     sub_8087AA0,
     sub_8087AA8,
@@ -503,55 +501,55 @@ void ApplyNewEncryptionKeyToGameStats(u32 newKey)
         ApplyNewEncryptionKeyToWord(&gSaveBlock1Ptr->gameStats[i], newKey);
 }
 
-void LoadMapObjTemplatesFromHeader(void)
+void LoadEventObjTemplatesFromHeader(void)
 {
     // Clear map object templates
-    CpuFill32(0, gSaveBlock1Ptr->mapObjectTemplates, sizeof(gSaveBlock1Ptr->mapObjectTemplates));
+    CpuFill32(0, gSaveBlock1Ptr->eventObjectTemplates, sizeof(gSaveBlock1Ptr->eventObjectTemplates));
 
     // Copy map header events to save block
-    CpuCopy32(gMapHeader.events->mapObjects,
-              gSaveBlock1Ptr->mapObjectTemplates,
-              gMapHeader.events->mapObjectCount * sizeof(struct MapObjectTemplate));
+    CpuCopy32(gMapHeader.events->eventObjects,
+              gSaveBlock1Ptr->eventObjectTemplates,
+              gMapHeader.events->eventObjectCount * sizeof(struct EventObjectTemplate));
 }
 
-void LoadSaveblockMapObjScripts(void)
+void LoadSaveblockEventObjScripts(void)
 {
-    struct MapObjectTemplate *mapHeaderObjTemplates = gMapHeader.events->mapObjects;
-    struct MapObjectTemplate *savObjTemplates = gSaveBlock1Ptr->mapObjectTemplates;
+    struct EventObjectTemplate *mapHeaderObjTemplates = gMapHeader.events->eventObjects;
+    struct EventObjectTemplate *savObjTemplates = gSaveBlock1Ptr->eventObjectTemplates;
     s32 i;
 
     for (i = 0; i < 64; i++)
         savObjTemplates[i].script = mapHeaderObjTemplates[i].script;
 }
 
-void Overworld_SetMapObjTemplateCoords(u8 localId, s16 x, s16 y)
+void Overworld_SetEventObjTemplateCoords(u8 localId, s16 x, s16 y)
 {
     s32 i;
-    struct MapObjectTemplate *savObjTemplates = gSaveBlock1Ptr->mapObjectTemplates;
+    struct EventObjectTemplate *savObjTemplates = gSaveBlock1Ptr->eventObjectTemplates;
 
     for (i = 0; i < 64; i++)
     {
-        struct MapObjectTemplate *mapObjectTemplate = &savObjTemplates[i];
-        if (mapObjectTemplate->localId == localId)
+        struct EventObjectTemplate *eventObjectTemplate = &savObjTemplates[i];
+        if (eventObjectTemplate->localId == localId)
         {
-            mapObjectTemplate->x = x;
-            mapObjectTemplate->y = y;
+            eventObjectTemplate->x = x;
+            eventObjectTemplate->y = y;
             return;
         }
     }
 }
 
-void Overworld_SetMapObjTemplateMovementType(u8 localId, u8 movementType)
+void Overworld_SetEventObjTemplateMovementType(u8 localId, u8 movementType)
 {
     s32 i;
 
-    struct MapObjectTemplate *savObjTemplates = gSaveBlock1Ptr->mapObjectTemplates;
+    struct EventObjectTemplate *savObjTemplates = gSaveBlock1Ptr->eventObjectTemplates;
     for (i = 0; i < 64; i++)
     {
-        struct MapObjectTemplate *mapObjectTemplate = &savObjTemplates[i];
-        if (mapObjectTemplate->localId == localId)
+        struct EventObjectTemplate *eventObjectTemplate = &savObjTemplates[i];
+        if (eventObjectTemplate->localId == localId)
         {
-            mapObjectTemplate->movementType = movementType;
+            eventObjectTemplate->movementType = movementType;
             return;
         }
     }
@@ -826,7 +824,7 @@ void mliX_load_map(u8 mapGroup, u8 mapNum)
 
     ApplyCurrentWarp();
     set_current_map_header_from_sav1_save_old_name();
-    LoadMapObjTemplatesFromHeader();
+    LoadEventObjTemplatesFromHeader();
     TrySetMapSaveWarpStatus();
     ClearTempFieldEventData();
     ResetCyclingRoadChallengeData();
@@ -869,7 +867,7 @@ static void mli0_load_map(u32 a1)
         else if (InTrainerHill())
             sub_81D5DF8();
         else
-            LoadMapObjTemplatesFromHeader();
+            LoadEventObjTemplatesFromHeader();
     }
 
     v2 = is_map_type_1_2_3_5_or_6(gMapHeader.mapType);
@@ -914,7 +912,7 @@ void player_avatar_init_params_reset(void)
 
 void walkrun_find_lowest_active_bit_in_bitfield(void)
 {
-    sUnknown_02032300.player_field_1 = player_get_direction_lower_nybble();
+    sUnknown_02032300.player_field_1 = GetPlayerFacingDirection();
 
     if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_MACH_BIKE))
         sUnknown_02032300.player_field_0 = 2;
@@ -1736,9 +1734,9 @@ void CB2_ContinueSavedGame(void)
     else if (trainerHillMapId != 0 && trainerHillMapId != 6)
         sub_81D5F48();
     else
-        LoadSaveblockMapObjScripts();
+        LoadSaveblockEventObjScripts();
 
-    UnfreezeMapObjects();
+    UnfreezeEventObjects();
     DoTimeBasedEvents();
     sub_8084788();
     if (gMapHeader.mapDataId == 0x169)
@@ -2172,7 +2170,7 @@ static void sub_80869DC(void)
     gUnknown_03005DEC = 0;
     gUnknown_03005DE8 = 0;
     sub_808D438();
-    SpawnFieldObjectsInView(0, 0);
+    TrySpawnEventObjects(0, 0);
     mapheader_run_first_tag4_script_list_match();
 }
 
@@ -2189,7 +2187,7 @@ static void mli4_mapscripts_and_other(void)
     InitPlayerAvatar(x, y, player->player_field_1, gSaveBlock2Ptr->playerGender);
     SetPlayerAvatarTransitionFlags(player->player_field_0);
     player_avatar_init_params_reset();
-    SpawnFieldObjectsInView(0, 0);
+    TrySpawnEventObjects(0, 0);
     mapheader_run_first_tag4_script_list_match();
 }
 
@@ -2202,7 +2200,7 @@ static void sub_8086A68(void)
 
 static void sub_8086A80(void)
 {
-    gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_15 = 1;
+    gEventObjects[gPlayerAvatar.eventObjectId].trackedByCamera = 1;
     InitCameraUpdateCallback(gPlayerAvatar.spriteId);
 }
 
@@ -2233,7 +2231,7 @@ static void sub_8086B14(void)
 
     for (i = 0; i < gFieldLinkPlayerCount; i++)
     {
-        SpawnLinkPlayerMapObject(i, i + x, y, gLinkPlayers[i].gender);
+        SpawnLinkPlayerEventObject(i, i + x, y, gLinkPlayers[i].gender);
         CreateLinkPlayerSprite(i, gLinkPlayers[i].version);
     }
 
@@ -2678,7 +2676,7 @@ static void sub_80872D8(s32 linkPlayerId, s32 a2, struct UnkStruct_8054FF8 *a3)
 
     a3->a = linkPlayerId;
     a3->b = (linkPlayerId == a2) ? 1 : 0;
-    a3->c = gLinkPlayerMapObjects[linkPlayerId].mode;
+    a3->c = gLinkPlayerEventObjects[linkPlayerId].mode;
     a3->d = sub_80878A0(linkPlayerId);
     sub_8087878(linkPlayerId, &x, &y);
     a3->sub.x = x;
@@ -2891,109 +2889,109 @@ static u32 sub_8087690(void)
         return gLink.sendQueue.count;
 }
 
-static void ZeroLinkPlayerMapObject(struct LinkPlayerMapObject *linkPlayerMapObj)
+static void ZeroLinkPlayerEventObject(struct LinkPlayerEventObject *linkPlayerEventObj)
 {
-    memset(linkPlayerMapObj, 0, sizeof(struct LinkPlayerMapObject));
+    memset(linkPlayerEventObj, 0, sizeof(struct LinkPlayerEventObject));
 }
 
-void ZeroAllLinkPlayerMapObjects(void)
+void ClearLinkPlayerEventObjects(void)
 {
-    memset(gLinkPlayerMapObjects, 0, sizeof(gLinkPlayerMapObjects));
+    memset(gLinkPlayerEventObjects, 0, sizeof(gLinkPlayerEventObjects));
 }
 
-static void ZeroMapObject(struct MapObject *mapObj)
+static void ZeroEventObject(struct EventObject *eventObj)
 {
-    memset(mapObj, 0, sizeof(struct MapObject));
+    memset(eventObj, 0, sizeof(struct EventObject));
 }
 
-static void SpawnLinkPlayerMapObject(u8 linkPlayerId, s16 x, s16 y, u8 a4)
+static void SpawnLinkPlayerEventObject(u8 linkPlayerId, s16 x, s16 y, u8 a4)
 {
-    u8 mapObjId = sub_808D4F4();
-    struct LinkPlayerMapObject *linkPlayerMapObj = &gLinkPlayerMapObjects[linkPlayerId];
-    struct MapObject *mapObj = &gMapObjects[mapObjId];
+    u8 eventObjId = GetFirstInactiveEventObjectId();
+    struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[linkPlayerId];
+    struct EventObject *eventObj = &gEventObjects[eventObjId];
 
-    ZeroLinkPlayerMapObject(linkPlayerMapObj);
-    ZeroMapObject(mapObj);
+    ZeroLinkPlayerEventObject(linkPlayerEventObj);
+    ZeroEventObject(eventObj);
 
-    linkPlayerMapObj->active = 1;
-    linkPlayerMapObj->linkPlayerId = linkPlayerId;
-    linkPlayerMapObj->mapObjId = mapObjId;
-    linkPlayerMapObj->mode = 0;
+    linkPlayerEventObj->active = 1;
+    linkPlayerEventObj->linkPlayerId = linkPlayerId;
+    linkPlayerEventObj->eventObjId = eventObjId;
+    linkPlayerEventObj->mode = 0;
 
-    mapObj->active = 1;
-    mapObj->mapobj_bit_1 = a4;
-    mapObj->range.as_byte = 2;
-    mapObj->spriteId = 64;
+    eventObj->active = 1;
+    eventObj->singleMovementActive = a4;
+    eventObj->range.as_byte = 2;
+    eventObj->spriteId = 64;
 
-    InitLinkPlayerMapObjectPos(mapObj, x, y);
+    InitLinkPlayerEventObjectPos(eventObj, x, y);
 }
 
-static void InitLinkPlayerMapObjectPos(struct MapObject *mapObj, s16 x, s16 y)
+static void InitLinkPlayerEventObjectPos(struct EventObject *eventObj, s16 x, s16 y)
 {
-    mapObj->coords2.x = x;
-    mapObj->coords2.y = y;
-    mapObj->coords3.x = x;
-    mapObj->coords3.y = y;
-    sub_8093038(x, y, &mapObj->coords1.x, &mapObj->coords1.y);
-    mapObj->coords1.x += 8;
-    FieldObjectUpdateZCoord(mapObj);
+    eventObj->currentCoords.x = x;
+    eventObj->currentCoords.y = y;
+    eventObj->previousCoords.x = x;
+    eventObj->previousCoords.y = y;
+    sub_8093038(x, y, &eventObj->initialCoords.x, &eventObj->initialCoords.y);
+    eventObj->initialCoords.x += 8;
+    EventObjectUpdateZCoord(eventObj);
 }
 
 static void sub_80877DC(u8 linkPlayerId, u8 a2)
 {
-    if (gLinkPlayerMapObjects[linkPlayerId].active)
+    if (gLinkPlayerEventObjects[linkPlayerId].active)
     {
-        u8 mapObjId = gLinkPlayerMapObjects[linkPlayerId].mapObjId;
-        struct MapObject *mapObj = &gMapObjects[mapObjId];
-        mapObj->range.as_byte = a2;
+        u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId;
+        struct EventObject *eventObj = &gEventObjects[eventObjId];
+        eventObj->range.as_byte = a2;
     }
 }
 
 static void sub_808780C(u8 linkPlayerId)
 {
-    struct LinkPlayerMapObject *linkPlayerMapObj = &gLinkPlayerMapObjects[linkPlayerId];
-    u8 mapObjId = linkPlayerMapObj->mapObjId;
-    struct MapObject *mapObj = &gMapObjects[mapObjId];
-    if (mapObj->spriteId != 64 )
-        DestroySprite(&gSprites[mapObj->spriteId]);
-    linkPlayerMapObj->active = 0;
-    mapObj->active = 0;
+    struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[linkPlayerId];
+    u8 eventObjId = linkPlayerEventObj->eventObjId;
+    struct EventObject *eventObj = &gEventObjects[eventObjId];
+    if (eventObj->spriteId != 64 )
+        DestroySprite(&gSprites[eventObj->spriteId]);
+    linkPlayerEventObj->active = 0;
+    eventObj->active = 0;
 }
 
 static u8 sub_8087858(u8 linkPlayerId)
 {
-    u8 mapObjId = gLinkPlayerMapObjects[linkPlayerId].mapObjId;
-    struct MapObject *mapObj = &gMapObjects[mapObjId];
-    return mapObj->spriteId;
+    u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId;
+    struct EventObject *eventObj = &gEventObjects[eventObjId];
+    return eventObj->spriteId;
 }
 
 static void sub_8087878(u8 linkPlayerId, u16 *x, u16 *y)
 {
-    u8 mapObjId = gLinkPlayerMapObjects[linkPlayerId].mapObjId;
-    struct MapObject *mapObj = &gMapObjects[mapObjId];
-    *x = mapObj->coords2.x;
-    *y = mapObj->coords2.y;
+    u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId;
+    struct EventObject *eventObj = &gEventObjects[eventObjId];
+    *x = eventObj->currentCoords.x;
+    *y = eventObj->currentCoords.y;
 }
 
 static u8 sub_80878A0(u8 linkPlayerId)
 {
-    u8 mapObjId = gLinkPlayerMapObjects[linkPlayerId].mapObjId;
-    struct MapObject *mapObj = &gMapObjects[mapObjId];
-    return mapObj->range.as_byte;
+    u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId;
+    struct EventObject *eventObj = &gEventObjects[eventObjId];
+    return eventObj->range.as_byte;
 }
 
 static u8 sub_80878C0(u8 linkPlayerId)
 {
-    u8 mapObjId = gLinkPlayerMapObjects[linkPlayerId].mapObjId;
-    struct MapObject *mapObj = &gMapObjects[mapObjId];
-    return mapObj->mapobj_unk_0B_0;
+    u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId;
+    struct EventObject *eventObj = &gEventObjects[eventObjId];
+    return eventObj->currentElevation;
 }
 
 static s32 sub_80878E4(u8 linkPlayerId)
 {
-    u8 mapObjId = gLinkPlayerMapObjects[linkPlayerId].mapObjId;
-    struct MapObject *mapObj = &gMapObjects[mapObjId];
-    return 16 - (s8)mapObj->mapobj_unk_21;
+    u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId;
+    struct EventObject *eventObj = &gEventObjects[eventObjId];
+    return 16 - (s8)eventObj->directionSequenceIndex;
 }
 
 static u8 GetLinkPlayerIdAt(s16 x, s16 y)
@@ -3001,11 +2999,11 @@ static u8 GetLinkPlayerIdAt(s16 x, s16 y)
     u8 i;
     for (i = 0; i < 4; i++)
     {
-        if (gLinkPlayerMapObjects[i].active
-         && (gLinkPlayerMapObjects[i].mode == 0 || gLinkPlayerMapObjects[i].mode == 2))
+        if (gLinkPlayerEventObjects[i].active
+         && (gLinkPlayerEventObjects[i].mode == 0 || gLinkPlayerEventObjects[i].mode == 2))
         {
-            struct MapObject *mapObj = &gMapObjects[gLinkPlayerMapObjects[i].mapObjId];
-            if (mapObj->coords2.x == x && mapObj->coords2.y == y)
+            struct EventObject *eventObj = &gEventObjects[gLinkPlayerEventObjects[i].eventObjId];
+            if (eventObj->currentCoords.x == x && eventObj->currentCoords.y == y)
                 return i;
         }
     }
@@ -3014,79 +3012,79 @@ static u8 GetLinkPlayerIdAt(s16 x, s16 y)
 
 static void sub_808796C(u8 linkPlayerId, u8 a2)
 {
-    struct LinkPlayerMapObject *linkPlayerMapObj = &gLinkPlayerMapObjects[linkPlayerId];
-    u8 mapObjId = linkPlayerMapObj->mapObjId;
-    struct MapObject *mapObj = &gMapObjects[mapObjId];
+    struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[linkPlayerId];
+    u8 eventObjId = linkPlayerEventObj->eventObjId;
+    struct EventObject *eventObj = &gEventObjects[eventObjId];
 
-    if (linkPlayerMapObj->active)
+    if (linkPlayerEventObj->active)
     {
         if (a2 > 10)
-            mapObj->mapobj_bit_2 = 1;
+            eventObj->triggerGroundEffectsOnMove = 1;
         else
-            gUnknown_08339E00[gUnknown_08339DC8[linkPlayerMapObj->mode](linkPlayerMapObj, mapObj, a2)](linkPlayerMapObj, mapObj);
+            gUnknown_08339E00[gUnknown_08339DC8[linkPlayerEventObj->mode](linkPlayerEventObj, eventObj, a2)](linkPlayerEventObj, eventObj);
     }
 }
 
-static u8 sub_80879D8(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
+static u8 sub_80879D8(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3)
 {
-    return gUnknown_08339DD4[a3](linkPlayerMapObj, mapObj, a3);
+    return gUnknown_08339DD4[a3](linkPlayerEventObj, eventObj, a3);
 }
 
-static u8 sub_80879F8(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
+static u8 sub_80879F8(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3)
 {
     return 1;
 }
 
-static u8 sub_80879FC(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
+static u8 sub_80879FC(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3)
 {
-    return gUnknown_08339DD4[a3](linkPlayerMapObj, mapObj, a3);
+    return gUnknown_08339DD4[a3](linkPlayerEventObj, eventObj, a3);
 }
 
-static u8 sub_8087A1C(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
+static u8 sub_8087A1C(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3)
 {
     return 0;
 }
 
-static u8 sub_8087A20(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
+static u8 sub_8087A20(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3)
 {
     s16 x, y;
 
-    mapObj->range.as_byte = npc_something3(a3, mapObj->range.as_byte);
-    FieldObjectMoveDestCoords(mapObj, mapObj->range.as_byte, &x, &y);
+    eventObj->range.as_byte = npc_something3(a3, eventObj->range.as_byte);
+    EventObjectMoveDestCoords(eventObj, eventObj->range.as_byte, &x, &y);
 
-    if (LinkPlayerDetectCollision(linkPlayerMapObj->mapObjId, mapObj->range.as_byte, x, y))
+    if (LinkPlayerDetectCollision(linkPlayerEventObj->eventObjId, eventObj->range.as_byte, x, y))
     {
         return 0;
     }
     else
     {
-        mapObj->mapobj_unk_21 = 16;
-        npc_coords_shift(mapObj, x, y);
-        FieldObjectUpdateZCoord(mapObj);
+        eventObj->directionSequenceIndex = 16;
+        ShiftEventObjectCoords(eventObj, x, y);
+        EventObjectUpdateZCoord(eventObj);
         return 1;
     }
 }
 
-static u8 sub_8087A88(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
+static u8 sub_8087A88(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3)
 {
-    mapObj->range.as_byte = npc_something3(a3, mapObj->range.as_byte);
+    eventObj->range.as_byte = npc_something3(a3, eventObj->range.as_byte);
     return 0;
 }
 
-static void sub_8087AA0(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj)
+static void sub_8087AA0(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj)
 {
-    linkPlayerMapObj->mode = 0;
+    linkPlayerEventObj->mode = 0;
 }
 
-static void sub_8087AA8(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj)
+static void sub_8087AA8(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj)
 {
-    mapObj->mapobj_unk_21--;
-    linkPlayerMapObj->mode = 1;
-    MoveCoords(mapObj->range.as_byte, &mapObj->coords1.x, &mapObj->coords1.y);
-    if (!mapObj->mapobj_unk_21)
+    eventObj->directionSequenceIndex--;
+    linkPlayerEventObj->mode = 1;
+    MoveCoords(eventObj->range.as_byte, &eventObj->initialCoords.x, &eventObj->initialCoords.y);
+    if (!eventObj->directionSequenceIndex)
     {
-        npc_coords_shift_still(mapObj);
-        linkPlayerMapObj->mode = 2;
+        ShiftStillEventObjectCoords(eventObj);
+        linkPlayerEventObj->mode = 2;
     }
 }
 
@@ -3110,15 +3108,15 @@ static u8 npc_something3(u8 a1, u8 a2)
     return a2;
 }
 
-static u8 LinkPlayerDetectCollision(u8 selfMapObjId, u8 a2, s16 x, s16 y)
+static u8 LinkPlayerDetectCollision(u8 selfEventObjId, u8 a2, s16 x, s16 y)
 {
     u8 i;
     for (i = 0; i < 16; i++)
     {
-        if (i != selfMapObjId)
+        if (i != selfEventObjId)
         {
-            if ((gMapObjects[i].coords2.x == x && gMapObjects[i].coords2.y == y)
-             || (gMapObjects[i].coords3.x == x && gMapObjects[i].coords3.y == y))
+            if ((gEventObjects[i].currentCoords.x == x && gEventObjects[i].currentCoords.y == y)
+             || (gEventObjects[i].previousCoords.x == x && gEventObjects[i].previousCoords.y == y))
             {
                 return 1;
             }
@@ -3129,51 +3127,51 @@ static u8 LinkPlayerDetectCollision(u8 selfMapObjId, u8 a2, s16 x, s16 y)
 
 static void CreateLinkPlayerSprite(u8 linkPlayerId, u8 gameVersion)
 {
-    struct LinkPlayerMapObject *linkPlayerMapObj = &gLinkPlayerMapObjects[linkPlayerId];
-    u8 mapObjId = linkPlayerMapObj->mapObjId;
-    struct MapObject *mapObj = &gMapObjects[mapObjId];
+    struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[linkPlayerId];
+    u8 eventObjId = linkPlayerEventObj->eventObjId;
+    struct EventObject *eventObj = &gEventObjects[eventObjId];
     struct Sprite *sprite;
 
-    if (linkPlayerMapObj->active)
+    if (linkPlayerEventObj->active)
     {
         switch (gameVersion)
         {
         case VERSION_FIRE_RED:
         case VERSION_LEAF_GREEN:
-            mapObj->spriteId = AddPseudoFieldObject(sub_808BD6C(mapObj->mapobj_bit_1), SpriteCB_LinkPlayer, 0, 0, 0);
+            eventObj->spriteId = AddPseudoEventObject(sub_808BD6C(eventObj->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0);
             break;
         case VERSION_RUBY:
         case VERSION_SAPPHIRE:
-            mapObj->spriteId = AddPseudoFieldObject(sub_808BD7C(mapObj->mapobj_bit_1), SpriteCB_LinkPlayer, 0, 0, 0);
+            eventObj->spriteId = AddPseudoEventObject(sub_808BD7C(eventObj->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0);
             break;
         case VERSION_EMERALD:
-            mapObj->spriteId = AddPseudoFieldObject(GetRivalAvatarGraphicsIdByStateIdAndGender(0, mapObj->mapobj_bit_1), SpriteCB_LinkPlayer, 0, 0, 0);
+            eventObj->spriteId = AddPseudoEventObject(GetRivalAvatarGraphicsIdByStateIdAndGender(0, eventObj->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0);
             break;
         }
 
-        sprite = &gSprites[mapObj->spriteId];
+        sprite = &gSprites[eventObj->spriteId];
         sprite->coordOffsetEnabled = TRUE;
         sprite->data[0] = linkPlayerId;
-        mapObj->mapobj_bit_2 = 0;
+        eventObj->triggerGroundEffectsOnMove = 0;
     }
 }
 
 static void SpriteCB_LinkPlayer(struct Sprite *sprite)
 {
-    struct LinkPlayerMapObject *linkPlayerMapObj = &gLinkPlayerMapObjects[sprite->data[0]];
-    struct MapObject *mapObj = &gMapObjects[linkPlayerMapObj->mapObjId];
-    sprite->pos1.x = mapObj->coords1.x;
-    sprite->pos1.y = mapObj->coords1.y;
-    SetObjectSubpriorityByZCoord(mapObj->elevation, sprite, 1);
-    sprite->oam.priority = ZCoordToPriority(mapObj->elevation);
+    struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[sprite->data[0]];
+    struct EventObject *eventObj = &gEventObjects[linkPlayerEventObj->eventObjId];
+    sprite->pos1.x = eventObj->initialCoords.x;
+    sprite->pos1.y = eventObj->initialCoords.y;
+    SetObjectSubpriorityByZCoord(eventObj->previousElevation, sprite, 1);
+    sprite->oam.priority = ZCoordToPriority(eventObj->previousElevation);
 
-	if (!linkPlayerMapObj->mode)
-        StartSpriteAnim(sprite, FieldObjectDirectionToImageAnimId(mapObj->range.as_byte));
+	if (!linkPlayerEventObj->mode)
+        StartSpriteAnim(sprite, GetFaceDirectionAnimNum(eventObj->range.as_byte));
     else
-        StartSpriteAnimIfDifferent(sprite, get_go_image_anim_num(mapObj->range.as_byte));
+        StartSpriteAnimIfDifferent(sprite, GetMoveDirectionAnimNum(eventObj->range.as_byte));
 
-	sub_80979D4(sprite, 0);
-    if (mapObj->mapobj_bit_2)
+	UpdateEventObjectSpriteVisibility(sprite, 0);
+    if (eventObj->triggerGroundEffectsOnMove)
     {
         sprite->invisible = ((sprite->data[7] & 4) >> 2);
         sprite->data[7]++;
diff --git a/src/player_pc.c b/src/player_pc.c
index c10c63dda..48be0633f 100644
--- a/src/player_pc.c
+++ b/src/player_pc.c
@@ -4,7 +4,7 @@
 #include "decoration.h"
 #include "event_scripts.h"
 #include "field_fadetransition.h"
-#include "field_map_obj.h"
+#include "event_object_movement.h"
 #include "field_screen.h"
 #include "field_weather.h"
 #include "international_string_util.h"
diff --git a/src/rom6.c b/src/rom6.c
index 4a5c506b6..cdc1064dd 100644
--- a/src/rom6.c
+++ b/src/rom6.c
@@ -1,12 +1,12 @@
 #include "global.h"
-#include "constants/map_objects.h"
+#include "constants/event_objects.h"
 #include "constants/songs.h"
 #include "rom6.h"
 #include "braille_puzzles.h"
 #include "event_data.h"
 #include "event_scripts.h"
 #include "field_effect.h"
-#include "field_map_obj.h"
+#include "event_object_movement.h"
 #include "field_player_avatar.h"
 #include "item_use.h"
 #include "party_menu.h"
@@ -32,18 +32,18 @@ extern struct MapPosition gUnknown_0203AB40;
 // text
 bool8 npc_before_player_of_type(u8 a)
 {
-    u8 mapObjId;
+    u8 eventObjId;
 
     GetXYCoordsOneStepInFrontOfPlayer(&gUnknown_0203AB40.x, &gUnknown_0203AB40.y);
     gUnknown_0203AB40.height = PlayerGetZCoord();
-    mapObjId = GetFieldObjectIdByXYZ(gUnknown_0203AB40.x, gUnknown_0203AB40.y, gUnknown_0203AB40.height);
-    if (gMapObjects[mapObjId].graphicsId != a)
+    eventObjId = GetEventObjectIdByXYZ(gUnknown_0203AB40.x, gUnknown_0203AB40.y, gUnknown_0203AB40.height);
+    if (gEventObjects[eventObjId].graphicsId != a)
     {
         return FALSE;
     }
     else
     {
-        gSpecialVar_LastTalked = gMapObjects[mapObjId].localId;
+        gSpecialVar_LastTalked = gEventObjects[eventObjId].localId;
         return TRUE;
     }
 }
@@ -56,13 +56,13 @@ u8 oei_task_add(void)
 
 static void task08_080C9820(u8 taskId)
 {
-    u8 mapObjId;
+    u8 eventObjId;
 
     ScriptContext2_Enable();
     gPlayerAvatar.preventStep = TRUE;
-    mapObjId = gPlayerAvatar.mapObjectId;
-    if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(&gMapObjects[mapObjId])
-     || FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[mapObjId]))
+    eventObjId = gPlayerAvatar.eventObjectId;
+    if (!EventObjectIsMovementOverridden(&gEventObjects[eventObjId])
+     || EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId]))
     {
         if (gMapHeader.mapType == MAP_TYPE_UNDERWATER)
         {
@@ -72,7 +72,7 @@ static void task08_080C9820(u8 taskId)
         else
         {
             sub_808C114();
-            FieldObjectSetSpecialAnim(&gMapObjects[mapObjId], 0x39);
+            EventObjectSetHeldMovement(&gEventObjects[eventObjId], 0x39);
             gTasks[taskId].func = sub_813552C;
         }
     }
@@ -80,7 +80,7 @@ static void task08_080C9820(u8 taskId)
 
 static void sub_813552C(u8 taskId)
 {
-    if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(&gMapObjects[gPlayerAvatar.mapObjectId]) == TRUE)
+    if (EventObjectCheckHeldMovementStatus(&gEventObjects[gPlayerAvatar.eventObjectId]) == TRUE)
     {
         FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
         gTasks[taskId].func = sub_8135578;
@@ -91,7 +91,7 @@ static void sub_8135578(u8 taskId)
 {
     if (!FieldEffectActiveListContains(6))
     {
-        gFieldEffectArguments[1] = player_get_direction_lower_nybble();
+        gFieldEffectArguments[1] = GetPlayerFacingDirection();
         if (gFieldEffectArguments[1] == 1)
             gFieldEffectArguments[2] = 0;
         if (gFieldEffectArguments[1] == 2)
@@ -100,7 +100,7 @@ static void sub_8135578(u8 taskId)
             gFieldEffectArguments[2] = 2;
         if (gFieldEffectArguments[1] == 4)
             gFieldEffectArguments[2] = 3;
-        FieldObjectSetGraphicsId(&gMapObjects[gPlayerAvatar.mapObjectId], GetPlayerAvatarGraphicsIdByCurrentState());
+        EventObjectSetGraphicsId(&gEventObjects[gPlayerAvatar.eventObjectId], GetPlayerAvatarGraphicsIdByCurrentState());
         StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], gFieldEffectArguments[2]);
         FieldEffectActiveListRemove(6);
         gTasks[taskId].func = sub_813561C;
diff --git a/src/rotating_gate.c b/src/rotating_gate.c
index b07814f58..1f5ef165f 100644
--- a/src/rotating_gate.c
+++ b/src/rotating_gate.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "bike.h"
 #include "event_data.h"
-#include "field_map_obj.h"
+#include "event_object_movement.h"
 #include "constants/maps.h"
 #include "constants/songs.h"
 #include "sound.h"
diff --git a/src/scrcmd.c b/src/scrcmd.c
index a29e64979..4e3fceb10 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -13,8 +13,7 @@
 #include "field_door.h"
 #include "field_effect.h"
 #include "field_fadetransition.h"
-#include "field_map_obj.h"
-#include "field_map_obj_helpers.h"
+#include "event_object_movement.h"
 #include "field_message_box.h"
 #include "field_player_avatar.h"
 #include "field_screen_effect.h"
@@ -25,7 +24,7 @@
 #include "item.h"
 #include "lilycove_lady.h"
 #include "main.h"
-#include "map_obj_lock.h"
+#include "event_obj_lock.h"
 #include "menu.h"
 #include "money.h"
 #include "mystery_event_script.h"
@@ -1052,7 +1051,7 @@ bool8 ScrCmd_removeobject(struct ScriptContext *ctx)
 {
     u16 localId = VarGet(ScriptReadHalfword(ctx));
 
-    RemoveFieldObjectByLocalIdAndMap(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
+    RemoveEventObjectByLocalIdAndMap(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
     return FALSE;
 }
 
@@ -1062,7 +1061,7 @@ bool8 ScrCmd_removeobject_at(struct ScriptContext *ctx)
     u8 mapGroup = ScriptReadByte(ctx);
     u8 mapNum = ScriptReadByte(ctx);
 
-    RemoveFieldObjectByLocalIdAndMap(objectId, mapNum, mapGroup);
+    RemoveEventObjectByLocalIdAndMap(objectId, mapNum, mapGroup);
     return FALSE;
 }
 
@@ -1100,7 +1099,7 @@ bool8 ScrCmd_setobjectxyperm(struct ScriptContext *ctx)
     u16 x = VarGet(ScriptReadHalfword(ctx));
     u16 y = VarGet(ScriptReadHalfword(ctx));
 
-    Overworld_SetMapObjTemplateCoords(localId, x, y);
+    Overworld_SetEventObjTemplateCoords(localId, x, y);
     return FALSE;
 }
 
@@ -1155,10 +1154,10 @@ bool8 ScrCmd_resetobjectpriority(struct ScriptContext *ctx)
 
 bool8 ScrCmd_faceplayer(struct ScriptContext *ctx)
 {
-    if (gMapObjects[gSelectedMapObject].active)
+    if (gEventObjects[gSelectedEventObject].active)
     {
-        FieldObjectFaceOppositeDirection(&gMapObjects[gSelectedMapObject],
-          player_get_direction_lower_nybble());
+        EventObjectFaceOppositeDirection(&gEventObjects[gSelectedEventObject],
+          GetPlayerFacingDirection());
     }
     return FALSE;
 }
@@ -1168,7 +1167,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);
+    EventObjectTurnByLocalIdAndMap(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, direction);
     return FALSE;
 }
 
@@ -1177,7 +1176,7 @@ bool8 ScrCmd_setobjectmovementtype(struct ScriptContext *ctx)
     u16 localId = VarGet(ScriptReadHalfword(ctx));
     u8 movementType = ScriptReadByte(ctx);
 
-    Overworld_SetMapObjTemplateMovementType(localId, movementType);
+    Overworld_SetEventObjTemplateMovementType(localId, movementType);
     return FALSE;
 }
 
@@ -1211,7 +1210,7 @@ bool8 ScrCmd_lockall(struct ScriptContext *ctx)
     }
     else
     {
-        ScriptFreezeMapObjects();
+        ScriptFreezeEventObjects();
         SetupNativeScript(ctx, sub_80983C4);
         return TRUE;
     }
@@ -1225,14 +1224,14 @@ bool8 ScrCmd_lock(struct ScriptContext *ctx)
     }
     else
     {
-        if (gMapObjects[gSelectedMapObject].active)
+        if (gEventObjects[gSelectedEventObject].active)
         {
-            LockSelectedMapObject();
+            LockSelectedEventObject();
             SetupNativeScript(ctx, sub_809847C);
         }
         else
         {
-            ScriptFreezeMapObjects();
+            ScriptFreezeEventObjects();
             SetupNativeScript(ctx, sub_80983C4);
         }
         return TRUE;
@@ -1244,10 +1243,10 @@ bool8 ScrCmd_releaseall(struct ScriptContext *ctx)
     u8 objectId;
 
     HideFieldMessageBox();
-    objectId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0);
-    FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[objectId]);
+    objectId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0);
+    EventObjectClearHeldMovementIfFinished(&gEventObjects[objectId]);
     sub_80D338C();
-    UnfreezeMapObjects();
+    UnfreezeEventObjects();
     return FALSE;
 }
 
@@ -1256,12 +1255,12 @@ bool8 ScrCmd_release(struct ScriptContext *ctx)
     u8 objectId;
 
     HideFieldMessageBox();
-    if (gMapObjects[gSelectedMapObject].active)
-        FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[gSelectedMapObject]);
-    objectId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0);
-    FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[objectId]);
+    if (gEventObjects[gSelectedEventObject].active)
+        EventObjectClearHeldMovementIfFinished(&gEventObjects[gSelectedEventObject]);
+    objectId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0);
+    EventObjectClearHeldMovementIfFinished(&gEventObjects[objectId]);
     sub_80D338C();
-    UnfreezeMapObjects();
+    UnfreezeEventObjects();
     return FALSE;
 }
 
@@ -2179,7 +2178,7 @@ bool8 ScrCmd_mossdeepgym4(struct ScriptContext *ctx)
 
 bool8 ScrCmd_cmdD8(struct ScriptContext *ctx)
 {
-    gSelectedMapObject = GetCurrentApproachingTrainerMapObjectId();
+    gSelectedEventObject = GetCurrentApproachingTrainerEventObjectId();
     return FALSE;
 }
 
@@ -2191,7 +2190,7 @@ bool8 ScrCmd_cmdD9(struct ScriptContext *ctx)
     }
     else
     {
-        if (gMapObjects[gSelectedMapObject].active)
+        if (gEventObjects[gSelectedEventObject].active)
         {
             sub_8098630();
             SetupNativeScript(ctx, sub_8098734);
@@ -2239,7 +2238,7 @@ bool8 ScrCmd_warpD1(struct ScriptContext *ctx)
     u16 y = VarGet(ScriptReadHalfword(ctx));
 
     Overworld_SetWarpDestination(mapGroup, mapNum, warpId, x, y);
-	sub_808D074(player_get_direction_lower_nybble());
+	sub_808D074(GetPlayerFacingDirection());
 	sub_80B0244();
     player_avatar_init_params_reset();
     return TRUE;
diff --git a/src/script_movement.c b/src/script_movement.c
index bbeb0eedc..9fee9e060 100644
--- a/src/script_movement.c
+++ b/src/script_movement.c
@@ -1,7 +1,6 @@
 #include "global.h"
 #include "script_movement.h"
-#include "field_map_obj.h"
-#include "field_map_obj_helpers.h"
+#include "event_object_movement.h"
 #include "task.h"
 #include "util.h"
 
@@ -22,25 +21,25 @@ static EWRAM_DATA const u8 *gUnknown_02039D90[16] = {0};
 // text
 bool8 ScriptMovement_StartObjectMovementScript(u8 localId, u8 mapNum, u8 mapGroup, const u8 *movementScript)
 {
-    u8 mapObjId;
+    u8 eventObjId;
 
-    if (TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjId))
+    if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjId))
         return TRUE;
     if (!FuncIsActiveTask(sub_80D3660))
         sub_80D33AC(50);
-    return sub_80D3408(sub_80D33F4(), mapObjId, movementScript);
+    return sub_80D3408(sub_80D33F4(), eventObjId, movementScript);
 }
 
 bool8 ScriptMovement_IsObjectMovementFinished(u8 localId, u8 mapNum, u8 mapBank)
 {
-    u8 mapObjId;
+    u8 eventObjId;
     u8 r4;
     u8 r1;
 
-    if (TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapBank, &mapObjId))
+    if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapBank, &eventObjId))
         return TRUE;
     r4 = sub_80D33F4();
-    r1 = sub_80D3474(r4, mapObjId);
+    r1 = sub_80D3474(r4, eventObjId);
     if (r1 == 16)
         return TRUE;
     return sub_80D3584(r4, r1);
@@ -74,11 +73,11 @@ static u8 sub_80D33F4(void)
     return FindTaskIdByFunc(sub_80D3660);
 }
 
-static bool8 sub_80D3408(u8 taskId, u8 mapObjId, const u8 *movementScript)
+static bool8 sub_80D3408(u8 taskId, u8 eventObjId, const u8 *movementScript)
 {
     u8 r4;
 
-    r4 = sub_80D3474(taskId, mapObjId);
+    r4 = sub_80D3474(taskId, eventObjId);
     if (r4 != 16)
     {
         if (sub_80D3584(taskId, r4) == 0)
@@ -87,7 +86,7 @@ static bool8 sub_80D3408(u8 taskId, u8 mapObjId, const u8 *movementScript)
         }
         else
         {
-            sub_80D35DC(taskId, r4, mapObjId, movementScript);
+            sub_80D35DC(taskId, r4, eventObjId, movementScript);
             return FALSE;
         }
     }
@@ -98,7 +97,7 @@ static bool8 sub_80D3408(u8 taskId, u8 mapObjId, const u8 *movementScript)
     }
     else
     {
-        sub_80D35DC(taskId, r4, mapObjId, movementScript);
+        sub_80D35DC(taskId, r4, eventObjId, movementScript);
         return FALSE;
     }
 }
@@ -174,23 +173,23 @@ static const u8 *sub_80D35CC(u8 a)
     return gUnknown_02039D90[a];
 }
 
-static void sub_80D35DC(u8 taskId, u8 b, u8 mapObjId, const u8 *movementScript)
+static void sub_80D35DC(u8 taskId, u8 b, u8 eventObjId, const u8 *movementScript)
 {
     sub_80D352C(taskId, b);
     npc_obj_offscreen_culling_and_flag_update(b, movementScript);
-    sub_80D34E4(taskId, b, mapObjId);
+    sub_80D34E4(taskId, b, eventObjId);
 }
 
 static void UnfreezeObjects(u8 taskId)
 {
-    u8 *pMapObjId;
+    u8 *pEventObjId;
     u8 i;
 
-    pMapObjId = (u8 *)&gTasks[taskId].data[1];
-    for (i = 0; i < 16; i++, pMapObjId++)
+    pEventObjId = (u8 *)&gTasks[taskId].data[1];
+    for (i = 0; i < 16; i++, pEventObjId++)
     {
-        if (*pMapObjId != 0xFF)
-            npc_sync_anim_pause_bits(&gMapObjects[*pMapObjId]);
+        if (*pEventObjId != 0xFF)
+            UnfreezeEventObject(&gEventObjects[*pEventObjId]);
     }
 }
 
@@ -207,23 +206,23 @@ static void sub_80D3660(u8 taskId)
     }
 }
 
-static void sub_80A2490(u8 taskId, u8 b, u8 mapObjId, const u8 *d)
+static void sub_80A2490(u8 taskId, u8 b, u8 eventObjId, const u8 *d)
 {
     u8 var;
 
-    if (FieldObjectIsSpecialAnimActive(&gMapObjects[mapObjId])
-     && !FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[mapObjId]))
+    if (EventObjectIsHeldMovementActive(&gEventObjects[eventObjId])
+     && !EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId]))
         return;
 
     var = *d;
     if (var == 0xFE)
     {
         sub_80D355C(taskId, b);
-        FreezeMapObject(&gMapObjects[mapObjId]);
+        FreezeEventObject(&gEventObjects[eventObjId]);
     }
     else
     {
-        if (!FieldObjectSetSpecialAnim(&gMapObjects[mapObjId], var))
+        if (!EventObjectSetHeldMovement(&gEventObjects[eventObjId], var))
         {
             d++;
             npc_obj_offscreen_culling_and_flag_update(b, d);
diff --git a/src/secret_base.c b/src/secret_base.c
index 44e980c43..d6f4e24a5 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -20,7 +20,7 @@
 #include "field_player_avatar.h"
 #include "field_screen.h"
 #include "field_weather.h"
-#include "field_map_obj.h"
+#include "event_object_movement.h"
 #include "field_effect.h"
 #include "fldeff_80F9BCC.h"
 #include "metatile_behavior.h"
@@ -412,7 +412,7 @@ bool8 sub_80E909C(void)
 
 void sub_80E90C8(u8 taskId)
 {
-    FieldObjectTurn(&gMapObjects[gPlayerAvatar.mapObjectId], DIR_NORTH);
+    EventObjectTurn(&gEventObjects[gPlayerAvatar.eventObjectId], DIR_NORTH);
     if (IsWeatherNotFadingIn() == TRUE)
     {
         EnableBothScriptContexts();
@@ -532,14 +532,14 @@ void sub_80E933C(void)
             category = gDecorations[roomDecor[decorIdx]].category;
             if (permission == DECORPERM_SOLID_MAT)
             {
-                for (objIdx = 0; objIdx < gMapHeader.events->mapObjectCount; objIdx ++)
+                for (objIdx = 0; objIdx < gMapHeader.events->eventObjectCount; objIdx ++)
                 {
-                    if (gMapHeader.events->mapObjects[objIdx].flagId == gSpecialVar_0x8004 + 0xAE)
+                    if (gMapHeader.events->eventObjects[objIdx].flagId == gSpecialVar_0x8004 + 0xAE)
                     {
                         break;
                     }
                 }
-                if (objIdx == gMapHeader.events->mapObjectCount)
+                if (objIdx == gMapHeader.events->eventObjectCount)
                 {
                     continue;
                 }
@@ -548,9 +548,9 @@ void sub_80E933C(void)
                 metatile = MapGridGetMetatileBehaviorAt(gSpecialVar_0x8006 + 7, gSpecialVar_0x8007 + 7);
                 if (MetatileBehavior_IsMB_B5(metatile) == TRUE || MetatileBehavior_IsMB_C3(metatile) == TRUE)
                 {
-                    gSpecialVar_Result = gMapHeader.events->mapObjects[objIdx].graphicsId + VAR_0x3F20;
+                    gSpecialVar_Result = gMapHeader.events->eventObjects[objIdx].graphicsId + VAR_0x3F20;
                     VarSet(gSpecialVar_Result, gDecorations[roomDecor[decorIdx]].tiles[0]);
-                    gSpecialVar_Result = gMapHeader.events->mapObjects[objIdx].localId;
+                    gSpecialVar_Result = gMapHeader.events->eventObjects[objIdx].localId;
                     FlagClear(gSpecialVar_0x8004 + 0xAE);
                     show_sprite(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
                     sub_808EBA8(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gSpecialVar_0x8006, gSpecialVar_0x8007);
@@ -578,12 +578,12 @@ void sub_80E9578(void)
     u8 objectEventIdx;
     u16 flagId;
 
-    for (objectEventIdx = 0; objectEventIdx < gMapHeader.events->mapObjectCount; objectEventIdx ++)
+    for (objectEventIdx = 0; objectEventIdx < gMapHeader.events->eventObjectCount; objectEventIdx ++)
     {
-        flagId = gMapHeader.events->mapObjects[objectEventIdx].flagId;
+        flagId = gMapHeader.events->eventObjects[objectEventIdx].flagId;
         if (flagId >= 0xAE && flagId <= 0xBB)
         {
-            RemoveFieldObjectByLocalIdAndMap(gMapHeader.events->mapObjects[objectEventIdx].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
+            RemoveEventObjectByLocalIdAndMap(gMapHeader.events->eventObjects[objectEventIdx].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
             FlagSet(flagId);
         }
     }
diff --git a/src/start_menu.c b/src/start_menu.c
index c248ca86b..7080ae6a8 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -15,7 +15,7 @@
 #include "battle_frontier_2.h"
 #include "rom_818CFC8.h"
 #include "field_specials.h"
-#include "field_map_obj_helpers.h"
+#include "event_object_movement.h"
 #include "script.h"
 #include "main.h"
 #include "sound.h"
@@ -561,7 +561,7 @@ void ShowStartMenu(void) // Called from overworld.c and field_control_avatar.s
 {
     if (!is_c1_link_related_active())
     {
-        FreezeMapObjects();
+        FreezeEventObjects();
         sub_808B864();
         sub_808BCF4();
     }
diff --git a/src/trainer_see.c b/src/trainer_see.c
index 7706da703..f5e9c300e 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -4,9 +4,8 @@
 #include "pokemon.h"
 #include "sprite.h"
 #include "field_effect.h"
-#include "field_map_obj.h"
+#include "event_object_movement.h"
 #include "field_player_avatar.h"
-#include "field_map_obj_helpers.h"
 #include "pokenav.h"
 #include "task.h"
 #include "util.h"
@@ -16,36 +15,36 @@
 
 extern bool8 InBattlePyramid(void);
 extern bool32 InTrainerHill(void);
-extern bool8 GetBattlePyramidTrainerFlag(u8 mapObjectId);
-extern bool8 GetTrainerHillTrainerFlag(u8 mapObjectId);
+extern bool8 GetBattlePyramidTrainerFlag(u8 eventObjectId);
+extern bool8 GetTrainerHillTrainerFlag(u8 eventObjectId);
 extern void sub_809BE48(u16 npcId);
 
 // this file's functions
-static u8 CheckTrainer(u8 mapObjectId);
-static u8 GetTrainerApproachDistance(struct MapObject *trainerObj);
-static u8 CheckPathBetweenTrainerAndPlayer(struct MapObject *trainerObj, u8 approachDistance, u8 direction);
-static void TrainerApproachPlayer(struct MapObject *trainerObj, u8 range);
+static u8 CheckTrainer(u8 eventObjectId);
+static u8 GetTrainerApproachDistance(struct EventObject *trainerObj);
+static u8 CheckPathBetweenTrainerAndPlayer(struct EventObject *trainerObj, u8 approachDistance, u8 direction);
+static void TrainerApproachPlayer(struct EventObject *trainerObj, u8 range);
 static void Task_RunTrainerSeeFuncList(u8 taskId);
 static void Task_DestroyTrainerApproachTask(u8 taskId);
 static void SetIconSpriteData(struct Sprite *sprite, u16 fldEffId, u8 spriteAnimNum);
 
-static u8 GetTrainerApproachDistanceSouth(struct MapObject *trainerObj, s16 range, s16 x, s16 y);
-static u8 GetTrainerApproachDistanceNorth(struct MapObject *trainerObj, s16 range, s16 x, s16 y);
-static u8 GetTrainerApproachDistanceWest(struct MapObject *trainerObj, s16 range, s16 x, s16 y);
-static u8 GetTrainerApproachDistanceEast(struct MapObject *trainerObj, s16 range, s16 x, s16 y);
-
-static bool8 sub_80B4178(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-static bool8 sub_80B417C(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-static bool8 sub_80B41C0(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-static bool8 sub_80B4200(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-static bool8 sub_80B425C(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-static bool8 sub_80B4318(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-static bool8 sub_80B435C(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-static bool8 sub_80B4390(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-static bool8 sub_80B43AC(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-static bool8 sub_80B43E0(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-static bool8 sub_80B4438(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-static bool8 sub_80B44AC(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static u8 GetTrainerApproachDistanceSouth(struct EventObject *trainerObj, s16 range, s16 x, s16 y);
+static u8 GetTrainerApproachDistanceNorth(struct EventObject *trainerObj, s16 range, s16 x, s16 y);
+static u8 GetTrainerApproachDistanceWest(struct EventObject *trainerObj, s16 range, s16 x, s16 y);
+static u8 GetTrainerApproachDistanceEast(struct EventObject *trainerObj, s16 range, s16 x, s16 y);
+
+static bool8 sub_80B4178(u8 taskId, struct Task *task, struct EventObject *trainerObj);
+static bool8 sub_80B417C(u8 taskId, struct Task *task, struct EventObject *trainerObj);
+static bool8 sub_80B41C0(u8 taskId, struct Task *task, struct EventObject *trainerObj);
+static bool8 sub_80B4200(u8 taskId, struct Task *task, struct EventObject *trainerObj);
+static bool8 sub_80B425C(u8 taskId, struct Task *task, struct EventObject *trainerObj);
+static bool8 sub_80B4318(u8 taskId, struct Task *task, struct EventObject *trainerObj);
+static bool8 sub_80B435C(u8 taskId, struct Task *task, struct EventObject *trainerObj);
+static bool8 sub_80B4390(u8 taskId, struct Task *task, struct EventObject *trainerObj);
+static bool8 sub_80B43AC(u8 taskId, struct Task *task, struct EventObject *trainerObj);
+static bool8 sub_80B43E0(u8 taskId, struct Task *task, struct EventObject *trainerObj);
+static bool8 sub_80B4438(u8 taskId, struct Task *task, struct EventObject *trainerObj);
+static bool8 sub_80B44AC(u8 taskId, struct Task *task, struct EventObject *trainerObj);
 
 static void SpriteCB_TrainerIcons(struct Sprite *sprite);
 
@@ -64,7 +63,7 @@ static const u8 sEmotion_ExclamationMarkGfx[] = INCBIN_U8("graphics/misc/emotion
 static const u8 sEmotion_QuestionMarkGfx[] = INCBIN_U8("graphics/misc/emotion_question.4bpp");
 static const u8 sEmotion_HeartGfx[] = INCBIN_U8("graphics/misc/emotion_heart.4bpp");
 
-static u8 (*const sDirectionalApproachDistanceFuncs[])(struct MapObject *trainerObj, s16 range, s16 x, s16 y) =
+static u8 (*const sDirectionalApproachDistanceFuncs[])(struct EventObject *trainerObj, s16 range, s16 x, s16 y) =
 {
     GetTrainerApproachDistanceSouth,
     GetTrainerApproachDistanceNorth,
@@ -72,7 +71,7 @@ static u8 (*const sDirectionalApproachDistanceFuncs[])(struct MapObject *trainer
     GetTrainerApproachDistanceEast,
 };
 
-static bool8 (*const sTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct MapObject *trainerObj) =
+static bool8 (*const sTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct EventObject *trainerObj) =
 {
     sub_80B4178,
 	sub_80B417C,
@@ -88,7 +87,7 @@ static bool8 (*const sTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct
 	sub_80B44AC
 };
 
-static bool8 (*const sTrainerSeeFuncList2[])(u8 taskId, struct Task *task, struct MapObject *trainerObj) =
+static bool8 (*const sTrainerSeeFuncList2[])(u8 taskId, struct Task *task, struct EventObject *trainerObj) =
 {
     sub_80B43AC,
     sub_80B43E0,
@@ -172,13 +171,13 @@ bool8 CheckForTrainersWantingBattle(void)
     gNoOfApproachingTrainers = 0;
     gApproachingTrainerId = 0;
 
-    for (i = 0; i < MAP_OBJECTS_COUNT; i++)
+    for (i = 0; i < EVENT_OBJECTS_COUNT; i++)
     {
         u8 retVal;
 
-        if (!gMapObjects[i].active)
+        if (!gEventObjects[i].active)
             continue;
-        if (gMapObjects[i].trainerType != 1 && gMapObjects[i].trainerType != 3)
+        if (gEventObjects[i].trainerType != 1 && gEventObjects[i].trainerType != 3)
             continue;
 
         retVal = CheckTrainer(i);
@@ -197,7 +196,7 @@ bool8 CheckForTrainersWantingBattle(void)
     if (gNoOfApproachingTrainers == 1)
     {
         ResetTrainerOpponentIds();
-        ConfigureAndSetUpOneTrainerBattle(gApproachingTrainers[gNoOfApproachingTrainers - 1].mapObjectId,
+        ConfigureAndSetUpOneTrainerBattle(gApproachingTrainers[gNoOfApproachingTrainers - 1].eventObjectId,
                                           gApproachingTrainers[gNoOfApproachingTrainers - 1].trainerScriptPtr);
         gUnknown_030060AC = 1;
         return TRUE;
@@ -207,7 +206,7 @@ bool8 CheckForTrainersWantingBattle(void)
         ResetTrainerOpponentIds();
         for (i = 0; i < gNoOfApproachingTrainers; i++, gApproachingTrainerId++)
         {
-            ConfigureTwoTrainersBattle(gApproachingTrainers[i].mapObjectId,
+            ConfigureTwoTrainersBattle(gApproachingTrainers[i].eventObjectId,
                                        gApproachingTrainers[i].trainerScriptPtr);
         }
         SetUpTwoTrainersBattle();
@@ -222,7 +221,7 @@ bool8 CheckForTrainersWantingBattle(void)
     }
 }
 
-static u8 CheckTrainer(u8 mapObjectId)
+static u8 CheckTrainer(u8 eventObjectId)
 {
     const u8 *scriptPtr;
     u8 ret = 1;
@@ -231,16 +230,16 @@ static u8 CheckTrainer(u8 mapObjectId)
     if (InTrainerHill() == TRUE)
         scriptPtr = sub_81D62AC();
     else
-        scriptPtr = GetFieldObjectScriptPointerByFieldObjectId(mapObjectId);
+        scriptPtr = GetEventObjectScriptPointerByEventObjectId(eventObjectId);
 
     if (InBattlePyramid())
     {
-        if (GetBattlePyramidTrainerFlag(mapObjectId))
+        if (GetBattlePyramidTrainerFlag(eventObjectId))
             return 0;
     }
     else if (InTrainerHill() == TRUE)
     {
-        if (GetTrainerHillTrainerFlag(mapObjectId))
+        if (GetTrainerHillTrainerFlag(eventObjectId))
             return 0;
     }
     else
@@ -249,7 +248,7 @@ static u8 CheckTrainer(u8 mapObjectId)
             return 0;
     }
 
-    approachDistance = GetTrainerApproachDistance(&gMapObjects[mapObjectId]);
+    approachDistance = GetTrainerApproachDistance(&gEventObjects[eventObjectId]);
 
     if (approachDistance != 0)
     {
@@ -263,10 +262,10 @@ static u8 CheckTrainer(u8 mapObjectId)
             ret = 2;
         }
 
-        gApproachingTrainers[gNoOfApproachingTrainers].mapObjectId = mapObjectId;
+        gApproachingTrainers[gNoOfApproachingTrainers].eventObjectId = eventObjectId;
         gApproachingTrainers[gNoOfApproachingTrainers].trainerScriptPtr = scriptPtr;
         gApproachingTrainers[gNoOfApproachingTrainers].radius = approachDistance;
-        TrainerApproachPlayer(&gMapObjects[mapObjectId], approachDistance - 1);
+        TrainerApproachPlayer(&gEventObjects[eventObjectId], approachDistance - 1);
         gNoOfApproachingTrainers++;
 
         return ret;
@@ -275,7 +274,7 @@ static u8 CheckTrainer(u8 mapObjectId)
     return 0;
 }
 
-static u8 GetTrainerApproachDistance(struct MapObject *trainerObj)
+static u8 GetTrainerApproachDistance(struct EventObject *trainerObj)
 {
     s16 x, y;
     u8 i;
@@ -284,8 +283,8 @@ static u8 GetTrainerApproachDistance(struct MapObject *trainerObj)
     PlayerGetDestCoords(&x, &y);
     if (trainerObj->trainerType == 1)  // can only see in one direction
     {
-        approachDistance = sDirectionalApproachDistanceFuncs[trainerObj->mapobj_unk_18 - 1](trainerObj, trainerObj->trainerRange_berryTreeId, x, y);
-        return CheckPathBetweenTrainerAndPlayer(trainerObj, approachDistance, trainerObj->mapobj_unk_18);
+        approachDistance = sDirectionalApproachDistanceFuncs[trainerObj->facingDirection - 1](trainerObj, trainerObj->trainerRange_berryTreeId, x, y);
+        return CheckPathBetweenTrainerAndPlayer(trainerObj, approachDistance, trainerObj->facingDirection);
     }
     else  // can see in all directions
     {
@@ -301,52 +300,52 @@ static u8 GetTrainerApproachDistance(struct MapObject *trainerObj)
 }
 
 // Returns how far south the player is from trainer. 0 if out of trainer's sight.
-static u8 GetTrainerApproachDistanceSouth(struct MapObject *trainerObj, s16 range, s16 x, s16 y)
+static u8 GetTrainerApproachDistanceSouth(struct EventObject *trainerObj, s16 range, s16 x, s16 y)
 {
-    if (trainerObj->coords2.x == x
-     && y > trainerObj->coords2.y
-     && y <= trainerObj->coords2.y + range)
-        return (y - trainerObj->coords2.y);
+    if (trainerObj->currentCoords.x == x
+     && y > trainerObj->currentCoords.y
+     && y <= trainerObj->currentCoords.y + range)
+        return (y - trainerObj->currentCoords.y);
     else
         return 0;
 }
 
 // Returns how far north the player is from trainer. 0 if out of trainer's sight.
-static u8 GetTrainerApproachDistanceNorth(struct MapObject *trainerObj, s16 range, s16 x, s16 y)
+static u8 GetTrainerApproachDistanceNorth(struct EventObject *trainerObj, s16 range, s16 x, s16 y)
 {
-    if (trainerObj->coords2.x == x
-     && y < trainerObj->coords2.y
-     && y >= trainerObj->coords2.y - range)
-        return (trainerObj->coords2.y - y);
+    if (trainerObj->currentCoords.x == x
+     && y < trainerObj->currentCoords.y
+     && y >= trainerObj->currentCoords.y - range)
+        return (trainerObj->currentCoords.y - y);
     else
         return 0;
 }
 
 // Returns how far west the player is from trainer. 0 if out of trainer's sight.
-static u8 GetTrainerApproachDistanceWest(struct MapObject *trainerObj, s16 range, s16 x, s16 y)
+static u8 GetTrainerApproachDistanceWest(struct EventObject *trainerObj, s16 range, s16 x, s16 y)
 {
-    if (trainerObj->coords2.y == y
-     && x < trainerObj->coords2.x
-     && x >= trainerObj->coords2.x - range)
-        return (trainerObj->coords2.x - x);
+    if (trainerObj->currentCoords.y == y
+     && x < trainerObj->currentCoords.x
+     && x >= trainerObj->currentCoords.x - range)
+        return (trainerObj->currentCoords.x - x);
     else
         return 0;
 }
 
 // Returns how far east the player is from trainer. 0 if out of trainer's sight.
-static u8 GetTrainerApproachDistanceEast(struct MapObject *trainerObj, s16 range, s16 x, s16 y)
+static u8 GetTrainerApproachDistanceEast(struct EventObject *trainerObj, s16 range, s16 x, s16 y)
 {
-    if (trainerObj->coords2.y == y
-     && x > trainerObj->coords2.x
-     && x <= trainerObj->coords2.x + range)
-        return (x - trainerObj->coords2.x);
+    if (trainerObj->currentCoords.y == y
+     && x > trainerObj->currentCoords.x
+     && x <= trainerObj->currentCoords.x + range)
+        return (x - trainerObj->currentCoords.x);
     else
         return 0;
 }
 
 #define COLLISION_MASK (~1)
 
-static u8 CheckPathBetweenTrainerAndPlayer(struct MapObject *trainerObj, u8 approachDistance, u8 direction)
+static u8 CheckPathBetweenTrainerAndPlayer(struct EventObject *trainerObj, u8 approachDistance, u8 direction)
 {
     s16 x, y;
     u8 unk19_temp;
@@ -357,13 +356,13 @@ static u8 CheckPathBetweenTrainerAndPlayer(struct MapObject *trainerObj, u8 appr
     if (approachDistance == 0)
         return 0;
 
-    x = trainerObj->coords2.x;
-    y = trainerObj->coords2.y;
+    x = trainerObj->currentCoords.x;
+    y = trainerObj->currentCoords.y;
 
     MoveCoords(direction, &x, &y);
     for (i = 0; i < approachDistance - 1; i++, MoveCoords(direction, &x, &y))
     {
-        collision = sub_8092C8C(trainerObj, x, y, direction);
+        collision = GetCollisionFlagsAtCoords(trainerObj, x, y, direction);
         if (collision != 0 && (collision & COLLISION_MASK))
             return 0;
     }
@@ -374,7 +373,7 @@ static u8 CheckPathBetweenTrainerAndPlayer(struct MapObject *trainerObj, u8 appr
     trainerObj->range.as_nybbles.x = 0;
     trainerObj->range.as_nybbles.y = 0;
 
-    collision = npc_block_way(trainerObj, x, y, direction);
+    collision = GetCollisionAtCoords(trainerObj, x, y, direction);
 
     trainerObj->range.as_nybbles.x = unk19_temp;
     trainerObj->range.as_nybbles.y = unk19b_temp;
@@ -387,16 +386,16 @@ static u8 CheckPathBetweenTrainerAndPlayer(struct MapObject *trainerObj, u8 appr
 #define tFuncId             data[0]
 #define tTrainerRange       data[3]
 #define tOutOfAshSpriteId   data[4]
-#define tTrainerMapObjectId data[7]
+#define tTrainerEventObjectId data[7]
 
-static void TrainerApproachPlayer(struct MapObject *trainerObj, u8 range)
+static void TrainerApproachPlayer(struct EventObject *trainerObj, u8 range)
 {
     struct Task *task;
 
     gApproachingTrainers[gNoOfApproachingTrainers].taskId = CreateTask(Task_RunTrainerSeeFuncList, 0x50);
     task = &gTasks[gApproachingTrainers[gNoOfApproachingTrainers].taskId];
     task->tTrainerRange = range;
-    task->tTrainerMapObjectId = gApproachingTrainers[gNoOfApproachingTrainers].mapObjectId;
+    task->tTrainerEventObjectId = gApproachingTrainers[gNoOfApproachingTrainers].eventObjectId;
 }
 
 static void sub_80B40C8(TaskFunc followupFunc)
@@ -418,7 +417,7 @@ static void sub_80B40C8(TaskFunc followupFunc)
 static void Task_RunTrainerSeeFuncList(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
-    struct MapObject *trainerObj = &gMapObjects[task->tTrainerMapObjectId];
+    struct EventObject *trainerObj = &gEventObjects[task->tTrainerEventObjectId];
 
     if (!trainerObj->active)
     {
@@ -430,125 +429,125 @@ static void Task_RunTrainerSeeFuncList(u8 taskId)
     }
 }
 
-static bool8 sub_80B4178(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_80B4178(u8 taskId, struct Task *task, struct EventObject *trainerObj)
 {
     return FALSE;
 }
 
-static bool8 sub_80B417C(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_80B417C(u8 taskId, struct Task *task, struct EventObject *trainerObj)
 {
     u8 direction;
 
-    FieldObjectGetLocalIdAndMap(trainerObj, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
-    FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_1);
-    direction = GetFaceDirectionAnimId(trainerObj->mapobj_unk_18);
-    FieldObjectSetSpecialAnim(trainerObj, direction);
+    EventObjectGetLocalIdAndMap(trainerObj, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
+    FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON);
+    direction = GetFaceDirectionMovementAction(trainerObj->facingDirection);
+    EventObjectSetHeldMovement(trainerObj, direction);
     task->tFuncId++;
     return TRUE;
 }
 
-static bool8 sub_80B41C0(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_80B41C0(u8 taskId, struct Task *task, struct EventObject *trainerObj)
 {
-    if (FieldEffectActiveListContains(FLDEFF_EXCLAMATION_MARK_ICON_1))
+    if (FieldEffectActiveListContains(FLDEFF_EXCLAMATION_MARK_ICON))
     {
         return FALSE;
     }
     else
     {
         task->tFuncId++;
-        if (trainerObj->animPattern == 57 || trainerObj->animPattern == 58)
+        if (trainerObj->movementType == 57 || trainerObj->movementType == 58)
             task->tFuncId = 6;
-        if (trainerObj->animPattern == 63)
+        if (trainerObj->movementType == 63)
             task->tFuncId = 8;
         return TRUE;
     }
 }
 
-static bool8 sub_80B4200(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_80B4200(u8 taskId, struct Task *task, struct EventObject *trainerObj)
 {
-    if (!(FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj)) || FieldObjectClearAnimIfSpecialAnimFinished(trainerObj))
+    if (!(EventObjectIsMovementOverridden(trainerObj)) || EventObjectClearHeldMovementIfFinished(trainerObj))
     {
         if (task->tTrainerRange)
         {
-            FieldObjectSetSpecialAnim(trainerObj, GetGoSpeed0AnimId(trainerObj->mapobj_unk_18));
+            EventObjectSetHeldMovement(trainerObj, GetWalkNormalMovementAction(trainerObj->facingDirection));
             task->tTrainerRange--;
         }
         else
         {
-            FieldObjectSetSpecialAnim(trainerObj, 0x3E);
+            EventObjectSetHeldMovement(trainerObj, 0x3E);
             task->tFuncId++;
         }
     }
     return FALSE;
 }
 
-static bool8 sub_80B425C(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_80B425C(u8 taskId, struct Task *task, struct EventObject *trainerObj)
 {
-    struct MapObject *playerObj;
+    struct EventObject *playerObj;
 
-    if (FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj) && !FieldObjectClearAnimIfSpecialAnimFinished(trainerObj))
+    if (EventObjectIsMovementOverridden(trainerObj) && !EventObjectClearHeldMovementIfFinished(trainerObj))
         return FALSE;
 
-    npc_set_running_behaviour_etc(trainerObj, npc_running_behaviour_by_direction(trainerObj->mapobj_unk_18));
-    sub_808F23C(trainerObj, npc_running_behaviour_by_direction(trainerObj->mapobj_unk_18));
-    sub_808F208(trainerObj);
+    SetTrainerMovementType(trainerObj, GetTrainerFacingDirectionMovementType(trainerObj->facingDirection));
+    TryOverrideTemplateCoordsForEventObject(trainerObj, GetTrainerFacingDirectionMovementType(trainerObj->facingDirection));
+    OverrideTemplateCoordsForEventObject(trainerObj);
 
-    playerObj = &gMapObjects[gPlayerAvatar.mapObjectId];
-    if (FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(playerObj) && !FieldObjectClearAnimIfSpecialAnimFinished(playerObj))
+    playerObj = &gEventObjects[gPlayerAvatar.eventObjectId];
+    if (EventObjectIsMovementOverridden(playerObj) && !EventObjectClearHeldMovementIfFinished(playerObj))
         return FALSE;
 
     sub_808BCE8();
-    FieldObjectSetSpecialAnim(&gMapObjects[gPlayerAvatar.mapObjectId], GetFaceDirectionAnimId(GetOppositeDirection(trainerObj->mapobj_unk_18)));
+    EventObjectSetHeldMovement(&gEventObjects[gPlayerAvatar.eventObjectId], GetFaceDirectionMovementAction(GetOppositeDirection(trainerObj->facingDirection)));
     task->tFuncId++;
     return FALSE;
 }
 
-static bool8 sub_80B4318(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_80B4318(u8 taskId, struct Task *task, struct EventObject *trainerObj)
 {
-    struct MapObject *playerObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *playerObj = &gEventObjects[gPlayerAvatar.eventObjectId];
 
-    if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(playerObj)
-     || FieldObjectClearAnimIfSpecialAnimFinished(playerObj))
+    if (!EventObjectIsMovementOverridden(playerObj)
+     || EventObjectClearHeldMovementIfFinished(playerObj))
         SwitchTaskToFollowupFunc(taskId);
     return FALSE;
 }
 
-static bool8 sub_80B435C(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_80B435C(u8 taskId, struct Task *task, struct EventObject *trainerObj)
 {
-    if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj)
-     || FieldObjectClearAnimIfSpecialAnimFinished(trainerObj))
+    if (!EventObjectIsMovementOverridden(trainerObj)
+     || EventObjectClearHeldMovementIfFinished(trainerObj))
     {
-        FieldObjectSetSpecialAnim(trainerObj, 0x59);
+        EventObjectSetHeldMovement(trainerObj, 0x59);
         task->tFuncId++;
     }
     return FALSE;
 }
 
-static bool8 sub_80B4390(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_80B4390(u8 taskId, struct Task *task, struct EventObject *trainerObj)
 {
-    if (FieldObjectClearAnimIfSpecialAnimFinished(trainerObj))
+    if (EventObjectClearHeldMovementIfFinished(trainerObj))
         task->tFuncId = 3;
 
     return FALSE;
 }
 
-static bool8 sub_80B43AC(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_80B43AC(u8 taskId, struct Task *task, struct EventObject *trainerObj)
 {
-    if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj)
-     || FieldObjectClearAnimIfSpecialAnimFinished(trainerObj))
+    if (!EventObjectIsMovementOverridden(trainerObj)
+     || EventObjectClearHeldMovementIfFinished(trainerObj))
     {
-        FieldObjectSetSpecialAnim(trainerObj, 0x3E);
+        EventObjectSetHeldMovement(trainerObj, 0x3E);
         task->tFuncId++;
     }
     return FALSE;
 }
 
-static bool8 sub_80B43E0(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_80B43E0(u8 taskId, struct Task *task, struct EventObject *trainerObj)
 {
-    if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(trainerObj))
+    if (EventObjectCheckHeldMovementStatus(trainerObj))
     {
-        gFieldEffectArguments[0] = trainerObj->coords2.x;
-        gFieldEffectArguments[1] = trainerObj->coords2.y;
+        gFieldEffectArguments[0] = trainerObj->currentCoords.x;
+        gFieldEffectArguments[1] = trainerObj->currentCoords.y;
         gFieldEffectArguments[2] = gSprites[trainerObj->spriteId].subpriority - 1;
         gFieldEffectArguments[3] = 2;
         task->tOutOfAshSpriteId = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH);
@@ -557,26 +556,26 @@ static bool8 sub_80B43E0(u8 taskId, struct Task *task, struct MapObject *trainer
     return FALSE;
 }
 
-static bool8 sub_80B4438(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_80B4438(u8 taskId, struct Task *task, struct EventObject *trainerObj)
 {
     struct Sprite *sprite;
 
     if (gSprites[task->tOutOfAshSpriteId].animCmdIndex == 2)
     {
-        trainerObj->mapobj_bit_26 = 0;
-        trainerObj->mapobj_bit_2 = 1;
+        trainerObj->fixedPriority = 0;
+        trainerObj->triggerGroundEffectsOnMove = 1;
 
         sprite = &gSprites[trainerObj->spriteId];
         sprite->oam.priority = 2;
-        FieldObjectClearAnimIfSpecialAnimFinished(trainerObj);
-        FieldObjectSetSpecialAnim(trainerObj, sub_80934BC(trainerObj->mapobj_unk_18));
+        EventObjectClearHeldMovementIfFinished(trainerObj);
+        EventObjectSetHeldMovement(trainerObj, GetJumpInPlaceMovementAction(trainerObj->facingDirection));
         task->tFuncId++;
     }
 
     return FALSE;
 }
 
-static bool8 sub_80B44AC(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_80B44AC(u8 taskId, struct Task *task, struct EventObject *trainerObj)
 {
     if (!FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH))
         task->tFuncId = 3;
@@ -587,34 +586,34 @@ static bool8 sub_80B44AC(u8 taskId, struct Task *task, struct MapObject *trainer
 #undef tFuncId
 #undef tTrainerRange
 #undef tOutOfAshSpriteId
-#undef tTrainerMapObjectId
+#undef tTrainerEventObjectId
 
 static void sub_80B44C8(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
-    struct MapObject *mapObj;
+    struct EventObject *eventObj;
 
-    // another mapObj loaded into by loadword?
-    LoadWordFromTwoHalfwords(&task->data[1], (u32 *)&mapObj);
+    // another eventObj loaded into by loadword?
+    LoadWordFromTwoHalfwords(&task->data[1], (u32 *)&eventObj);
     if (!task->data[7])
     {
-        FieldObjectClearAnim(mapObj);
+        EventObjectClearHeldMovement(eventObj);
         task->data[7]++;
     }
-    sTrainerSeeFuncList2[task->data[0]](taskId, task, mapObj);
+    sTrainerSeeFuncList2[task->data[0]](taskId, task, eventObj);
     if (task->data[0] == 3 && !FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH))
     {
-        npc_set_running_behaviour_etc(mapObj, npc_running_behaviour_by_direction(mapObj->mapobj_unk_18));
-        sub_808F23C(mapObj, npc_running_behaviour_by_direction(mapObj->mapobj_unk_18));
+        SetTrainerMovementType(eventObj, GetTrainerFacingDirectionMovementType(eventObj->facingDirection));
+        TryOverrideTemplateCoordsForEventObject(eventObj, GetTrainerFacingDirectionMovementType(eventObj->facingDirection));
         DestroyTask(taskId);
     }
     else
     {
-        mapObj->mapobj_bit_7 = 0;
+        eventObj->heldMovementFinished = 0;
     }
 }
 
-void sub_80B4578(struct MapObject *var)
+void sub_80B4578(struct EventObject *var)
 {
     StoreWordInTwoHalfwords(&gTasks[CreateTask(sub_80B44C8, 0)].data[1], (u32)var);
 }
@@ -638,8 +637,8 @@ void sub_80B45D0(void)
         {
             gApproachingTrainerId++;
             gSpecialVar_Result = 1;
-            UnfreezeMapObjects();
-            FreezeMapObjectsExceptOne(gApproachingTrainers[1].mapObjectId);
+            UnfreezeEventObjects();
+            FreezeEventObjectsExceptOne(gApproachingTrainers[1].eventObjectId);
         }
         else
         {
@@ -660,22 +659,22 @@ void sub_80B45D0(void)
 #define sData4      data[4]
 #define sFldEffId   data[7]
 
-u8 FldEff_ExclamationMarkIcon1(void)
+u8 FldEff_ExclamationMarkIcon(void)
 {
     u8 spriteId = CreateSpriteAtEnd(&sSpriteTemplate_ExclamationQuestionMark, 0, 0, 0x53);
 
     if (spriteId != MAX_SPRITES)
-        SetIconSpriteData(&gSprites[spriteId], FLDEFF_EXCLAMATION_MARK_ICON_1, 0);
+        SetIconSpriteData(&gSprites[spriteId], FLDEFF_EXCLAMATION_MARK_ICON, 0);
 
     return 0;
 }
 
-u8 FldEff_ExclamationMarkIcon2(void)
+u8 FldEff_QuestionMarkIcon(void)
 {
     u8 spriteId = CreateSpriteAtEnd(&sSpriteTemplate_ExclamationQuestionMark, 0, 0, 0x52);
 
     if (spriteId != MAX_SPRITES)
-        SetIconSpriteData(&gSprites[spriteId], FLDEFF_EXCLAMATION_MARK_ICON_2, 1);
+        SetIconSpriteData(&gSprites[spriteId], FLDEFF_QUESTION_MARK_ICON, 1);
 
     return 0;
 }
@@ -711,21 +710,21 @@ static void SetIconSpriteData(struct Sprite *sprite, u16 fldEffId, u8 spriteAnim
 
 static void SpriteCB_TrainerIcons(struct Sprite *sprite)
 {
-    u8 mapObjId;
+    u8 eventObjId;
 
-    if (TryGetFieldObjectIdByLocalIdAndMap(sprite->sLocalId, sprite->sMapNum, sprite->sMapGroup, &mapObjId)
+    if (TryGetEventObjectIdByLocalIdAndMap(sprite->sLocalId, sprite->sMapNum, sprite->sMapGroup, &eventObjId)
      || sprite->animEnded)
     {
         FieldEffectStop(sprite, sprite->sFldEffId);
     }
     else
     {
-        struct Sprite *mapObjSprite = &gSprites[gMapObjects[mapObjId].spriteId];
+        struct Sprite *eventObjSprite = &gSprites[gEventObjects[eventObjId].spriteId];
         sprite->sData4 += sprite->sData3;
-        sprite->pos1.x = mapObjSprite->pos1.x;
-        sprite->pos1.y = mapObjSprite->pos1.y - 16;
-        sprite->pos2.x = mapObjSprite->pos2.x;
-        sprite->pos2.y = mapObjSprite->pos2.y + sprite->sData4;
+        sprite->pos1.x = eventObjSprite->pos1.x;
+        sprite->pos1.y = eventObjSprite->pos1.y - 16;
+        sprite->pos2.x = eventObjSprite->pos2.x;
+        sprite->pos2.y = eventObjSprite->pos2.y + sprite->sData4;
         if (sprite->sData4)
             sprite->sData3++;
         else
@@ -740,39 +739,39 @@ static void SpriteCB_TrainerIcons(struct Sprite *sprite)
 #undef sData4
 #undef sFldEffId
 
-u8 GetCurrentApproachingTrainerMapObjectId(void)
+u8 GetCurrentApproachingTrainerEventObjectId(void)
 {
     if (gApproachingTrainerId == 0)
-        return gApproachingTrainers[0].mapObjectId;
+        return gApproachingTrainers[0].eventObjectId;
     else
-        return gApproachingTrainers[1].mapObjectId;
+        return gApproachingTrainers[1].eventObjectId;
 }
 
-u8 GetChosenApproachingTrainerMapObjectId(u8 arrayId)
+u8 GetChosenApproachingTrainerEventObjectId(u8 arrayId)
 {
     if (arrayId >= ARRAY_COUNT(gApproachingTrainers))
         return 0;
     else if (arrayId == 0)
-        return gApproachingTrainers[0].mapObjectId;
+        return gApproachingTrainers[0].eventObjectId;
     else
-        return gApproachingTrainers[1].mapObjectId;
+        return gApproachingTrainers[1].eventObjectId;
 }
 
 void sub_80B4808(void)
 {
-    struct MapObject *trainerObj;
+    struct EventObject *trainerObj;
 
     if (gUnknown_030060AC == 1)
     {
-        trainerObj = &gMapObjects[gApproachingTrainers[gUnknown_03006080].mapObjectId];
-        gUnknown_03006084[0] = GetFaceDirectionAnimId(GetOppositeDirection(trainerObj->mapobj_unk_18));
+        trainerObj = &gEventObjects[gApproachingTrainers[gUnknown_03006080].eventObjectId];
+        gUnknown_03006084[0] = GetFaceDirectionMovementAction(GetOppositeDirection(trainerObj->facingDirection));
         gUnknown_03006084[1] = 0xFE;
         ScriptMovement_StartObjectMovementScript(0xFF, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gUnknown_03006084);
     }
     else
     {
-        trainerObj = &gMapObjects[gPlayerAvatar.mapObjectId];
-        gUnknown_03006084[0] = GetFaceDirectionAnimId(trainerObj->mapobj_unk_18);
+        trainerObj = &gEventObjects[gPlayerAvatar.eventObjectId];
+        gUnknown_03006084[0] = GetFaceDirectionMovementAction(trainerObj->facingDirection);
         gUnknown_03006084[1] = 0xFE;
         ScriptMovement_StartObjectMovementScript(0xFF, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gUnknown_03006084);
     }
diff --git a/src/tv.c b/src/tv.c
index e69f6f411..2219a720b 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -26,7 +26,7 @@
 #include "lilycove_lady.h"
 #include "rom6.h"
 #include "pokedex.h"
-#include "field_map_obj.h"
+#include "event_object_movement.h"
 #include "text.h"
 #include "script_menu.h"
 #include "naming_screen.h"
@@ -1037,7 +1037,7 @@ u8 GabbyAndTyGetLastBattleTrivia(void)
     return 0;
 }
 
-void GabbyAndTySetScriptVarsToFieldObjectLocalIds(void)
+void GabbyAndTySetScriptVarsToEventObjectLocalIds(void)
 {
     switch (GabbyAndTyGetBattleNum())
     {
@@ -3602,7 +3602,7 @@ void GetMomOrDadStringForTVMessage(void)
 void sub_80F01B8(void)
 {
     VarSet(VAR_0x40BC, 0);
-    RemoveFieldObjectByLocalIdAndMap(5, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
+    RemoveEventObjectByLocalIdAndMap(5, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
     FlagSet(0x396);
 }
 
diff --git a/sym_common.txt b/sym_common.txt
index 64bfa88ec..3fa302968 100644
--- a/sym_common.txt
+++ b/sym_common.txt
@@ -27,7 +27,7 @@ gBGTilemapBuffers3: @ 3005DA4
     .include "fieldmap.o"
     .include "field_camera.o"
 
-gSelectedMapObject: @ 3005DF0
+gSelectedEventObject: @ 3005DF0
 	.space 0x4
 
 gMenuCallback: @ 3005DF4
diff --git a/sym_ewram.txt b/sym_ewram.txt
index 49fef1ad8..7ea9bef79 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -216,7 +216,7 @@ gUnknown_020322D5: @ 20322D5
 gUnknown_0203734C: @ 203734C
 	.space 0x4
 
-gMapObjects: @ 2037350
+gEventObjects: @ 2037350
 	.space 0x240
 
 gPlayerAvatar: @ 2037590
@@ -234,7 +234,7 @@ gUnknown_020375B4: @ 20375B4
 gUnknown_020375B6: @ 20375B6
 	.space 0x2
 
-gUnknown_020375B8: @ 20375B8
+gLockedAnimEventObjects: @ 20375B8
 	.space 0x4
 
     .include "src/field_message_box.o"