Rebrand 'map object' and 'field object' to 'event object'

2157 files changed, 12709 insertions, 12711 deletions

diff --git a/asm/battle_frontier_1.s b/asm/battle_frontier_1.s
index 729140801..535bbbbbe 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 EventObjectClearAnimIfSpecialAnimFinished
 	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..c42d96640 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 EventObjectClearAnimIfSpecialAnimFinished
 	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..ff10928cb 100644
--- a/asm/field_control_avatar.s
+++ b/asm/field_control_avatar.s
@@ -187,7 +187,7 @@ 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
 	lsls r0, 24
@@ -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,9 +2447,9 @@ _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
@@ -2470,12 +2470,12 @@ 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
diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s
index 77f8213b3..08df3215c 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]
@@ -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]
@@ -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]
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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_player_avatar.s b/asm/field_player_avatar.s
index f5acc1e3e..375177337 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 EventObjectCB_NoMovement2
+@ void EventObjectCB_NoMovement2(struct obj *object)
+EventObjectCB_NoMovement2: @ 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 EventObjectStep
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end FieldObjectCB_NoMovement2
+	thumb_func_end EventObjectCB_NoMovement2
 
-	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 EventObjectIsSpecialAnimOrDirectionSequenceAnimActive
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808AA92
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl EventObjectClearAnimIfSpecialAnimFinished
 	lsls r0, 24
 	cmp r0, 0
 	bne _0808AA92
 	adds r0, r4, 0
-	bl FieldObjectGetSpecialAnim
+	bl EventObjectGetSpecialAnim
 	lsls r0, 24
 	movs r1, 0xE7
 	lsls r1, 24
@@ -123,7 +123,7 @@ _0808AA74:
 	beq _0808AA84
 _0808AA7C:
 	adds r0, r4, 0
-	bl FieldObjectClearAnim
+	bl EventObjectClearAnim
 	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 EventObjectSetDirection
 	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
@@ -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
@@ -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
@@ -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
@@ -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 EventObjectIsSpecialAnimOrDirectionSequenceAnimActive
 	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 EventObjectCheckIfSpecialAnimFinishedOrInactive
 	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
@@ -1742,7 +1742,7 @@ player_set_x22: @ 808B684
 
 	thumb_func_start player_get_x22
 player_get_x22: @ 808B6A0
-	ldr r2, =gMapObjects
+	ldr r2, =gEventObjects
 	ldr r0, =gPlayerAvatar
 	ldrb r1, [r0, 0x5]
 	lsls r0, r1, 3
@@ -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 EventObjectForceSetSpecialAnim
 	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 EventObjectSetSpecialAnim
 _0808B712:
 	pop {r4,r5}
 	pop {r0}
@@ -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
@@ -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
@@ -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
@@ -2465,7 +2465,7 @@ _0808BC30:
 	thumb_func_start player_get_direction_lower_nybble
 @ u8 player_get_direction_lower_nybble()
 player_get_direction_lower_nybble: @ 808BC38
-	ldr r2, =gMapObjects
+	ldr r2, =gEventObjects
 	ldr r0, =gPlayerAvatar
 	ldrb r1, [r0, 0x5]
 	lsls r0, r1, 3
@@ -2482,7 +2482,7 @@ player_get_direction_lower_nybble: @ 808BC38
 	thumb_func_start player_get_direction_upper_nybble
 @ u8 player_get_direction_upper_nybble()
 player_get_direction_upper_nybble: @ 808BC58
-	ldr r2, =gMapObjects
+	ldr r2, =gEventObjects
 	ldr r0, =gPlayerAvatar
 	ldrb r1, [r0, 0x5]
 	lsls r0, r1, 3
@@ -2498,7 +2498,7 @@ player_get_direction_upper_nybble: @ 808BC58
 	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 EventObjectSetDirection
 	movs r0, 0x6
 	bl TestPlayerAvatarFlags
 	lsls r0, 24
@@ -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
@@ -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
@@ -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
@@ -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 EventObjectDirectionToImageAnimId
 	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 EventObjectIsSpecialAnimActive
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808C3DE
 	adds r0, r5, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl EventObjectClearAnimIfSpecialAnimFinished
 _0808C3DE:
 	adds r0, r4, 0
-	bl FieldObjectIsSpecialAnimActive
+	bl EventObjectIsSpecialAnimActive
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808C3F0
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl EventObjectClearAnimIfSpecialAnimFinished
 _0808C3F0:
 	adds r0, r5, 0
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
+	bl EventObjectIsSpecialAnimOrDirectionSequenceAnimActive
 	lsls r0, 24
 	cmp r0, 0
 	bne _0808C472
 	adds r0, r4, 0
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
+	bl EventObjectIsSpecialAnimOrDirectionSequenceAnimActive
 	lsls r0, 24
 	cmp r0, 0
 	bne _0808C472
 	adds r0, r5, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl EventObjectClearAnimIfSpecialAnimFinished
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl EventObjectClearAnimIfSpecialAnimFinished
 	ldrb r0, [r6, 0xC]
 	bl GetStepInPlaceDelay16AnimId
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r5, 0
-	bl FieldObjectSetSpecialAnim
+	bl EventObjectSetSpecialAnim
 	ldrb r0, [r6, 0xC]
 	bl GetSimpleGoAnimId
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetSpecialAnim
+	bl EventObjectSetSpecialAnim
 	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 EventObjectCheckIfSpecialAnimFinishedOrInactive
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808C4C6
 	adds r0, r5, 0
-	bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
+	bl EventObjectCheckIfSpecialAnimFinishedOrInactive
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808C4C6
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl EventObjectClearAnimIfSpecialAnimFinished
 	adds r0, r5, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl EventObjectClearAnimIfSpecialAnimFinished
 	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 EventObjectClearAnimIfSpecialAnimFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808C5A0
@@ -3662,7 +3662,7 @@ sub_808C544: @ 808C544
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetSpecialAnim
+	bl EventObjectSetSpecialAnim
 	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 EventObjectClearAnimIfSpecialAnimFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808C6AC
@@ -3787,7 +3787,7 @@ sub_808C644: @ 808C644
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r5, 0
-	bl FieldObjectSetSpecialAnim
+	bl EventObjectSetSpecialAnim
 	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 EventObjectClearAnimIfSpecialAnimFinished
 	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 EventObjectSetSpecialAnim
 	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 EventObjectClearAnimIfSpecialAnimFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808C740
@@ -3871,7 +3871,7 @@ sub_808C6FC: @ 808C6FC
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r5, 0
-	bl FieldObjectSetSpecialAnim
+	bl EventObjectSetSpecialAnim
 	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 EventObjectIsSpecialAnimOrDirectionSequenceAnimActive
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808C7D4
 	adds r0, r5, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl EventObjectClearAnimIfSpecialAnimFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808C7FC
@@ -3963,7 +3963,7 @@ _0808C7D4:
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r5, 0
-	bl FieldObjectSetSpecialAnim
+	bl EventObjectSetSpecialAnim
 	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 EventObjectClearAnimIfSpecialAnimFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808C87A
@@ -3996,7 +3996,7 @@ 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
@@ -4005,7 +4005,7 @@ sub_808C814: @ 808C814
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetSpecialAnim
+	bl EventObjectSetSpecialAnim
 	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 EventObjectClearAnimIfSpecialAnimActive
 	ldrb r0, [r4, 0x1]
 	movs r1, 0x8
 	orrs r0, r1
@@ -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
@@ -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
@@ -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 EventObjectClearAnimIfSpecialAnimFinished
 	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
@@ -5262,7 +5262,7 @@ _0808D25E:
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectForceSetSpecialAnim
+	bl EventObjectForceSetSpecialAnim
 	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 EventObjectCheckIfSpecialAnimFinishedOrInactive
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808D3E4
@@ -5429,7 +5429,7 @@ _0808D3A8:
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r5, 0
-	bl FieldObjectForceSetSpecialAnim
+	bl EventObjectForceSetSpecialAnim
 	movs r0, 0
 	strh r0, [r6]
 	ldrb r0, [r5, 0x18]
diff --git a/asm/field_screen.s b/asm/field_screen.s
index e35c768dd..5d5602b7f 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 EventObjectSetSpecialAnim
 	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 EventObjectClearAnimIfSpecialAnimFinished
 	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,13 +8524,13 @@ _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
 	lsls r0, 24
@@ -8540,7 +8540,7 @@ _080AF5A2:
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetSpecialAnim
+	bl EventObjectSetSpecialAnim
 	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 EventObjectClearAnimIfSpecialAnimActive
 	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 EventObjectSetSpecialAnim
 	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 EventObjectClearAnimIfSpecialAnimFinished
 	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..6916fc6ea 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
@@ -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
@@ -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..702852445 100644
--- a/asm/fldeff_80F9BCC.s
+++ b/asm/fldeff_80F9BCC.s
@@ -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
@@ -2312,15 +2312,15 @@ 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 EventObjectIsSpecialAnimOrDirectionSequenceAnimActive
 	lsls r0, 24
 	cmp r0, 0
 	beq _080FAF1C
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl EventObjectClearAnimIfSpecialAnimFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _080FAF4E
@@ -2337,7 +2337,7 @@ _080FAF1C:
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetSpecialAnim
+	bl EventObjectSetSpecialAnim
 	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 EventObjectClearAnimIfSpecialAnimFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _080FAFC8
@@ -2389,7 +2389,7 @@ sub_80FAF64: @ 80FAF64
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r5, 0
-	bl FieldObjectSetSpecialAnim
+	bl EventObjectSetSpecialAnim
 	b _080FAFC8
 	.pool
 _080FAFC4:
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..14e418f1c 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 EventObjectIsSpecialAnimOrDirectionSequenceAnimActive
 	lsls r0, 24
 	cmp r0, 0
 	bne _08019B30
 	ldrb r1, [r5]
 	adds r0, r4, 0
-	bl FieldObjectSetSpecialAnim
+	bl EventObjectSetSpecialAnim
 	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 EventObjectClearAnimIfSpecialAnimFinished
 	lsls r0, 24
 	cmp r0, 0
 	bne _08019B84
@@ -13672,7 +13672,7 @@ _08019B84:
 	b _08019B9C
 _08019B96:
 	adds r0, r4, 0
-	bl FreezeMapObject
+	bl FreezeEventObject
 _08019B9C:
 	movs r0, 0x1
 _08019B9E:
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/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/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/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/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/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc
index 269ef2530..0cf683bb8 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
diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc
index 3461f8275..bcaa7dfe1 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
diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc b/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc
index d071639f8..05cee99b9 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
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/NavelRock_Top.inc b/data/scripts/maps/NavelRock_Top.inc
index 6193a092e..c05d32088 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
diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc
index a652c7897..a2ea5ed1d 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
diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc
index 793b6f4fd..6dac80f4b 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,12 +269,12 @@ 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
@@ -312,10 +312,10 @@ SootopolisCity_Movement_1E5A75: @ 81E5A75
 
 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,12 +369,12 @@ 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
@@ -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
diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc
index b7d4e101c..f78f938ca 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
diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc
index 39cca8244..9d4aa80b6 100644
--- a/data/scripts/pokeblocks.inc
+++ b/data/scripts/pokeblocks.inc
@@ -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/specials.inc b/data/specials.inc
index 1fa17b908..939995150 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
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 b6926ef68..1a8b7fa25 100644
--- a/include/berry.h
+++ b/include/berry.h
@@ -23,7 +23,7 @@ enum
 
 #define NUM_BERRIES 44
 
-extern const u8 *const gBerryTreeFieldObjectGraphicsIdTablePointers[];
+extern const u8 *const gBerryTreeEventObjectGraphicsIdTablePointers[];
 extern const struct SpriteFrameImage *const gBerryTreePicTablePointers[];
 extern const u8 *const gBerryTreePaletteSlotTablePointers[];
 
@@ -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
index 293c2e3dc..ca2449a6d 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -1,5 +1,5 @@
-#ifndef GUARD_FIELD_MAP_OBJ_H
-#define GUARD_FIELD_MAP_OBJ_H
+#ifndef GUARD_FIELD_EVENT_OBJ_H
+#define GUARD_FIELD_EVENT_OBJ_H
 
 #define NUM_OBJECT_GRAPHICS_INFO 239
 #define SPRITE_VAR 240
@@ -47,40 +47,40 @@ struct UnkStruct_085094AC {
 #define GROUND_EFFECT_FLAG_SEAWEED               (1 << 19)
 
 #define null_object_step(name, retval) \
-bool8 FieldObjectCB2_##name(struct MapObject *, struct Sprite *);\
-void FieldObjectCB_##name(struct Sprite *sprite)\
+bool8 EventObjectCB2_##name(struct EventObject *, struct Sprite *);\
+void EventObjectCB_##name(struct Sprite *sprite)\
 {\
-    FieldObjectStep(&gMapObjects[sprite->data[0]], sprite, FieldObjectCB2_##name);\
+    EventObjectStep(&gEventObjects[sprite->data[0]], sprite, EventObjectCB2_##name);\
 }\
-bool8 FieldObjectCB2_##name(struct MapObject *mapObject, struct Sprite *sprite)\
+bool8 EventObjectCB2_##name(struct EventObject *eventObject, 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)\
+extern bool8 (*const (table)[])(struct EventObject *, struct Sprite *);\
+bool8 EventObjectCB2_##name(struct EventObject *, struct Sprite *);\
+void EventObjectCB_##name(struct Sprite *sprite)\
 {\
-    FieldObjectStep(&gMapObjects[sprite->data[0]], sprite, FieldObjectCB2_##name);\
+    EventObjectStep(&gEventObjects[sprite->data[0]], sprite, EventObjectCB2_##name);\
 }\
-bool8 FieldObjectCB2_##name(struct MapObject *mapObject, struct Sprite *sprite)\
+bool8 EventObjectCB2_##name(struct EventObject *eventObject, struct Sprite *sprite)\
 {\
-    return (table)[sprite->data[1]](mapObject, sprite);\
+    return (table)[sprite->data[1]](eventObject, 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)\
+bool8 sub(struct EventObject *eventObject, struct Sprite *sprite)\
 {\
     u8 route[sizeof(path)];\
     memcpy(route, path, sizeof(path));\
-    if (mapObject->directionSequenceIndex == (catch) && mapObject->initialCoords.coord == mapObject->currentCoords.coord)\
+    if (eventObject->directionSequenceIndex == (catch) && eventObject->initialCoords.coord == eventObject->currentCoords.coord)\
     {\
-        mapObject->directionSequenceIndex = (catch) + 1;\
+        eventObject->directionSequenceIndex = (catch) + 1;\
     }\
-    return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, route);\
+    return MoveEventObjectInNextDirectionInSequence(eventObject, sprite, route);\
 }\
 
 struct PairedPalettes {
@@ -88,16 +88,16 @@ struct PairedPalettes {
     const u16 *data;
 };
 
-extern const struct SpriteFrameImage gFieldObjectPicTable_PechaBerryTree[];
+extern const struct SpriteFrameImage gEventObjectPicTable_PechaBerryTree[];
 
 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 GetEventObjectIdByLocalIdAndMap(u8, u8, u8);
+bool8 TryGetEventObjectIdByLocalIdAndMap(u8, u8, u8, u8 *);
+u8 GetEventObjectIdByXY(s16, s16);
+void EventObjectSetDirection(struct EventObject *, u8);
 u8 sub_808D4F4(void);
-void RemoveFieldObjectByLocalIdAndMap(u8, u8, u8);
+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);
@@ -105,185 +105,185 @@ void pal_patch_for_npc(u16, u8);
 void sub_808E16C(s16, s16);
 void sub_808F28C(u8 localId, u8 mapNum, u8 mapGroup, u8 decorCat);
 void sub_8092FF0(s16, s16, s16 *, s16 *);
-u8 FieldObjectDirectionToImageAnimId(u8);
+u8 EventObjectDirectionToImageAnimId(u8);
 void sub_80930E0(s16 *, s16 *, s16, s16);
-void FieldObjectClearAnim(struct MapObject *);
-void FieldObjectClearAnimIfSpecialAnimActive(struct MapObject *);
-void SpawnFieldObjectsInView(s16, s16);
+void EventObjectClearAnim(struct EventObject *);
+void EventObjectClearAnimIfSpecialAnimActive(struct EventObject *);
+void SpawnEventObjectsInView(s16, s16);
 u8 sprite_new(u8, u8, s16, s16, u8, u8);
-u8 AddPseudoFieldObject(u16, void (*)(struct Sprite *), s16, s16, u8);
+u8 AddPseudoEventObject(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 *);
+u8 SpawnSpecialEventObjectParametrized(u8, u8, u8, s16, s16, u8);
+u8 SpawnSpecialEventObject(struct EventObjectTemplate *);
 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 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 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 EventObjectGetLocalIdAndMap(struct EventObject *eventObject, void *localId, void *mapNum, void *mapGroup);
+void npc_coords_shift(struct EventObject *, s16, s16);
+void sub_808EB08(struct EventObject *, s16, s16);
 void sub_808F254(u8, u8, u8);
-void FieldObjectStep(struct MapObject *, struct Sprite *, bool8(struct MapObject *, struct Sprite *));
-u8 FieldObjectFaceOppositeDirection(struct MapObject *, u8);
+void EventObjectStep(struct EventObject *, struct Sprite *, bool8(struct EventObject *, struct Sprite *));
+u8 EventObjectFaceOppositeDirection(struct EventObject *, u8);
 u8 GetOppositeDirection(u8);
 u8 GetStepInPlaceDelay4AnimId(u32);
 u8 GetStepInPlaceDelay8AnimId(u32);
 u8 GetStepInPlaceDelay16AnimId(u32);
 u8 GetStepInPlaceDelay32AnimId(u32);
-u8 npc_block_way(struct MapObject *, s16, s16, u32);
+u8 npc_block_way(struct EventObject *, 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 movementType);
+bool8 EventObjectIsSpecialAnimActive(struct EventObject *);
+u8 EventObjectClearAnimIfSpecialAnimFinished(struct EventObject *);
+u8 GetEventObjectIdByXYZ(u16 x, u16 y, u8 z);
+void npc_set_running_behaviour_etc(struct EventObject *eventObject, u8 movementType);
 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);
+const u8 *GetEventObjectScriptPointerByEventObjectId(u8 eventObjectId);
+u8 sub_8092C8C(struct EventObject *eventObject, s16 x, s16 y, u8 direction);
 u8 GetFaceDirectionAnimId(u32);
 u8 GetGoSpeed0AnimId(u32);
 u8 GetGoSpeed1AnimId(u32);
 u8 GetGoSpeed3AnimId(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);
+bool8 EventObjectSetSpecialAnim(struct EventObject *eventObject, u8 specialAnimId);
+bool8 EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(struct EventObject *eventObject);
+u8 EventObjectCheckIfSpecialAnimFinishedOrInactive(struct EventObject *eventObject);
+void sub_808F23C(const struct EventObject *eventObject, u8 movementType);
+void sub_808F208(const struct EventObject *eventObject);
+void npc_coords_shift_still(struct EventObject *pObject);
+void EventObjectMoveDestCoords(struct EventObject *pObject, u32 unk_19, s16 *pInt, s16 *pInt1);
 u8 AddCameraObject(u8 linkedSpriteId);
-void UpdateFieldObjectsForCameraUpdate(s16 x, s16 y);
+void UpdateEventObjectsForCameraUpdate(s16 x, s16 y);
 u8 GetSimpleGoAnimId(u32);
 u8 sub_8093514(u32);
 bool8 AreZCoordsCompatible(u8, u8);
 u8 ZCoordToPriority(u8);
-void FieldObjectUpdateZCoord(struct MapObject *pObject);
+void EventObjectUpdateZCoord(struct EventObject *pObject);
 void SetObjectSubpriorityByZCoord(u8, struct Sprite *, u8);
 bool8 IsZCoordMismatchAt(u8, s16, s16);
 void sub_8097AC8(struct Sprite *);
-void npc_sync_anim_pause_bits(struct MapObject *);
+void npc_sync_anim_pause_bits(struct EventObject *);
 void oamt_npc_ministep_reset(struct Sprite *, u8, u8);
-u8 sub_8097F78(struct MapObject *);
+u8 sub_8097F78(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 MapObject *);
+void DoShadowFieldEffect(struct EventObject *);
 u8 sub_809785C(struct Sprite *);
 u8 sub_80978E4(struct Sprite *);
 void obj_anim_image_set_and_seek(struct Sprite *, u8, u8);
 bool8 sub_80979BC(struct Sprite *);
 void sub_8097750(struct Sprite *);
 bool8 sub_8097758(struct Sprite *);
-void sub_8097FA4(struct MapObject *);
+void sub_8097FA4(struct EventObject *);
 void sub_8098044(u8);
-void UnfreezeMapObjects(void);
-void FreezeMapObjectsExceptOne(u8 mapObjectId);
+void UnfreezeEventObjects(void);
+void FreezeEventObjectsExceptOne(u8 eventObjectId);
 void sub_8097B78(u8, u8);
 void sub_8098074(u8 var1, u8 var2);
-void FreezeMapObjects(void);
-bool8 FreezeMapObject(struct MapObject *mapObject);
+void FreezeEventObjects(void);
+bool8 FreezeEventObject(struct EventObject *eventObject);
 u8 get_go_fast_image_anim_num(u8);
 u8 get_go_faster_image_anim_num(u8);
 u8 get_go_fastest_image_anim_num(u8);
 
-void FieldObjectCB_NoMovement1(struct Sprite *);
-void FieldObjectCB_LookRandomDirections(struct Sprite *);
-void FieldObjectCB_GoRandomDirections(struct Sprite *);
-void FieldObjectCB_RandomlyGoNorthOrSouth(struct Sprite *);
-void FieldObjectCB_RandomlyGoNorthOrSouth(struct Sprite *);
-void FieldObjectCB_RandomlyGoEastOrWest(struct Sprite *);
-void FieldObjectCB_RandomlyGoEastOrWest(struct Sprite *);
-void FieldObjectCB_FaceFixedDirection(struct Sprite *);
-void FieldObjectCB_FaceFixedDirection(struct Sprite *);
-void FieldObjectCB_FaceFixedDirection(struct Sprite *);
-void FieldObjectCB_FaceFixedDirection(struct Sprite *);
-void FieldObjectCB_NoMovement2(struct Sprite *);
-void FieldObjectCB_BerryTree(struct Sprite *);
-void FieldObjectCB_RandomlyLookNorthOrSouth(struct Sprite *);
-void FieldObjectCB_RandomlyLookEastOrWest(struct Sprite *);
-void FieldObjectCB_RandomlyLookNorthOrWest(struct Sprite *);
-void FieldObjectCB_RandomlyLookNorthOrEast(struct Sprite *);
-void FieldObjectCB_RandomlyLookSouthOrWest(struct Sprite *);
-void FieldObjectCB_RandomlyLookSouthOrEast(struct Sprite *);
-void FieldObjectCB_RandomlyLookNorthOrSouthOrWest(struct Sprite *);
-void FieldObjectCB_RandomlyLookNorthOrSouthOrEast(struct Sprite *);
-void FieldObjectCB_RandomlyLookNorthOrEastOrWest(struct Sprite *);
-void FieldObjectCB_RandomlyLookSouthOrEastOrWest(struct Sprite *);
-void FieldObjectCB_LookAroundCounterclockwise(struct Sprite *);
-void FieldObjectCB_LookAroundClockwise(struct Sprite *);
-void FieldObjectCB_AlternatelyGoInOppositeDirections(struct Sprite *);
-void FieldObjectCB_AlternatelyGoInOppositeDirections(struct Sprite *);
-void FieldObjectCB_AlternatelyGoInOppositeDirections(struct Sprite *);
-void FieldObjectCB_AlternatelyGoInOppositeDirections(struct Sprite *);
-void FieldObjectCB_GoInDirectionSequence1(struct Sprite *);
-void FieldObjectCB_GoInDirectionSequence2(struct Sprite *);
-void FieldObjectCB_GoInDirectionSequence3(struct Sprite *);
-void FieldObjectCB_GoInDirectionSequence4(struct Sprite *);
-void FieldObjectCB_GoInDirectionSequence5(struct Sprite *);
-void FieldObjectCB_GoInDirectionSequence6(struct Sprite *);
-void FieldObjectCB_GoInDirectionSequence7(struct Sprite *);
-void FieldObjectCB_GoInDirectionSequence8(struct Sprite *);
-void FieldObjectCB_GoInDirectionSequence9(struct Sprite *);
-void FieldObjectCB_GoInDirectionSequence10(struct Sprite *);
-void FieldObjectCB_GoInDirectionSequence11(struct Sprite *);
-void FieldObjectCB_GoInDirectionSequence12(struct Sprite *);
-void FieldObjectCB_GoInDirectionSequence13(struct Sprite *);
-void FieldObjectCB_GoInDirectionSequence14(struct Sprite *);
-void FieldObjectCB_GoInDirectionSequence15(struct Sprite *);
-void FieldObjectCB_GoInDirectionSequence16(struct Sprite *);
-void FieldObjectCB_GoInDirectionSequence17(struct Sprite *);
-void FieldObjectCB_GoInDirectionSequence18(struct Sprite *);
-void FieldObjectCB_GoInDirectionSequence19(struct Sprite *);
-void FieldObjectCB_GoInDirectionSequence20(struct Sprite *);
-void FieldObjectCB_GoInDirectionSequence21(struct Sprite *);
-void FieldObjectCB_GoInDirectionSequence22(struct Sprite *);
-void FieldObjectCB_GoInDirectionSequence23(struct Sprite *);
-void FieldObjectCB_GoInDirectionSequence24(struct Sprite *);
-void FieldObjectCB_CopyPlayer1(struct Sprite *);
-void FieldObjectCB_CopyPlayer1(struct Sprite *);
-void FieldObjectCB_CopyPlayer1(struct Sprite *);
-void FieldObjectCB_CopyPlayer1(struct Sprite *);
-void FieldObjectCB_TreeDisguise(struct Sprite *);
-void FieldObjectCB_MountainDisguise(struct Sprite *);
-void FieldObjectCB_CopyPlayer2(struct Sprite *);
-void FieldObjectCB_CopyPlayer2(struct Sprite *);
-void FieldObjectCB_CopyPlayer2(struct Sprite *);
-void FieldObjectCB_CopyPlayer2(struct Sprite *);
-void FieldObjectCB_Hidden1(struct Sprite *);
-void FieldObjectCB_WalkInPlace1(struct Sprite *);
-void FieldObjectCB_WalkInPlace1(struct Sprite *);
-void FieldObjectCB_WalkInPlace1(struct Sprite *);
-void FieldObjectCB_WalkInPlace1(struct Sprite *);
-void FieldObjectCB_WalkInPlace2(struct Sprite *);
-void FieldObjectCB_WalkInPlace2(struct Sprite *);
-void FieldObjectCB_WalkInPlace2(struct Sprite *);
-void FieldObjectCB_WalkInPlace2(struct Sprite *);
-void FieldObjectCB_WalkInPlace3(struct Sprite *);
-void FieldObjectCB_WalkInPlace3(struct Sprite *);
-void FieldObjectCB_WalkInPlace3(struct Sprite *);
-void FieldObjectCB_WalkInPlace3(struct Sprite *);
-void FieldObjectCB_Hidden2(struct Sprite *);
-void FieldObjectCB_WalkInPlace4(struct Sprite *);
-void FieldObjectCB_WalkInPlace4(struct Sprite *);
-void FieldObjectCB_WalkInPlace4(struct Sprite *);
-void FieldObjectCB_WalkInPlace4(struct Sprite *);
+void EventObjectCB_NoMovement1(struct Sprite *);
+void EventObjectCB_LookRandomDirections(struct Sprite *);
+void EventObjectCB_GoRandomDirections(struct Sprite *);
+void EventObjectCB_RandomlyGoNorthOrSouth(struct Sprite *);
+void EventObjectCB_RandomlyGoNorthOrSouth(struct Sprite *);
+void EventObjectCB_RandomlyGoEastOrWest(struct Sprite *);
+void EventObjectCB_RandomlyGoEastOrWest(struct Sprite *);
+void EventObjectCB_FaceFixedDirection(struct Sprite *);
+void EventObjectCB_FaceFixedDirection(struct Sprite *);
+void EventObjectCB_FaceFixedDirection(struct Sprite *);
+void EventObjectCB_FaceFixedDirection(struct Sprite *);
+void EventObjectCB_NoMovement2(struct Sprite *);
+void EventObjectCB_BerryTree(struct Sprite *);
+void EventObjectCB_RandomlyLookNorthOrSouth(struct Sprite *);
+void EventObjectCB_RandomlyLookEastOrWest(struct Sprite *);
+void EventObjectCB_RandomlyLookNorthOrWest(struct Sprite *);
+void EventObjectCB_RandomlyLookNorthOrEast(struct Sprite *);
+void EventObjectCB_RandomlyLookSouthOrWest(struct Sprite *);
+void EventObjectCB_RandomlyLookSouthOrEast(struct Sprite *);
+void EventObjectCB_RandomlyLookNorthOrSouthOrWest(struct Sprite *);
+void EventObjectCB_RandomlyLookNorthOrSouthOrEast(struct Sprite *);
+void EventObjectCB_RandomlyLookNorthOrEastOrWest(struct Sprite *);
+void EventObjectCB_RandomlyLookSouthOrEastOrWest(struct Sprite *);
+void EventObjectCB_LookAroundCounterclockwise(struct Sprite *);
+void EventObjectCB_LookAroundClockwise(struct Sprite *);
+void EventObjectCB_AlternatelyGoInOppositeDirections(struct Sprite *);
+void EventObjectCB_AlternatelyGoInOppositeDirections(struct Sprite *);
+void EventObjectCB_AlternatelyGoInOppositeDirections(struct Sprite *);
+void EventObjectCB_AlternatelyGoInOppositeDirections(struct Sprite *);
+void EventObjectCB_GoInDirectionSequence1(struct Sprite *);
+void EventObjectCB_GoInDirectionSequence2(struct Sprite *);
+void EventObjectCB_GoInDirectionSequence3(struct Sprite *);
+void EventObjectCB_GoInDirectionSequence4(struct Sprite *);
+void EventObjectCB_GoInDirectionSequence5(struct Sprite *);
+void EventObjectCB_GoInDirectionSequence6(struct Sprite *);
+void EventObjectCB_GoInDirectionSequence7(struct Sprite *);
+void EventObjectCB_GoInDirectionSequence8(struct Sprite *);
+void EventObjectCB_GoInDirectionSequence9(struct Sprite *);
+void EventObjectCB_GoInDirectionSequence10(struct Sprite *);
+void EventObjectCB_GoInDirectionSequence11(struct Sprite *);
+void EventObjectCB_GoInDirectionSequence12(struct Sprite *);
+void EventObjectCB_GoInDirectionSequence13(struct Sprite *);
+void EventObjectCB_GoInDirectionSequence14(struct Sprite *);
+void EventObjectCB_GoInDirectionSequence15(struct Sprite *);
+void EventObjectCB_GoInDirectionSequence16(struct Sprite *);
+void EventObjectCB_GoInDirectionSequence17(struct Sprite *);
+void EventObjectCB_GoInDirectionSequence18(struct Sprite *);
+void EventObjectCB_GoInDirectionSequence19(struct Sprite *);
+void EventObjectCB_GoInDirectionSequence20(struct Sprite *);
+void EventObjectCB_GoInDirectionSequence21(struct Sprite *);
+void EventObjectCB_GoInDirectionSequence22(struct Sprite *);
+void EventObjectCB_GoInDirectionSequence23(struct Sprite *);
+void EventObjectCB_GoInDirectionSequence24(struct Sprite *);
+void EventObjectCB_CopyPlayer1(struct Sprite *);
+void EventObjectCB_CopyPlayer1(struct Sprite *);
+void EventObjectCB_CopyPlayer1(struct Sprite *);
+void EventObjectCB_CopyPlayer1(struct Sprite *);
+void EventObjectCB_TreeDisguise(struct Sprite *);
+void EventObjectCB_MountainDisguise(struct Sprite *);
+void EventObjectCB_CopyPlayer2(struct Sprite *);
+void EventObjectCB_CopyPlayer2(struct Sprite *);
+void EventObjectCB_CopyPlayer2(struct Sprite *);
+void EventObjectCB_CopyPlayer2(struct Sprite *);
+void EventObjectCB_Hidden1(struct Sprite *);
+void EventObjectCB_WalkInPlace1(struct Sprite *);
+void EventObjectCB_WalkInPlace1(struct Sprite *);
+void EventObjectCB_WalkInPlace1(struct Sprite *);
+void EventObjectCB_WalkInPlace1(struct Sprite *);
+void EventObjectCB_WalkInPlace2(struct Sprite *);
+void EventObjectCB_WalkInPlace2(struct Sprite *);
+void EventObjectCB_WalkInPlace2(struct Sprite *);
+void EventObjectCB_WalkInPlace2(struct Sprite *);
+void EventObjectCB_WalkInPlace3(struct Sprite *);
+void EventObjectCB_WalkInPlace3(struct Sprite *);
+void EventObjectCB_WalkInPlace3(struct Sprite *);
+void EventObjectCB_WalkInPlace3(struct Sprite *);
+void EventObjectCB_Hidden2(struct Sprite *);
+void EventObjectCB_WalkInPlace4(struct Sprite *);
+void EventObjectCB_WalkInPlace4(struct Sprite *);
+void EventObjectCB_WalkInPlace4(struct Sprite *);
+void EventObjectCB_WalkInPlace4(struct Sprite *);
 
-u8 sub_808F44C(struct MapObject *, struct Sprite *);
-u8 sub_808F460(struct MapObject *, struct Sprite *);
-u8 sub_808F48C(struct MapObject *, struct Sprite *);
-u8 sub_808F4C8(struct MapObject *, struct Sprite *);
-u8 sub_808F4E8(struct MapObject *, struct Sprite *);
-u8 sub_808F534(struct MapObject *, struct Sprite *);
-u8 sub_808F564(struct MapObject *, struct Sprite *);
+u8 sub_808F44C(struct EventObject *, struct Sprite *);
+u8 sub_808F460(struct EventObject *, struct Sprite *);
+u8 sub_808F48C(struct EventObject *, struct Sprite *);
+u8 sub_808F4C8(struct EventObject *, struct Sprite *);
+u8 sub_808F4E8(struct EventObject *, struct Sprite *);
+u8 sub_808F534(struct EventObject *, struct Sprite *);
+u8 sub_808F564(struct EventObject *, struct Sprite *);
 u8 GetRegularRunningPastFacingDirection(s16, s16, s16, s16);
 u8 GetNorthSouthRunningPastFacingDirection(s16, s16, s16, s16);
 u8 GetEastWestRunningPastFacingDirection(s16, s16, s16, s16);
@@ -295,146 +295,146 @@ u8 GetNonEastRunningPastFacingDirection(s16, s16, s16, s16);
 u8 GetNonWestRunningPastFacingDirection(s16, s16, s16, s16);
 u8 GetNonSouthRunningPastFacingDirection(s16, s16, s16, s16);
 u8 GetNonNorthRunningPastFacingDirection(s16, s16, s16, s16);
-u8 sub_808F988(struct MapObject *, struct Sprite *);
-u8 sub_808F99C(struct MapObject *, struct Sprite *);
-u8 sub_808F9C8(struct MapObject *, struct Sprite *);
-u8 sub_808FA0C(struct MapObject *, struct Sprite *);
-u8 sub_808FA3C(struct MapObject *, struct Sprite *);
-u8 sub_808FAC8(struct MapObject *, struct Sprite *);
-u8 sub_808FADC(struct MapObject *, struct Sprite *);
-u8 sub_808FB08(struct MapObject *, struct Sprite *);
-u8 sub_808FB44(struct MapObject *, struct Sprite *);
-u8 sub_808FB64(struct MapObject *, struct Sprite *);
-u8 sub_808FBB0(struct MapObject *, struct Sprite *);
-u8 sub_808FBE0(struct MapObject *, struct Sprite *);
-u8 sub_808FC4C(struct MapObject *, struct Sprite *);
-u8 sub_808FC60(struct MapObject *, struct Sprite *);
-u8 sub_808FC8C(struct MapObject *, struct Sprite *);
-u8 sub_808FCC8(struct MapObject *, struct Sprite *);
-u8 sub_808FCE8(struct MapObject *, struct Sprite *);
-u8 sub_808FD34(struct MapObject *, struct Sprite *);
-u8 sub_808FD64(struct MapObject *, struct Sprite *);
-u8 sub_808FDD0(struct MapObject *, struct Sprite *);
-u8 sub_808FDFC(struct MapObject *, struct Sprite *);
-u8 sub_808FE1C(struct MapObject *, struct Sprite *);
-u8 do_berry_tree_growth_sparkle_1(struct MapObject *, struct Sprite *);
-u8 sub_808FF48(struct MapObject *, struct Sprite *);
-u8 do_berry_tree_growth_sparkle_2(struct MapObject *, struct Sprite *);
-u8 sub_808FFB4(struct MapObject *, struct Sprite *);
-u8 sub_8090004(struct MapObject *, struct Sprite *);
-u8 sub_8090094(struct MapObject *, struct Sprite *);
-u8 sub_80900A8(struct MapObject *, struct Sprite *);
-u8 sub_80900D4(struct MapObject *, struct Sprite *);
-u8 sub_8090118(struct MapObject *, struct Sprite *);
-u8 sub_8090148(struct MapObject *, struct Sprite *);
-u8 sub_80901D4(struct MapObject *, struct Sprite *);
-u8 sub_80901E8(struct MapObject *, struct Sprite *);
-u8 sub_8090214(struct MapObject *, struct Sprite *);
-u8 sub_8090258(struct MapObject *, struct Sprite *);
-u8 sub_8090288(struct MapObject *, struct Sprite *);
-u8 sub_8090314(struct MapObject *, struct Sprite *);
-u8 sub_8090328(struct MapObject *, struct Sprite *);
-u8 sub_8090354(struct MapObject *, struct Sprite *);
-u8 sub_8090398(struct MapObject *, struct Sprite *);
-u8 sub_80903C8(struct MapObject *, struct Sprite *);
-u8 sub_8090454(struct MapObject *, struct Sprite *);
-u8 sub_8090468(struct MapObject *, struct Sprite *);
-u8 sub_8090494(struct MapObject *, struct Sprite *);
-u8 sub_80904D8(struct MapObject *, struct Sprite *);
-u8 sub_8090508(struct MapObject *, struct Sprite *);
-u8 sub_8090594(struct MapObject *, struct Sprite *);
-u8 sub_80905A8(struct MapObject *, struct Sprite *);
-u8 sub_80905D4(struct MapObject *, struct Sprite *);
-u8 sub_8090618(struct MapObject *, struct Sprite *);
-u8 sub_8090648(struct MapObject *, struct Sprite *);
-u8 sub_80906D4(struct MapObject *, struct Sprite *);
-u8 sub_80906E8(struct MapObject *, struct Sprite *);
-u8 sub_8090714(struct MapObject *, struct Sprite *);
-u8 sub_8090758(struct MapObject *, struct Sprite *);
-u8 sub_8090788(struct MapObject *, struct Sprite *);
-u8 sub_8090814(struct MapObject *, struct Sprite *);
-u8 sub_8090828(struct MapObject *, struct Sprite *);
-u8 sub_8090854(struct MapObject *, struct Sprite *);
-u8 sub_8090898(struct MapObject *, struct Sprite *);
-u8 sub_80908C8(struct MapObject *, struct Sprite *);
-u8 sub_8090954(struct MapObject *, struct Sprite *);
-u8 sub_8090968(struct MapObject *, struct Sprite *);
-u8 sub_8090994(struct MapObject *, struct Sprite *);
-u8 sub_80909D8(struct MapObject *, struct Sprite *);
-u8 sub_8090A08(struct MapObject *, struct Sprite *);
-u8 sub_8090A94(struct MapObject *, struct Sprite *);
-u8 sub_8090AA8(struct MapObject *, struct Sprite *);
-u8 sub_8090AD4(struct MapObject *, struct Sprite *);
-u8 sub_8090B18(struct MapObject *, struct Sprite *);
-u8 sub_8090B48(struct MapObject *, struct Sprite *);
-u8 sub_8090BD4(struct MapObject *, struct Sprite *);
-u8 sub_8090BE8(struct MapObject *, struct Sprite *);
-u8 sub_8090C14(struct MapObject *, struct Sprite *);
-u8 sub_8090C58(struct MapObject *, struct Sprite *);
-u8 sub_8090C88(struct MapObject *, struct Sprite *);
-u8 sub_8090D14(struct MapObject *, struct Sprite *);
-u8 sub_8090D40(struct MapObject *, struct Sprite *);
-u8 sub_8090D64(struct MapObject *, struct Sprite *);
-u8 sub_8090D90(struct MapObject *, struct Sprite *);
-u8 sub_8090E18(struct MapObject *, struct Sprite *);
-u8 sub_8090E44(struct MapObject *, struct Sprite *);
-u8 sub_8090E68(struct MapObject *, struct Sprite *);
-u8 sub_8090E94(struct MapObject *, struct Sprite *);
-u8 sub_8090F1C(struct MapObject *, struct Sprite *);
-u8 sub_8090F30(struct MapObject *, struct Sprite *);
-u8 sub_8090F68(struct MapObject *, struct Sprite *);
-u8 sub_8091020(struct MapObject *, struct Sprite *);
-u8 sub_8091048(struct MapObject *, struct Sprite *);
-u8 sub_809117C(struct MapObject *, struct Sprite *);
-u8 sub_8091110(struct MapObject *, struct Sprite *);
-u8 sub_8091208(struct MapObject *, struct Sprite *);
-u8 sub_8091294(struct MapObject *, struct Sprite *);
-u8 sub_8091320(struct MapObject *, struct Sprite *);
-u8 sub_80913AC(struct MapObject *, struct Sprite *);
-u8 sub_8091438(struct MapObject *, struct Sprite *);
-u8 sub_80914C4(struct MapObject *, struct Sprite *);
-u8 sub_8091550(struct MapObject *, struct Sprite *);
-u8 sub_80915DC(struct MapObject *, struct Sprite *);
-u8 sub_8091668(struct MapObject *, struct Sprite *);
-u8 sub_80916F4(struct MapObject *, struct Sprite *);
-u8 sub_8091780(struct MapObject *, struct Sprite *);
-u8 sub_809180C(struct MapObject *, struct Sprite *);
-u8 sub_8091898(struct MapObject *, struct Sprite *);
-u8 sub_8091924(struct MapObject *, struct Sprite *);
-u8 sub_80919B0(struct MapObject *, struct Sprite *);
-u8 sub_8091A3C(struct MapObject *, struct Sprite *);
-u8 sub_8091AC8(struct MapObject *, struct Sprite *);
-u8 sub_8091B54(struct MapObject *, struct Sprite *);
-u8 sub_8091BE0(struct MapObject *, struct Sprite *);
-u8 sub_8091C6C(struct MapObject *, struct Sprite *);
-u8 sub_8091CF8(struct MapObject *, struct Sprite *);
-u8 sub_8091D84(struct MapObject *, struct Sprite *);
-u8 sub_8091E10(struct MapObject *, struct Sprite *);
-u8 mss_npc_reset_oampriv3_1_unk2_unk3(struct MapObject *, struct Sprite *);
-u8 sub_8091EC0(struct MapObject *, struct Sprite *);
-u8 sub_8091F20(struct MapObject *, struct Sprite *);
-bool8 sub_8091F48(struct MapObject *, struct Sprite *, u8, bool8(u8));
-bool8 sub_8091F4C(struct MapObject *, struct Sprite *, u8, bool8(u8));
-bool8 sub_8091F94(struct MapObject *, struct Sprite *, u8, bool8(u8));
-bool8 sub_80920A4(struct MapObject *, struct Sprite *, u8, bool8(u8));
-bool8 sub_809215C(struct MapObject *, struct Sprite *, u8, bool8(u8));
-bool8 sub_8092214(struct MapObject *, struct Sprite *, u8, bool8(u8));
-bool8 cph_IM_DIFFERENT(struct MapObject *, struct Sprite *, u8, bool8(u8));
-bool8 sub_8092314(struct MapObject *, struct Sprite *, u8, bool8(u8));
-bool8 oac_hopping(struct MapObject *, struct Sprite *, u8, bool8(u8));
-u8 mss_08062EA4(struct MapObject *, struct Sprite *);
-u8 sub_80926AC(struct MapObject *, struct Sprite *);
-u8 sub_8092718(struct MapObject *, struct Sprite *);
-u8 sub_80926B8(struct MapObject *, struct Sprite *);
-u8 sub_8092788(struct MapObject *, struct Sprite *);
-u8 sub_80927F8(struct MapObject *, struct Sprite *);
-u8 sub_8092868(struct MapObject *, struct Sprite *);
-u8 sub_80928D8(struct MapObject *, struct Sprite *);
-u8 sub_809290C(struct MapObject *, struct Sprite *);
-u8 sub_809292C(struct MapObject *, struct Sprite *);
+u8 sub_808F988(struct EventObject *, struct Sprite *);
+u8 sub_808F99C(struct EventObject *, struct Sprite *);
+u8 sub_808F9C8(struct EventObject *, struct Sprite *);
+u8 sub_808FA0C(struct EventObject *, struct Sprite *);
+u8 sub_808FA3C(struct EventObject *, struct Sprite *);
+u8 sub_808FAC8(struct EventObject *, struct Sprite *);
+u8 sub_808FADC(struct EventObject *, struct Sprite *);
+u8 sub_808FB08(struct EventObject *, struct Sprite *);
+u8 sub_808FB44(struct EventObject *, struct Sprite *);
+u8 sub_808FB64(struct EventObject *, struct Sprite *);
+u8 sub_808FBB0(struct EventObject *, struct Sprite *);
+u8 sub_808FBE0(struct EventObject *, struct Sprite *);
+u8 sub_808FC4C(struct EventObject *, struct Sprite *);
+u8 sub_808FC60(struct EventObject *, struct Sprite *);
+u8 sub_808FC8C(struct EventObject *, struct Sprite *);
+u8 sub_808FCC8(struct EventObject *, struct Sprite *);
+u8 sub_808FCE8(struct EventObject *, struct Sprite *);
+u8 sub_808FD34(struct EventObject *, struct Sprite *);
+u8 sub_808FD64(struct EventObject *, struct Sprite *);
+u8 sub_808FDD0(struct EventObject *, struct Sprite *);
+u8 sub_808FDFC(struct EventObject *, struct Sprite *);
+u8 sub_808FE1C(struct EventObject *, struct Sprite *);
+u8 do_berry_tree_growth_sparkle_1(struct EventObject *, struct Sprite *);
+u8 sub_808FF48(struct EventObject *, struct Sprite *);
+u8 do_berry_tree_growth_sparkle_2(struct EventObject *, struct Sprite *);
+u8 sub_808FFB4(struct EventObject *, struct Sprite *);
+u8 sub_8090004(struct EventObject *, struct Sprite *);
+u8 sub_8090094(struct EventObject *, struct Sprite *);
+u8 sub_80900A8(struct EventObject *, struct Sprite *);
+u8 sub_80900D4(struct EventObject *, struct Sprite *);
+u8 sub_8090118(struct EventObject *, struct Sprite *);
+u8 sub_8090148(struct EventObject *, struct Sprite *);
+u8 sub_80901D4(struct EventObject *, struct Sprite *);
+u8 sub_80901E8(struct EventObject *, struct Sprite *);
+u8 sub_8090214(struct EventObject *, struct Sprite *);
+u8 sub_8090258(struct EventObject *, struct Sprite *);
+u8 sub_8090288(struct EventObject *, struct Sprite *);
+u8 sub_8090314(struct EventObject *, struct Sprite *);
+u8 sub_8090328(struct EventObject *, struct Sprite *);
+u8 sub_8090354(struct EventObject *, struct Sprite *);
+u8 sub_8090398(struct EventObject *, struct Sprite *);
+u8 sub_80903C8(struct EventObject *, struct Sprite *);
+u8 sub_8090454(struct EventObject *, struct Sprite *);
+u8 sub_8090468(struct EventObject *, struct Sprite *);
+u8 sub_8090494(struct EventObject *, struct Sprite *);
+u8 sub_80904D8(struct EventObject *, struct Sprite *);
+u8 sub_8090508(struct EventObject *, struct Sprite *);
+u8 sub_8090594(struct EventObject *, struct Sprite *);
+u8 sub_80905A8(struct EventObject *, struct Sprite *);
+u8 sub_80905D4(struct EventObject *, struct Sprite *);
+u8 sub_8090618(struct EventObject *, struct Sprite *);
+u8 sub_8090648(struct EventObject *, struct Sprite *);
+u8 sub_80906D4(struct EventObject *, struct Sprite *);
+u8 sub_80906E8(struct EventObject *, struct Sprite *);
+u8 sub_8090714(struct EventObject *, struct Sprite *);
+u8 sub_8090758(struct EventObject *, struct Sprite *);
+u8 sub_8090788(struct EventObject *, struct Sprite *);
+u8 sub_8090814(struct EventObject *, struct Sprite *);
+u8 sub_8090828(struct EventObject *, struct Sprite *);
+u8 sub_8090854(struct EventObject *, struct Sprite *);
+u8 sub_8090898(struct EventObject *, struct Sprite *);
+u8 sub_80908C8(struct EventObject *, struct Sprite *);
+u8 sub_8090954(struct EventObject *, struct Sprite *);
+u8 sub_8090968(struct EventObject *, struct Sprite *);
+u8 sub_8090994(struct EventObject *, struct Sprite *);
+u8 sub_80909D8(struct EventObject *, struct Sprite *);
+u8 sub_8090A08(struct EventObject *, struct Sprite *);
+u8 sub_8090A94(struct EventObject *, struct Sprite *);
+u8 sub_8090AA8(struct EventObject *, struct Sprite *);
+u8 sub_8090AD4(struct EventObject *, struct Sprite *);
+u8 sub_8090B18(struct EventObject *, struct Sprite *);
+u8 sub_8090B48(struct EventObject *, struct Sprite *);
+u8 sub_8090BD4(struct EventObject *, struct Sprite *);
+u8 sub_8090BE8(struct EventObject *, struct Sprite *);
+u8 sub_8090C14(struct EventObject *, struct Sprite *);
+u8 sub_8090C58(struct EventObject *, struct Sprite *);
+u8 sub_8090C88(struct EventObject *, struct Sprite *);
+u8 sub_8090D14(struct EventObject *, struct Sprite *);
+u8 sub_8090D40(struct EventObject *, struct Sprite *);
+u8 sub_8090D64(struct EventObject *, struct Sprite *);
+u8 sub_8090D90(struct EventObject *, struct Sprite *);
+u8 sub_8090E18(struct EventObject *, struct Sprite *);
+u8 sub_8090E44(struct EventObject *, struct Sprite *);
+u8 sub_8090E68(struct EventObject *, struct Sprite *);
+u8 sub_8090E94(struct EventObject *, struct Sprite *);
+u8 sub_8090F1C(struct EventObject *, struct Sprite *);
+u8 sub_8090F30(struct EventObject *, struct Sprite *);
+u8 sub_8090F68(struct EventObject *, struct Sprite *);
+u8 sub_8091020(struct EventObject *, struct Sprite *);
+u8 sub_8091048(struct EventObject *, struct Sprite *);
+u8 sub_809117C(struct EventObject *, struct Sprite *);
+u8 sub_8091110(struct EventObject *, struct Sprite *);
+u8 sub_8091208(struct EventObject *, struct Sprite *);
+u8 sub_8091294(struct EventObject *, struct Sprite *);
+u8 sub_8091320(struct EventObject *, struct Sprite *);
+u8 sub_80913AC(struct EventObject *, struct Sprite *);
+u8 sub_8091438(struct EventObject *, struct Sprite *);
+u8 sub_80914C4(struct EventObject *, struct Sprite *);
+u8 sub_8091550(struct EventObject *, struct Sprite *);
+u8 sub_80915DC(struct EventObject *, struct Sprite *);
+u8 sub_8091668(struct EventObject *, struct Sprite *);
+u8 sub_80916F4(struct EventObject *, struct Sprite *);
+u8 sub_8091780(struct EventObject *, struct Sprite *);
+u8 sub_809180C(struct EventObject *, struct Sprite *);
+u8 sub_8091898(struct EventObject *, struct Sprite *);
+u8 sub_8091924(struct EventObject *, struct Sprite *);
+u8 sub_80919B0(struct EventObject *, struct Sprite *);
+u8 sub_8091A3C(struct EventObject *, struct Sprite *);
+u8 sub_8091AC8(struct EventObject *, struct Sprite *);
+u8 sub_8091B54(struct EventObject *, struct Sprite *);
+u8 sub_8091BE0(struct EventObject *, struct Sprite *);
+u8 sub_8091C6C(struct EventObject *, struct Sprite *);
+u8 sub_8091CF8(struct EventObject *, struct Sprite *);
+u8 sub_8091D84(struct EventObject *, struct Sprite *);
+u8 sub_8091E10(struct EventObject *, struct Sprite *);
+u8 mss_npc_reset_oampriv3_1_unk2_unk3(struct EventObject *, struct Sprite *);
+u8 sub_8091EC0(struct EventObject *, struct Sprite *);
+u8 sub_8091F20(struct EventObject *, struct Sprite *);
+bool8 sub_8091F48(struct EventObject *, struct Sprite *, u8, bool8(u8));
+bool8 sub_8091F4C(struct EventObject *, struct Sprite *, u8, bool8(u8));
+bool8 sub_8091F94(struct EventObject *, struct Sprite *, u8, bool8(u8));
+bool8 sub_80920A4(struct EventObject *, struct Sprite *, u8, bool8(u8));
+bool8 sub_809215C(struct EventObject *, struct Sprite *, u8, bool8(u8));
+bool8 sub_8092214(struct EventObject *, struct Sprite *, u8, bool8(u8));
+bool8 cph_IM_DIFFERENT(struct EventObject *, struct Sprite *, u8, bool8(u8));
+bool8 sub_8092314(struct EventObject *, struct Sprite *, u8, bool8(u8));
+bool8 oac_hopping(struct EventObject *, struct Sprite *, u8, bool8(u8));
+u8 mss_08062EA4(struct EventObject *, struct Sprite *);
+u8 sub_80926AC(struct EventObject *, struct Sprite *);
+u8 sub_8092718(struct EventObject *, struct Sprite *);
+u8 sub_80926B8(struct EventObject *, struct Sprite *);
+u8 sub_8092788(struct EventObject *, struct Sprite *);
+u8 sub_80927F8(struct EventObject *, struct Sprite *);
+u8 sub_8092868(struct EventObject *, struct Sprite *);
+u8 sub_80928D8(struct EventObject *, struct Sprite *);
+u8 sub_809290C(struct EventObject *, struct Sprite *);
+u8 sub_809292C(struct EventObject *, struct Sprite *);
 
 // Exported data declarations
 
 extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[];
 
-#endif //GUARD_FIELD_MAP_OBJ_H
+#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 b613df926..5e7cec4cb 100644
--- a/include/field_effect.h
+++ b/include/field_effect.h
@@ -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_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_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_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 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 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 *);
diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h
index e7517acf1..547f515eb 100644
--- a/include/field_effect_helpers.h
+++ b/include/field_effect_helpers.h
@@ -11,12 +11,12 @@
 
 // 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 MapObject*, struct Sprite*, u8);
-u32 StartFieldEffectForEventObject(u8, struct MapObject*);
+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*);
diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h
index 0b9ea385c..970f47d5f 100644
--- a/include/field_player_avatar.h
+++ b/include/field_player_avatar.h
@@ -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);
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index 68277812d..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;
@@ -133,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;
@@ -176,7 +176,7 @@ struct MapHeader
     /* 0x1B */ u8 battleType;
 };
 
-struct MapObject
+struct EventObject
 {
     /*0x00*/ u32 active:1;
              u32 singleMovementActive:1;
@@ -239,7 +239,7 @@ struct MapObject
     /*size = 0x24*/
 };
 
-struct MapObjectGraphicsInfo
+struct EventObjectGraphicsInfo
 {
     /*0x00*/ u16 tileTag;
     /*0x02*/ u16 paletteTag1;
@@ -320,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
@@ -342,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/overworld.h b/include/overworld.h
index 15d7bb362..ace988f4e 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 ZeroAllLinkPlayerEventObjects(void);
 
 #endif // GUARD_OVERWORLD_H
diff --git a/include/pokenav.h b/include/pokenav.h
index 734a1ec3f..2bca4db94 100644
--- a/include/pokenav.h
+++ b/include/pokenav.h
@@ -21,7 +21,7 @@ void sub_81D1EC0(void);
 void sub_81D1D04(u8);
 bool8 sub_81D1C44(u8);
 void sub_81D5FB4(u16*);
-bool8 sub_81D4A58(struct MapObject*);
+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..39f3cd8b0 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_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 66af49175..1949d0480 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -94,7 +94,7 @@ SECTIONS {
         asm/field_player_avatar.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);
diff --git a/src/battle_setup.c b/src/battle_setup.c
index bc7931025..2875aaff2 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -62,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);
@@ -101,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;
@@ -155,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},
@@ -168,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},
@@ -181,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},
@@ -194,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},
@@ -207,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},
@@ -220,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},
@@ -233,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},
@@ -387,7 +387,7 @@ void BattleSetup_StartBattlePikeWildBattle(void)
 static void DoStandardWildBattle(void)
 {
     ScriptContext2_Enable();
-    FreezeMapObjects();
+    FreezeEventObjects();
     sub_808BCF4();
     gMain.savedCallback = CB2_EndWildBattle;
     gBattleTypeFlags = 0;
@@ -406,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;
@@ -420,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;
@@ -430,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;
@@ -1011,7 +1011,7 @@ static void InitTrainerBattleVariables(void)
         sTrainerBDefeatSpeech = NULL;
         sTrainerBBattleScriptRetAddr = NULL;
     }
-    sTrainerMapObjectLocalId = 0;
+    sTrainerEventObjectLocalId = 0;
     sTrainerVictorySpeech = NULL;
     sTrainerCannotBattleSpeech = NULL;
     sTrainerBattleEndScript = NULL;
@@ -1074,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);
     }
 }
 
@@ -1171,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);
 }
 
@@ -1201,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->facingDirection));
+    npc_set_running_behaviour_etc(eventObject, npc_running_behaviour_by_direction(eventObject->facingDirection));
 }
 
 u8 GetTrainerBattleMode(void)
@@ -1214,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());
 }
@@ -1361,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();
     }
@@ -1370,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 3b5df1cc8..7b83743a7 100644
--- a/src/berry.c
+++ b/src/berry.c
@@ -8,10 +8,10 @@
 #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 const u8* GetEventObjectScriptPointerForComparison(void);
 extern bool8 sub_8092E9C(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,7 +1160,7 @@ void FieldObjectInteractionGetBerryTreeData(void)
     u8 group;
     u8 num;
 
-    id = FieldObjectGetBerryTreeId(gSelectedMapObject);
+    id = EventObjectGetBerryTreeId(gSelectedEventObject);
     berry = GetBerryTypeByBerryTreeId(id);
     ResetBerryTreeSparkleFlag(id);
     unk = gSpecialVar_LastTalked;
@@ -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].movementType == 12)
+        if (gEventObjects[i].active && gEventObjects[i].movementType == 12)
         {
-            cam_left = gMapObjects[i].currentCoords.x;
-            cam_top = gMapObjects[i].currentCoords.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/bike.c b/src/bike.c
index 92f4b8a60..d44bb1043 100644
--- a/src/bike.c
+++ b/src/bike.c
@@ -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);
@@ -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->currentMetatileBehavior))
+    if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior))
     {
         PlayerTurnInPlace(direction);
         Bike_SetBikeStill();
     }
     else
     {
-        MachBikeTransition_FaceDirection(playerMapObj->facingDirection);
+        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->currentMetatileBehavior) == 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->movementDirection);
+            MachBikeTransition_TrySlowDown(playerEventObj->movementDirection);
         else
-            MachBikeTransition_FaceDirection(playerMapObj->movementDirection);
+            MachBikeTransition_FaceDirection(playerEventObj->movementDirection);
     }
     else
     {
@@ -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];
+    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->currentMetatileBehavior))
+        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];
+    playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
     if (!(heldKeys & B_BUTTON))
     {
         // B button was released
         Bike_SetBikeStill();
-        if (MetatileBehavior_IsBumpySlope(playerMapObj->currentMetatileBehavior))
+        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];
+    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->currentMetatileBehavior))
+        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->facingDirectionLocked = 0;
-    FieldObjectSetDirection(playerMapObj, playerMapObj->facingDirection);
+    playerEventObj->facingDirectionLocked = 0;
+    EventObjectSetDirection(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->currentMetatileBehavior) == 0)
-        direction = playerMapObj->movementDirection;
+    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->currentMetatileBehavior) == 0)
+    if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0)
     {
-        AcroBikeTransition_FaceDirection(playerMapObj->movementDirection);
+        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->currentMetatileBehavior) == 0)
-        direction = playerMapObj->movementDirection;
+    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->currentMetatileBehavior) == 0)
-        direction = playerMapObj->movementDirection;
+    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->currentMetatileBehavior) == 0)
-        direction = playerMapObj->movementDirection;
+    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->currentMetatileBehavior) == 0)
-        direction = playerMapObj->movementDirection;
+    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->currentMetatileBehavior) == 0)
+    if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0)
     {
-        AcroBikeTransition_WheelieHoppingStanding(playerMapObj->movementDirection);
+        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,9 +669,9 @@ static void AcroBikeTransition_SideJump(u8 direction)
             return;
         }
     }
-    playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
     PlaySE(SE_JITE_PYOKO);
-    playerMapObj->facingDirectionLocked = 1;
+    playerEventObj->facingDirectionLocked = 1;
     PlayerSetAnimId(sub_8093514(direction), 2);
 }
 
@@ -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->currentMetatileBehavior) == 0)
+    if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0)
     {
-        PlayerIdleWheelie(playerMapObj->movementDirection);
+        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->currentMetatileBehavior))
+            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->currentMetatileBehavior) == 0)
+    if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0)
     {
-        PlayerStartWheelie(playerMapObj->movementDirection);
+        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->currentMetatileBehavior))
+            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->currentMetatileBehavior) == 0)
+    if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0)
     {
-        PlayerEndWheelie(playerMapObj->movementDirection);
+        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->currentCoords.x;
-    y = playerMapObj->currentCoords.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].currentMetatileBehavior) != FALSE)
+    if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_ACRO_BIKE) != FALSE && MetatileBehavior_IsBumpySlope(gEventObjects[gPlayerAvatar.eventObjectId].currentMetatileBehavior) != FALSE)
         return FALSE;
     else
         return TRUE;
diff --git a/src/data/field_event_obj/base_oam.h b/src/data/field_event_obj/base_oam.h
index 4558081e7..1aa6987c3 100755
--- a/src/data/field_event_obj/base_oam.h
+++ b/src/data/field_event_obj/base_oam.h
@@ -1,49 +1,49 @@
 #ifndef GUARD_BASE_OAM_H
 #define GUARD_BASE_OAM_H
 
-const struct OamData gFieldObjectBaseOam_8x8 = {
+const struct OamData gEventObjectBaseOam_8x8 = {
     .shape = 0,
     .size = 0,
     .priority = 2
 };
 
-const struct OamData gFieldObjectBaseOam_16x8 = {
+const struct OamData gEventObjectBaseOam_16x8 = {
     .shape = 1,
     .size = 0,
     .priority = 2
 };
 
-const struct OamData gFieldObjectBaseOam_16x16 = {
+const struct OamData gEventObjectBaseOam_16x16 = {
     .shape = 0,
     .size = 1,
     .priority = 2
 };
 
-const struct OamData gFieldObjectBaseOam_32x8 = {
+const struct OamData gEventObjectBaseOam_32x8 = {
     .shape = 1,
     .size = 1,
     .priority = 2
 };
 
-const struct OamData gFieldObjectBaseOam_64x32 = {
+const struct OamData gEventObjectBaseOam_64x32 = {
     .shape = 1,
     .size = 3,
     .priority = 2
 };
 
-const struct OamData gFieldObjectBaseOam_16x32 = {
+const struct OamData gEventObjectBaseOam_16x32 = {
     .shape = 2,
     .size = 2,
     .priority = 2
 };
 
-const struct OamData gFieldObjectBaseOam_32x32 = {
+const struct OamData gEventObjectBaseOam_32x32 = {
     .shape = 0,
     .size = 2,
     .priority = 2
 };
 
-const struct OamData gFieldObjectBaseOam_64x64 = {
+const struct OamData gEventObjectBaseOam_64x64 = {
     .shape = 0,
     .size = 3,
     .priority = 2
diff --git a/src/data/field_event_obj/berry_tree_graphics_tables.h b/src/data/field_event_obj/berry_tree_graphics_tables.h
index 9e899788a..31d515a82 100755
--- a/src/data/field_event_obj/berry_tree_graphics_tables.h
+++ b/src/data/field_event_obj/berry_tree_graphics_tables.h
@@ -1,474 +1,474 @@
 #ifndef GUARD_BERRY_TREE_GRAPHICS_TABLES_H
 #define GUARD_BERRY_TREE_GRAPHICS_TABLES_H
 
-const struct SpriteFrameImage gFieldObjectPicTable_PechaBerryTree[] = {
-    obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gFieldObjectPic_PechaBerryTree_0),
-    obj_frame_tiles(gFieldObjectPic_PechaBerryTree_1),
-    obj_frame_tiles(gFieldObjectPic_PechaBerryTree_2),
-    obj_frame_tiles(gFieldObjectPic_PechaBerryTree_3),
-    obj_frame_tiles(gFieldObjectPic_PechaBerryTree_4),
-    obj_frame_tiles(gFieldObjectPic_PechaBerryTree_5),
+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 gFieldObjectPicTable_KelpsyBerryTree[] = {
-    obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gFieldObjectPic_KelpsyBerryTree_0),
-    obj_frame_tiles(gFieldObjectPic_KelpsyBerryTree_1),
-    obj_frame_tiles(gFieldObjectPic_KelpsyBerryTree_2),
-    obj_frame_tiles(gFieldObjectPic_KelpsyBerryTree_3),
-    obj_frame_tiles(gFieldObjectPic_KelpsyBerryTree_4),
-    obj_frame_tiles(gFieldObjectPic_KelpsyBerryTree_5),
+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 gFieldObjectPicTable_WepearBerryTree[] = {
-    obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gFieldObjectPic_WepearBerryTree_0),
-    obj_frame_tiles(gFieldObjectPic_WepearBerryTree_1),
-    obj_frame_tiles(gFieldObjectPic_WepearBerryTree_2),
-    obj_frame_tiles(gFieldObjectPic_WepearBerryTree_3),
-    obj_frame_tiles(gFieldObjectPic_WepearBerryTree_4),
-    obj_frame_tiles(gFieldObjectPic_WepearBerryTree_5),
+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 gFieldObjectPicTable_IapapaBerryTree[] = {
-    obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gFieldObjectPic_IapapaBerryTree_0),
-    obj_frame_tiles(gFieldObjectPic_IapapaBerryTree_1),
-    obj_frame_tiles(gFieldObjectPic_IapapaBerryTree_2),
-    obj_frame_tiles(gFieldObjectPic_IapapaBerryTree_3),
-    obj_frame_tiles(gFieldObjectPic_IapapaBerryTree_4),
-    obj_frame_tiles(gFieldObjectPic_IapapaBerryTree_5),
+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 gFieldObjectPicTable_CheriBerryTree[] = {
-    obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gFieldObjectPic_CheriBerryTree_0),
-    obj_frame_tiles(gFieldObjectPic_CheriBerryTree_1),
-    obj_frame_tiles(gFieldObjectPic_CheriBerryTree_2),
-    obj_frame_tiles(gFieldObjectPic_CheriBerryTree_3),
-    obj_frame_tiles(gFieldObjectPic_CheriBerryTree_4),
-    obj_frame_tiles(gFieldObjectPic_CheriBerryTree_5),
+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 gFieldObjectPicTable_FigyBerryTree[] = {
-    obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gFieldObjectPic_FigyBerryTree_0),
-    obj_frame_tiles(gFieldObjectPic_FigyBerryTree_1),
-    obj_frame_tiles(gFieldObjectPic_FigyBerryTree_2),
-    obj_frame_tiles(gFieldObjectPic_FigyBerryTree_3),
-    obj_frame_tiles(gFieldObjectPic_FigyBerryTree_4),
-    obj_frame_tiles(gFieldObjectPic_FigyBerryTree_5),
+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 gFieldObjectPicTable_MagoBerryTree[] = {
-    obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gFieldObjectPic_MagoBerryTree_0),
-    obj_frame_tiles(gFieldObjectPic_MagoBerryTree_1),
-    obj_frame_tiles(gFieldObjectPic_MagoBerryTree_2),
-    obj_frame_tiles(gFieldObjectPic_MagoBerryTree_3),
-    obj_frame_tiles(gFieldObjectPic_MagoBerryTree_4),
-    obj_frame_tiles(gFieldObjectPic_MagoBerryTree_5),
+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 gFieldObjectPicTable_LumBerryTree[] = {
-    obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gFieldObjectPic_LumBerryTree_0),
-    obj_frame_tiles(gFieldObjectPic_LumBerryTree_1),
-    obj_frame_tiles(gFieldObjectPic_LumBerryTree_2),
-    obj_frame_tiles(gFieldObjectPic_LumBerryTree_3),
-    obj_frame_tiles(gFieldObjectPic_LumBerryTree_4),
-    obj_frame_tiles(gFieldObjectPic_LumBerryTree_5),
+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 gFieldObjectPicTable_RazzBerryTree[] = {
-    obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gFieldObjectPic_RazzBerryTree_0),
-    obj_frame_tiles(gFieldObjectPic_RazzBerryTree_1),
-    obj_frame_tiles(gFieldObjectPic_RazzBerryTree_2),
-    obj_frame_tiles(gFieldObjectPic_RazzBerryTree_3),
-    obj_frame_tiles(gFieldObjectPic_RazzBerryTree_4),
-    obj_frame_tiles(gFieldObjectPic_RazzBerryTree_5),
+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 gFieldObjectPicTable_GrepaBerryTree[] = {
-    obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gFieldObjectPic_GrepaBerryTree_0),
-    obj_frame_tiles(gFieldObjectPic_GrepaBerryTree_1),
-    obj_frame_tiles(gFieldObjectPic_GrepaBerryTree_2),
-    obj_frame_tiles(gFieldObjectPic_GrepaBerryTree_3),
-    obj_frame_tiles(gFieldObjectPic_GrepaBerryTree_4),
-    obj_frame_tiles(gFieldObjectPic_GrepaBerryTree_5),
+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 gFieldObjectPicTable_RabutaBerryTree[] = {
-    obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gFieldObjectPic_RabutaBerryTree_0),
-    obj_frame_tiles(gFieldObjectPic_RabutaBerryTree_1),
-    obj_frame_tiles(gFieldObjectPic_RabutaBerryTree_2),
-    obj_frame_tiles(gFieldObjectPic_RabutaBerryTree_3),
-    obj_frame_tiles(gFieldObjectPic_RabutaBerryTree_4),
-    obj_frame_tiles(gFieldObjectPic_RabutaBerryTree_5),
+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 gFieldObjectPicTable_NomelBerryTree[] = {
-    obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gFieldObjectPic_NomelBerryTree_0),
-    obj_frame_tiles(gFieldObjectPic_NomelBerryTree_1),
-    obj_frame_tiles(gFieldObjectPic_NomelBerryTree_2),
-    obj_frame_tiles(gFieldObjectPic_NomelBerryTree_3),
-    obj_frame_tiles(gFieldObjectPic_NomelBerryTree_4),
-    obj_frame_tiles(gFieldObjectPic_NomelBerryTree_5),
+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 gFieldObjectPicTable_LeppaBerryTree[] = {
-    obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gFieldObjectPic_LeppaBerryTree_0),
-    obj_frame_tiles(gFieldObjectPic_LeppaBerryTree_1),
-    obj_frame_tiles(gFieldObjectPic_LeppaBerryTree_2),
-    obj_frame_tiles(gFieldObjectPic_LeppaBerryTree_3),
-    obj_frame_tiles(gFieldObjectPic_LeppaBerryTree_4),
-    obj_frame_tiles(gFieldObjectPic_LeppaBerryTree_5),
+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 gFieldObjectPicTable_LiechiBerryTree[] = {
-    obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gFieldObjectPic_LiechiBerryTree_0),
-    obj_frame_tiles(gFieldObjectPic_LiechiBerryTree_1),
-    obj_frame_tiles(gFieldObjectPic_LiechiBerryTree_2),
-    obj_frame_tiles(gFieldObjectPic_LiechiBerryTree_3),
-    obj_frame_tiles(gFieldObjectPic_LiechiBerryTree_4),
-    obj_frame_tiles(gFieldObjectPic_LiechiBerryTree_5),
+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 gFieldObjectPicTable_HondewBerryTree[] = {
-    obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gFieldObjectPic_HondewBerryTree_0),
-    obj_frame_tiles(gFieldObjectPic_HondewBerryTree_1),
-    obj_frame_tiles(gFieldObjectPic_HondewBerryTree_2),
-    obj_frame_tiles(gFieldObjectPic_HondewBerryTree_3),
-    obj_frame_tiles(gFieldObjectPic_HondewBerryTree_4),
-    obj_frame_tiles(gFieldObjectPic_HondewBerryTree_5),
+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 gFieldObjectPicTable_AguavBerryTree[] = {
-    obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gFieldObjectPic_AguavBerryTree_0),
-    obj_frame_tiles(gFieldObjectPic_AguavBerryTree_1),
-    obj_frame_tiles(gFieldObjectPic_AguavBerryTree_2),
-    obj_frame_tiles(gFieldObjectPic_AguavBerryTree_3),
-    obj_frame_tiles(gFieldObjectPic_AguavBerryTree_4),
-    obj_frame_tiles(gFieldObjectPic_AguavBerryTree_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 gFieldObjectPicTable_WikiBerryTree[] = {
-    obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gFieldObjectPic_WikiBerryTree_0),
-    obj_frame_tiles(gFieldObjectPic_WikiBerryTree_1),
-    obj_frame_tiles(gFieldObjectPic_WikiBerryTree_2),
-    obj_frame_tiles(gFieldObjectPic_WikiBerryTree_3),
-    obj_frame_tiles(gFieldObjectPic_WikiBerryTree_4),
-    obj_frame_tiles(gFieldObjectPic_WikiBerryTree_5),
+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 gFieldObjectPicTable_PomegBerryTree[] = {
-    obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gFieldObjectPic_PomegBerryTree_0),
-    obj_frame_tiles(gFieldObjectPic_PomegBerryTree_1),
-    obj_frame_tiles(gFieldObjectPic_PomegBerryTree_2),
-    obj_frame_tiles(gFieldObjectPic_PomegBerryTree_3),
-    obj_frame_tiles(gFieldObjectPic_PomegBerryTree_4),
-    obj_frame_tiles(gFieldObjectPic_PomegBerryTree_5),
+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 gFieldObjectPicTable_RawstBerryTree[] = {
-    obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gFieldObjectPic_RawstBerryTree_0),
-    obj_frame_tiles(gFieldObjectPic_RawstBerryTree_1),
-    obj_frame_tiles(gFieldObjectPic_RawstBerryTree_2),
-    obj_frame_tiles(gFieldObjectPic_RawstBerryTree_3),
-    obj_frame_tiles(gFieldObjectPic_RawstBerryTree_4),
-    obj_frame_tiles(gFieldObjectPic_RawstBerryTree_5),
+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 gFieldObjectPicTable_SpelonBerryTree[] = {
-    obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gFieldObjectPic_SpelonBerryTree_0),
-    obj_frame_tiles(gFieldObjectPic_SpelonBerryTree_1),
-    obj_frame_tiles(gFieldObjectPic_SpelonBerryTree_2),
-    obj_frame_tiles(gFieldObjectPic_SpelonBerryTree_3),
-    obj_frame_tiles(gFieldObjectPic_SpelonBerryTree_4),
-    obj_frame_tiles(gFieldObjectPic_SpelonBerryTree_5),
+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 gFieldObjectPicTable_ChestoBerryTree[] = {
-    obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gFieldObjectPic_ChestoBerryTree_0),
-    obj_frame_tiles(gFieldObjectPic_ChestoBerryTree_1),
-    obj_frame_tiles(gFieldObjectPic_ChestoBerryTree_2),
-    obj_frame_tiles(gFieldObjectPic_ChestoBerryTree_3),
-    obj_frame_tiles(gFieldObjectPic_ChestoBerryTree_4),
-    obj_frame_tiles(gFieldObjectPic_ChestoBerryTree_5),
+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 gFieldObjectPicTable_OranBerryTree[] = {
-    obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gFieldObjectPic_OranBerryTree_0),
-    obj_frame_tiles(gFieldObjectPic_OranBerryTree_1),
-    obj_frame_tiles(gFieldObjectPic_OranBerryTree_2),
-    obj_frame_tiles(gFieldObjectPic_OranBerryTree_3),
-    obj_frame_tiles(gFieldObjectPic_OranBerryTree_4),
-    obj_frame_tiles(gFieldObjectPic_OranBerryTree_5),
+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 gFieldObjectPicTable_PersimBerryTree[] = {
-    obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gFieldObjectPic_PersimBerryTree_0),
-    obj_frame_tiles(gFieldObjectPic_PersimBerryTree_1),
-    obj_frame_tiles(gFieldObjectPic_PersimBerryTree_2),
-    obj_frame_tiles(gFieldObjectPic_PersimBerryTree_3),
-    obj_frame_tiles(gFieldObjectPic_PersimBerryTree_4),
-    obj_frame_tiles(gFieldObjectPic_PersimBerryTree_5),
+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 gFieldObjectPicTable_SitrusBerryTree[] = {
-    obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gFieldObjectPic_SitrusBerryTree_0),
-    obj_frame_tiles(gFieldObjectPic_SitrusBerryTree_1),
-    obj_frame_tiles(gFieldObjectPic_SitrusBerryTree_2),
-    obj_frame_tiles(gFieldObjectPic_SitrusBerryTree_3),
-    obj_frame_tiles(gFieldObjectPic_SitrusBerryTree_4),
-    obj_frame_tiles(gFieldObjectPic_SitrusBerryTree_5),
+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 gFieldObjectPicTable_AspearBerryTree[] = {
-    obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gFieldObjectPic_AspearBerryTree_0),
-    obj_frame_tiles(gFieldObjectPic_AspearBerryTree_1),
-    obj_frame_tiles(gFieldObjectPic_AspearBerryTree_2),
-    obj_frame_tiles(gFieldObjectPic_AspearBerryTree_3),
-    obj_frame_tiles(gFieldObjectPic_AspearBerryTree_4),
-    obj_frame_tiles(gFieldObjectPic_AspearBerryTree_5),
+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 gFieldObjectPicTable_PamtreBerryTree[] = {
-    obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gFieldObjectPic_PamtreBerryTree_0),
-    obj_frame_tiles(gFieldObjectPic_PamtreBerryTree_1),
-    obj_frame_tiles(gFieldObjectPic_PamtreBerryTree_2),
-    obj_frame_tiles(gFieldObjectPic_PamtreBerryTree_3),
-    obj_frame_tiles(gFieldObjectPic_PamtreBerryTree_4),
-    obj_frame_tiles(gFieldObjectPic_PamtreBerryTree_5),
+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 gFieldObjectPicTable_CornnBerryTree[] = {
-    obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gFieldObjectPic_CornnBerryTree_0),
-    obj_frame_tiles(gFieldObjectPic_CornnBerryTree_1),
-    obj_frame_tiles(gFieldObjectPic_CornnBerryTree_2),
-    obj_frame_tiles(gFieldObjectPic_CornnBerryTree_3),
-    obj_frame_tiles(gFieldObjectPic_CornnBerryTree_4),
-    obj_frame_tiles(gFieldObjectPic_CornnBerryTree_5),
+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 gFieldObjectPicTable_LansatBerryTree[] = {
-    obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gFieldObjectPic_LansatBerryTree_0),
-    obj_frame_tiles(gFieldObjectPic_LansatBerryTree_1),
-    obj_frame_tiles(gFieldObjectPic_LansatBerryTree_2),
-    obj_frame_tiles(gFieldObjectPic_LansatBerryTree_3),
-    obj_frame_tiles(gFieldObjectPic_LansatBerryTree_4),
-    obj_frame_tiles(gFieldObjectPic_LansatBerryTree_5),
+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 gFieldObjectPicTable_DurinBerryTree[] = {
-    obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gFieldObjectPic_DurinBerryTree_0),
-    obj_frame_tiles(gFieldObjectPic_DurinBerryTree_1),
-    obj_frame_tiles(gFieldObjectPic_DurinBerryTree_2),
-    obj_frame_tiles(gFieldObjectPic_DurinBerryTree_3),
-    obj_frame_tiles(gFieldObjectPic_DurinBerryTree_4),
-    obj_frame_tiles(gFieldObjectPic_DurinBerryTree_5),
+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 gFieldObjectPicTable_TamatoBerryTree[] = {
-    obj_frame_tiles(gFieldObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gFieldObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gFieldObjectPic_TamatoBerryTree_0),
-    obj_frame_tiles(gFieldObjectPic_TamatoBerryTree_1),
-    obj_frame_tiles(gFieldObjectPic_TamatoBerryTree_2),
-    obj_frame_tiles(gFieldObjectPic_TamatoBerryTree_3),
-    obj_frame_tiles(gFieldObjectPic_TamatoBerryTree_4),
-    obj_frame_tiles(gFieldObjectPic_TamatoBerryTree_5),
+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 gDeadBerryTreeFieldObjectGraphicsIdTable[] = {MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES, MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES, MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES, MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES, MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES};
+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 gBerryTreeFieldObjectGraphicsIdTable[] = {MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES, MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES, MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES, MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES, MAP_OBJ_GFX_BERRY_TREE_LATE_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[] = {
-    gFieldObjectPicTable_CheriBerryTree,
-    gFieldObjectPicTable_ChestoBerryTree,
-    gFieldObjectPicTable_PechaBerryTree,
-    gFieldObjectPicTable_RawstBerryTree,
-    gFieldObjectPicTable_AspearBerryTree,
-    gFieldObjectPicTable_LeppaBerryTree,
-    gFieldObjectPicTable_OranBerryTree,
-    gFieldObjectPicTable_PersimBerryTree,
-    gFieldObjectPicTable_LumBerryTree,
-    gFieldObjectPicTable_SitrusBerryTree,
-    gFieldObjectPicTable_FigyBerryTree,
-    gFieldObjectPicTable_WikiBerryTree,
-    gFieldObjectPicTable_MagoBerryTree,
-    gFieldObjectPicTable_AguavBerryTree,
-    gFieldObjectPicTable_IapapaBerryTree,
-    gFieldObjectPicTable_RazzBerryTree,
-    gFieldObjectPicTable_RazzBerryTree,
-    gFieldObjectPicTable_MagoBerryTree,
-    gFieldObjectPicTable_WepearBerryTree,
-    gFieldObjectPicTable_IapapaBerryTree,
-    gFieldObjectPicTable_PomegBerryTree,
-    gFieldObjectPicTable_KelpsyBerryTree,
-    gFieldObjectPicTable_WepearBerryTree,
-    gFieldObjectPicTable_HondewBerryTree,
-    gFieldObjectPicTable_GrepaBerryTree,
-    gFieldObjectPicTable_TamatoBerryTree,
-    gFieldObjectPicTable_CornnBerryTree,
-    gFieldObjectPicTable_PomegBerryTree,
-    gFieldObjectPicTable_RabutaBerryTree,
-    gFieldObjectPicTable_NomelBerryTree,
-    gFieldObjectPicTable_SpelonBerryTree,
-    gFieldObjectPicTable_PamtreBerryTree,
-    gFieldObjectPicTable_RabutaBerryTree,
-    gFieldObjectPicTable_DurinBerryTree,
-    gFieldObjectPicTable_HondewBerryTree,
-    gFieldObjectPicTable_LiechiBerryTree,
-    gFieldObjectPicTable_HondewBerryTree,
-    gFieldObjectPicTable_AguavBerryTree,
-    gFieldObjectPicTable_PomegBerryTree,
-    gFieldObjectPicTable_GrepaBerryTree,
-    gFieldObjectPicTable_LansatBerryTree,
-    gFieldObjectPicTable_CornnBerryTree,
-    gFieldObjectPicTable_DurinBerryTree,
+    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[] = {
@@ -517,53 +517,53 @@ const u8 *const gBerryTreePaletteSlotTablePointers[] = {
     gBerryTreePaletteSlotTable_Durin,
 };
 
-const u8 *const gBerryTreeFieldObjectGraphicsIdTablePointers[] = {
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
-    gBerryTreeFieldObjectGraphicsIdTable,
+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,
 };
 
 
diff --git a/src/data/field_event_obj/event_object_anims.h b/src/data/field_event_obj/event_object_anims.h
index 3857bf815..9b897651d 100755
--- a/src/data/field_event_obj/event_object_anims.h
+++ b/src/data/field_event_obj/event_object_anims.h
@@ -1,7 +1,7 @@
 #ifndef GUARD_EVENT_OBJECT_ANIMS_H
 #define GUARD_EVENT_OBJECT_ANIMS_H
 
-const union AnimCmd gFieldObjectImageAnim_StayStill[] =
+const union AnimCmd gEventObjectImageAnim_StayStill[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_FRAME(0, 8),
@@ -10,31 +10,31 @@ const union AnimCmd gFieldObjectImageAnim_StayStill[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_QuintyPlumpFaceSouth[] =
+const union AnimCmd gEventObjectImageAnim_QuintyPlumpFaceSouth[] =
 {
     ANIMCMD_FRAME(0, 16),
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_QuintyPlumpFaceNorth[] =
+const union AnimCmd gEventObjectImageAnim_QuintyPlumpFaceNorth[] =
 {
     ANIMCMD_FRAME(1, 16),
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_QuintyPlumpFaceWest[] =
+const union AnimCmd gEventObjectImageAnim_QuintyPlumpFaceWest[] =
 {
     ANIMCMD_FRAME(2, 16),
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_QuintyPlumpFaceEast[] =
+const union AnimCmd gEventObjectImageAnim_QuintyPlumpFaceEast[] =
 {
     ANIMCMD_FRAME(2, 16, .hFlip = TRUE),
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoSouth[] =
+const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoSouth[] =
 {
     ANIMCMD_FRAME(3, 8),
     ANIMCMD_FRAME(0, 8),
@@ -43,7 +43,7 @@ const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoSouth[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoNorth[] =
+const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoNorth[] =
 {
     ANIMCMD_FRAME(4, 8),
     ANIMCMD_FRAME(1, 8),
@@ -52,7 +52,7 @@ const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoNorth[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoWest[] =
+const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoWest[] =
 {
     ANIMCMD_FRAME(5, 8),
     ANIMCMD_FRAME(2, 8),
@@ -61,7 +61,7 @@ const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoWest[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoEast[] =
+const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoEast[] =
 {
     ANIMCMD_FRAME(5, 8, .hFlip = TRUE),
     ANIMCMD_FRAME(2, 8, .hFlip = TRUE),
@@ -70,7 +70,7 @@ const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoEast[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFastSouth[] =
+const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastSouth[] =
 {
     ANIMCMD_FRAME(3, 4),
     ANIMCMD_FRAME(0, 4),
@@ -79,7 +79,7 @@ const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFastSouth[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFastNorth[] =
+const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastNorth[] =
 {
     ANIMCMD_FRAME(4, 4),
     ANIMCMD_FRAME(1, 4),
@@ -88,7 +88,7 @@ const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFastNorth[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFastWest[] =
+const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastWest[] =
 {
     ANIMCMD_FRAME(5, 4),
     ANIMCMD_FRAME(2, 4),
@@ -97,7 +97,7 @@ const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFastWest[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFastEast[] =
+const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastEast[] =
 {
     ANIMCMD_FRAME(5, 4, .hFlip = TRUE),
     ANIMCMD_FRAME(2, 4, .hFlip = TRUE),
@@ -106,7 +106,7 @@ const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFastEast[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFasterSouth[] =
+const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFasterSouth[] =
 {
     ANIMCMD_FRAME(3, 2),
     ANIMCMD_FRAME(0, 2),
@@ -115,7 +115,7 @@ const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFasterSouth[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFasterNorth[] =
+const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFasterNorth[] =
 {
     ANIMCMD_FRAME(4, 2),
     ANIMCMD_FRAME(1, 2),
@@ -124,7 +124,7 @@ const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFasterNorth[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFasterWest[] =
+const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFasterWest[] =
 {
     ANIMCMD_FRAME(5, 2),
     ANIMCMD_FRAME(2, 2),
@@ -133,7 +133,7 @@ const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFasterWest[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFasterEast[] =
+const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFasterEast[] =
 {
     ANIMCMD_FRAME(5, 2, .hFlip = TRUE),
     ANIMCMD_FRAME(2, 2, .hFlip = TRUE),
@@ -142,7 +142,7 @@ const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFasterEast[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFastestSouth[] =
+const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastestSouth[] =
 {
     ANIMCMD_FRAME(3, 1),
     ANIMCMD_FRAME(0, 1),
@@ -151,7 +151,7 @@ const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFastestSouth[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFastestNorth[] =
+const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastestNorth[] =
 {
     ANIMCMD_FRAME(4, 1),
     ANIMCMD_FRAME(1, 1),
@@ -160,7 +160,7 @@ const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFastestNorth[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFastestWest[] =
+const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastestWest[] =
 {
     ANIMCMD_FRAME(5, 1),
     ANIMCMD_FRAME(2, 1),
@@ -169,7 +169,7 @@ const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFastestWest[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFastestEast[] =
+const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastestEast[] =
 {
     ANIMCMD_FRAME(5, 1, .hFlip = TRUE),
     ANIMCMD_FRAME(2, 1, .hFlip = TRUE),
@@ -178,31 +178,31 @@ const union AnimCmd gFieldObjectImageAnim_QuintyPlumpGoFastestEast[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_FaceSouth[] =
+const union AnimCmd gEventObjectImageAnim_FaceSouth[] =
 {
     ANIMCMD_FRAME(0, 16),
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_FaceNorth[] =
+const union AnimCmd gEventObjectImageAnim_FaceNorth[] =
 {
     ANIMCMD_FRAME(1, 16),
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_FaceWest[] =
+const union AnimCmd gEventObjectImageAnim_FaceWest[] =
 {
     ANIMCMD_FRAME(2, 16),
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_FaceEast[] =
+const union AnimCmd gEventObjectImageAnim_FaceEast[] =
 {
     ANIMCMD_FRAME(2, 16, .hFlip = TRUE),
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_GoSouth[] =
+const union AnimCmd gEventObjectImageAnim_GoSouth[] =
 {
     ANIMCMD_FRAME(3, 8),
     ANIMCMD_FRAME(0, 8),
@@ -211,7 +211,7 @@ const union AnimCmd gFieldObjectImageAnim_GoSouth[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_GoNorth[] =
+const union AnimCmd gEventObjectImageAnim_GoNorth[] =
 {
     ANIMCMD_FRAME(5, 8),
     ANIMCMD_FRAME(1, 8),
@@ -220,7 +220,7 @@ const union AnimCmd gFieldObjectImageAnim_GoNorth[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_GoWest[] =
+const union AnimCmd gEventObjectImageAnim_GoWest[] =
 {
     ANIMCMD_FRAME(7, 8),
     ANIMCMD_FRAME(2, 8),
@@ -229,7 +229,7 @@ const union AnimCmd gFieldObjectImageAnim_GoWest[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_GoEast[] =
+const union AnimCmd gEventObjectImageAnim_GoEast[] =
 {
     ANIMCMD_FRAME(7, 8, .hFlip = TRUE),
     ANIMCMD_FRAME(2, 8, .hFlip = TRUE),
@@ -238,7 +238,7 @@ const union AnimCmd gFieldObjectImageAnim_GoEast[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_GoFastSouth[] =
+const union AnimCmd gEventObjectImageAnim_GoFastSouth[] =
 {
     ANIMCMD_FRAME(3, 4),
     ANIMCMD_FRAME(0, 4),
@@ -247,7 +247,7 @@ const union AnimCmd gFieldObjectImageAnim_GoFastSouth[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_GoFastNorth[] =
+const union AnimCmd gEventObjectImageAnim_GoFastNorth[] =
 {
     ANIMCMD_FRAME(5, 4),
     ANIMCMD_FRAME(1, 4),
@@ -256,7 +256,7 @@ const union AnimCmd gFieldObjectImageAnim_GoFastNorth[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_GoFastWest[] =
+const union AnimCmd gEventObjectImageAnim_GoFastWest[] =
 {
     ANIMCMD_FRAME(7, 4),
     ANIMCMD_FRAME(2, 4),
@@ -265,7 +265,7 @@ const union AnimCmd gFieldObjectImageAnim_GoFastWest[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_GoFastEast[] =
+const union AnimCmd gEventObjectImageAnim_GoFastEast[] =
 {
     ANIMCMD_FRAME(7, 4, .hFlip = TRUE),
     ANIMCMD_FRAME(2, 4, .hFlip = TRUE),
@@ -274,7 +274,7 @@ const union AnimCmd gFieldObjectImageAnim_GoFastEast[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_GoFasterSouth[] =
+const union AnimCmd gEventObjectImageAnim_GoFasterSouth[] =
 {
     ANIMCMD_FRAME(3, 2),
     ANIMCMD_FRAME(0, 2),
@@ -283,7 +283,7 @@ const union AnimCmd gFieldObjectImageAnim_GoFasterSouth[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_GoFasterNorth[] =
+const union AnimCmd gEventObjectImageAnim_GoFasterNorth[] =
 {
     ANIMCMD_FRAME(5, 2),
     ANIMCMD_FRAME(1, 2),
@@ -292,7 +292,7 @@ const union AnimCmd gFieldObjectImageAnim_GoFasterNorth[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_GoFasterWest[] =
+const union AnimCmd gEventObjectImageAnim_GoFasterWest[] =
 {
     ANIMCMD_FRAME(7, 2),
     ANIMCMD_FRAME(2, 2),
@@ -301,7 +301,7 @@ const union AnimCmd gFieldObjectImageAnim_GoFasterWest[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_GoFasterEast[] =
+const union AnimCmd gEventObjectImageAnim_GoFasterEast[] =
 {
     ANIMCMD_FRAME(7, 2, .hFlip = TRUE),
     ANIMCMD_FRAME(2, 2, .hFlip = TRUE),
@@ -310,7 +310,7 @@ const union AnimCmd gFieldObjectImageAnim_GoFasterEast[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_GoFastestSouth[] =
+const union AnimCmd gEventObjectImageAnim_GoFastestSouth[] =
 {
     ANIMCMD_FRAME(3, 1),
     ANIMCMD_FRAME(0, 1),
@@ -319,7 +319,7 @@ const union AnimCmd gFieldObjectImageAnim_GoFastestSouth[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_GoFastestNorth[] =
+const union AnimCmd gEventObjectImageAnim_GoFastestNorth[] =
 {
     ANIMCMD_FRAME(5, 1),
     ANIMCMD_FRAME(1, 1),
@@ -328,7 +328,7 @@ const union AnimCmd gFieldObjectImageAnim_GoFastestNorth[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_GoFastestWest[] =
+const union AnimCmd gEventObjectImageAnim_GoFastestWest[] =
 {
     ANIMCMD_FRAME(7, 1),
     ANIMCMD_FRAME(2, 1),
@@ -337,7 +337,7 @@ const union AnimCmd gFieldObjectImageAnim_GoFastestWest[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_GoFastestEast[] =
+const union AnimCmd gEventObjectImageAnim_GoFastestEast[] =
 {
     ANIMCMD_FRAME(7, 1, .hFlip = TRUE),
     ANIMCMD_FRAME(2, 1, .hFlip = TRUE),
@@ -346,7 +346,7 @@ const union AnimCmd gFieldObjectImageAnim_GoFastestEast[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_RunSouth[] =
+const union AnimCmd gEventObjectImageAnim_RunSouth[] =
 {
     ANIMCMD_FRAME(12, 5),
     ANIMCMD_FRAME(9, 3),
@@ -355,7 +355,7 @@ const union AnimCmd gFieldObjectImageAnim_RunSouth[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_RunNorth[] =
+const union AnimCmd gEventObjectImageAnim_RunNorth[] =
 {
     ANIMCMD_FRAME(14, 5),
     ANIMCMD_FRAME(10, 3),
@@ -364,7 +364,7 @@ const union AnimCmd gFieldObjectImageAnim_RunNorth[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_RunWest[] =
+const union AnimCmd gEventObjectImageAnim_RunWest[] =
 {
     ANIMCMD_FRAME(16, 5),
     ANIMCMD_FRAME(11, 3),
@@ -373,7 +373,7 @@ const union AnimCmd gFieldObjectImageAnim_RunWest[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_RunEast[] =
+const union AnimCmd gEventObjectImageAnim_RunEast[] =
 {
     ANIMCMD_FRAME(16, 5, .hFlip = TRUE),
     ANIMCMD_FRAME(11, 3, .hFlip = TRUE),
@@ -382,7 +382,7 @@ const union AnimCmd gFieldObjectImageAnim_RunEast[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_FieldMove[] =
+const union AnimCmd gEventObjectImageAnim_FieldMove[] =
 {
     ANIMCMD_FRAME(0, 4),
     ANIMCMD_FRAME(1, 4),
@@ -392,143 +392,143 @@ const union AnimCmd gFieldObjectImageAnim_FieldMove[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldObjectImageAnim_GetOnOffSurfBlobSouth[] =
+const union AnimCmd gEventObjectImageAnim_GetOnOffSurfBlobSouth[] =
 {
     ANIMCMD_FRAME(9, 32),
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_GetOnOffSurfBlobNorth[] =
+const union AnimCmd gEventObjectImageAnim_GetOnOffSurfBlobNorth[] =
 {
     ANIMCMD_FRAME(10, 32),
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_GetOnOffSurfBlobWest[] =
+const union AnimCmd gEventObjectImageAnim_GetOnOffSurfBlobWest[] =
 {
     ANIMCMD_FRAME(11, 32),
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_GetOnOffSurfBlobEast[] =
+const union AnimCmd gEventObjectImageAnim_GetOnOffSurfBlobEast[] =
 {
     ANIMCMD_FRAME(11, 32, .hFlip = TRUE),
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_BunnyHoppyBackWheelSouth[] =
+const union AnimCmd gEventObjectImageAnim_BunnyHoppyBackWheelSouth[] =
 {
     ANIMCMD_FRAME(9, 4),
     ANIMCMD_FRAME(10, 4),
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldObjectImageAnim_BunnyHoppyBackWheelNorth[] =
+const union AnimCmd gEventObjectImageAnim_BunnyHoppyBackWheelNorth[] =
 {
     ANIMCMD_FRAME(13, 4),
     ANIMCMD_FRAME(14, 4),
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldObjectImageAnim_BunnyHoppyBackWheelWest[] =
+const union AnimCmd gEventObjectImageAnim_BunnyHoppyBackWheelWest[] =
 {
     ANIMCMD_FRAME(17, 4),
     ANIMCMD_FRAME(18, 4),
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldObjectImageAnim_BunnyHoppyBackWheelEast[] =
+const union AnimCmd gEventObjectImageAnim_BunnyHoppyBackWheelEast[] =
 {
     ANIMCMD_FRAME(17, 4, .hFlip = TRUE),
     ANIMCMD_FRAME(18, 4, .hFlip = TRUE),
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldObjectImageAnim_BunnyHoppyFrontWheelSouth[] =
+const union AnimCmd gEventObjectImageAnim_BunnyHoppyFrontWheelSouth[] =
 {
     ANIMCMD_FRAME(11, 4),
     ANIMCMD_FRAME(12, 4),
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldObjectImageAnim_BunnyHoppyFrontWheelNorth[] =
+const union AnimCmd gEventObjectImageAnim_BunnyHoppyFrontWheelNorth[] =
 {
     ANIMCMD_FRAME(15, 4),
     ANIMCMD_FRAME(16, 4),
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldObjectImageAnim_BunnyHoppyFrontWheelWest[] =
+const union AnimCmd gEventObjectImageAnim_BunnyHoppyFrontWheelWest[] =
 {
     ANIMCMD_FRAME(19, 4),
     ANIMCMD_FRAME(20, 4),
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldObjectImageAnim_BunnyHoppyFrontWheelEast[] =
+const union AnimCmd gEventObjectImageAnim_BunnyHoppyFrontWheelEast[] =
 {
     ANIMCMD_FRAME(19, 4, .hFlip = TRUE),
     ANIMCMD_FRAME(20, 4, .hFlip = TRUE),
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldObjectImageAnim_StandingWheelieBackWheelSouth[] =
+const union AnimCmd gEventObjectImageAnim_StandingWheelieBackWheelSouth[] =
 {
     ANIMCMD_FRAME(9, 4),
     ANIMCMD_FRAME(0, 4),
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldObjectImageAnim_StandingWheelieBackWheelNorth[] =
+const union AnimCmd gEventObjectImageAnim_StandingWheelieBackWheelNorth[] =
 {
     ANIMCMD_FRAME(13, 4),
     ANIMCMD_FRAME(1, 4),
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldObjectImageAnim_StandingWheelieBackWheelWest[] =
+const union AnimCmd gEventObjectImageAnim_StandingWheelieBackWheelWest[] =
 {
     ANIMCMD_FRAME(17, 4),
     ANIMCMD_FRAME(2, 4),
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldObjectImageAnim_StandingWheelieBackWheelEast[] =
+const union AnimCmd gEventObjectImageAnim_StandingWheelieBackWheelEast[] =
 {
     ANIMCMD_FRAME(17, 4, .hFlip = TRUE),
     ANIMCMD_FRAME(2, 4, .hFlip = TRUE),
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldObjectImageAnim_StandingWheelieFrontWheelSouth[] =
+const union AnimCmd gEventObjectImageAnim_StandingWheelieFrontWheelSouth[] =
 {
     ANIMCMD_FRAME(11, 4),
     ANIMCMD_FRAME(0, 4),
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldObjectImageAnim_StandingWheelieFrontWheelNorth[] =
+const union AnimCmd gEventObjectImageAnim_StandingWheelieFrontWheelNorth[] =
 {
     ANIMCMD_FRAME(15, 4),
     ANIMCMD_FRAME(1, 4),
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldObjectImageAnim_StandingWheelieFrontWheelWest[] =
+const union AnimCmd gEventObjectImageAnim_StandingWheelieFrontWheelWest[] =
 {
     ANIMCMD_FRAME(19, 4),
     ANIMCMD_FRAME(2, 4),
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldObjectImageAnim_StandingWheelieFrontWheelEast[] =
+const union AnimCmd gEventObjectImageAnim_StandingWheelieFrontWheelEast[] =
 {
     ANIMCMD_FRAME(19, 4, .hFlip = TRUE),
     ANIMCMD_FRAME(2, 4, .hFlip = TRUE),
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldObjectImageAnim_MovingWheelieSouth[] =
+const union AnimCmd gEventObjectImageAnim_MovingWheelieSouth[] =
 {
     ANIMCMD_FRAME(21, 4),
     ANIMCMD_FRAME(10, 4),
@@ -537,7 +537,7 @@ const union AnimCmd gFieldObjectImageAnim_MovingWheelieSouth[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_MovingWheelieNorth[] =
+const union AnimCmd gEventObjectImageAnim_MovingWheelieNorth[] =
 {
     ANIMCMD_FRAME(23, 4),
     ANIMCMD_FRAME(14, 4),
@@ -546,7 +546,7 @@ const union AnimCmd gFieldObjectImageAnim_MovingWheelieNorth[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_MovingWheelieWest[] =
+const union AnimCmd gEventObjectImageAnim_MovingWheelieWest[] =
 {
     ANIMCMD_FRAME(25, 4),
     ANIMCMD_FRAME(18, 4),
@@ -555,7 +555,7 @@ const union AnimCmd gFieldObjectImageAnim_MovingWheelieWest[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_MovingWheelieEast[] =
+const union AnimCmd gEventObjectImageAnim_MovingWheelieEast[] =
 {
     ANIMCMD_FRAME(25, 4, .hFlip = TRUE),
     ANIMCMD_FRAME(18, 4, .hFlip = TRUE),
@@ -564,27 +564,27 @@ const union AnimCmd gFieldObjectImageAnim_MovingWheelieEast[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_BerryTreeStage0[] =
+const union AnimCmd gEventObjectImageAnim_BerryTreeStage0[] =
 {
     ANIMCMD_FRAME(0, 32),
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldObjectImageAnim_BerryTreeStage1[] =
+const union AnimCmd gEventObjectImageAnim_BerryTreeStage1[] =
 {
     ANIMCMD_FRAME(1, 32),
     ANIMCMD_FRAME(2, 32),
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldObjectImageAnim_BerryTreeStage2[] =
+const union AnimCmd gEventObjectImageAnim_BerryTreeStage2[] =
 {
     ANIMCMD_FRAME(3, 48),
     ANIMCMD_FRAME(4, 48),
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldObjectImageAnim_BerryTreeStage3[] =
+const union AnimCmd gEventObjectImageAnim_BerryTreeStage3[] =
 {
     ANIMCMD_FRAME(5, 32),
     ANIMCMD_FRAME(5, 32),
@@ -593,7 +593,7 @@ const union AnimCmd gFieldObjectImageAnim_BerryTreeStage3[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldObjectImageAnim_BerryTreeStage4[] =
+const union AnimCmd gEventObjectImageAnim_BerryTreeStage4[] =
 {
     ANIMCMD_FRAME(7, 48),
     ANIMCMD_FRAME(7, 48),
@@ -602,7 +602,7 @@ const union AnimCmd gFieldObjectImageAnim_BerryTreeStage4[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldObjectImageAnim_NurseBow[] =
+const union AnimCmd gEventObjectImageAnim_NurseBow[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_FRAME(9, 32),
@@ -610,7 +610,7 @@ const union AnimCmd gFieldObjectImageAnim_NurseBow[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldObjectImageAnim_RockBreak[] =
+const union AnimCmd gEventObjectImageAnim_RockBreak[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_FRAME(1, 8),
@@ -619,7 +619,7 @@ const union AnimCmd gFieldObjectImageAnim_RockBreak[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldObjectImageAnim_TreeCut[] =
+const union AnimCmd gEventObjectImageAnim_TreeCut[] =
 {
     ANIMCMD_FRAME(0, 6),
     ANIMCMD_FRAME(1, 6),
@@ -628,7 +628,7 @@ const union AnimCmd gFieldObjectImageAnim_TreeCut[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldObjectImageAnim_TakeOutRodSouth[] =
+const union AnimCmd gEventObjectImageAnim_TakeOutRodSouth[] =
 {
     ANIMCMD_FRAME(8, 4),
     ANIMCMD_FRAME(9, 4),
@@ -637,7 +637,7 @@ const union AnimCmd gFieldObjectImageAnim_TakeOutRodSouth[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldObjectImageAnim_TakeOutRodNorth[] =
+const union AnimCmd gEventObjectImageAnim_TakeOutRodNorth[] =
 {
     ANIMCMD_FRAME(4, 4),
     ANIMCMD_FRAME(5, 4),
@@ -646,7 +646,7 @@ const union AnimCmd gFieldObjectImageAnim_TakeOutRodNorth[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldObjectImageAnim_TakeOutRodWest[] =
+const union AnimCmd gEventObjectImageAnim_TakeOutRodWest[] =
 {
     ANIMCMD_FRAME(0, 4),
     ANIMCMD_FRAME(1, 4),
@@ -655,7 +655,7 @@ const union AnimCmd gFieldObjectImageAnim_TakeOutRodWest[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldObjectImageAnim_TakeOutRodEast[] =
+const union AnimCmd gEventObjectImageAnim_TakeOutRodEast[] =
 {
     ANIMCMD_FRAME(0, 4, .hFlip = TRUE),
     ANIMCMD_FRAME(1, 4, .hFlip = TRUE),
@@ -664,7 +664,7 @@ const union AnimCmd gFieldObjectImageAnim_TakeOutRodEast[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldObjectImageAnim_PutAwayRodSouth[] =
+const union AnimCmd gEventObjectImageAnim_PutAwayRodSouth[] =
 {
     ANIMCMD_FRAME(11, 4),
     ANIMCMD_FRAME(10, 6),
@@ -673,7 +673,7 @@ const union AnimCmd gFieldObjectImageAnim_PutAwayRodSouth[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldObjectImageAnim_PutAwayRodNorth[] =
+const union AnimCmd gEventObjectImageAnim_PutAwayRodNorth[] =
 {
     ANIMCMD_FRAME(7, 4),
     ANIMCMD_FRAME(6, 6),
@@ -682,7 +682,7 @@ const union AnimCmd gFieldObjectImageAnim_PutAwayRodNorth[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldObjectImageAnim_PutAwayRodWest[] =
+const union AnimCmd gEventObjectImageAnim_PutAwayRodWest[] =
 {
     ANIMCMD_FRAME(3, 4),
     ANIMCMD_FRAME(2, 4),
@@ -691,7 +691,7 @@ const union AnimCmd gFieldObjectImageAnim_PutAwayRodWest[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldObjectImageAnim_PutAwayRodEast[] =
+const union AnimCmd gEventObjectImageAnim_PutAwayRodEast[] =
 {
     ANIMCMD_FRAME(3, 4, .hFlip = TRUE),
     ANIMCMD_FRAME(2, 4, .hFlip = TRUE),
@@ -700,7 +700,7 @@ const union AnimCmd gFieldObjectImageAnim_PutAwayRodEast[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gFieldObjectImageAnim_HookedPokemonSouth[] =
+const union AnimCmd gEventObjectImageAnim_HookedPokemonSouth[] =
 {
     ANIMCMD_FRAME(10, 6),
     ANIMCMD_FRAME(11, 6),
@@ -709,7 +709,7 @@ const union AnimCmd gFieldObjectImageAnim_HookedPokemonSouth[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_HookedPokemonNorth[] =
+const union AnimCmd gEventObjectImageAnim_HookedPokemonNorth[] =
 {
     ANIMCMD_FRAME(6, 6),
     ANIMCMD_FRAME(7, 6),
@@ -718,7 +718,7 @@ const union AnimCmd gFieldObjectImageAnim_HookedPokemonNorth[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_HookedPokemonWest[] =
+const union AnimCmd gEventObjectImageAnim_HookedPokemonWest[] =
 {
     ANIMCMD_FRAME(2, 6),
     ANIMCMD_FRAME(3, 6),
@@ -727,7 +727,7 @@ const union AnimCmd gFieldObjectImageAnim_HookedPokemonWest[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_HookedPokemonEast[] =
+const union AnimCmd gEventObjectImageAnim_HookedPokemonEast[] =
 {
     ANIMCMD_FRAME(2, 6, .hFlip = TRUE),
     ANIMCMD_FRAME(3, 6, .hFlip = TRUE),
@@ -736,7 +736,7 @@ const union AnimCmd gFieldObjectImageAnim_HookedPokemonEast[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AffineAnimCmd gFieldObjectRotScalAnim_8508FD8[] =
+const union AffineAnimCmd gEventObjectRotScalAnim_8508FD8[] =
 {
     AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 1),
     AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1),
@@ -746,7 +746,7 @@ const union AffineAnimCmd gFieldObjectRotScalAnim_8508FD8[] =
     AFFINEANIMCMD_JUMP(0),
 };
 
-const union AffineAnimCmd gFieldObjectRotScalAnim_8509008[] =
+const union AffineAnimCmd gEventObjectRotScalAnim_8509008[] =
 {
     AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 1),
     AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1),
@@ -757,33 +757,33 @@ const union AffineAnimCmd gFieldObjectRotScalAnim_8509008[] =
     AFFINEANIMCMD_JUMP(0),
 };
 
-const union AffineAnimCmd gFieldObjectRotScalAnim_8509040[] =
+const union AffineAnimCmd gEventObjectRotScalAnim_8509040[] =
 {
     AFFINEANIMCMD_FRAME(0x100, 0x100, 10, 0),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gFieldObjectRotScalAnim_8509050[] =
+const union AffineAnimCmd gEventObjectRotScalAnim_8509050[] =
 {
     AFFINEANIMCMD_FRAME(0x100, 0x100, 10, 0),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gFieldObjectRotScalAnim_8509060[] =
+const union AffineAnimCmd gEventObjectRotScalAnim_8509060[] =
 {
     AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 1),
     AFFINEANIMCMD_LOOP(8),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gFieldObjectRotScalAnim_8509078[] =
+const union AffineAnimCmd gEventObjectRotScalAnim_8509078[] =
 {
     AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 1),
     AFFINEANIMCMD_LOOP(8),
     AFFINEANIMCMD_END,
 };
 
-const union AnimCmd gFieldObjectImageAnim_HoOhFlapWings[] =
+const union AnimCmd gEventObjectImageAnim_HoOhFlapWings[] =
 {
     ANIMCMD_FRAME(3, 8),
     ANIMCMD_FRAME(4, 8),
@@ -792,379 +792,379 @@ const union AnimCmd gFieldObjectImageAnim_HoOhFlapWings[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_HoOhStayStill[] =
+const union AnimCmd gEventObjectImageAnim_HoOhStayStill[] =
 {
     ANIMCMD_FRAME(3, 16),
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd *const gFieldObjectImageAnimTable_Inanimate[] = {
-    gFieldObjectImageAnim_StayStill,
-};
-
-const union AnimCmd *const gFieldObjectImageAnimTable_QuintyPlump[] = {
-    gFieldObjectImageAnim_QuintyPlumpFaceSouth,
-    gFieldObjectImageAnim_QuintyPlumpFaceNorth,
-    gFieldObjectImageAnim_QuintyPlumpFaceWest,
-    gFieldObjectImageAnim_QuintyPlumpFaceEast,
-    gFieldObjectImageAnim_QuintyPlumpGoSouth,
-    gFieldObjectImageAnim_QuintyPlumpGoNorth,
-    gFieldObjectImageAnim_QuintyPlumpGoWest,
-    gFieldObjectImageAnim_QuintyPlumpGoEast,
-    gFieldObjectImageAnim_QuintyPlumpGoFastSouth,
-    gFieldObjectImageAnim_QuintyPlumpGoFastNorth,
-    gFieldObjectImageAnim_QuintyPlumpGoFastWest,
-    gFieldObjectImageAnim_QuintyPlumpGoFastEast,
-    gFieldObjectImageAnim_QuintyPlumpGoFasterSouth,
-    gFieldObjectImageAnim_QuintyPlumpGoFasterNorth,
-    gFieldObjectImageAnim_QuintyPlumpGoFasterWest,
-    gFieldObjectImageAnim_QuintyPlumpGoFasterEast,
-    gFieldObjectImageAnim_QuintyPlumpGoFastestSouth,
-    gFieldObjectImageAnim_QuintyPlumpGoFastestNorth,
-    gFieldObjectImageAnim_QuintyPlumpGoFastestWest,
-    gFieldObjectImageAnim_QuintyPlumpGoFastestEast,
-};
-
-const union AnimCmd *const gFieldObjectImageAnimTable_Standard[] = {
-    gFieldObjectImageAnim_FaceSouth,
-    gFieldObjectImageAnim_FaceNorth,
-    gFieldObjectImageAnim_FaceWest,
-    gFieldObjectImageAnim_FaceEast,
-    gFieldObjectImageAnim_GoSouth,
-    gFieldObjectImageAnim_GoNorth,
-    gFieldObjectImageAnim_GoWest,
-    gFieldObjectImageAnim_GoEast,
-    gFieldObjectImageAnim_GoFastSouth,
-    gFieldObjectImageAnim_GoFastNorth,
-    gFieldObjectImageAnim_GoFastWest,
-    gFieldObjectImageAnim_GoFastEast,
-    gFieldObjectImageAnim_GoFasterSouth,
-    gFieldObjectImageAnim_GoFasterNorth,
-    gFieldObjectImageAnim_GoFasterWest,
-    gFieldObjectImageAnim_GoFasterEast,
-    gFieldObjectImageAnim_GoFastestSouth,
-    gFieldObjectImageAnim_GoFastestNorth,
-    gFieldObjectImageAnim_GoFastestWest,
-    gFieldObjectImageAnim_GoFastestEast,
-};
-
-const union AnimCmd *const gFieldObjectImageAnimTable_HoOh[] = {
-    gFieldObjectImageAnim_FaceSouth,
-    gFieldObjectImageAnim_FaceNorth,
-    gFieldObjectImageAnim_FaceWest,
-    gFieldObjectImageAnim_FaceEast,
-    gFieldObjectImageAnim_HoOhFlapWings,
-    gFieldObjectImageAnim_HoOhStayStill,
-    gFieldObjectImageAnim_GoWest,
-    gFieldObjectImageAnim_GoEast,
-    gFieldObjectImageAnim_GoFastSouth,
-    gFieldObjectImageAnim_GoFastNorth,
-    gFieldObjectImageAnim_GoFastWest,
-    gFieldObjectImageAnim_GoFastEast,
-    gFieldObjectImageAnim_GoFasterSouth,
-    gFieldObjectImageAnim_GoFasterNorth,
-    gFieldObjectImageAnim_GoFasterWest,
-    gFieldObjectImageAnim_GoFasterEast,
-    gFieldObjectImageAnim_GoFastestSouth,
-    gFieldObjectImageAnim_GoFastestNorth,
-    gFieldObjectImageAnim_GoFastestWest,
-    gFieldObjectImageAnim_GoFastestEast,
-};
-
-const union AnimCmd *const gFieldObjectImageAnimTable_Groudon3[] = {
-    gFieldObjectImageAnim_FaceSouth,
-    gFieldObjectImageAnim_FaceNorth,
-    gFieldObjectImageAnim_FaceWest,
-    gFieldObjectImageAnim_FaceEast,
-    gFieldObjectImageAnim_GoSouth,
-    gFieldObjectImageAnim_GoEast,
-    gFieldObjectImageAnim_GoWest,
-    gFieldObjectImageAnim_GoEast,
-    gFieldObjectImageAnim_GoFastSouth,
-    gFieldObjectImageAnim_GoFastEast,
-    gFieldObjectImageAnim_GoFastWest,
-    gFieldObjectImageAnim_GoFastEast,
-    gFieldObjectImageAnim_GoFasterSouth,
-    gFieldObjectImageAnim_GoFasterEast,
-    gFieldObjectImageAnim_GoFasterWest,
-    gFieldObjectImageAnim_GoFasterEast,
-    gFieldObjectImageAnim_GoFastestSouth,
-    gFieldObjectImageAnim_GoFastestEast,
-    gFieldObjectImageAnim_GoFastestWest,
-    gFieldObjectImageAnim_GoFastestEast,
-};
-
-const union AnimCmd gFieldObjectImageAnim_85091F0[] =
+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 gFieldObjectImageAnim_85091F8[] =
+const union AnimCmd gEventObjectImageAnim_85091F8[] =
 {
     ANIMCMD_FRAME(4, 1),
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_8509200[] =
+const union AnimCmd gEventObjectImageAnim_8509200[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_8509208[] =
+const union AnimCmd gEventObjectImageAnim_8509208[] =
 {
     ANIMCMD_FRAME(2, 1),
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_8509210[] =
+const union AnimCmd gEventObjectImageAnim_8509210[] =
 {
     ANIMCMD_FRAME(3, 1),
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_8509218[] =
+const union AnimCmd gEventObjectImageAnim_8509218[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_8509220[] =
+const union AnimCmd gEventObjectImageAnim_8509220[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_8509228[] =
+const union AnimCmd gEventObjectImageAnim_8509228[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldObjectImageAnim_8509230[] =
+const union AnimCmd gEventObjectImageAnim_8509230[] =
 {
     ANIMCMD_FRAME(3, 1),
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd *const gFieldObjectImageAnimTable_Rayquaza2[] = {
-    gFieldObjectImageAnim_8509218,
-    gFieldObjectImageAnim_8509220,
-    gFieldObjectImageAnim_8509228,
-    gFieldObjectImageAnim_8509230,
-    gFieldObjectImageAnim_8509200,
-    gFieldObjectImageAnim_85091F8,
-    gFieldObjectImageAnim_8509208,
-    gFieldObjectImageAnim_8509210,
-    gFieldObjectImageAnim_8509200,
-    gFieldObjectImageAnim_85091F8,
-    gFieldObjectImageAnim_85091F0,
-    gFieldObjectImageAnim_8509210,
-    gFieldObjectImageAnim_8509200,
-    gFieldObjectImageAnim_85091F8,
-    gFieldObjectImageAnim_8509208,
-    gFieldObjectImageAnim_8509210,
-    gFieldObjectImageAnim_8509200,
-    gFieldObjectImageAnim_85091F8,
-    gFieldObjectImageAnim_8509208,
-    gFieldObjectImageAnim_8509210,
-};
-
-const union AnimCmd *const gFieldObjectImageAnimTable_BrendanMayNormal[] = {
-    gFieldObjectImageAnim_FaceSouth,
-    gFieldObjectImageAnim_FaceNorth,
-    gFieldObjectImageAnim_FaceWest,
-    gFieldObjectImageAnim_FaceEast,
-    gFieldObjectImageAnim_GoSouth,
-    gFieldObjectImageAnim_GoNorth,
-    gFieldObjectImageAnim_GoWest,
-    gFieldObjectImageAnim_GoEast,
-    gFieldObjectImageAnim_GoFastSouth,
-    gFieldObjectImageAnim_GoFastNorth,
-    gFieldObjectImageAnim_GoFastWest,
-    gFieldObjectImageAnim_GoFastEast,
-    gFieldObjectImageAnim_GoFasterSouth,
-    gFieldObjectImageAnim_GoFasterNorth,
-    gFieldObjectImageAnim_GoFasterWest,
-    gFieldObjectImageAnim_GoFasterEast,
-    gFieldObjectImageAnim_GoFastestSouth,
-    gFieldObjectImageAnim_GoFastestNorth,
-    gFieldObjectImageAnim_GoFastestWest,
-    gFieldObjectImageAnim_GoFastestEast,
-    gFieldObjectImageAnim_RunSouth,
-    gFieldObjectImageAnim_RunNorth,
-    gFieldObjectImageAnim_RunWest,
-    gFieldObjectImageAnim_RunEast,
-};
-
-const union AnimCmd *const gFieldObjectImageAnimTable_AcroBike[] = {
-    gFieldObjectImageAnim_FaceSouth,
-    gFieldObjectImageAnim_FaceNorth,
-    gFieldObjectImageAnim_FaceWest,
-    gFieldObjectImageAnim_FaceEast,
-    gFieldObjectImageAnim_GoSouth,
-    gFieldObjectImageAnim_GoNorth,
-    gFieldObjectImageAnim_GoWest,
-    gFieldObjectImageAnim_GoEast,
-    gFieldObjectImageAnim_GoFastSouth,
-    gFieldObjectImageAnim_GoFastNorth,
-    gFieldObjectImageAnim_GoFastWest,
-    gFieldObjectImageAnim_GoFastEast,
-    gFieldObjectImageAnim_GoFasterSouth,
-    gFieldObjectImageAnim_GoFasterNorth,
-    gFieldObjectImageAnim_GoFasterWest,
-    gFieldObjectImageAnim_GoFasterEast,
-    gFieldObjectImageAnim_GoFastestSouth,
-    gFieldObjectImageAnim_GoFastestNorth,
-    gFieldObjectImageAnim_GoFastestWest,
-    gFieldObjectImageAnim_GoFastestEast,
-    gFieldObjectImageAnim_BunnyHoppyBackWheelSouth,
-    gFieldObjectImageAnim_BunnyHoppyBackWheelNorth,
-    gFieldObjectImageAnim_BunnyHoppyBackWheelWest,
-    gFieldObjectImageAnim_BunnyHoppyBackWheelEast,
-    gFieldObjectImageAnim_BunnyHoppyFrontWheelSouth,
-    gFieldObjectImageAnim_BunnyHoppyFrontWheelNorth,
-    gFieldObjectImageAnim_BunnyHoppyFrontWheelWest,
-    gFieldObjectImageAnim_BunnyHoppyFrontWheelEast,
-    gFieldObjectImageAnim_StandingWheelieBackWheelSouth,
-    gFieldObjectImageAnim_StandingWheelieBackWheelNorth,
-    gFieldObjectImageAnim_StandingWheelieBackWheelWest,
-    gFieldObjectImageAnim_StandingWheelieBackWheelEast,
-    gFieldObjectImageAnim_StandingWheelieFrontWheelSouth,
-    gFieldObjectImageAnim_StandingWheelieFrontWheelNorth,
-    gFieldObjectImageAnim_StandingWheelieFrontWheelWest,
-    gFieldObjectImageAnim_StandingWheelieFrontWheelEast,
-    gFieldObjectImageAnim_MovingWheelieSouth,
-    gFieldObjectImageAnim_MovingWheelieNorth,
-    gFieldObjectImageAnim_MovingWheelieWest,
-    gFieldObjectImageAnim_MovingWheelieEast,
-};
-
-const union AnimCmd *const gFieldObjectImageAnimTable_Surfing[] = {
-    gFieldObjectImageAnim_FaceSouth,
-    gFieldObjectImageAnim_FaceNorth,
-    gFieldObjectImageAnim_FaceWest,
-    gFieldObjectImageAnim_FaceEast,
-    gFieldObjectImageAnim_GoSouth,
-    gFieldObjectImageAnim_GoNorth,
-    gFieldObjectImageAnim_GoWest,
-    gFieldObjectImageAnim_GoEast,
-    gFieldObjectImageAnim_GoFastSouth,
-    gFieldObjectImageAnim_GoFastNorth,
-    gFieldObjectImageAnim_GoFastWest,
-    gFieldObjectImageAnim_GoFastEast,
-    gFieldObjectImageAnim_GoFasterSouth,
-    gFieldObjectImageAnim_GoFasterNorth,
-    gFieldObjectImageAnim_GoFasterWest,
-    gFieldObjectImageAnim_GoFasterEast,
-    gFieldObjectImageAnim_GoFastestSouth,
-    gFieldObjectImageAnim_GoFastestNorth,
-    gFieldObjectImageAnim_GoFastestWest,
-    gFieldObjectImageAnim_GoFastestEast,
-    gFieldObjectImageAnim_GetOnOffSurfBlobSouth,
-    gFieldObjectImageAnim_GetOnOffSurfBlobNorth,
-    gFieldObjectImageAnim_GetOnOffSurfBlobWest,
-    gFieldObjectImageAnim_GetOnOffSurfBlobEast,
-};
-
-const union AnimCmd *const gFieldObjectImageAnimTable_Nurse[] = {
-    gFieldObjectImageAnim_FaceSouth,
-    gFieldObjectImageAnim_FaceNorth,
-    gFieldObjectImageAnim_FaceWest,
-    gFieldObjectImageAnim_FaceEast,
-    gFieldObjectImageAnim_GoSouth,
-    gFieldObjectImageAnim_GoNorth,
-    gFieldObjectImageAnim_GoWest,
-    gFieldObjectImageAnim_GoEast,
-    gFieldObjectImageAnim_GoFastSouth,
-    gFieldObjectImageAnim_GoFastNorth,
-    gFieldObjectImageAnim_GoFastWest,
-    gFieldObjectImageAnim_GoFastEast,
-    gFieldObjectImageAnim_GoFasterSouth,
-    gFieldObjectImageAnim_GoFasterNorth,
-    gFieldObjectImageAnim_GoFasterWest,
-    gFieldObjectImageAnim_GoFasterEast,
-    gFieldObjectImageAnim_GoFastestSouth,
-    gFieldObjectImageAnim_GoFastestNorth,
-    gFieldObjectImageAnim_GoFastestWest,
-    gFieldObjectImageAnim_GoFastestEast,
-    gFieldObjectImageAnim_NurseBow,
-};
-
-const union AnimCmd *const gFieldObjectImageAnimTable_FieldMove[] = {
-    gFieldObjectImageAnim_FieldMove,
-};
-
-const union AnimCmd *const gFieldObjectImageAnimTable_BerryTree[] = {
-    gFieldObjectImageAnim_BerryTreeStage0,
-    gFieldObjectImageAnim_BerryTreeStage1,
-    gFieldObjectImageAnim_BerryTreeStage2,
-    gFieldObjectImageAnim_BerryTreeStage3,
-    gFieldObjectImageAnim_BerryTreeStage4,
-};
-
-const union AnimCmd *const gFieldObjectImageAnimTable_BreakableRock[] = {
-    gFieldObjectImageAnim_StayStill,
-    gFieldObjectImageAnim_RockBreak,
-};
-
-const union AnimCmd *const gFieldObjectImageAnimTable_CuttableTree[] = {
-    gFieldObjectImageAnim_StayStill,
-    gFieldObjectImageAnim_TreeCut,
-};
-
-const union AnimCmd *const gFieldObjectImageAnimTable_Fishing[] = {
-    gFieldObjectImageAnim_TakeOutRodSouth,
-    gFieldObjectImageAnim_TakeOutRodNorth,
-    gFieldObjectImageAnim_TakeOutRodWest,
-    gFieldObjectImageAnim_TakeOutRodEast,
-    gFieldObjectImageAnim_PutAwayRodSouth,
-    gFieldObjectImageAnim_PutAwayRodNorth,
-    gFieldObjectImageAnim_PutAwayRodWest,
-    gFieldObjectImageAnim_PutAwayRodEast,
-    gFieldObjectImageAnim_HookedPokemonSouth,
-    gFieldObjectImageAnim_HookedPokemonNorth,
-    gFieldObjectImageAnim_HookedPokemonWest,
-    gFieldObjectImageAnim_HookedPokemonEast,
-};
-
-const union AffineAnimCmd *const gFieldObjectRotScalAnimTable_KyogreGroudon[] = {
-    gFieldObjectRotScalAnim_8508FD8,
-    gFieldObjectRotScalAnim_8509008,
-    gFieldObjectRotScalAnim_8509050,
-    gFieldObjectRotScalAnim_8509040,
-    gFieldObjectRotScalAnim_8509078,
-    gFieldObjectRotScalAnim_8509060,
+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 = gFieldObjectImageAnimTable_QuintyPlump,
+        .anims = gEventObjectImageAnimTable_QuintyPlump,
         .animPos = {1, 3, 0, 2},
     },
     {
-        .anims = gFieldObjectImageAnimTable_Standard,
+        .anims = gEventObjectImageAnimTable_Standard,
         .animPos = {1, 3, 0, 2},
     },
     {
-        .anims = gFieldObjectImageAnimTable_BrendanMayNormal,
+        .anims = gEventObjectImageAnimTable_BrendanMayNormal,
         .animPos = {1, 3, 0, 2},
     },
     {
-        .anims = gFieldObjectImageAnimTable_AcroBike,
+        .anims = gEventObjectImageAnimTable_AcroBike,
         .animPos = {1, 3, 0, 2},
     },
     {
-        .anims = gFieldObjectImageAnimTable_Surfing,
+        .anims = gEventObjectImageAnimTable_Surfing,
         .animPos = {1, 3, 0, 2},
     },
     {
-        .anims = gFieldObjectImageAnimTable_Nurse,
+        .anims = gEventObjectImageAnimTable_Nurse,
         .animPos = {1, 3, 0, 2},
     },
     {
-        .anims = gFieldObjectImageAnimTable_Fishing,
+        .anims = gEventObjectImageAnimTable_Fishing,
         .animPos = {1, 3, 0, 2},
     },
     {
diff --git a/src/data/field_event_obj/event_object_graphics.h b/src/data/field_event_obj/event_object_graphics.h
index 9a9f096a2..3d4303189 100755
--- a/src/data/field_event_obj/event_object_graphics.h
+++ b/src/data/field_event_obj/event_object_graphics.h
@@ -1,44 +1,44 @@
 #ifndef GUARD_EVENT_OBJECT_GFX_H
 #define GUARD_EVENT_OBJECT_GFX_H
 
-const u32 gFieldObjectPic_BrendanNormal_0[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/00.4bpp");
-const u32 gFieldObjectPic_BrendanNormal_1[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/01.4bpp");
-const u32 gFieldObjectPic_BrendanNormal_2[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/02.4bpp");
-const u32 gFieldObjectPic_BrendanNormal_3[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/03.4bpp");
-const u32 gFieldObjectPic_BrendanNormal_4[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/04.4bpp");
-const u32 gFieldObjectPic_BrendanNormal_5[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/05.4bpp");
-const u32 gFieldObjectPic_BrendanNormal_6[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/06.4bpp");
-const u32 gFieldObjectPic_BrendanNormal_7[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/07.4bpp");
-const u32 gFieldObjectPic_BrendanNormal_8[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/08.4bpp");
-const u32 gFieldObjectPic_BrendanNormal_9[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/09.4bpp");
-const u32 gFieldObjectPic_BrendanNormal_10[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/10.4bpp");
-const u32 gFieldObjectPic_BrendanNormal_11[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/11.4bpp");
-const u32 gFieldObjectPic_BrendanNormal_12[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/12.4bpp");
-const u32 gFieldObjectPic_BrendanNormal_13[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/13.4bpp");
-const u32 gFieldObjectPic_BrendanNormal_14[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/14.4bpp");
-const u32 gFieldObjectPic_BrendanNormal_15[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/15.4bpp");
-const u32 gFieldObjectPic_BrendanNormal_16[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/16.4bpp");
-const u32 gFieldObjectPic_BrendanNormal_17[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/17.4bpp");
-const u16 gFieldObjectPalette8[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_08.gbapal");
-const u32 gFieldObjectPic_RubySapphireBrendan_0[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/00.4bpp");
-const u32 gFieldObjectPic_RubySapphireBrendan_1[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/01.4bpp");
-const u32 gFieldObjectPic_RubySapphireBrendan_2[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/02.4bpp");
-const u32 gFieldObjectPic_RubySapphireBrendan_3[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/03.4bpp");
-const u32 gFieldObjectPic_RubySapphireBrendan_4[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/04.4bpp");
-const u32 gFieldObjectPic_RubySapphireBrendan_5[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/05.4bpp");
-const u32 gFieldObjectPic_RubySapphireBrendan_6[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/06.4bpp");
-const u32 gFieldObjectPic_RubySapphireBrendan_7[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/07.4bpp");
-const u32 gFieldObjectPic_RubySapphireBrendan_8[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/08.4bpp");
-const u32 gFieldObjectPic_RubySapphireBrendan_9[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/09.4bpp");
-const u32 gFieldObjectPic_RubySapphireBrendan_10[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/10.4bpp");
-const u32 gFieldObjectPic_RubySapphireBrendan_11[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/11.4bpp");
-const u32 gFieldObjectPic_RubySapphireBrendan_12[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/12.4bpp");
-const u32 gFieldObjectPic_RubySapphireBrendan_13[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/13.4bpp");
-const u32 gFieldObjectPic_RubySapphireBrendan_14[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/14.4bpp");
-const u32 gFieldObjectPic_RubySapphireBrendan_15[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/15.4bpp");
-const u32 gFieldObjectPic_RubySapphireBrendan_16[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/16.4bpp");
-const u32 gFieldObjectPic_RubySapphireBrendan_17[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_brendan/17.4bpp");
-const u16 gFieldObjectPalette33[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_33.gbapal");
+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] = {};
@@ -54,124 +54,124 @@ const u16 NullPalette_8499B98[16] = {};
 const u16 NullPalette_8499BB8[16] = {};
 const u16 NullPalette_8499BD8[16] = {};
 const u16 NullPalette_8499BF8[16] = {};
-const u16 gFieldObjectPalette9[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_09.gbapal");
-const u16 gFieldObjectPalette10[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_10.gbapal");
-const u32 gFieldObjectPic_BrendanFieldMove_0[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/field_move/0.4bpp");
-const u32 gFieldObjectPic_BrendanFieldMove_1[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/field_move/1.4bpp");
-const u32 gFieldObjectPic_BrendanFieldMove_2[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/field_move/2.4bpp");
-const u32 gFieldObjectPic_BrendanFieldMove_3[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/field_move/3.4bpp");
-const u32 gFieldObjectPic_BrendanFieldMove_4[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/field_move/4.4bpp");
-const u32 gFieldObjectPic_BrendanSurfing_0[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/surfing/0.4bpp");
-const u32 gFieldObjectPic_BrendanSurfing_3[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/surfing/3.4bpp");
-const u32 gFieldObjectPic_BrendanSurfing_1[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/surfing/1.4bpp");
-const u32 gFieldObjectPic_BrendanSurfing_4[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/surfing/4.4bpp");
-const u32 gFieldObjectPic_BrendanSurfing_2[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/surfing/2.4bpp");
-const u32 gFieldObjectPic_BrendanSurfing_5[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/surfing/5.4bpp");
-const u32 gFieldObjectPic_BrendanMachBike_0[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/mach_bike/0.4bpp");
-const u32 gFieldObjectPic_BrendanMachBike_1[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/mach_bike/1.4bpp");
-const u32 gFieldObjectPic_BrendanMachBike_2[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/mach_bike/2.4bpp");
-const u32 gFieldObjectPic_BrendanMachBike_3[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/mach_bike/3.4bpp");
-const u32 gFieldObjectPic_BrendanMachBike_4[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/mach_bike/4.4bpp");
-const u32 gFieldObjectPic_BrendanMachBike_5[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/mach_bike/5.4bpp");
-const u32 gFieldObjectPic_BrendanMachBike_6[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/mach_bike/6.4bpp");
-const u32 gFieldObjectPic_BrendanMachBike_7[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/mach_bike/7.4bpp");
-const u32 gFieldObjectPic_BrendanMachBike_8[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/mach_bike/8.4bpp");
-const u32 gFieldObjectPic_BrendanAcroBike_0[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/00.4bpp");
-const u32 gFieldObjectPic_BrendanAcroBike_1[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/01.4bpp");
-const u32 gFieldObjectPic_BrendanAcroBike_2[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/02.4bpp");
-const u32 gFieldObjectPic_BrendanAcroBike_3[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/03.4bpp");
-const u32 gFieldObjectPic_BrendanAcroBike_4[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/04.4bpp");
-const u32 gFieldObjectPic_BrendanAcroBike_5[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/05.4bpp");
-const u32 gFieldObjectPic_BrendanAcroBike_6[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/06.4bpp");
-const u32 gFieldObjectPic_BrendanAcroBike_7[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/07.4bpp");
-const u32 gFieldObjectPic_BrendanAcroBike_8[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/08.4bpp");
-const u32 gFieldObjectPic_BrendanAcroBike_9[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/09.4bpp");
-const u32 gFieldObjectPic_BrendanAcroBike_10[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/10.4bpp");
-const u32 gFieldObjectPic_BrendanAcroBike_11[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/11.4bpp");
-const u32 gFieldObjectPic_BrendanAcroBike_12[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/12.4bpp");
-const u32 gFieldObjectPic_BrendanAcroBike_13[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/13.4bpp");
-const u32 gFieldObjectPic_BrendanAcroBike_14[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/14.4bpp");
-const u32 gFieldObjectPic_BrendanAcroBike_15[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/15.4bpp");
-const u32 gFieldObjectPic_BrendanAcroBike_16[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/16.4bpp");
-const u32 gFieldObjectPic_BrendanAcroBike_17[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/17.4bpp");
-const u32 gFieldObjectPic_BrendanAcroBike_18[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/18.4bpp");
-const u32 gFieldObjectPic_BrendanAcroBike_19[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/19.4bpp");
-const u32 gFieldObjectPic_BrendanAcroBike_20[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/20.4bpp");
-const u32 gFieldObjectPic_BrendanAcroBike_21[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/21.4bpp");
-const u32 gFieldObjectPic_BrendanAcroBike_22[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/22.4bpp");
-const u32 gFieldObjectPic_BrendanAcroBike_23[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/23.4bpp");
-const u32 gFieldObjectPic_BrendanAcroBike_24[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/24.4bpp");
-const u32 gFieldObjectPic_BrendanAcroBike_25[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/25.4bpp");
-const u32 gFieldObjectPic_BrendanAcroBike_26[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/26.4bpp");
-const u32 gFieldObjectPic_BrendanFishing_0[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/00.4bpp");
-const u32 gFieldObjectPic_BrendanFishing_1[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/01.4bpp");
-const u32 gFieldObjectPic_BrendanFishing_2[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/02.4bpp");
-const u32 gFieldObjectPic_BrendanFishing_3[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/03.4bpp");
-const u32 gFieldObjectPic_BrendanFishing_4[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/04.4bpp");
-const u32 gFieldObjectPic_BrendanFishing_5[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/05.4bpp");
-const u32 gFieldObjectPic_BrendanFishing_6[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/06.4bpp");
-const u32 gFieldObjectPic_BrendanFishing_7[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/07.4bpp");
-const u32 gFieldObjectPic_BrendanFishing_8[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/08.4bpp");
-const u32 gFieldObjectPic_BrendanFishing_9[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/09.4bpp");
-const u32 gFieldObjectPic_BrendanFishing_10[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/10.4bpp");
-const u32 gFieldObjectPic_BrendanFishing_11[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/11.4bpp");
-const u32 gFieldObjectPic_BrendanWatering_0[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/watering/0.4bpp");
-const u32 gFieldObjectPic_BrendanWatering_3[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/watering/3.4bpp");
-const u32 gFieldObjectPic_BrendanWatering_1[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/watering/1.4bpp");
-const u32 gFieldObjectPic_BrendanWatering_4[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/watering/4.4bpp");
-const u32 gFieldObjectPic_BrendanWatering_2[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/watering/2.4bpp");
-const u32 gFieldObjectPic_BrendanWatering_5[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/watering/5.4bpp");
-const u32 gFieldObjectPic_BrendanDecorating[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/decorating.4bpp");
-const u32 gFieldObjectPic_MayDecorating[] = INCBIN_U32("graphics/map_objects/pics/people/may/decorating.4bpp");
-const u32 gFieldObjectPic_BrendanUnderwater_0[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/underwater/0.4bpp");
-const u32 gFieldObjectPic_BrendanUnderwater_1[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/underwater/1.4bpp");
-const u32 gFieldObjectPic_BrendanUnderwater_2[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/underwater/2.4bpp");
-const u32 gFieldObjectPic_BrendanUnderwater_3[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/underwater/3.4bpp");
-const u32 gFieldObjectPic_MayUnderwater_0[] = INCBIN_U32("graphics/map_objects/pics/people/may/underwater/0.4bpp");
-const u32 gFieldObjectPic_MayUnderwater_1[] = INCBIN_U32("graphics/map_objects/pics/people/may/underwater/1.4bpp");
-const u32 gFieldObjectPic_MayUnderwater_2[] = INCBIN_U32("graphics/map_objects/pics/people/may/underwater/2.4bpp");
-const u32 gFieldObjectPic_MayUnderwater_3[] = INCBIN_U32("graphics/map_objects/pics/people/may/underwater/3.4bpp");
-const u16 gFieldObjectPalette11[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_11.gbapal");
-const u32 gFieldObjectPic_MayNormal_0[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/00.4bpp");
-const u32 gFieldObjectPic_MayNormal_1[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/01.4bpp");
-const u32 gFieldObjectPic_MayNormal_2[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/02.4bpp");
-const u32 gFieldObjectPic_MayNormal_3[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/03.4bpp");
-const u32 gFieldObjectPic_MayNormal_4[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/04.4bpp");
-const u32 gFieldObjectPic_MayNormal_5[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/05.4bpp");
-const u32 gFieldObjectPic_MayNormal_6[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/06.4bpp");
-const u32 gFieldObjectPic_MayNormal_7[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/07.4bpp");
-const u32 gFieldObjectPic_MayNormal_8[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/08.4bpp");
-const u32 gFieldObjectPic_MayNormal_9[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/09.4bpp");
-const u32 gFieldObjectPic_MayNormal_10[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/10.4bpp");
-const u32 gFieldObjectPic_MayNormal_11[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/11.4bpp");
-const u32 gFieldObjectPic_MayNormal_12[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/12.4bpp");
-const u32 gFieldObjectPic_MayNormal_13[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/13.4bpp");
-const u32 gFieldObjectPic_MayNormal_14[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/14.4bpp");
-const u32 gFieldObjectPic_MayNormal_15[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/15.4bpp");
-const u32 gFieldObjectPic_MayNormal_16[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/16.4bpp");
-const u32 gFieldObjectPic_MayNormal_17[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/17.4bpp");
-const u16 gFieldObjectPalette17[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_17.gbapal");
-const u16 gFieldObjectPalette18[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_18.gbapal");
-const u32 gFieldObjectPic_RubySapphireMay_0[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/00.4bpp");
-const u32 gFieldObjectPic_RubySapphireMay_1[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/01.4bpp");
-const u32 gFieldObjectPic_RubySapphireMay_2[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/02.4bpp");
-const u32 gFieldObjectPic_RubySapphireMay_3[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/03.4bpp");
-const u32 gFieldObjectPic_RubySapphireMay_4[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/04.4bpp");
-const u32 gFieldObjectPic_RubySapphireMay_5[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/05.4bpp");
-const u32 gFieldObjectPic_RubySapphireMay_6[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/06.4bpp");
-const u32 gFieldObjectPic_RubySapphireMay_7[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/07.4bpp");
-const u32 gFieldObjectPic_RubySapphireMay_8[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/08.4bpp");
-const u32 gFieldObjectPic_RubySapphireMay_9[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/09.4bpp");
-const u32 gFieldObjectPic_RubySapphireMay_10[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/10.4bpp");
-const u32 gFieldObjectPic_RubySapphireMay_11[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/11.4bpp");
-const u32 gFieldObjectPic_RubySapphireMay_12[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/12.4bpp");
-const u32 gFieldObjectPic_RubySapphireMay_13[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/13.4bpp");
-const u32 gFieldObjectPic_RubySapphireMay_14[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/14.4bpp");
-const u32 gFieldObjectPic_RubySapphireMay_15[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/15.4bpp");
-const u32 gFieldObjectPic_RubySapphireMay_16[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/16.4bpp");
-const u32 gFieldObjectPic_RubySapphireMay_17[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_may/17.4bpp");
-const u16 gFieldObjectPalette34[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_34.gbapal");
-const u16 gUnusedFieldObjectPalette[] = INCBIN_U16("graphics/map_objects/palettes/unused_palette.gbapal");
+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] = {};
@@ -186,1482 +186,1482 @@ const u16 NullPalette_84A5638[16] = {};
 const u16 NullPalette_84A5658[16] = {};
 const u16 NullPalette_84A5678[16] = {};
 const u16 NullPalette_84A5698[16] = {};
-const u32 gFieldObjectPic_MayMachBike_0[] = INCBIN_U32("graphics/map_objects/pics/people/may/mach_bike/0.4bpp");
-const u32 gFieldObjectPic_MayMachBike_1[] = INCBIN_U32("graphics/map_objects/pics/people/may/mach_bike/1.4bpp");
-const u32 gFieldObjectPic_MayMachBike_2[] = INCBIN_U32("graphics/map_objects/pics/people/may/mach_bike/2.4bpp");
-const u32 gFieldObjectPic_MayMachBike_3[] = INCBIN_U32("graphics/map_objects/pics/people/may/mach_bike/3.4bpp");
-const u32 gFieldObjectPic_MayMachBike_4[] = INCBIN_U32("graphics/map_objects/pics/people/may/mach_bike/4.4bpp");
-const u32 gFieldObjectPic_MayMachBike_5[] = INCBIN_U32("graphics/map_objects/pics/people/may/mach_bike/5.4bpp");
-const u32 gFieldObjectPic_MayMachBike_6[] = INCBIN_U32("graphics/map_objects/pics/people/may/mach_bike/6.4bpp");
-const u32 gFieldObjectPic_MayMachBike_7[] = INCBIN_U32("graphics/map_objects/pics/people/may/mach_bike/7.4bpp");
-const u32 gFieldObjectPic_MayMachBike_8[] = INCBIN_U32("graphics/map_objects/pics/people/may/mach_bike/8.4bpp");
-const u32 gFieldObjectPic_MayAcroBike_0[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/00.4bpp");
-const u32 gFieldObjectPic_MayAcroBike_1[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/01.4bpp");
-const u32 gFieldObjectPic_MayAcroBike_2[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/02.4bpp");
-const u32 gFieldObjectPic_MayAcroBike_3[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/03.4bpp");
-const u32 gFieldObjectPic_MayAcroBike_4[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/04.4bpp");
-const u32 gFieldObjectPic_MayAcroBike_5[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/05.4bpp");
-const u32 gFieldObjectPic_MayAcroBike_6[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/06.4bpp");
-const u32 gFieldObjectPic_MayAcroBike_7[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/07.4bpp");
-const u32 gFieldObjectPic_MayAcroBike_8[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/08.4bpp");
-const u32 gFieldObjectPic_MayAcroBike_9[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/09.4bpp");
-const u32 gFieldObjectPic_MayAcroBike_10[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/10.4bpp");
-const u32 gFieldObjectPic_MayAcroBike_11[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/11.4bpp");
-const u32 gFieldObjectPic_MayAcroBike_12[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/12.4bpp");
-const u32 gFieldObjectPic_MayAcroBike_13[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/13.4bpp");
-const u32 gFieldObjectPic_MayAcroBike_14[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/14.4bpp");
-const u32 gFieldObjectPic_MayAcroBike_15[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/15.4bpp");
-const u32 gFieldObjectPic_MayAcroBike_16[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/16.4bpp");
-const u32 gFieldObjectPic_MayAcroBike_17[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/17.4bpp");
-const u32 gFieldObjectPic_MayAcroBike_18[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/18.4bpp");
-const u32 gFieldObjectPic_MayAcroBike_19[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/19.4bpp");
-const u32 gFieldObjectPic_MayAcroBike_20[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/20.4bpp");
-const u32 gFieldObjectPic_MayAcroBike_21[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/21.4bpp");
-const u32 gFieldObjectPic_MayAcroBike_22[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/22.4bpp");
-const u32 gFieldObjectPic_MayAcroBike_23[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/23.4bpp");
-const u32 gFieldObjectPic_MayAcroBike_24[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/24.4bpp");
-const u32 gFieldObjectPic_MayAcroBike_25[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/25.4bpp");
-const u32 gFieldObjectPic_MayAcroBike_26[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/26.4bpp");
-const u32 gFieldObjectPic_MaySurfing_0[] = INCBIN_U32("graphics/map_objects/pics/people/may/surfing/0.4bpp");
-const u32 gFieldObjectPic_MaySurfing_3[] = INCBIN_U32("graphics/map_objects/pics/people/may/surfing/3.4bpp");
-const u32 gFieldObjectPic_MaySurfing_1[] = INCBIN_U32("graphics/map_objects/pics/people/may/surfing/1.4bpp");
-const u32 gFieldObjectPic_MaySurfing_4[] = INCBIN_U32("graphics/map_objects/pics/people/may/surfing/4.4bpp");
-const u32 gFieldObjectPic_MaySurfing_2[] = INCBIN_U32("graphics/map_objects/pics/people/may/surfing/2.4bpp");
-const u32 gFieldObjectPic_MaySurfing_5[] = INCBIN_U32("graphics/map_objects/pics/people/may/surfing/5.4bpp");
-const u32 gFieldObjectPic_MayFieldMove_0[] = INCBIN_U32("graphics/map_objects/pics/people/may/field_move/0.4bpp");
-const u32 gFieldObjectPic_MayFieldMove_1[] = INCBIN_U32("graphics/map_objects/pics/people/may/field_move/1.4bpp");
-const u32 gFieldObjectPic_MayFieldMove_2[] = INCBIN_U32("graphics/map_objects/pics/people/may/field_move/2.4bpp");
-const u32 gFieldObjectPic_MayFieldMove_3[] = INCBIN_U32("graphics/map_objects/pics/people/may/field_move/3.4bpp");
-const u32 gFieldObjectPic_MayFieldMove_4[] = INCBIN_U32("graphics/map_objects/pics/people/may/field_move/4.4bpp");
-const u32 gFieldObjectPic_MayFishing_0[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/00.4bpp");
-const u32 gFieldObjectPic_MayFishing_1[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/01.4bpp");
-const u32 gFieldObjectPic_MayFishing_2[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/02.4bpp");
-const u32 gFieldObjectPic_MayFishing_3[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/03.4bpp");
-const u32 gFieldObjectPic_MayFishing_4[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/04.4bpp");
-const u32 gFieldObjectPic_MayFishing_5[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/05.4bpp");
-const u32 gFieldObjectPic_MayFishing_6[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/06.4bpp");
-const u32 gFieldObjectPic_MayFishing_7[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/07.4bpp");
-const u32 gFieldObjectPic_MayFishing_8[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/08.4bpp");
-const u32 gFieldObjectPic_MayFishing_9[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/09.4bpp");
-const u32 gFieldObjectPic_MayFishing_10[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/10.4bpp");
-const u32 gFieldObjectPic_MayFishing_11[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/11.4bpp");
-const u32 gFieldObjectPic_MayWatering_0[] = INCBIN_U32("graphics/map_objects/pics/people/may/watering/0.4bpp");
-const u32 gFieldObjectPic_MayWatering_3[] = INCBIN_U32("graphics/map_objects/pics/people/may/watering/3.4bpp");
-const u32 gFieldObjectPic_MayWatering_1[] = INCBIN_U32("graphics/map_objects/pics/people/may/watering/1.4bpp");
-const u32 gFieldObjectPic_MayWatering_4[] = INCBIN_U32("graphics/map_objects/pics/people/may/watering/4.4bpp");
-const u32 gFieldObjectPic_MayWatering_2[] = INCBIN_U32("graphics/map_objects/pics/people/may/watering/2.4bpp");
-const u32 gFieldObjectPic_MayWatering_5[] = INCBIN_U32("graphics/map_objects/pics/people/may/watering/5.4bpp");
-const u16 gFieldObjectPalette0[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_00.gbapal");
-const u16 gFieldObjectPalette1[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_01.gbapal");
-const u16 gFieldObjectPalette2[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_02.gbapal");
-const u16 gFieldObjectPalette3[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_03.gbapal");
-const u16 gFieldObjectPalette4[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_04.gbapal");
-const u16 gFieldObjectPalette5[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_05.gbapal");
-const u16 gFieldObjectPalette6[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_06.gbapal");
-const u16 gFieldObjectPalette7[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_07.gbapal");
-const u32 gFieldObjectPic_LittleBoy1_0[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_1/0.4bpp");
-const u32 gFieldObjectPic_LittleBoy1_1[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_1/1.4bpp");
-const u32 gFieldObjectPic_LittleBoy1_2[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_1/2.4bpp");
-const u32 gFieldObjectPic_LittleBoy1_3[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_1/3.4bpp");
-const u32 gFieldObjectPic_LittleBoy1_4[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_1/4.4bpp");
-const u32 gFieldObjectPic_LittleBoy1_5[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_1/5.4bpp");
-const u32 gFieldObjectPic_LittleBoy1_6[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_1/6.4bpp");
-const u32 gFieldObjectPic_LittleBoy1_7[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_1/7.4bpp");
-const u32 gFieldObjectPic_LittleBoy1_8[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_1/8.4bpp");
-const u32 gFieldObjectPic_LittleGirl1_0[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_1/0.4bpp");
-const u32 gFieldObjectPic_LittleGirl1_1[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_1/1.4bpp");
-const u32 gFieldObjectPic_LittleGirl1_2[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_1/2.4bpp");
-const u32 gFieldObjectPic_LittleGirl1_3[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_1/3.4bpp");
-const u32 gFieldObjectPic_LittleGirl1_4[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_1/4.4bpp");
-const u32 gFieldObjectPic_LittleGirl1_5[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_1/5.4bpp");
-const u32 gFieldObjectPic_LittleGirl1_6[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_1/6.4bpp");
-const u32 gFieldObjectPic_LittleGirl1_7[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_1/7.4bpp");
-const u32 gFieldObjectPic_LittleGirl1_8[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_1/8.4bpp");
-const u32 gFieldObjectPic_Boy1_0[] = INCBIN_U32("graphics/map_objects/pics/people/boy_1/0.4bpp");
-const u32 gFieldObjectPic_Boy1_1[] = INCBIN_U32("graphics/map_objects/pics/people/boy_1/1.4bpp");
-const u32 gFieldObjectPic_Boy1_2[] = INCBIN_U32("graphics/map_objects/pics/people/boy_1/2.4bpp");
-const u32 gFieldObjectPic_Boy1_3[] = INCBIN_U32("graphics/map_objects/pics/people/boy_1/3.4bpp");
-const u32 gFieldObjectPic_Boy1_4[] = INCBIN_U32("graphics/map_objects/pics/people/boy_1/4.4bpp");
-const u32 gFieldObjectPic_Boy1_5[] = INCBIN_U32("graphics/map_objects/pics/people/boy_1/5.4bpp");
-const u32 gFieldObjectPic_Boy1_6[] = INCBIN_U32("graphics/map_objects/pics/people/boy_1/6.4bpp");
-const u32 gFieldObjectPic_Boy1_7[] = INCBIN_U32("graphics/map_objects/pics/people/boy_1/7.4bpp");
-const u32 gFieldObjectPic_Boy1_8[] = INCBIN_U32("graphics/map_objects/pics/people/boy_1/8.4bpp");
-const u32 gFieldObjectPic_Girl1_0[] = INCBIN_U32("graphics/map_objects/pics/people/girl_1/0.4bpp");
-const u32 gFieldObjectPic_Girl1_1[] = INCBIN_U32("graphics/map_objects/pics/people/girl_1/1.4bpp");
-const u32 gFieldObjectPic_Girl1_2[] = INCBIN_U32("graphics/map_objects/pics/people/girl_1/2.4bpp");
-const u32 gFieldObjectPic_Girl1_3[] = INCBIN_U32("graphics/map_objects/pics/people/girl_1/3.4bpp");
-const u32 gFieldObjectPic_Girl1_4[] = INCBIN_U32("graphics/map_objects/pics/people/girl_1/4.4bpp");
-const u32 gFieldObjectPic_Girl1_5[] = INCBIN_U32("graphics/map_objects/pics/people/girl_1/5.4bpp");
-const u32 gFieldObjectPic_Girl1_6[] = INCBIN_U32("graphics/map_objects/pics/people/girl_1/6.4bpp");
-const u32 gFieldObjectPic_Girl1_7[] = INCBIN_U32("graphics/map_objects/pics/people/girl_1/7.4bpp");
-const u32 gFieldObjectPic_Girl1_8[] = INCBIN_U32("graphics/map_objects/pics/people/girl_1/8.4bpp");
-const u32 gFieldObjectPic_Boy2_0[] = INCBIN_U32("graphics/map_objects/pics/people/boy_2/0.4bpp");
-const u32 gFieldObjectPic_Boy2_1[] = INCBIN_U32("graphics/map_objects/pics/people/boy_2/1.4bpp");
-const u32 gFieldObjectPic_Boy2_2[] = INCBIN_U32("graphics/map_objects/pics/people/boy_2/2.4bpp");
-const u32 gFieldObjectPic_Boy2_3[] = INCBIN_U32("graphics/map_objects/pics/people/boy_2/3.4bpp");
-const u32 gFieldObjectPic_Boy2_4[] = INCBIN_U32("graphics/map_objects/pics/people/boy_2/4.4bpp");
-const u32 gFieldObjectPic_Boy2_5[] = INCBIN_U32("graphics/map_objects/pics/people/boy_2/5.4bpp");
-const u32 gFieldObjectPic_Boy2_6[] = INCBIN_U32("graphics/map_objects/pics/people/boy_2/6.4bpp");
-const u32 gFieldObjectPic_Boy2_7[] = INCBIN_U32("graphics/map_objects/pics/people/boy_2/7.4bpp");
-const u32 gFieldObjectPic_Boy2_8[] = INCBIN_U32("graphics/map_objects/pics/people/boy_2/8.4bpp");
-const u32 gFieldObjectPic_Girl2_0[] = INCBIN_U32("graphics/map_objects/pics/people/girl_2/0.4bpp");
-const u32 gFieldObjectPic_Girl2_1[] = INCBIN_U32("graphics/map_objects/pics/people/girl_2/1.4bpp");
-const u32 gFieldObjectPic_Girl2_2[] = INCBIN_U32("graphics/map_objects/pics/people/girl_2/2.4bpp");
-const u32 gFieldObjectPic_Girl2_3[] = INCBIN_U32("graphics/map_objects/pics/people/girl_2/3.4bpp");
-const u32 gFieldObjectPic_Girl2_4[] = INCBIN_U32("graphics/map_objects/pics/people/girl_2/4.4bpp");
-const u32 gFieldObjectPic_Girl2_5[] = INCBIN_U32("graphics/map_objects/pics/people/girl_2/5.4bpp");
-const u32 gFieldObjectPic_Girl2_6[] = INCBIN_U32("graphics/map_objects/pics/people/girl_2/6.4bpp");
-const u32 gFieldObjectPic_Girl2_7[] = INCBIN_U32("graphics/map_objects/pics/people/girl_2/7.4bpp");
-const u32 gFieldObjectPic_Girl2_8[] = INCBIN_U32("graphics/map_objects/pics/people/girl_2/8.4bpp");
-const u32 gFieldObjectPic_LittleBoy2_0[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_2/0.4bpp");
-const u32 gFieldObjectPic_LittleBoy2_1[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_2/1.4bpp");
-const u32 gFieldObjectPic_LittleBoy2_2[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_2/2.4bpp");
-const u32 gFieldObjectPic_LittleBoy2_3[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_2/3.4bpp");
-const u32 gFieldObjectPic_LittleBoy2_4[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_2/4.4bpp");
-const u32 gFieldObjectPic_LittleBoy2_5[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_2/5.4bpp");
-const u32 gFieldObjectPic_LittleBoy2_6[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_2/6.4bpp");
-const u32 gFieldObjectPic_LittleBoy2_7[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_2/7.4bpp");
-const u32 gFieldObjectPic_LittleBoy2_8[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_2/8.4bpp");
-const u32 gFieldObjectPic_LittleGirl2_0[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_2/0.4bpp");
-const u32 gFieldObjectPic_LittleGirl2_1[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_2/1.4bpp");
-const u32 gFieldObjectPic_LittleGirl2_2[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_2/2.4bpp");
-const u32 gFieldObjectPic_LittleGirl2_3[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_2/3.4bpp");
-const u32 gFieldObjectPic_LittleGirl2_4[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_2/4.4bpp");
-const u32 gFieldObjectPic_LittleGirl2_5[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_2/5.4bpp");
-const u32 gFieldObjectPic_LittleGirl2_6[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_2/6.4bpp");
-const u32 gFieldObjectPic_LittleGirl2_7[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_2/7.4bpp");
-const u32 gFieldObjectPic_LittleGirl2_8[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_2/8.4bpp");
-const u32 gFieldObjectPic_Boy3_0[] = INCBIN_U32("graphics/map_objects/pics/people/boy_3/0.4bpp");
-const u32 gFieldObjectPic_Boy3_1[] = INCBIN_U32("graphics/map_objects/pics/people/boy_3/1.4bpp");
-const u32 gFieldObjectPic_Boy3_2[] = INCBIN_U32("graphics/map_objects/pics/people/boy_3/2.4bpp");
-const u32 gFieldObjectPic_Boy3_3[] = INCBIN_U32("graphics/map_objects/pics/people/boy_3/3.4bpp");
-const u32 gFieldObjectPic_Boy3_4[] = INCBIN_U32("graphics/map_objects/pics/people/boy_3/4.4bpp");
-const u32 gFieldObjectPic_Boy3_5[] = INCBIN_U32("graphics/map_objects/pics/people/boy_3/5.4bpp");
-const u32 gFieldObjectPic_Boy3_6[] = INCBIN_U32("graphics/map_objects/pics/people/boy_3/6.4bpp");
-const u32 gFieldObjectPic_Boy3_7[] = INCBIN_U32("graphics/map_objects/pics/people/boy_3/7.4bpp");
-const u32 gFieldObjectPic_Boy3_8[] = INCBIN_U32("graphics/map_objects/pics/people/boy_3/8.4bpp");
-const u32 gFieldObjectPic_Girl3_0[] = INCBIN_U32("graphics/map_objects/pics/people/girl_3/0.4bpp");
-const u32 gFieldObjectPic_Girl3_1[] = INCBIN_U32("graphics/map_objects/pics/people/girl_3/1.4bpp");
-const u32 gFieldObjectPic_Girl3_2[] = INCBIN_U32("graphics/map_objects/pics/people/girl_3/2.4bpp");
-const u32 gFieldObjectPic_Girl3_3[] = INCBIN_U32("graphics/map_objects/pics/people/girl_3/3.4bpp");
-const u32 gFieldObjectPic_Girl3_4[] = INCBIN_U32("graphics/map_objects/pics/people/girl_3/4.4bpp");
-const u32 gFieldObjectPic_Girl3_5[] = INCBIN_U32("graphics/map_objects/pics/people/girl_3/5.4bpp");
-const u32 gFieldObjectPic_Girl3_6[] = INCBIN_U32("graphics/map_objects/pics/people/girl_3/6.4bpp");
-const u32 gFieldObjectPic_Girl3_7[] = INCBIN_U32("graphics/map_objects/pics/people/girl_3/7.4bpp");
-const u32 gFieldObjectPic_Girl3_8[] = INCBIN_U32("graphics/map_objects/pics/people/girl_3/8.4bpp");
-const u32 gFieldObjectPic_Boy4_0[] = INCBIN_U32("graphics/map_objects/pics/people/boy_4/0.4bpp");
-const u32 gFieldObjectPic_Boy4_1[] = INCBIN_U32("graphics/map_objects/pics/people/boy_4/1.4bpp");
-const u32 gFieldObjectPic_Boy4_2[] = INCBIN_U32("graphics/map_objects/pics/people/boy_4/2.4bpp");
-const u32 gFieldObjectPic_Boy4_3[] = INCBIN_U32("graphics/map_objects/pics/people/boy_4/3.4bpp");
-const u32 gFieldObjectPic_Boy4_4[] = INCBIN_U32("graphics/map_objects/pics/people/boy_4/4.4bpp");
-const u32 gFieldObjectPic_Boy4_5[] = INCBIN_U32("graphics/map_objects/pics/people/boy_4/5.4bpp");
-const u32 gFieldObjectPic_Boy4_6[] = INCBIN_U32("graphics/map_objects/pics/people/boy_4/6.4bpp");
-const u32 gFieldObjectPic_Boy4_7[] = INCBIN_U32("graphics/map_objects/pics/people/boy_4/7.4bpp");
-const u32 gFieldObjectPic_Boy4_8[] = INCBIN_U32("graphics/map_objects/pics/people/boy_4/8.4bpp");
-const u32 gFieldObjectPic_Woman1_0[] = INCBIN_U32("graphics/map_objects/pics/people/woman_1/0.4bpp");
-const u32 gFieldObjectPic_Woman1_1[] = INCBIN_U32("graphics/map_objects/pics/people/woman_1/1.4bpp");
-const u32 gFieldObjectPic_Woman1_2[] = INCBIN_U32("graphics/map_objects/pics/people/woman_1/2.4bpp");
-const u32 gFieldObjectPic_Woman1_3[] = INCBIN_U32("graphics/map_objects/pics/people/woman_1/3.4bpp");
-const u32 gFieldObjectPic_Woman1_4[] = INCBIN_U32("graphics/map_objects/pics/people/woman_1/4.4bpp");
-const u32 gFieldObjectPic_Woman1_5[] = INCBIN_U32("graphics/map_objects/pics/people/woman_1/5.4bpp");
-const u32 gFieldObjectPic_Woman1_6[] = INCBIN_U32("graphics/map_objects/pics/people/woman_1/6.4bpp");
-const u32 gFieldObjectPic_Woman1_7[] = INCBIN_U32("graphics/map_objects/pics/people/woman_1/7.4bpp");
-const u32 gFieldObjectPic_Woman1_8[] = INCBIN_U32("graphics/map_objects/pics/people/woman_1/8.4bpp");
-const u32 gFieldObjectPic_FatMan_0[] = INCBIN_U32("graphics/map_objects/pics/people/fat_man/0.4bpp");
-const u32 gFieldObjectPic_FatMan_1[] = INCBIN_U32("graphics/map_objects/pics/people/fat_man/1.4bpp");
-const u32 gFieldObjectPic_FatMan_2[] = INCBIN_U32("graphics/map_objects/pics/people/fat_man/2.4bpp");
-const u32 gFieldObjectPic_FatMan_3[] = INCBIN_U32("graphics/map_objects/pics/people/fat_man/3.4bpp");
-const u32 gFieldObjectPic_FatMan_4[] = INCBIN_U32("graphics/map_objects/pics/people/fat_man/4.4bpp");
-const u32 gFieldObjectPic_FatMan_5[] = INCBIN_U32("graphics/map_objects/pics/people/fat_man/5.4bpp");
-const u32 gFieldObjectPic_FatMan_6[] = INCBIN_U32("graphics/map_objects/pics/people/fat_man/6.4bpp");
-const u32 gFieldObjectPic_FatMan_7[] = INCBIN_U32("graphics/map_objects/pics/people/fat_man/7.4bpp");
-const u32 gFieldObjectPic_FatMan_8[] = INCBIN_U32("graphics/map_objects/pics/people/fat_man/8.4bpp");
-const u32 gFieldObjectPic_Woman2_0[] = INCBIN_U32("graphics/map_objects/pics/people/woman_2/0.4bpp");
-const u32 gFieldObjectPic_Woman2_1[] = INCBIN_U32("graphics/map_objects/pics/people/woman_2/1.4bpp");
-const u32 gFieldObjectPic_Woman2_2[] = INCBIN_U32("graphics/map_objects/pics/people/woman_2/2.4bpp");
-const u32 gFieldObjectPic_Woman2_3[] = INCBIN_U32("graphics/map_objects/pics/people/woman_2/3.4bpp");
-const u32 gFieldObjectPic_Woman2_4[] = INCBIN_U32("graphics/map_objects/pics/people/woman_2/4.4bpp");
-const u32 gFieldObjectPic_Woman2_5[] = INCBIN_U32("graphics/map_objects/pics/people/woman_2/5.4bpp");
-const u32 gFieldObjectPic_Woman2_6[] = INCBIN_U32("graphics/map_objects/pics/people/woman_2/6.4bpp");
-const u32 gFieldObjectPic_Woman2_7[] = INCBIN_U32("graphics/map_objects/pics/people/woman_2/7.4bpp");
-const u32 gFieldObjectPic_Woman2_8[] = INCBIN_U32("graphics/map_objects/pics/people/woman_2/8.4bpp");
-const u32 gFieldObjectPic_Man1_0[] = INCBIN_U32("graphics/map_objects/pics/people/man_1/0.4bpp");
-const u32 gFieldObjectPic_Man1_1[] = INCBIN_U32("graphics/map_objects/pics/people/man_1/1.4bpp");
-const u32 gFieldObjectPic_Man1_2[] = INCBIN_U32("graphics/map_objects/pics/people/man_1/2.4bpp");
-const u32 gFieldObjectPic_Man1_3[] = INCBIN_U32("graphics/map_objects/pics/people/man_1/3.4bpp");
-const u32 gFieldObjectPic_Man1_4[] = INCBIN_U32("graphics/map_objects/pics/people/man_1/4.4bpp");
-const u32 gFieldObjectPic_Man1_5[] = INCBIN_U32("graphics/map_objects/pics/people/man_1/5.4bpp");
-const u32 gFieldObjectPic_Man1_6[] = INCBIN_U32("graphics/map_objects/pics/people/man_1/6.4bpp");
-const u32 gFieldObjectPic_Man1_7[] = INCBIN_U32("graphics/map_objects/pics/people/man_1/7.4bpp");
-const u32 gFieldObjectPic_Man1_8[] = INCBIN_U32("graphics/map_objects/pics/people/man_1/8.4bpp");
-const u32 gFieldObjectPic_Woman3_0[] = INCBIN_U32("graphics/map_objects/pics/people/woman_3/0.4bpp");
-const u32 gFieldObjectPic_Woman3_1[] = INCBIN_U32("graphics/map_objects/pics/people/woman_3/1.4bpp");
-const u32 gFieldObjectPic_Woman3_2[] = INCBIN_U32("graphics/map_objects/pics/people/woman_3/2.4bpp");
-const u32 gFieldObjectPic_Woman3_3[] = INCBIN_U32("graphics/map_objects/pics/people/woman_3/3.4bpp");
-const u32 gFieldObjectPic_Woman3_4[] = INCBIN_U32("graphics/map_objects/pics/people/woman_3/4.4bpp");
-const u32 gFieldObjectPic_Woman3_5[] = INCBIN_U32("graphics/map_objects/pics/people/woman_3/5.4bpp");
-const u32 gFieldObjectPic_Woman3_6[] = INCBIN_U32("graphics/map_objects/pics/people/woman_3/6.4bpp");
-const u32 gFieldObjectPic_Woman3_7[] = INCBIN_U32("graphics/map_objects/pics/people/woman_3/7.4bpp");
-const u32 gFieldObjectPic_Woman3_8[] = INCBIN_U32("graphics/map_objects/pics/people/woman_3/8.4bpp");
-const u32 gFieldObjectPic_OldMan1_0[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_1/0.4bpp");
-const u32 gFieldObjectPic_OldMan1_1[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_1/1.4bpp");
-const u32 gFieldObjectPic_OldMan1_2[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_1/2.4bpp");
-const u32 gFieldObjectPic_OldMan1_3[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_1/3.4bpp");
-const u32 gFieldObjectPic_OldMan1_4[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_1/4.4bpp");
-const u32 gFieldObjectPic_OldMan1_5[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_1/5.4bpp");
-const u32 gFieldObjectPic_OldMan1_6[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_1/6.4bpp");
-const u32 gFieldObjectPic_OldMan1_7[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_1/7.4bpp");
-const u32 gFieldObjectPic_OldMan1_8[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_1/8.4bpp");
-const u32 gFieldObjectPic_OldWoman1_0[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_1/0.4bpp");
-const u32 gFieldObjectPic_OldWoman1_1[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_1/1.4bpp");
-const u32 gFieldObjectPic_OldWoman1_2[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_1/2.4bpp");
-const u32 gFieldObjectPic_OldWoman1_3[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_1/3.4bpp");
-const u32 gFieldObjectPic_OldWoman1_4[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_1/4.4bpp");
-const u32 gFieldObjectPic_OldWoman1_5[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_1/5.4bpp");
-const u32 gFieldObjectPic_OldWoman1_6[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_1/6.4bpp");
-const u32 gFieldObjectPic_OldWoman1_7[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_1/7.4bpp");
-const u32 gFieldObjectPic_OldWoman1_8[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_1/8.4bpp");
-const u32 gFieldObjectPic_Man2_0[] = INCBIN_U32("graphics/map_objects/pics/people/man_2/0.4bpp");
-const u32 gFieldObjectPic_Man2_1[] = INCBIN_U32("graphics/map_objects/pics/people/man_2/1.4bpp");
-const u32 gFieldObjectPic_Man2_2[] = INCBIN_U32("graphics/map_objects/pics/people/man_2/2.4bpp");
-const u32 gFieldObjectPic_Man2_3[] = INCBIN_U32("graphics/map_objects/pics/people/man_2/3.4bpp");
-const u32 gFieldObjectPic_Man2_4[] = INCBIN_U32("graphics/map_objects/pics/people/man_2/4.4bpp");
-const u32 gFieldObjectPic_Man2_5[] = INCBIN_U32("graphics/map_objects/pics/people/man_2/5.4bpp");
-const u32 gFieldObjectPic_Man2_6[] = INCBIN_U32("graphics/map_objects/pics/people/man_2/6.4bpp");
-const u32 gFieldObjectPic_Man2_7[] = INCBIN_U32("graphics/map_objects/pics/people/man_2/7.4bpp");
-const u32 gFieldObjectPic_Man2_8[] = INCBIN_U32("graphics/map_objects/pics/people/man_2/8.4bpp");
-const u32 gFieldObjectPic_Woman4_0[] = INCBIN_U32("graphics/map_objects/pics/people/woman_4/0.4bpp");
-const u32 gFieldObjectPic_Woman4_1[] = INCBIN_U32("graphics/map_objects/pics/people/woman_4/1.4bpp");
-const u32 gFieldObjectPic_Woman4_2[] = INCBIN_U32("graphics/map_objects/pics/people/woman_4/2.4bpp");
-const u32 gFieldObjectPic_Woman4_3[] = INCBIN_U32("graphics/map_objects/pics/people/woman_4/3.4bpp");
-const u32 gFieldObjectPic_Woman4_4[] = INCBIN_U32("graphics/map_objects/pics/people/woman_4/4.4bpp");
-const u32 gFieldObjectPic_Woman4_5[] = INCBIN_U32("graphics/map_objects/pics/people/woman_4/5.4bpp");
-const u32 gFieldObjectPic_Woman4_6[] = INCBIN_U32("graphics/map_objects/pics/people/woman_4/6.4bpp");
-const u32 gFieldObjectPic_Woman4_7[] = INCBIN_U32("graphics/map_objects/pics/people/woman_4/7.4bpp");
-const u32 gFieldObjectPic_Woman4_8[] = INCBIN_U32("graphics/map_objects/pics/people/woman_4/8.4bpp");
-const u32 gFieldObjectPic_Man3_0[] = INCBIN_U32("graphics/map_objects/pics/people/man_3/0.4bpp");
-const u32 gFieldObjectPic_Man3_1[] = INCBIN_U32("graphics/map_objects/pics/people/man_3/1.4bpp");
-const u32 gFieldObjectPic_Man3_2[] = INCBIN_U32("graphics/map_objects/pics/people/man_3/2.4bpp");
-const u32 gFieldObjectPic_Man3_3[] = INCBIN_U32("graphics/map_objects/pics/people/man_3/3.4bpp");
-const u32 gFieldObjectPic_Man3_4[] = INCBIN_U32("graphics/map_objects/pics/people/man_3/4.4bpp");
-const u32 gFieldObjectPic_Man3_5[] = INCBIN_U32("graphics/map_objects/pics/people/man_3/5.4bpp");
-const u32 gFieldObjectPic_Man3_6[] = INCBIN_U32("graphics/map_objects/pics/people/man_3/6.4bpp");
-const u32 gFieldObjectPic_Man3_7[] = INCBIN_U32("graphics/map_objects/pics/people/man_3/7.4bpp");
-const u32 gFieldObjectPic_Man3_8[] = INCBIN_U32("graphics/map_objects/pics/people/man_3/8.4bpp");
-const u32 gFieldObjectPic_Woman5_0[] = INCBIN_U32("graphics/map_objects/pics/people/woman_5/0.4bpp");
-const u32 gFieldObjectPic_Woman5_1[] = INCBIN_U32("graphics/map_objects/pics/people/woman_5/1.4bpp");
-const u32 gFieldObjectPic_Woman5_2[] = INCBIN_U32("graphics/map_objects/pics/people/woman_5/2.4bpp");
-const u32 gFieldObjectPic_Woman5_3[] = INCBIN_U32("graphics/map_objects/pics/people/woman_5/3.4bpp");
-const u32 gFieldObjectPic_Woman5_4[] = INCBIN_U32("graphics/map_objects/pics/people/woman_5/4.4bpp");
-const u32 gFieldObjectPic_Woman5_5[] = INCBIN_U32("graphics/map_objects/pics/people/woman_5/5.4bpp");
-const u32 gFieldObjectPic_Woman5_6[] = INCBIN_U32("graphics/map_objects/pics/people/woman_5/6.4bpp");
-const u32 gFieldObjectPic_Woman5_7[] = INCBIN_U32("graphics/map_objects/pics/people/woman_5/7.4bpp");
-const u32 gFieldObjectPic_Woman5_8[] = INCBIN_U32("graphics/map_objects/pics/people/woman_5/8.4bpp");
-const u32 gFieldObjectPic_Cook_0[] = INCBIN_U32("graphics/map_objects/pics/people/cook/0.4bpp");
-const u32 gFieldObjectPic_Cook_1[] = INCBIN_U32("graphics/map_objects/pics/people/cook/1.4bpp");
-const u32 gFieldObjectPic_Cook_2[] = INCBIN_U32("graphics/map_objects/pics/people/cook/2.4bpp");
-const u32 gFieldObjectPic_Woman6_0[] = INCBIN_U32("graphics/map_objects/pics/people/woman_6/0.4bpp");
-const u32 gFieldObjectPic_Woman6_1[] = INCBIN_U32("graphics/map_objects/pics/people/woman_6/1.4bpp");
-const u32 gFieldObjectPic_Woman6_2[] = INCBIN_U32("graphics/map_objects/pics/people/woman_6/2.4bpp");
-const u32 gFieldObjectPic_Woman6_3[] = INCBIN_U32("graphics/map_objects/pics/people/woman_6/3.4bpp");
-const u32 gFieldObjectPic_Woman6_4[] = INCBIN_U32("graphics/map_objects/pics/people/woman_6/4.4bpp");
-const u32 gFieldObjectPic_Woman6_5[] = INCBIN_U32("graphics/map_objects/pics/people/woman_6/5.4bpp");
-const u32 gFieldObjectPic_Woman6_6[] = INCBIN_U32("graphics/map_objects/pics/people/woman_6/6.4bpp");
-const u32 gFieldObjectPic_Woman6_7[] = INCBIN_U32("graphics/map_objects/pics/people/woman_6/7.4bpp");
-const u32 gFieldObjectPic_Woman6_8[] = INCBIN_U32("graphics/map_objects/pics/people/woman_6/8.4bpp");
-const u32 gFieldObjectPic_OldMan2_0[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_2/0.4bpp");
-const u32 gFieldObjectPic_OldMan2_1[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_2/1.4bpp");
-const u32 gFieldObjectPic_OldMan2_2[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_2/2.4bpp");
-const u32 gFieldObjectPic_OldWoman2_0[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_2/0.4bpp");
-const u32 gFieldObjectPic_OldWoman2_1[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_2/1.4bpp");
-const u32 gFieldObjectPic_OldWoman2_2[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_2/2.4bpp");
-const u32 gFieldObjectPic_OldWoman2_3[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_2/3.4bpp");
-const u32 gFieldObjectPic_OldWoman2_4[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_2/4.4bpp");
-const u32 gFieldObjectPic_OldWoman2_5[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_2/5.4bpp");
-const u32 gFieldObjectPic_OldWoman2_6[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_2/6.4bpp");
-const u32 gFieldObjectPic_OldWoman2_7[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_2/7.4bpp");
-const u32 gFieldObjectPic_OldWoman2_8[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_2/8.4bpp");
-const u32 gFieldObjectPic_Camper_0[] = INCBIN_U32("graphics/map_objects/pics/people/camper/0.4bpp");
-const u32 gFieldObjectPic_Camper_1[] = INCBIN_U32("graphics/map_objects/pics/people/camper/1.4bpp");
-const u32 gFieldObjectPic_Camper_2[] = INCBIN_U32("graphics/map_objects/pics/people/camper/2.4bpp");
-const u32 gFieldObjectPic_Camper_3[] = INCBIN_U32("graphics/map_objects/pics/people/camper/3.4bpp");
-const u32 gFieldObjectPic_Camper_4[] = INCBIN_U32("graphics/map_objects/pics/people/camper/4.4bpp");
-const u32 gFieldObjectPic_Camper_5[] = INCBIN_U32("graphics/map_objects/pics/people/camper/5.4bpp");
-const u32 gFieldObjectPic_Camper_6[] = INCBIN_U32("graphics/map_objects/pics/people/camper/6.4bpp");
-const u32 gFieldObjectPic_Camper_7[] = INCBIN_U32("graphics/map_objects/pics/people/camper/7.4bpp");
-const u32 gFieldObjectPic_Camper_8[] = INCBIN_U32("graphics/map_objects/pics/people/camper/8.4bpp");
-const u32 gFieldObjectPic_Picnicker_0[] = INCBIN_U32("graphics/map_objects/pics/people/picnicker/0.4bpp");
-const u32 gFieldObjectPic_Picnicker_1[] = INCBIN_U32("graphics/map_objects/pics/people/picnicker/1.4bpp");
-const u32 gFieldObjectPic_Picnicker_2[] = INCBIN_U32("graphics/map_objects/pics/people/picnicker/2.4bpp");
-const u32 gFieldObjectPic_Picnicker_3[] = INCBIN_U32("graphics/map_objects/pics/people/picnicker/3.4bpp");
-const u32 gFieldObjectPic_Picnicker_4[] = INCBIN_U32("graphics/map_objects/pics/people/picnicker/4.4bpp");
-const u32 gFieldObjectPic_Picnicker_5[] = INCBIN_U32("graphics/map_objects/pics/people/picnicker/5.4bpp");
-const u32 gFieldObjectPic_Picnicker_6[] = INCBIN_U32("graphics/map_objects/pics/people/picnicker/6.4bpp");
-const u32 gFieldObjectPic_Picnicker_7[] = INCBIN_U32("graphics/map_objects/pics/people/picnicker/7.4bpp");
-const u32 gFieldObjectPic_Picnicker_8[] = INCBIN_U32("graphics/map_objects/pics/people/picnicker/8.4bpp");
-const u32 gFieldObjectPic_Man4_0[] = INCBIN_U32("graphics/map_objects/pics/people/man_4/0.4bpp");
-const u32 gFieldObjectPic_Man4_1[] = INCBIN_U32("graphics/map_objects/pics/people/man_4/1.4bpp");
-const u32 gFieldObjectPic_Man4_2[] = INCBIN_U32("graphics/map_objects/pics/people/man_4/2.4bpp");
-const u32 gFieldObjectPic_Man4_3[] = INCBIN_U32("graphics/map_objects/pics/people/man_4/3.4bpp");
-const u32 gFieldObjectPic_Man4_4[] = INCBIN_U32("graphics/map_objects/pics/people/man_4/4.4bpp");
-const u32 gFieldObjectPic_Man4_5[] = INCBIN_U32("graphics/map_objects/pics/people/man_4/5.4bpp");
-const u32 gFieldObjectPic_Man4_6[] = INCBIN_U32("graphics/map_objects/pics/people/man_4/6.4bpp");
-const u32 gFieldObjectPic_Man4_7[] = INCBIN_U32("graphics/map_objects/pics/people/man_4/7.4bpp");
-const u32 gFieldObjectPic_Man4_8[] = INCBIN_U32("graphics/map_objects/pics/people/man_4/8.4bpp");
-const u32 gFieldObjectPic_Woman7_0[] = INCBIN_U32("graphics/map_objects/pics/people/woman_7/0.4bpp");
-const u32 gFieldObjectPic_Woman7_1[] = INCBIN_U32("graphics/map_objects/pics/people/woman_7/1.4bpp");
-const u32 gFieldObjectPic_Woman7_2[] = INCBIN_U32("graphics/map_objects/pics/people/woman_7/2.4bpp");
-const u32 gFieldObjectPic_Woman7_3[] = INCBIN_U32("graphics/map_objects/pics/people/woman_7/3.4bpp");
-const u32 gFieldObjectPic_Woman7_4[] = INCBIN_U32("graphics/map_objects/pics/people/woman_7/4.4bpp");
-const u32 gFieldObjectPic_Woman7_5[] = INCBIN_U32("graphics/map_objects/pics/people/woman_7/5.4bpp");
-const u32 gFieldObjectPic_Woman7_6[] = INCBIN_U32("graphics/map_objects/pics/people/woman_7/6.4bpp");
-const u32 gFieldObjectPic_Woman7_7[] = INCBIN_U32("graphics/map_objects/pics/people/woman_7/7.4bpp");
-const u32 gFieldObjectPic_Woman7_8[] = INCBIN_U32("graphics/map_objects/pics/people/woman_7/8.4bpp");
-const u32 gFieldObjectPic_Youngster_0[] = INCBIN_U32("graphics/map_objects/pics/people/youngster/0.4bpp");
-const u32 gFieldObjectPic_Youngster_1[] = INCBIN_U32("graphics/map_objects/pics/people/youngster/1.4bpp");
-const u32 gFieldObjectPic_Youngster_2[] = INCBIN_U32("graphics/map_objects/pics/people/youngster/2.4bpp");
-const u32 gFieldObjectPic_Youngster_3[] = INCBIN_U32("graphics/map_objects/pics/people/youngster/3.4bpp");
-const u32 gFieldObjectPic_Youngster_4[] = INCBIN_U32("graphics/map_objects/pics/people/youngster/4.4bpp");
-const u32 gFieldObjectPic_Youngster_5[] = INCBIN_U32("graphics/map_objects/pics/people/youngster/5.4bpp");
-const u32 gFieldObjectPic_Youngster_6[] = INCBIN_U32("graphics/map_objects/pics/people/youngster/6.4bpp");
-const u32 gFieldObjectPic_Youngster_7[] = INCBIN_U32("graphics/map_objects/pics/people/youngster/7.4bpp");
-const u32 gFieldObjectPic_Youngster_8[] = INCBIN_U32("graphics/map_objects/pics/people/youngster/8.4bpp");
-const u32 gFieldObjectPic_BugCatcher_0[] = INCBIN_U32("graphics/map_objects/pics/people/bug_catcher/0.4bpp");
-const u32 gFieldObjectPic_BugCatcher_1[] = INCBIN_U32("graphics/map_objects/pics/people/bug_catcher/1.4bpp");
-const u32 gFieldObjectPic_BugCatcher_2[] = INCBIN_U32("graphics/map_objects/pics/people/bug_catcher/2.4bpp");
-const u32 gFieldObjectPic_BugCatcher_3[] = INCBIN_U32("graphics/map_objects/pics/people/bug_catcher/3.4bpp");
-const u32 gFieldObjectPic_BugCatcher_4[] = INCBIN_U32("graphics/map_objects/pics/people/bug_catcher/4.4bpp");
-const u32 gFieldObjectPic_BugCatcher_5[] = INCBIN_U32("graphics/map_objects/pics/people/bug_catcher/5.4bpp");
-const u32 gFieldObjectPic_BugCatcher_6[] = INCBIN_U32("graphics/map_objects/pics/people/bug_catcher/6.4bpp");
-const u32 gFieldObjectPic_BugCatcher_7[] = INCBIN_U32("graphics/map_objects/pics/people/bug_catcher/7.4bpp");
-const u32 gFieldObjectPic_BugCatcher_8[] = INCBIN_U32("graphics/map_objects/pics/people/bug_catcher/8.4bpp");
-const u32 gFieldObjectPic_PsychicM_0[] = INCBIN_U32("graphics/map_objects/pics/people/psychic_m/0.4bpp");
-const u32 gFieldObjectPic_PsychicM_1[] = INCBIN_U32("graphics/map_objects/pics/people/psychic_m/1.4bpp");
-const u32 gFieldObjectPic_PsychicM_2[] = INCBIN_U32("graphics/map_objects/pics/people/psychic_m/2.4bpp");
-const u32 gFieldObjectPic_PsychicM_3[] = INCBIN_U32("graphics/map_objects/pics/people/psychic_m/3.4bpp");
-const u32 gFieldObjectPic_PsychicM_4[] = INCBIN_U32("graphics/map_objects/pics/people/psychic_m/4.4bpp");
-const u32 gFieldObjectPic_PsychicM_5[] = INCBIN_U32("graphics/map_objects/pics/people/psychic_m/5.4bpp");
-const u32 gFieldObjectPic_PsychicM_6[] = INCBIN_U32("graphics/map_objects/pics/people/psychic_m/6.4bpp");
-const u32 gFieldObjectPic_PsychicM_7[] = INCBIN_U32("graphics/map_objects/pics/people/psychic_m/7.4bpp");
-const u32 gFieldObjectPic_PsychicM_8[] = INCBIN_U32("graphics/map_objects/pics/people/psychic_m/8.4bpp");
-const u32 gFieldObjectPic_SchoolKidM_0[] = INCBIN_U32("graphics/map_objects/pics/people/school_kid_m/0.4bpp");
-const u32 gFieldObjectPic_SchoolKidM_1[] = INCBIN_U32("graphics/map_objects/pics/people/school_kid_m/1.4bpp");
-const u32 gFieldObjectPic_SchoolKidM_2[] = INCBIN_U32("graphics/map_objects/pics/people/school_kid_m/2.4bpp");
-const u32 gFieldObjectPic_SchoolKidM_3[] = INCBIN_U32("graphics/map_objects/pics/people/school_kid_m/3.4bpp");
-const u32 gFieldObjectPic_SchoolKidM_4[] = INCBIN_U32("graphics/map_objects/pics/people/school_kid_m/4.4bpp");
-const u32 gFieldObjectPic_SchoolKidM_5[] = INCBIN_U32("graphics/map_objects/pics/people/school_kid_m/5.4bpp");
-const u32 gFieldObjectPic_SchoolKidM_6[] = INCBIN_U32("graphics/map_objects/pics/people/school_kid_m/6.4bpp");
-const u32 gFieldObjectPic_SchoolKidM_7[] = INCBIN_U32("graphics/map_objects/pics/people/school_kid_m/7.4bpp");
-const u32 gFieldObjectPic_SchoolKidM_8[] = INCBIN_U32("graphics/map_objects/pics/people/school_kid_m/8.4bpp");
-const u32 gFieldObjectPic_Maniac_0[] = INCBIN_U32("graphics/map_objects/pics/people/maniac/0.4bpp");
-const u32 gFieldObjectPic_Maniac_1[] = INCBIN_U32("graphics/map_objects/pics/people/maniac/1.4bpp");
-const u32 gFieldObjectPic_Maniac_2[] = INCBIN_U32("graphics/map_objects/pics/people/maniac/2.4bpp");
-const u32 gFieldObjectPic_Maniac_3[] = INCBIN_U32("graphics/map_objects/pics/people/maniac/3.4bpp");
-const u32 gFieldObjectPic_Maniac_4[] = INCBIN_U32("graphics/map_objects/pics/people/maniac/4.4bpp");
-const u32 gFieldObjectPic_Maniac_5[] = INCBIN_U32("graphics/map_objects/pics/people/maniac/5.4bpp");
-const u32 gFieldObjectPic_Maniac_6[] = INCBIN_U32("graphics/map_objects/pics/people/maniac/6.4bpp");
-const u32 gFieldObjectPic_Maniac_7[] = INCBIN_U32("graphics/map_objects/pics/people/maniac/7.4bpp");
-const u32 gFieldObjectPic_Maniac_8[] = INCBIN_U32("graphics/map_objects/pics/people/maniac/8.4bpp");
-const u32 gFieldObjectPic_HexManiac_0[] = INCBIN_U32("graphics/map_objects/pics/people/hex_maniac/0.4bpp");
-const u32 gFieldObjectPic_HexManiac_1[] = INCBIN_U32("graphics/map_objects/pics/people/hex_maniac/1.4bpp");
-const u32 gFieldObjectPic_HexManiac_2[] = INCBIN_U32("graphics/map_objects/pics/people/hex_maniac/2.4bpp");
-const u32 gFieldObjectPic_HexManiac_3[] = INCBIN_U32("graphics/map_objects/pics/people/hex_maniac/3.4bpp");
-const u32 gFieldObjectPic_HexManiac_4[] = INCBIN_U32("graphics/map_objects/pics/people/hex_maniac/4.4bpp");
-const u32 gFieldObjectPic_HexManiac_5[] = INCBIN_U32("graphics/map_objects/pics/people/hex_maniac/5.4bpp");
-const u32 gFieldObjectPic_HexManiac_6[] = INCBIN_U32("graphics/map_objects/pics/people/hex_maniac/6.4bpp");
-const u32 gFieldObjectPic_HexManiac_7[] = INCBIN_U32("graphics/map_objects/pics/people/hex_maniac/7.4bpp");
-const u32 gFieldObjectPic_HexManiac_8[] = INCBIN_U32("graphics/map_objects/pics/people/hex_maniac/8.4bpp");
-const u32 gFieldObjectPic_UnusedWoman_0[] = INCBIN_U32("graphics/map_objects/pics/people/unused_woman/0.4bpp");
-const u32 gFieldObjectPic_UnusedWoman_1[] = INCBIN_U32("graphics/map_objects/pics/people/unused_woman/1.4bpp");
-const u32 gFieldObjectPic_UnusedWoman_2[] = INCBIN_U32("graphics/map_objects/pics/people/unused_woman/2.4bpp");
-const u32 gFieldObjectPic_UnusedWoman_3[] = INCBIN_U32("graphics/map_objects/pics/people/unused_woman/3.4bpp");
-const u32 gFieldObjectPic_UnusedWoman_4[] = INCBIN_U32("graphics/map_objects/pics/people/unused_woman/4.4bpp");
-const u32 gFieldObjectPic_UnusedWoman_5[] = INCBIN_U32("graphics/map_objects/pics/people/unused_woman/5.4bpp");
-const u32 gFieldObjectPic_UnusedWoman_6[] = INCBIN_U32("graphics/map_objects/pics/people/unused_woman/6.4bpp");
-const u32 gFieldObjectPic_UnusedWoman_7[] = INCBIN_U32("graphics/map_objects/pics/people/unused_woman/7.4bpp");
-const u32 gFieldObjectPic_UnusedWoman_8[] = INCBIN_U32("graphics/map_objects/pics/people/unused_woman/8.4bpp");
-const u32 gFieldObjectPic_SwimmerM_0[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_m/0.4bpp");
-const u32 gFieldObjectPic_SwimmerM_1[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_m/1.4bpp");
-const u32 gFieldObjectPic_SwimmerM_2[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_m/2.4bpp");
-const u32 gFieldObjectPic_SwimmerM_3[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_m/3.4bpp");
-const u32 gFieldObjectPic_SwimmerM_4[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_m/4.4bpp");
-const u32 gFieldObjectPic_SwimmerM_5[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_m/5.4bpp");
-const u32 gFieldObjectPic_SwimmerM_6[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_m/6.4bpp");
-const u32 gFieldObjectPic_SwimmerM_7[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_m/7.4bpp");
-const u32 gFieldObjectPic_SwimmerM_8[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_m/8.4bpp");
-const u32 gFieldObjectPic_SwimmerF_0[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_f/0.4bpp");
-const u32 gFieldObjectPic_SwimmerF_1[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_f/1.4bpp");
-const u32 gFieldObjectPic_SwimmerF_2[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_f/2.4bpp");
-const u32 gFieldObjectPic_SwimmerF_3[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_f/3.4bpp");
-const u32 gFieldObjectPic_SwimmerF_4[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_f/4.4bpp");
-const u32 gFieldObjectPic_SwimmerF_5[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_f/5.4bpp");
-const u32 gFieldObjectPic_SwimmerF_6[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_f/6.4bpp");
-const u32 gFieldObjectPic_SwimmerF_7[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_f/7.4bpp");
-const u32 gFieldObjectPic_SwimmerF_8[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_f/8.4bpp");
-const u32 gFieldObjectPic_BlackBelt_0[] = INCBIN_U32("graphics/map_objects/pics/people/black_belt/0.4bpp");
-const u32 gFieldObjectPic_BlackBelt_1[] = INCBIN_U32("graphics/map_objects/pics/people/black_belt/1.4bpp");
-const u32 gFieldObjectPic_BlackBelt_2[] = INCBIN_U32("graphics/map_objects/pics/people/black_belt/2.4bpp");
-const u32 gFieldObjectPic_BlackBelt_3[] = INCBIN_U32("graphics/map_objects/pics/people/black_belt/3.4bpp");
-const u32 gFieldObjectPic_BlackBelt_4[] = INCBIN_U32("graphics/map_objects/pics/people/black_belt/4.4bpp");
-const u32 gFieldObjectPic_BlackBelt_5[] = INCBIN_U32("graphics/map_objects/pics/people/black_belt/5.4bpp");
-const u32 gFieldObjectPic_BlackBelt_6[] = INCBIN_U32("graphics/map_objects/pics/people/black_belt/6.4bpp");
-const u32 gFieldObjectPic_BlackBelt_7[] = INCBIN_U32("graphics/map_objects/pics/people/black_belt/7.4bpp");
-const u32 gFieldObjectPic_BlackBelt_8[] = INCBIN_U32("graphics/map_objects/pics/people/black_belt/8.4bpp");
-const u32 gFieldObjectPic_Beauty_0[] = INCBIN_U32("graphics/map_objects/pics/people/beauty/0.4bpp");
-const u32 gFieldObjectPic_Beauty_1[] = INCBIN_U32("graphics/map_objects/pics/people/beauty/1.4bpp");
-const u32 gFieldObjectPic_Beauty_2[] = INCBIN_U32("graphics/map_objects/pics/people/beauty/2.4bpp");
-const u32 gFieldObjectPic_Beauty_3[] = INCBIN_U32("graphics/map_objects/pics/people/beauty/3.4bpp");
-const u32 gFieldObjectPic_Beauty_4[] = INCBIN_U32("graphics/map_objects/pics/people/beauty/4.4bpp");
-const u32 gFieldObjectPic_Beauty_5[] = INCBIN_U32("graphics/map_objects/pics/people/beauty/5.4bpp");
-const u32 gFieldObjectPic_Beauty_6[] = INCBIN_U32("graphics/map_objects/pics/people/beauty/6.4bpp");
-const u32 gFieldObjectPic_Beauty_7[] = INCBIN_U32("graphics/map_objects/pics/people/beauty/7.4bpp");
-const u32 gFieldObjectPic_Beauty_8[] = INCBIN_U32("graphics/map_objects/pics/people/beauty/8.4bpp");
-const u32 gFieldObjectPic_Scientist1_0[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_1/0.4bpp");
-const u32 gFieldObjectPic_Scientist1_1[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_1/1.4bpp");
-const u32 gFieldObjectPic_Scientist1_2[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_1/2.4bpp");
-const u32 gFieldObjectPic_Scientist1_3[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_1/3.4bpp");
-const u32 gFieldObjectPic_Scientist1_4[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_1/4.4bpp");
-const u32 gFieldObjectPic_Scientist1_5[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_1/5.4bpp");
-const u32 gFieldObjectPic_Scientist1_6[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_1/6.4bpp");
-const u32 gFieldObjectPic_Scientist1_7[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_1/7.4bpp");
-const u32 gFieldObjectPic_Scientist1_8[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_1/8.4bpp");
-const u32 gFieldObjectPic_Lass_0[] = INCBIN_U32("graphics/map_objects/pics/people/lass/0.4bpp");
-const u32 gFieldObjectPic_Lass_1[] = INCBIN_U32("graphics/map_objects/pics/people/lass/1.4bpp");
-const u32 gFieldObjectPic_Lass_2[] = INCBIN_U32("graphics/map_objects/pics/people/lass/2.4bpp");
-const u32 gFieldObjectPic_Lass_3[] = INCBIN_U32("graphics/map_objects/pics/people/lass/3.4bpp");
-const u32 gFieldObjectPic_Lass_4[] = INCBIN_U32("graphics/map_objects/pics/people/lass/4.4bpp");
-const u32 gFieldObjectPic_Lass_5[] = INCBIN_U32("graphics/map_objects/pics/people/lass/5.4bpp");
-const u32 gFieldObjectPic_Lass_6[] = INCBIN_U32("graphics/map_objects/pics/people/lass/6.4bpp");
-const u32 gFieldObjectPic_Lass_7[] = INCBIN_U32("graphics/map_objects/pics/people/lass/7.4bpp");
-const u32 gFieldObjectPic_Lass_8[] = INCBIN_U32("graphics/map_objects/pics/people/lass/8.4bpp");
-const u32 gFieldObjectPic_Gentleman_0[] = INCBIN_U32("graphics/map_objects/pics/people/gentleman/0.4bpp");
-const u32 gFieldObjectPic_Gentleman_1[] = INCBIN_U32("graphics/map_objects/pics/people/gentleman/1.4bpp");
-const u32 gFieldObjectPic_Gentleman_2[] = INCBIN_U32("graphics/map_objects/pics/people/gentleman/2.4bpp");
-const u32 gFieldObjectPic_Gentleman_3[] = INCBIN_U32("graphics/map_objects/pics/people/gentleman/3.4bpp");
-const u32 gFieldObjectPic_Gentleman_4[] = INCBIN_U32("graphics/map_objects/pics/people/gentleman/4.4bpp");
-const u32 gFieldObjectPic_Gentleman_5[] = INCBIN_U32("graphics/map_objects/pics/people/gentleman/5.4bpp");
-const u32 gFieldObjectPic_Gentleman_6[] = INCBIN_U32("graphics/map_objects/pics/people/gentleman/6.4bpp");
-const u32 gFieldObjectPic_Gentleman_7[] = INCBIN_U32("graphics/map_objects/pics/people/gentleman/7.4bpp");
-const u32 gFieldObjectPic_Gentleman_8[] = INCBIN_U32("graphics/map_objects/pics/people/gentleman/8.4bpp");
-const u32 gFieldObjectPic_Sailor_0[] = INCBIN_U32("graphics/map_objects/pics/people/sailor/0.4bpp");
-const u32 gFieldObjectPic_Sailor_1[] = INCBIN_U32("graphics/map_objects/pics/people/sailor/1.4bpp");
-const u32 gFieldObjectPic_Sailor_2[] = INCBIN_U32("graphics/map_objects/pics/people/sailor/2.4bpp");
-const u32 gFieldObjectPic_Sailor_3[] = INCBIN_U32("graphics/map_objects/pics/people/sailor/3.4bpp");
-const u32 gFieldObjectPic_Sailor_4[] = INCBIN_U32("graphics/map_objects/pics/people/sailor/4.4bpp");
-const u32 gFieldObjectPic_Sailor_5[] = INCBIN_U32("graphics/map_objects/pics/people/sailor/5.4bpp");
-const u32 gFieldObjectPic_Sailor_6[] = INCBIN_U32("graphics/map_objects/pics/people/sailor/6.4bpp");
-const u32 gFieldObjectPic_Sailor_7[] = INCBIN_U32("graphics/map_objects/pics/people/sailor/7.4bpp");
-const u32 gFieldObjectPic_Sailor_8[] = INCBIN_U32("graphics/map_objects/pics/people/sailor/8.4bpp");
-const u32 gFieldObjectPic_Fisherman_0[] = INCBIN_U32("graphics/map_objects/pics/people/fisherman/0.4bpp");
-const u32 gFieldObjectPic_Fisherman_1[] = INCBIN_U32("graphics/map_objects/pics/people/fisherman/1.4bpp");
-const u32 gFieldObjectPic_Fisherman_2[] = INCBIN_U32("graphics/map_objects/pics/people/fisherman/2.4bpp");
-const u32 gFieldObjectPic_Fisherman_3[] = INCBIN_U32("graphics/map_objects/pics/people/fisherman/3.4bpp");
-const u32 gFieldObjectPic_Fisherman_4[] = INCBIN_U32("graphics/map_objects/pics/people/fisherman/4.4bpp");
-const u32 gFieldObjectPic_Fisherman_5[] = INCBIN_U32("graphics/map_objects/pics/people/fisherman/5.4bpp");
-const u32 gFieldObjectPic_Fisherman_6[] = INCBIN_U32("graphics/map_objects/pics/people/fisherman/6.4bpp");
-const u32 gFieldObjectPic_Fisherman_7[] = INCBIN_U32("graphics/map_objects/pics/people/fisherman/7.4bpp");
-const u32 gFieldObjectPic_Fisherman_8[] = INCBIN_U32("graphics/map_objects/pics/people/fisherman/8.4bpp");
-const u32 gFieldObjectPic_RunningTriathleteM_0[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_m/0.4bpp");
-const u32 gFieldObjectPic_RunningTriathleteM_1[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_m/1.4bpp");
-const u32 gFieldObjectPic_RunningTriathleteM_2[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_m/2.4bpp");
-const u32 gFieldObjectPic_RunningTriathleteM_3[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_m/3.4bpp");
-const u32 gFieldObjectPic_RunningTriathleteM_4[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_m/4.4bpp");
-const u32 gFieldObjectPic_RunningTriathleteM_5[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_m/5.4bpp");
-const u32 gFieldObjectPic_RunningTriathleteM_6[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_m/6.4bpp");
-const u32 gFieldObjectPic_RunningTriathleteM_7[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_m/7.4bpp");
-const u32 gFieldObjectPic_RunningTriathleteM_8[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_m/8.4bpp");
-const u32 gFieldObjectPic_RunningTriathleteF_0[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_f/0.4bpp");
-const u32 gFieldObjectPic_RunningTriathleteF_1[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_f/1.4bpp");
-const u32 gFieldObjectPic_RunningTriathleteF_2[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_f/2.4bpp");
-const u32 gFieldObjectPic_RunningTriathleteF_3[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_f/3.4bpp");
-const u32 gFieldObjectPic_RunningTriathleteF_4[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_f/4.4bpp");
-const u32 gFieldObjectPic_RunningTriathleteF_5[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_f/5.4bpp");
-const u32 gFieldObjectPic_RunningTriathleteF_6[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_f/6.4bpp");
-const u32 gFieldObjectPic_RunningTriathleteF_7[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_f/7.4bpp");
-const u32 gFieldObjectPic_RunningTriathleteF_8[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_f/8.4bpp");
-const u32 gFieldObjectPic_TuberF_0[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_f/0.4bpp");
-const u32 gFieldObjectPic_TuberF_1[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_f/1.4bpp");
-const u32 gFieldObjectPic_TuberF_2[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_f/2.4bpp");
-const u32 gFieldObjectPic_TuberF_3[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_f/3.4bpp");
-const u32 gFieldObjectPic_TuberF_4[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_f/4.4bpp");
-const u32 gFieldObjectPic_TuberF_5[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_f/5.4bpp");
-const u32 gFieldObjectPic_TuberF_6[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_f/6.4bpp");
-const u32 gFieldObjectPic_TuberF_7[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_f/7.4bpp");
-const u32 gFieldObjectPic_TuberF_8[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_f/8.4bpp");
-const u32 gFieldObjectPic_TuberM_0[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m/0.4bpp");
-const u32 gFieldObjectPic_TuberM_1[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m/1.4bpp");
-const u32 gFieldObjectPic_TuberM_2[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m/2.4bpp");
-const u32 gFieldObjectPic_TuberM_3[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m/3.4bpp");
-const u32 gFieldObjectPic_TuberM_4[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m/4.4bpp");
-const u32 gFieldObjectPic_TuberM_5[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m/5.4bpp");
-const u32 gFieldObjectPic_TuberM_6[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m/6.4bpp");
-const u32 gFieldObjectPic_TuberM_7[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m/7.4bpp");
-const u32 gFieldObjectPic_TuberM_8[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m/8.4bpp");
-const u32 gFieldObjectPic_Hiker_0[] = INCBIN_U32("graphics/map_objects/pics/people/hiker/0.4bpp");
-const u32 gFieldObjectPic_Hiker_1[] = INCBIN_U32("graphics/map_objects/pics/people/hiker/1.4bpp");
-const u32 gFieldObjectPic_Hiker_2[] = INCBIN_U32("graphics/map_objects/pics/people/hiker/2.4bpp");
-const u32 gFieldObjectPic_Hiker_3[] = INCBIN_U32("graphics/map_objects/pics/people/hiker/3.4bpp");
-const u32 gFieldObjectPic_Hiker_4[] = INCBIN_U32("graphics/map_objects/pics/people/hiker/4.4bpp");
-const u32 gFieldObjectPic_Hiker_5[] = INCBIN_U32("graphics/map_objects/pics/people/hiker/5.4bpp");
-const u32 gFieldObjectPic_Hiker_6[] = INCBIN_U32("graphics/map_objects/pics/people/hiker/6.4bpp");
-const u32 gFieldObjectPic_Hiker_7[] = INCBIN_U32("graphics/map_objects/pics/people/hiker/7.4bpp");
-const u32 gFieldObjectPic_Hiker_8[] = INCBIN_U32("graphics/map_objects/pics/people/hiker/8.4bpp");
-const u32 gFieldObjectPic_CyclingTriathleteM_0[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_m/0.4bpp");
-const u32 gFieldObjectPic_CyclingTriathleteM_1[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_m/1.4bpp");
-const u32 gFieldObjectPic_CyclingTriathleteM_2[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_m/2.4bpp");
-const u32 gFieldObjectPic_CyclingTriathleteM_3[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_m/3.4bpp");
-const u32 gFieldObjectPic_CyclingTriathleteM_4[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_m/4.4bpp");
-const u32 gFieldObjectPic_CyclingTriathleteM_5[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_m/5.4bpp");
-const u32 gFieldObjectPic_CyclingTriathleteM_6[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_m/6.4bpp");
-const u32 gFieldObjectPic_CyclingTriathleteM_7[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_m/7.4bpp");
-const u32 gFieldObjectPic_CyclingTriathleteM_8[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_m/8.4bpp");
-const u32 gFieldObjectPic_CyclingTriathleteF_0[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_f/0.4bpp");
-const u32 gFieldObjectPic_CyclingTriathleteF_1[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_f/1.4bpp");
-const u32 gFieldObjectPic_CyclingTriathleteF_2[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_f/2.4bpp");
-const u32 gFieldObjectPic_CyclingTriathleteF_3[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_f/3.4bpp");
-const u32 gFieldObjectPic_CyclingTriathleteF_4[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_f/4.4bpp");
-const u32 gFieldObjectPic_CyclingTriathleteF_5[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_f/5.4bpp");
-const u32 gFieldObjectPic_CyclingTriathleteF_6[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_f/6.4bpp");
-const u32 gFieldObjectPic_CyclingTriathleteF_7[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_f/7.4bpp");
-const u32 gFieldObjectPic_CyclingTriathleteF_8[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_f/8.4bpp");
-const u32 gFieldObjectPic_Man5_0[] = INCBIN_U32("graphics/map_objects/pics/people/man_5/0.4bpp");
-const u32 gFieldObjectPic_Man5_1[] = INCBIN_U32("graphics/map_objects/pics/people/man_5/1.4bpp");
-const u32 gFieldObjectPic_Man5_2[] = INCBIN_U32("graphics/map_objects/pics/people/man_5/2.4bpp");
-const u32 gFieldObjectPic_Man5_3[] = INCBIN_U32("graphics/map_objects/pics/people/man_5/3.4bpp");
-const u32 gFieldObjectPic_Man5_4[] = INCBIN_U32("graphics/map_objects/pics/people/man_5/4.4bpp");
-const u32 gFieldObjectPic_Man5_5[] = INCBIN_U32("graphics/map_objects/pics/people/man_5/5.4bpp");
-const u32 gFieldObjectPic_Man5_6[] = INCBIN_U32("graphics/map_objects/pics/people/man_5/6.4bpp");
-const u32 gFieldObjectPic_Man5_7[] = INCBIN_U32("graphics/map_objects/pics/people/man_5/7.4bpp");
-const u32 gFieldObjectPic_Man5_8[] = INCBIN_U32("graphics/map_objects/pics/people/man_5/8.4bpp");
-const u32 gFieldObjectPic_Man6_0[] = INCBIN_U32("graphics/map_objects/pics/people/man_6/0.4bpp");
-const u32 gFieldObjectPic_Man6_1[] = INCBIN_U32("graphics/map_objects/pics/people/man_6/1.4bpp");
-const u32 gFieldObjectPic_Man6_2[] = INCBIN_U32("graphics/map_objects/pics/people/man_6/2.4bpp");
-const u32 gFieldObjectPic_Man6_3[] = INCBIN_U32("graphics/map_objects/pics/people/man_6/3.4bpp");
-const u32 gFieldObjectPic_Man6_4[] = INCBIN_U32("graphics/map_objects/pics/people/man_6/4.4bpp");
-const u32 gFieldObjectPic_Man6_5[] = INCBIN_U32("graphics/map_objects/pics/people/man_6/5.4bpp");
-const u32 gFieldObjectPic_Man6_6[] = INCBIN_U32("graphics/map_objects/pics/people/man_6/6.4bpp");
-const u32 gFieldObjectPic_Man6_7[] = INCBIN_U32("graphics/map_objects/pics/people/man_6/7.4bpp");
-const u32 gFieldObjectPic_Man6_8[] = INCBIN_U32("graphics/map_objects/pics/people/man_6/8.4bpp");
-const u32 gFieldObjectPic_Nurse_0[] = INCBIN_U32("graphics/map_objects/pics/people/nurse/0.4bpp");
-const u32 gFieldObjectPic_Nurse_1[] = INCBIN_U32("graphics/map_objects/pics/people/nurse/1.4bpp");
-const u32 gFieldObjectPic_Nurse_2[] = INCBIN_U32("graphics/map_objects/pics/people/nurse/2.4bpp");
-const u32 gFieldObjectPic_Nurse_3[] = INCBIN_U32("graphics/map_objects/pics/people/nurse/3.4bpp");
-const u32 gFieldObjectPic_ItemBall[] = INCBIN_U32("graphics/map_objects/pics/misc/item_ball.4bpp");
-const u32 gFieldObjectPic_ProfBirch_0[] = INCBIN_U32("graphics/map_objects/pics/people/prof_birch/0.4bpp");
-const u32 gFieldObjectPic_ProfBirch_1[] = INCBIN_U32("graphics/map_objects/pics/people/prof_birch/1.4bpp");
-const u32 gFieldObjectPic_ProfBirch_2[] = INCBIN_U32("graphics/map_objects/pics/people/prof_birch/2.4bpp");
-const u32 gFieldObjectPic_ProfBirch_3[] = INCBIN_U32("graphics/map_objects/pics/people/prof_birch/3.4bpp");
-const u32 gFieldObjectPic_ProfBirch_4[] = INCBIN_U32("graphics/map_objects/pics/people/prof_birch/4.4bpp");
-const u32 gFieldObjectPic_ProfBirch_5[] = INCBIN_U32("graphics/map_objects/pics/people/prof_birch/5.4bpp");
-const u32 gFieldObjectPic_ProfBirch_6[] = INCBIN_U32("graphics/map_objects/pics/people/prof_birch/6.4bpp");
-const u32 gFieldObjectPic_ProfBirch_7[] = INCBIN_U32("graphics/map_objects/pics/people/prof_birch/7.4bpp");
-const u32 gFieldObjectPic_ProfBirch_8[] = INCBIN_U32("graphics/map_objects/pics/people/prof_birch/8.4bpp");
-const u32 gFieldObjectPic_ReporterM_0[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_m/0.4bpp");
-const u32 gFieldObjectPic_ReporterM_1[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_m/1.4bpp");
-const u32 gFieldObjectPic_ReporterM_2[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_m/2.4bpp");
-const u32 gFieldObjectPic_ReporterM_3[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_m/3.4bpp");
-const u32 gFieldObjectPic_ReporterM_4[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_m/4.4bpp");
-const u32 gFieldObjectPic_ReporterM_5[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_m/5.4bpp");
-const u32 gFieldObjectPic_ReporterM_6[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_m/6.4bpp");
-const u32 gFieldObjectPic_ReporterM_7[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_m/7.4bpp");
-const u32 gFieldObjectPic_ReporterM_8[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_m/8.4bpp");
-const u32 gFieldObjectPic_ReporterF_0[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_f/0.4bpp");
-const u32 gFieldObjectPic_ReporterF_1[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_f/1.4bpp");
-const u32 gFieldObjectPic_ReporterF_2[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_f/2.4bpp");
-const u32 gFieldObjectPic_ReporterF_3[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_f/3.4bpp");
-const u32 gFieldObjectPic_ReporterF_4[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_f/4.4bpp");
-const u32 gFieldObjectPic_ReporterF_5[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_f/5.4bpp");
-const u32 gFieldObjectPic_ReporterF_6[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_f/6.4bpp");
-const u32 gFieldObjectPic_ReporterF_7[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_f/7.4bpp");
-const u32 gFieldObjectPic_ReporterF_8[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_f/8.4bpp");
-const u32 gFieldObjectPic_MauvilleOldMan1_0[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_1/0.4bpp");
-const u32 gFieldObjectPic_MauvilleOldMan1_1[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_1/1.4bpp");
-const u32 gFieldObjectPic_MauvilleOldMan1_2[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_1/2.4bpp");
-const u32 gFieldObjectPic_MauvilleOldMan1_3[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_1/3.4bpp");
-const u32 gFieldObjectPic_MauvilleOldMan1_4[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_1/4.4bpp");
-const u32 gFieldObjectPic_MauvilleOldMan1_5[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_1/5.4bpp");
-const u32 gFieldObjectPic_MauvilleOldMan1_6[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_1/6.4bpp");
-const u32 gFieldObjectPic_MauvilleOldMan1_7[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_1/7.4bpp");
-const u32 gFieldObjectPic_MauvilleOldMan1_8[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_1/8.4bpp");
-const u32 gFieldObjectPic_MauvilleOldMan2_0[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_2/0.4bpp");
-const u32 gFieldObjectPic_MauvilleOldMan2_1[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_2/1.4bpp");
-const u32 gFieldObjectPic_MauvilleOldMan2_2[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_2/2.4bpp");
-const u32 gFieldObjectPic_MauvilleOldMan2_3[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_2/3.4bpp");
-const u32 gFieldObjectPic_MauvilleOldMan2_4[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_2/4.4bpp");
-const u32 gFieldObjectPic_MauvilleOldMan2_5[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_2/5.4bpp");
-const u32 gFieldObjectPic_MauvilleOldMan2_6[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_2/6.4bpp");
-const u32 gFieldObjectPic_MauvilleOldMan2_7[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_2/7.4bpp");
-const u32 gFieldObjectPic_MauvilleOldMan2_8[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_2/8.4bpp");
-const u32 gFieldObjectPic_MartEmployee_0[] = INCBIN_U32("graphics/map_objects/pics/people/mart_employee/0.4bpp");
-const u32 gFieldObjectPic_MartEmployee_1[] = INCBIN_U32("graphics/map_objects/pics/people/mart_employee/1.4bpp");
-const u32 gFieldObjectPic_MartEmployee_2[] = INCBIN_U32("graphics/map_objects/pics/people/mart_employee/2.4bpp");
-const u32 gFieldObjectPic_MartEmployee_3[] = INCBIN_U32("graphics/map_objects/pics/people/mart_employee/3.4bpp");
-const u32 gFieldObjectPic_MartEmployee_4[] = INCBIN_U32("graphics/map_objects/pics/people/mart_employee/4.4bpp");
-const u32 gFieldObjectPic_MartEmployee_5[] = INCBIN_U32("graphics/map_objects/pics/people/mart_employee/5.4bpp");
-const u32 gFieldObjectPic_MartEmployee_6[] = INCBIN_U32("graphics/map_objects/pics/people/mart_employee/6.4bpp");
-const u32 gFieldObjectPic_MartEmployee_7[] = INCBIN_U32("graphics/map_objects/pics/people/mart_employee/7.4bpp");
-const u32 gFieldObjectPic_MartEmployee_8[] = INCBIN_U32("graphics/map_objects/pics/people/mart_employee/8.4bpp");
-const u32 gFieldObjectPic_RooftopSaleWoman_0[] = INCBIN_U32("graphics/map_objects/pics/people/rooftop_sale_woman/0.4bpp");
-const u32 gFieldObjectPic_RooftopSaleWoman_1[] = INCBIN_U32("graphics/map_objects/pics/people/rooftop_sale_woman/1.4bpp");
-const u32 gFieldObjectPic_RooftopSaleWoman_2[] = INCBIN_U32("graphics/map_objects/pics/people/rooftop_sale_woman/2.4bpp");
-const u32 gFieldObjectPic_RooftopSaleWoman_3[] = INCBIN_U32("graphics/map_objects/pics/people/rooftop_sale_woman/3.4bpp");
-const u32 gFieldObjectPic_RooftopSaleWoman_4[] = INCBIN_U32("graphics/map_objects/pics/people/rooftop_sale_woman/4.4bpp");
-const u32 gFieldObjectPic_RooftopSaleWoman_5[] = INCBIN_U32("graphics/map_objects/pics/people/rooftop_sale_woman/5.4bpp");
-const u32 gFieldObjectPic_RooftopSaleWoman_6[] = INCBIN_U32("graphics/map_objects/pics/people/rooftop_sale_woman/6.4bpp");
-const u32 gFieldObjectPic_RooftopSaleWoman_7[] = INCBIN_U32("graphics/map_objects/pics/people/rooftop_sale_woman/7.4bpp");
-const u32 gFieldObjectPic_RooftopSaleWoman_8[] = INCBIN_U32("graphics/map_objects/pics/people/rooftop_sale_woman/8.4bpp");
-const u32 gFieldObjectPic_Teala_0[] = INCBIN_U32("graphics/map_objects/pics/people/teala/0.4bpp");
-const u32 gFieldObjectPic_Teala_1[] = INCBIN_U32("graphics/map_objects/pics/people/teala/1.4bpp");
-const u32 gFieldObjectPic_Teala_2[] = INCBIN_U32("graphics/map_objects/pics/people/teala/2.4bpp");
-const u32 gFieldObjectPic_Teala_3[] = INCBIN_U32("graphics/map_objects/pics/people/teala/3.4bpp");
-const u32 gFieldObjectPic_Teala_4[] = INCBIN_U32("graphics/map_objects/pics/people/teala/4.4bpp");
-const u32 gFieldObjectPic_Teala_5[] = INCBIN_U32("graphics/map_objects/pics/people/teala/5.4bpp");
-const u32 gFieldObjectPic_Teala_6[] = INCBIN_U32("graphics/map_objects/pics/people/teala/6.4bpp");
-const u32 gFieldObjectPic_Teala_7[] = INCBIN_U32("graphics/map_objects/pics/people/teala/7.4bpp");
-const u32 gFieldObjectPic_Teala_8[] = INCBIN_U32("graphics/map_objects/pics/people/teala/8.4bpp");
-const u32 gFieldObjectPic_Artist_0[] = INCBIN_U32("graphics/map_objects/pics/people/artist/0.4bpp");
-const u32 gFieldObjectPic_Artist_1[] = INCBIN_U32("graphics/map_objects/pics/people/artist/1.4bpp");
-const u32 gFieldObjectPic_Artist_2[] = INCBIN_U32("graphics/map_objects/pics/people/artist/2.4bpp");
-const u32 gFieldObjectPic_Artist_3[] = INCBIN_U32("graphics/map_objects/pics/people/artist/3.4bpp");
-const u32 gFieldObjectPic_Artist_4[] = INCBIN_U32("graphics/map_objects/pics/people/artist/4.4bpp");
-const u32 gFieldObjectPic_Artist_5[] = INCBIN_U32("graphics/map_objects/pics/people/artist/5.4bpp");
-const u32 gFieldObjectPic_Artist_6[] = INCBIN_U32("graphics/map_objects/pics/people/artist/6.4bpp");
-const u32 gFieldObjectPic_Artist_7[] = INCBIN_U32("graphics/map_objects/pics/people/artist/7.4bpp");
-const u32 gFieldObjectPic_Artist_8[] = INCBIN_U32("graphics/map_objects/pics/people/artist/8.4bpp");
-const u32 gFieldObjectPic_Cameraman_0[] = INCBIN_U32("graphics/map_objects/pics/people/cameraman/0.4bpp");
-const u32 gFieldObjectPic_Cameraman_1[] = INCBIN_U32("graphics/map_objects/pics/people/cameraman/1.4bpp");
-const u32 gFieldObjectPic_Cameraman_2[] = INCBIN_U32("graphics/map_objects/pics/people/cameraman/2.4bpp");
-const u32 gFieldObjectPic_Cameraman_3[] = INCBIN_U32("graphics/map_objects/pics/people/cameraman/3.4bpp");
-const u32 gFieldObjectPic_Cameraman_4[] = INCBIN_U32("graphics/map_objects/pics/people/cameraman/4.4bpp");
-const u32 gFieldObjectPic_Cameraman_5[] = INCBIN_U32("graphics/map_objects/pics/people/cameraman/5.4bpp");
-const u32 gFieldObjectPic_Cameraman_6[] = INCBIN_U32("graphics/map_objects/pics/people/cameraman/6.4bpp");
-const u32 gFieldObjectPic_Cameraman_7[] = INCBIN_U32("graphics/map_objects/pics/people/cameraman/7.4bpp");
-const u32 gFieldObjectPic_Cameraman_8[] = INCBIN_U32("graphics/map_objects/pics/people/cameraman/8.4bpp");
-const u32 gFieldObjectPic_Scientist2_0[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_2/0.4bpp");
-const u32 gFieldObjectPic_Scientist2_1[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_2/1.4bpp");
-const u32 gFieldObjectPic_Scientist2_2[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_2/2.4bpp");
-const u32 gFieldObjectPic_Scientist2_3[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_2/3.4bpp");
-const u32 gFieldObjectPic_Scientist2_4[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_2/4.4bpp");
-const u32 gFieldObjectPic_Scientist2_5[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_2/5.4bpp");
-const u32 gFieldObjectPic_Scientist2_6[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_2/6.4bpp");
-const u32 gFieldObjectPic_Scientist2_7[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_2/7.4bpp");
-const u32 gFieldObjectPic_Scientist2_8[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_2/8.4bpp");
-const u32 gFieldObjectPic_Man7_0[] = INCBIN_U32("graphics/map_objects/pics/people/man_7/0.4bpp");
-const u32 gFieldObjectPic_Man7_1[] = INCBIN_U32("graphics/map_objects/pics/people/man_7/1.4bpp");
-const u32 gFieldObjectPic_Man7_2[] = INCBIN_U32("graphics/map_objects/pics/people/man_7/2.4bpp");
-const u32 gFieldObjectPic_Man7_3[] = INCBIN_U32("graphics/map_objects/pics/people/man_7/3.4bpp");
-const u32 gFieldObjectPic_Man7_4[] = INCBIN_U32("graphics/map_objects/pics/people/man_7/4.4bpp");
-const u32 gFieldObjectPic_Man7_5[] = INCBIN_U32("graphics/map_objects/pics/people/man_7/5.4bpp");
-const u32 gFieldObjectPic_Man7_6[] = INCBIN_U32("graphics/map_objects/pics/people/man_7/6.4bpp");
-const u32 gFieldObjectPic_Man7_7[] = INCBIN_U32("graphics/map_objects/pics/people/man_7/7.4bpp");
-const u32 gFieldObjectPic_Man7_8[] = INCBIN_U32("graphics/map_objects/pics/people/man_7/8.4bpp");
-const u32 gFieldObjectPic_AquaMemberM_0[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_m/0.4bpp");
-const u32 gFieldObjectPic_AquaMemberM_1[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_m/1.4bpp");
-const u32 gFieldObjectPic_AquaMemberM_2[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_m/2.4bpp");
-const u32 gFieldObjectPic_AquaMemberM_3[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_m/3.4bpp");
-const u32 gFieldObjectPic_AquaMemberM_4[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_m/4.4bpp");
-const u32 gFieldObjectPic_AquaMemberM_5[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_m/5.4bpp");
-const u32 gFieldObjectPic_AquaMemberM_6[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_m/6.4bpp");
-const u32 gFieldObjectPic_AquaMemberM_7[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_m/7.4bpp");
-const u32 gFieldObjectPic_AquaMemberM_8[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_m/8.4bpp");
-const u32 gFieldObjectPic_AquaMemberF_0[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_f/0.4bpp");
-const u32 gFieldObjectPic_AquaMemberF_1[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_f/1.4bpp");
-const u32 gFieldObjectPic_AquaMemberF_2[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_f/2.4bpp");
-const u32 gFieldObjectPic_AquaMemberF_3[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_f/3.4bpp");
-const u32 gFieldObjectPic_AquaMemberF_4[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_f/4.4bpp");
-const u32 gFieldObjectPic_AquaMemberF_5[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_f/5.4bpp");
-const u32 gFieldObjectPic_AquaMemberF_6[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_f/6.4bpp");
-const u32 gFieldObjectPic_AquaMemberF_7[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_f/7.4bpp");
-const u32 gFieldObjectPic_AquaMemberF_8[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_f/8.4bpp");
-const u32 gFieldObjectPic_MagmaMemberM_0[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_m/0.4bpp");
-const u32 gFieldObjectPic_MagmaMemberM_1[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_m/1.4bpp");
-const u32 gFieldObjectPic_MagmaMemberM_2[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_m/2.4bpp");
-const u32 gFieldObjectPic_MagmaMemberM_3[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_m/3.4bpp");
-const u32 gFieldObjectPic_MagmaMemberM_4[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_m/4.4bpp");
-const u32 gFieldObjectPic_MagmaMemberM_5[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_m/5.4bpp");
-const u32 gFieldObjectPic_MagmaMemberM_6[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_m/6.4bpp");
-const u32 gFieldObjectPic_MagmaMemberM_7[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_m/7.4bpp");
-const u32 gFieldObjectPic_MagmaMemberM_8[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_m/8.4bpp");
-const u32 gFieldObjectPic_MagmaMemberF_0[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_f/0.4bpp");
-const u32 gFieldObjectPic_MagmaMemberF_1[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_f/1.4bpp");
-const u32 gFieldObjectPic_MagmaMemberF_2[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_f/2.4bpp");
-const u32 gFieldObjectPic_MagmaMemberF_3[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_f/3.4bpp");
-const u32 gFieldObjectPic_MagmaMemberF_4[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_f/4.4bpp");
-const u32 gFieldObjectPic_MagmaMemberF_5[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_f/5.4bpp");
-const u32 gFieldObjectPic_MagmaMemberF_6[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_f/6.4bpp");
-const u32 gFieldObjectPic_MagmaMemberF_7[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_f/7.4bpp");
-const u32 gFieldObjectPic_MagmaMemberF_8[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_f/8.4bpp");
-const u32 gFieldObjectPic_Sidney_0[] = INCBIN_U32("graphics/map_objects/pics/people/sidney/0.4bpp");
-const u32 gFieldObjectPic_Sidney_1[] = INCBIN_U32("graphics/map_objects/pics/people/sidney/1.4bpp");
-const u32 gFieldObjectPic_Sidney_2[] = INCBIN_U32("graphics/map_objects/pics/people/sidney/2.4bpp");
-const u32 gFieldObjectPic_Phoebe_0[] = INCBIN_U32("graphics/map_objects/pics/people/phoebe/0.4bpp");
-const u32 gFieldObjectPic_Phoebe_1[] = INCBIN_U32("graphics/map_objects/pics/people/phoebe/1.4bpp");
-const u32 gFieldObjectPic_Phoebe_2[] = INCBIN_U32("graphics/map_objects/pics/people/phoebe/2.4bpp");
-const u32 gFieldObjectPic_Glacia_0[] = INCBIN_U32("graphics/map_objects/pics/people/glacia/0.4bpp");
-const u32 gFieldObjectPic_Glacia_1[] = INCBIN_U32("graphics/map_objects/pics/people/glacia/1.4bpp");
-const u32 gFieldObjectPic_Glacia_2[] = INCBIN_U32("graphics/map_objects/pics/people/glacia/2.4bpp");
-const u32 gFieldObjectPic_Drake_0[] = INCBIN_U32("graphics/map_objects/pics/people/drake/0.4bpp");
-const u32 gFieldObjectPic_Drake_1[] = INCBIN_U32("graphics/map_objects/pics/people/drake/1.4bpp");
-const u32 gFieldObjectPic_Drake_2[] = INCBIN_U32("graphics/map_objects/pics/people/drake/2.4bpp");
-const u32 gFieldObjectPic_Roxanne_0[] = INCBIN_U32("graphics/map_objects/pics/people/roxanne/0.4bpp");
-const u32 gFieldObjectPic_Roxanne_1[] = INCBIN_U32("graphics/map_objects/pics/people/roxanne/1.4bpp");
-const u32 gFieldObjectPic_Roxanne_2[] = INCBIN_U32("graphics/map_objects/pics/people/roxanne/2.4bpp");
-const u32 gFieldObjectPic_Brawly_0[] = INCBIN_U32("graphics/map_objects/pics/people/brawly/0.4bpp");
-const u32 gFieldObjectPic_Brawly_1[] = INCBIN_U32("graphics/map_objects/pics/people/brawly/1.4bpp");
-const u32 gFieldObjectPic_Brawly_2[] = INCBIN_U32("graphics/map_objects/pics/people/brawly/2.4bpp");
-const u32 gFieldObjectPic_Wattson_0[] = INCBIN_U32("graphics/map_objects/pics/people/wattson/0.4bpp");
-const u32 gFieldObjectPic_Wattson_1[] = INCBIN_U32("graphics/map_objects/pics/people/wattson/1.4bpp");
-const u32 gFieldObjectPic_Wattson_2[] = INCBIN_U32("graphics/map_objects/pics/people/wattson/2.4bpp");
-const u32 gFieldObjectPic_Flannery_0[] = INCBIN_U32("graphics/map_objects/pics/people/flannery/0.4bpp");
-const u32 gFieldObjectPic_Flannery_1[] = INCBIN_U32("graphics/map_objects/pics/people/flannery/1.4bpp");
-const u32 gFieldObjectPic_Flannery_2[] = INCBIN_U32("graphics/map_objects/pics/people/flannery/2.4bpp");
-const u32 gFieldObjectPic_Norman_0[] = INCBIN_U32("graphics/map_objects/pics/people/norman/0.4bpp");
-const u32 gFieldObjectPic_Norman_1[] = INCBIN_U32("graphics/map_objects/pics/people/norman/1.4bpp");
-const u32 gFieldObjectPic_Norman_2[] = INCBIN_U32("graphics/map_objects/pics/people/norman/2.4bpp");
-const u32 gFieldObjectPic_Norman_3[] = INCBIN_U32("graphics/map_objects/pics/people/norman/3.4bpp");
-const u32 gFieldObjectPic_Norman_4[] = INCBIN_U32("graphics/map_objects/pics/people/norman/4.4bpp");
-const u32 gFieldObjectPic_Norman_5[] = INCBIN_U32("graphics/map_objects/pics/people/norman/5.4bpp");
-const u32 gFieldObjectPic_Norman_6[] = INCBIN_U32("graphics/map_objects/pics/people/norman/6.4bpp");
-const u32 gFieldObjectPic_Norman_7[] = INCBIN_U32("graphics/map_objects/pics/people/norman/7.4bpp");
-const u32 gFieldObjectPic_Norman_8[] = INCBIN_U32("graphics/map_objects/pics/people/norman/8.4bpp");
-const u32 gFieldObjectPic_Winona_0[] = INCBIN_U32("graphics/map_objects/pics/people/winona/0.4bpp");
-const u32 gFieldObjectPic_Winona_1[] = INCBIN_U32("graphics/map_objects/pics/people/winona/1.4bpp");
-const u32 gFieldObjectPic_Winona_2[] = INCBIN_U32("graphics/map_objects/pics/people/winona/2.4bpp");
-const u32 gFieldObjectPic_Liza_0[] = INCBIN_U32("graphics/map_objects/pics/people/liza/0.4bpp");
-const u32 gFieldObjectPic_Liza_1[] = INCBIN_U32("graphics/map_objects/pics/people/liza/1.4bpp");
-const u32 gFieldObjectPic_Liza_2[] = INCBIN_U32("graphics/map_objects/pics/people/liza/2.4bpp");
-const u32 gFieldObjectPic_Tate_0[] = INCBIN_U32("graphics/map_objects/pics/people/tate/0.4bpp");
-const u32 gFieldObjectPic_Tate_1[] = INCBIN_U32("graphics/map_objects/pics/people/tate/1.4bpp");
-const u32 gFieldObjectPic_Tate_2[] = INCBIN_U32("graphics/map_objects/pics/people/tate/2.4bpp");
-const u32 gFieldObjectPic_Wallace_0[] = INCBIN_U32("graphics/map_objects/pics/people/wallace/0.4bpp");
-const u32 gFieldObjectPic_Wallace_1[] = INCBIN_U32("graphics/map_objects/pics/people/wallace/1.4bpp");
-const u32 gFieldObjectPic_Wallace_2[] = INCBIN_U32("graphics/map_objects/pics/people/wallace/2.4bpp");
-const u32 gFieldObjectPic_Wallace_3[] = INCBIN_U32("graphics/map_objects/pics/people/wallace/3.4bpp");
-const u32 gFieldObjectPic_Wallace_4[] = INCBIN_U32("graphics/map_objects/pics/people/wallace/4.4bpp");
-const u32 gFieldObjectPic_Wallace_5[] = INCBIN_U32("graphics/map_objects/pics/people/wallace/5.4bpp");
-const u32 gFieldObjectPic_Wallace_6[] = INCBIN_U32("graphics/map_objects/pics/people/wallace/6.4bpp");
-const u32 gFieldObjectPic_Wallace_7[] = INCBIN_U32("graphics/map_objects/pics/people/wallace/7.4bpp");
-const u32 gFieldObjectPic_Wallace_8[] = INCBIN_U32("graphics/map_objects/pics/people/wallace/8.4bpp");
-const u32 gFieldObjectPic_Steven_0[] = INCBIN_U32("graphics/map_objects/pics/people/steven/0.4bpp");
-const u32 gFieldObjectPic_Steven_1[] = INCBIN_U32("graphics/map_objects/pics/people/steven/1.4bpp");
-const u32 gFieldObjectPic_Steven_2[] = INCBIN_U32("graphics/map_objects/pics/people/steven/2.4bpp");
-const u32 gFieldObjectPic_Steven_3[] = INCBIN_U32("graphics/map_objects/pics/people/steven/3.4bpp");
-const u32 gFieldObjectPic_Steven_4[] = INCBIN_U32("graphics/map_objects/pics/people/steven/4.4bpp");
-const u32 gFieldObjectPic_Steven_5[] = INCBIN_U32("graphics/map_objects/pics/people/steven/5.4bpp");
-const u32 gFieldObjectPic_Steven_6[] = INCBIN_U32("graphics/map_objects/pics/people/steven/6.4bpp");
-const u32 gFieldObjectPic_Steven_7[] = INCBIN_U32("graphics/map_objects/pics/people/steven/7.4bpp");
-const u32 gFieldObjectPic_Steven_8[] = INCBIN_U32("graphics/map_objects/pics/people/steven/8.4bpp");
-const u32 gFieldObjectPic_Wally_0[] = INCBIN_U32("graphics/map_objects/pics/people/wally/0.4bpp");
-const u32 gFieldObjectPic_Wally_1[] = INCBIN_U32("graphics/map_objects/pics/people/wally/1.4bpp");
-const u32 gFieldObjectPic_Wally_2[] = INCBIN_U32("graphics/map_objects/pics/people/wally/2.4bpp");
-const u32 gFieldObjectPic_Wally_3[] = INCBIN_U32("graphics/map_objects/pics/people/wally/3.4bpp");
-const u32 gFieldObjectPic_Wally_4[] = INCBIN_U32("graphics/map_objects/pics/people/wally/4.4bpp");
-const u32 gFieldObjectPic_Wally_5[] = INCBIN_U32("graphics/map_objects/pics/people/wally/5.4bpp");
-const u32 gFieldObjectPic_Wally_6[] = INCBIN_U32("graphics/map_objects/pics/people/wally/6.4bpp");
-const u32 gFieldObjectPic_Wally_7[] = INCBIN_U32("graphics/map_objects/pics/people/wally/7.4bpp");
-const u32 gFieldObjectPic_Wally_8[] = INCBIN_U32("graphics/map_objects/pics/people/wally/8.4bpp");
-const u32 gFieldObjectPic_RubySapphireLittleBoy_0[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_little_boy/0.4bpp");
-const u32 gFieldObjectPic_RubySapphireLittleBoy_1[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_little_boy/1.4bpp");
-const u32 gFieldObjectPic_RubySapphireLittleBoy_2[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_little_boy/2.4bpp");
-const u32 gFieldObjectPic_RubySapphireLittleBoy_3[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_little_boy/3.4bpp");
-const u32 gFieldObjectPic_RubySapphireLittleBoy_4[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_little_boy/4.4bpp");
-const u32 gFieldObjectPic_RubySapphireLittleBoy_5[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_little_boy/5.4bpp");
-const u32 gFieldObjectPic_RubySapphireLittleBoy_6[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_little_boy/6.4bpp");
-const u32 gFieldObjectPic_RubySapphireLittleBoy_7[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_little_boy/7.4bpp");
-const u32 gFieldObjectPic_RubySapphireLittleBoy_8[] = INCBIN_U32("graphics/map_objects/pics/people/ruby_sapphire_little_boy/8.4bpp");
-const u32 gFieldObjectPic_HotSpringsOldWoman_0[] = INCBIN_U32("graphics/map_objects/pics/people/hot_springs_old_woman/0.4bpp");
-const u32 gFieldObjectPic_HotSpringsOldWoman_1[] = INCBIN_U32("graphics/map_objects/pics/people/hot_springs_old_woman/1.4bpp");
-const u32 gFieldObjectPic_HotSpringsOldWoman_2[] = INCBIN_U32("graphics/map_objects/pics/people/hot_springs_old_woman/2.4bpp");
-const u32 gFieldObjectPic_HotSpringsOldWoman_3[] = INCBIN_U32("graphics/map_objects/pics/people/hot_springs_old_woman/3.4bpp");
-const u32 gFieldObjectPic_HotSpringsOldWoman_4[] = INCBIN_U32("graphics/map_objects/pics/people/hot_springs_old_woman/4.4bpp");
-const u32 gFieldObjectPic_HotSpringsOldWoman_5[] = INCBIN_U32("graphics/map_objects/pics/people/hot_springs_old_woman/5.4bpp");
-const u32 gFieldObjectPic_HotSpringsOldWoman_6[] = INCBIN_U32("graphics/map_objects/pics/people/hot_springs_old_woman/6.4bpp");
-const u32 gFieldObjectPic_HotSpringsOldWoman_7[] = INCBIN_U32("graphics/map_objects/pics/people/hot_springs_old_woman/7.4bpp");
-const u32 gFieldObjectPic_HotSpringsOldWoman_8[] = INCBIN_U32("graphics/map_objects/pics/people/hot_springs_old_woman/8.4bpp");
-const u32 gFieldObjectPic_LatiasLatios_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/latias_latios/0.4bpp");
-const u32 gFieldObjectPic_LatiasLatios_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/latias_latios/1.4bpp");
-const u32 gFieldObjectPic_LatiasLatios_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/latias_latios/2.4bpp");
-const u32 gFieldObjectPic_Boy5_0[] = INCBIN_U32("graphics/map_objects/pics/people/boy_5/0.4bpp");
-const u32 gFieldObjectPic_Boy5_1[] = INCBIN_U32("graphics/map_objects/pics/people/boy_5/1.4bpp");
-const u32 gFieldObjectPic_Boy5_2[] = INCBIN_U32("graphics/map_objects/pics/people/boy_5/2.4bpp");
-const u32 gFieldObjectPic_ContestOldMan_0[] = INCBIN_U32("graphics/map_objects/pics/people/contest_old_man/0.4bpp");
-const u32 gFieldObjectPic_ContestOldMan_1[] = INCBIN_U32("graphics/map_objects/pics/people/contest_old_man/1.4bpp");
-const u32 gFieldObjectPic_ContestOldMan_2[] = INCBIN_U32("graphics/map_objects/pics/people/contest_old_man/2.4bpp");
-const u32 gFieldObjectPic_ContestOldMan_3[] = INCBIN_U32("graphics/map_objects/pics/people/contest_old_man/3.4bpp");
-const u32 gFieldObjectPic_ContestOldMan_4[] = INCBIN_U32("graphics/map_objects/pics/people/contest_old_man/4.4bpp");
-const u32 gFieldObjectPic_ContestOldMan_5[] = INCBIN_U32("graphics/map_objects/pics/people/contest_old_man/5.4bpp");
-const u32 gFieldObjectPic_ContestOldMan_6[] = INCBIN_U32("graphics/map_objects/pics/people/contest_old_man/6.4bpp");
-const u32 gFieldObjectPic_ContestOldMan_7[] = INCBIN_U32("graphics/map_objects/pics/people/contest_old_man/7.4bpp");
-const u32 gFieldObjectPic_ContestOldMan_8[] = INCBIN_U32("graphics/map_objects/pics/people/contest_old_man/8.4bpp");
-const u32 gFieldObjectPic_Archie_0[] = INCBIN_U32("graphics/map_objects/pics/people/archie/0.4bpp");
-const u32 gFieldObjectPic_Archie_1[] = INCBIN_U32("graphics/map_objects/pics/people/archie/1.4bpp");
-const u32 gFieldObjectPic_Archie_2[] = INCBIN_U32("graphics/map_objects/pics/people/archie/2.4bpp");
-const u32 gFieldObjectPic_Archie_3[] = INCBIN_U32("graphics/map_objects/pics/people/archie/3.4bpp");
-const u32 gFieldObjectPic_Archie_4[] = INCBIN_U32("graphics/map_objects/pics/people/archie/4.4bpp");
-const u32 gFieldObjectPic_Archie_5[] = INCBIN_U32("graphics/map_objects/pics/people/archie/5.4bpp");
-const u32 gFieldObjectPic_Archie_6[] = INCBIN_U32("graphics/map_objects/pics/people/archie/6.4bpp");
-const u32 gFieldObjectPic_Archie_7[] = INCBIN_U32("graphics/map_objects/pics/people/archie/7.4bpp");
-const u32 gFieldObjectPic_Archie_8[] = INCBIN_U32("graphics/map_objects/pics/people/archie/8.4bpp");
-const u32 gFieldObjectPic_Maxie_0[] = INCBIN_U32("graphics/map_objects/pics/people/maxie/0.4bpp");
-const u32 gFieldObjectPic_Maxie_1[] = INCBIN_U32("graphics/map_objects/pics/people/maxie/1.4bpp");
-const u32 gFieldObjectPic_Maxie_2[] = INCBIN_U32("graphics/map_objects/pics/people/maxie/2.4bpp");
-const u32 gFieldObjectPic_Maxie_3[] = INCBIN_U32("graphics/map_objects/pics/people/maxie/3.4bpp");
-const u32 gFieldObjectPic_Maxie_4[] = INCBIN_U32("graphics/map_objects/pics/people/maxie/4.4bpp");
-const u32 gFieldObjectPic_Maxie_5[] = INCBIN_U32("graphics/map_objects/pics/people/maxie/5.4bpp");
-const u32 gFieldObjectPic_Maxie_6[] = INCBIN_U32("graphics/map_objects/pics/people/maxie/6.4bpp");
-const u32 gFieldObjectPic_Maxie_7[] = INCBIN_U32("graphics/map_objects/pics/people/maxie/7.4bpp");
-const u32 gFieldObjectPic_Maxie_8[] = INCBIN_U32("graphics/map_objects/pics/people/maxie/8.4bpp");
-const u32 gFieldObjectPic_KyogreFront_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kyogre_front/0.4bpp");
-const u32 gFieldObjectPic_KyogreFront_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kyogre_front/1.4bpp");
-const u32 gFieldObjectPic_KyogreSide_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kyogre_side/0.4bpp");
-const u32 gFieldObjectPic_KyogreSide_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kyogre_side/1.4bpp");
-const u32 gFieldObjectPic_GroudonFront_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/groudon_front/0.4bpp");
-const u32 gFieldObjectPic_GroudonFront_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/groudon_front/1.4bpp");
-const u32 gFieldObjectPic_GroudonSide_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/groudon_side/0.4bpp");
-const u32 gFieldObjectPic_GroudonSide_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/groudon_side/1.4bpp");
-const u32 gFieldObjectPic_Regi[] = INCBIN_U32("graphics/map_objects/pics/pokemon/regi.4bpp");
-const u32 gFieldObjectPic_Skitty_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/skitty/0.4bpp");
-const u32 gFieldObjectPic_Skitty_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/skitty/1.4bpp");
-const u32 gFieldObjectPic_Skitty_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/skitty/2.4bpp");
-const u32 gFieldObjectPic_Kecleon_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kecleon/0.4bpp");
-const u32 gFieldObjectPic_Kecleon_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kecleon/1.4bpp");
-const u32 gFieldObjectPic_Kecleon_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kecleon/2.4bpp");
-const u32 gFieldObjectPic_Rayquaza_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/rayquaza/0.4bpp");
-const u32 gFieldObjectPic_Rayquaza_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/rayquaza/1.4bpp");
-const u32 gFieldObjectPic_Rayquaza_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/rayquaza/2.4bpp");
-const u32 gFieldObjectPic_Rayquaza_3[] = INCBIN_U32("graphics/map_objects/pics/pokemon/rayquaza/3.4bpp");
-const u32 gFieldObjectPic_Rayquaza_4[] = INCBIN_U32("graphics/map_objects/pics/pokemon/rayquaza/4.4bpp");
-const u32 gFieldObjectPic_RayquazaStill[] = INCBIN_U32("graphics/map_objects/pics/pokemon/rayquaza_still.4bpp");
-const u32 gFieldObjectPic_Zigzagoon_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/zigzagoon/0.4bpp");
-const u32 gFieldObjectPic_Zigzagoon_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/zigzagoon/1.4bpp");
-const u32 gFieldObjectPic_Zigzagoon_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/zigzagoon/2.4bpp");
-const u32 gFieldObjectPic_Pikachu_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/pikachu/0.4bpp");
-const u32 gFieldObjectPic_Pikachu_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/pikachu/1.4bpp");
-const u32 gFieldObjectPic_Pikachu_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/pikachu/2.4bpp");
-const u32 gFieldObjectPic_Azumarill_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/azumarill/0.4bpp");
-const u32 gFieldObjectPic_Azumarill_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/azumarill/1.4bpp");
-const u32 gFieldObjectPic_Azumarill_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/azumarill/2.4bpp");
-const u32 gFieldObjectPic_Wingull_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/wingull/0.4bpp");
-const u32 gFieldObjectPic_Wingull_3[] = INCBIN_U32("graphics/map_objects/pics/pokemon/wingull/3.4bpp");
-const u32 gFieldObjectPic_Wingull_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/wingull/1.4bpp");
-const u32 gFieldObjectPic_Wingull_4[] = INCBIN_U32("graphics/map_objects/pics/pokemon/wingull/4.4bpp");
-const u32 gFieldObjectPic_Wingull_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/wingull/2.4bpp");
-const u32 gFieldObjectPic_Wingull_5[] = INCBIN_U32("graphics/map_objects/pics/pokemon/wingull/5.4bpp");
-const u32 gFieldObjectPic_TuberMSwimming_0[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m_swimming/0.4bpp");
-const u32 gFieldObjectPic_TuberMSwimming_1[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m_swimming/1.4bpp");
-const u32 gFieldObjectPic_TuberMSwimming_2[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m_swimming/2.4bpp");
-const u32 gFieldObjectPic_TuberMSwimming_3[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m_swimming/3.4bpp");
-const u32 gFieldObjectPic_TuberMSwimming_4[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m_swimming/4.4bpp");
-const u32 gFieldObjectPic_TuberMSwimming_5[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m_swimming/5.4bpp");
-const u32 gFieldObjectPic_TuberMSwimming_6[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m_swimming/6.4bpp");
-const u32 gFieldObjectPic_TuberMSwimming_7[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m_swimming/7.4bpp");
-const u32 gFieldObjectPic_TuberMSwimming_8[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m_swimming/8.4bpp");
-const u32 gFieldObjectPic_Azurill_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/azurill/0.4bpp");
-const u32 gFieldObjectPic_Azurill_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/azurill/1.4bpp");
-const u32 gFieldObjectPic_Azurill_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/azurill/2.4bpp");
-const u32 gFieldObjectPic_Mom_0[] = INCBIN_U32("graphics/map_objects/pics/people/mom/0.4bpp");
-const u32 gFieldObjectPic_Mom_1[] = INCBIN_U32("graphics/map_objects/pics/people/mom/1.4bpp");
-const u32 gFieldObjectPic_Mom_2[] = INCBIN_U32("graphics/map_objects/pics/people/mom/2.4bpp");
-const u32 gFieldObjectPic_Mom_3[] = INCBIN_U32("graphics/map_objects/pics/people/mom/3.4bpp");
-const u32 gFieldObjectPic_Mom_4[] = INCBIN_U32("graphics/map_objects/pics/people/mom/4.4bpp");
-const u32 gFieldObjectPic_Mom_5[] = INCBIN_U32("graphics/map_objects/pics/people/mom/5.4bpp");
-const u32 gFieldObjectPic_Mom_6[] = INCBIN_U32("graphics/map_objects/pics/people/mom/6.4bpp");
-const u32 gFieldObjectPic_Mom_7[] = INCBIN_U32("graphics/map_objects/pics/people/mom/7.4bpp");
-const u32 gFieldObjectPic_Mom_8[] = INCBIN_U32("graphics/map_objects/pics/people/mom/8.4bpp");
-const u16 gFieldObjectPalette22[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_22.gbapal");
-const u16 gFieldObjectPalette23[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_23.gbapal");
-const u16 gFieldObjectPalette24[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_24.gbapal");
-const u16 gFieldObjectPalette25[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_25.gbapal");
-const u32 gFieldObjectPic_UnusedNatuDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/unused_natu_doll.4bpp");
-const u32 gFieldObjectPic_UnusedMagnemiteDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/unused_magnemite_doll.4bpp");
-const u32 gFieldObjectPic_UnusedSquirtleDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/unused_squirtle_doll.4bpp");
-const u32 gFieldObjectPic_UnusedWooperDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/unused_wooper_doll.4bpp");
-const u32 gFieldObjectPic_UnusedPikachuDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/unused_pikachu_doll.4bpp");
-const u32 gFieldObjectPic_UnusedPorygon2Doll[] = INCBIN_U32("graphics/map_objects/pics/dolls/unused_porygon2_doll.4bpp");
-const u32 gFieldObjectPic_PichuDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/pichu_doll.4bpp");
-const u32 gFieldObjectPic_PikachuDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/pikachu_doll.4bpp");
-const u32 gFieldObjectPic_MarillDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/marill_doll.4bpp");
-const u32 gFieldObjectPic_TogepiDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/togepi_doll.4bpp");
-const u32 gFieldObjectPic_CyndaquilDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/cyndaquil_doll.4bpp");
-const u32 gFieldObjectPic_ChikoritaDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/chikorita_doll.4bpp");
-const u32 gFieldObjectPic_TotodileDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/totodile_doll.4bpp");
-const u32 gFieldObjectPic_JigglypuffDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/jigglypuff_doll.4bpp");
-const u32 gFieldObjectPic_MeowthDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/meowth_doll.4bpp");
-const u32 gFieldObjectPic_ClefairyDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/clefairy_doll.4bpp");
-const u32 gFieldObjectPic_DittoDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/ditto_doll.4bpp");
-const u32 gFieldObjectPic_SmoochumDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/smoochum_doll.4bpp");
-const u32 gFieldObjectPic_TreeckoDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/treecko_doll.4bpp");
-const u32 gFieldObjectPic_TorchicDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/torchic_doll.4bpp");
-const u32 gFieldObjectPic_MudkipDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/mudkip_doll.4bpp");
-const u32 gFieldObjectPic_DuskullDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/duskull_doll.4bpp");
-const u32 gFieldObjectPic_WynautDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/wynaut_doll.4bpp");
-const u32 gFieldObjectPic_BaltoyDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/baltoy_doll.4bpp");
-const u32 gFieldObjectPic_KecleonDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/kecleon_doll.4bpp");
-const u32 gFieldObjectPic_AzurillDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/azurill_doll.4bpp");
-const u32 gFieldObjectPic_SkittyDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/skitty_doll.4bpp");
-const u32 gFieldObjectPic_SwabluDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/swablu_doll.4bpp");
-const u32 gFieldObjectPic_GulpinDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/gulpin_doll.4bpp");
-const u32 gFieldObjectPic_LotadDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/lotad_doll.4bpp");
-const u32 gFieldObjectPic_SeedotDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/seedot_doll.4bpp");
-const u32 gFieldObjectPic_PikaCushion[] = INCBIN_U32("graphics/map_objects/pics/cushions/pika_cushion.4bpp");
-const u32 gFieldObjectPic_RoundCushion[] = INCBIN_U32("graphics/map_objects/pics/cushions/round_cushion.4bpp");
-const u32 gFieldObjectPic_KissCushion[] = INCBIN_U32("graphics/map_objects/pics/cushions/kiss_cushion.4bpp");
-const u32 gFieldObjectPic_ZigzagCushion[] = INCBIN_U32("graphics/map_objects/pics/cushions/zigzag_cushion.4bpp");
-const u32 gFieldObjectPic_SpinCushion[] = INCBIN_U32("graphics/map_objects/pics/cushions/spin_cushion.4bpp");
-const u32 gFieldObjectPic_DiamondCushion[] = INCBIN_U32("graphics/map_objects/pics/cushions/diamond_cushion.4bpp");
-const u32 gFieldObjectPic_BallCushion[] = INCBIN_U32("graphics/map_objects/pics/cushions/ball_cushion.4bpp");
-const u32 gFieldObjectPic_GrassCushion[] = INCBIN_U32("graphics/map_objects/pics/cushions/grass_cushion.4bpp");
-const u32 gFieldObjectPic_FireCushion[] = INCBIN_U32("graphics/map_objects/pics/cushions/fire_cushion.4bpp");
-const u32 gFieldObjectPic_WaterCushion[] = INCBIN_U32("graphics/map_objects/pics/cushions/water_cushion.4bpp");
-const u32 gFieldObjectPic_BigSnorlaxDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/big_snorlax_doll.4bpp");
-const u32 gFieldObjectPic_BigRhydonDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/big_rhydon_doll.4bpp");
-const u32 gFieldObjectPic_BigLaprasDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/big_lapras_doll.4bpp");
-const u32 gFieldObjectPic_BigVenusaurDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/big_venusaur_doll.4bpp");
-const u32 gFieldObjectPic_BigCharizardDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/big_charizard_doll.4bpp");
-const u32 gFieldObjectPic_BigBlastoiseDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/big_blastoise_doll.4bpp");
-const u32 gFieldObjectPic_BigWailmerDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/big_wailmer_doll.4bpp");
-const u32 gFieldObjectPic_BigRegirockDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/big_regirock_doll.4bpp");
-const u32 gFieldObjectPic_BigRegiceDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/big_regice_doll.4bpp");
-const u32 gFieldObjectPic_BigRegisteelDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/big_registeel_doll.4bpp");
-const u32 gFieldObjectPic_CuttableTree_0[] = INCBIN_U32("graphics/map_objects/pics/misc/cuttable_tree/0.4bpp");
-const u32 gFieldObjectPic_CuttableTree_1[] = INCBIN_U32("graphics/map_objects/pics/misc/cuttable_tree/1.4bpp");
-const u32 gFieldObjectPic_CuttableTree_2[] = INCBIN_U32("graphics/map_objects/pics/misc/cuttable_tree/2.4bpp");
-const u32 gFieldObjectPic_CuttableTree_3[] = INCBIN_U32("graphics/map_objects/pics/misc/cuttable_tree/3.4bpp");
-const u32 gFieldObjectPic_BreakableRock_0[] = INCBIN_U32("graphics/map_objects/pics/misc/breakable_rock/0.4bpp");
-const u32 gFieldObjectPic_BreakableRock_1[] = INCBIN_U32("graphics/map_objects/pics/misc/breakable_rock/1.4bpp");
-const u32 gFieldObjectPic_BreakableRock_2[] = INCBIN_U32("graphics/map_objects/pics/misc/breakable_rock/2.4bpp");
-const u32 gFieldObjectPic_BreakableRock_3[] = INCBIN_U32("graphics/map_objects/pics/misc/breakable_rock/3.4bpp");
-const u32 gFieldObjectPic_PushableBoulder[] = INCBIN_U32("graphics/map_objects/pics/misc/pushable_boulder.4bpp");
-const u32 gFieldObjectPic_MrBrineysBoat_0[] = INCBIN_U32("graphics/map_objects/pics/misc/mr_brineys_boat/0.4bpp");
-const u32 gFieldObjectPic_MrBrineysBoat_1[] = INCBIN_U32("graphics/map_objects/pics/misc/mr_brineys_boat/1.4bpp");
-const u32 gFieldObjectPic_MrBrineysBoat_2[] = INCBIN_U32("graphics/map_objects/pics/misc/mr_brineys_boat/2.4bpp");
-const u32 gFieldObjectPic_Fossil[] = INCBIN_U32("graphics/map_objects/pics/misc/fossil.4bpp");
-const u32 gFieldObjectPic_SubmarineShadow[] = INCBIN_U32("graphics/map_objects/pics/misc/submarine_shadow.4bpp");
-const u16 gFieldObjectPalette26[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_26.gbapal");
-const u32 gFieldObjectPic_Truck[] = INCBIN_U32("graphics/map_objects/pics/misc/truck.4bpp");
-const u16 gFieldObjectPalette14[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_14.gbapal");
-const u32 gFieldObjectPic_VigorothCarryingBox_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/vigoroth_carrying_box/0.4bpp");
-const u32 gFieldObjectPic_VigorothCarryingBox_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/vigoroth_carrying_box/1.4bpp");
-const u32 gFieldObjectPic_VigorothCarryingBox_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/vigoroth_carrying_box/2.4bpp");
-const u32 gFieldObjectPic_VigorothFacingAway_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/vigoroth_facing_away/0.4bpp");
-const u32 gFieldObjectPic_VigorothFacingAway_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/vigoroth_facing_away/1.4bpp");
-const u16 gFieldObjectPalette15[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_15.gbapal");
-const u32 gFieldObjectPic_BirchsBag[] = INCBIN_U32("graphics/map_objects/pics/misc/birchs_bag.4bpp");
-const u32 gFieldObjectPic_EnemyZigzagoon_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/enemy_zigzagoon/0.4bpp");
-const u32 gFieldObjectPic_EnemyZigzagoon_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/enemy_zigzagoon/1.4bpp");
-const u32 gFieldObjectPic_EnemyZigzagoon_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/enemy_zigzagoon/2.4bpp");
-const u32 gFieldObjectPic_EnemyZigzagoon_3[] = INCBIN_U32("graphics/map_objects/pics/pokemon/enemy_zigzagoon/3.4bpp");
-const u32 gFieldObjectPic_EnemyZigzagoon_4[] = INCBIN_U32("graphics/map_objects/pics/pokemon/enemy_zigzagoon/4.4bpp");
-const u32 gFieldObjectPic_EnemyZigzagoon_5[] = INCBIN_U32("graphics/map_objects/pics/pokemon/enemy_zigzagoon/5.4bpp");
-const u32 gFieldObjectPic_EnemyZigzagoon_6[] = INCBIN_U32("graphics/map_objects/pics/pokemon/enemy_zigzagoon/6.4bpp");
-const u32 gFieldObjectPic_EnemyZigzagoon_7[] = INCBIN_U32("graphics/map_objects/pics/pokemon/enemy_zigzagoon/7.4bpp");
-const u32 gFieldObjectPic_EnemyZigzagoon_8[] = INCBIN_U32("graphics/map_objects/pics/pokemon/enemy_zigzagoon/8.4bpp");
-const u16 gFieldObjectPalette16[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_16.gbapal");
-const u32 gFieldObjectPic_Poochyena_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/poochyena/0.4bpp");
-const u32 gFieldObjectPic_Poochyena_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/poochyena/1.4bpp");
-const u32 gFieldObjectPic_Poochyena_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/poochyena/2.4bpp");
-const u32 gFieldObjectPic_Poochyena_3[] = INCBIN_U32("graphics/map_objects/pics/pokemon/poochyena/3.4bpp");
-const u32 gFieldObjectPic_Poochyena_4[] = INCBIN_U32("graphics/map_objects/pics/pokemon/poochyena/4.4bpp");
-const u32 gFieldObjectPic_Poochyena_5[] = INCBIN_U32("graphics/map_objects/pics/pokemon/poochyena/5.4bpp");
-const u32 gFieldObjectPic_Poochyena_6[] = INCBIN_U32("graphics/map_objects/pics/pokemon/poochyena/6.4bpp");
-const u32 gFieldObjectPic_Poochyena_7[] = INCBIN_U32("graphics/map_objects/pics/pokemon/poochyena/7.4bpp");
-const u32 gFieldObjectPic_Poochyena_8[] = INCBIN_U32("graphics/map_objects/pics/pokemon/poochyena/8.4bpp");
-const u16 gFieldObjectPalette27[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_27.gbapal");
-const u32 gFieldObjectPic_CableCar[] = INCBIN_U32("graphics/map_objects/pics/misc/cable_car.4bpp");
-const u16 gFieldObjectPalette20[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_20.gbapal");
-const u32 gFieldObjectPic_SSTidal[] = INCBIN_U32("graphics/map_objects/pics/misc/ss_tidal.4bpp");
-const u16 gFieldObjectPalette21[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_21.gbapal");
-const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle_0[] = INCBIN_U32("graphics/map_objects/pics/effects/berry_tree_growth_sparkle/0.4bpp");
-const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle_1[] = INCBIN_U32("graphics/map_objects/pics/effects/berry_tree_growth_sparkle/1.4bpp");
-const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle_2[] = INCBIN_U32("graphics/map_objects/pics/effects/berry_tree_growth_sparkle/2.4bpp");
-const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle_3[] = INCBIN_U32("graphics/map_objects/pics/effects/berry_tree_growth_sparkle/3.4bpp");
-const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle_4[] = INCBIN_U32("graphics/map_objects/pics/effects/berry_tree_growth_sparkle/4.4bpp");
-const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle_5[] = INCBIN_U32("graphics/map_objects/pics/effects/berry_tree_growth_sparkle/5.4bpp");
-const u32 gFieldObjectPic_BerryTreeDirtPile[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/dirt_pile.4bpp");
-const u32 gFieldObjectPic_BerryTreeSprout_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/sprout/0.4bpp");
-const u32 gFieldObjectPic_BerryTreeSprout_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/sprout/1.4bpp");
-const u32 gFieldObjectPic_PechaBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pecha/0.4bpp");
-const u32 gFieldObjectPic_PechaBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pecha/1.4bpp");
-const u32 gFieldObjectPic_PechaBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pecha/2.4bpp");
-const u32 gFieldObjectPic_PechaBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pecha/3.4bpp");
-const u32 gFieldObjectPic_PechaBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pecha/4.4bpp");
-const u32 gFieldObjectPic_PechaBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pecha/5.4bpp");
-const u32 gFieldObjectPic_KelpsyBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/kelpsy/0.4bpp");
-const u32 gFieldObjectPic_KelpsyBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/kelpsy/1.4bpp");
-const u32 gFieldObjectPic_KelpsyBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/kelpsy/2.4bpp");
-const u32 gFieldObjectPic_KelpsyBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/kelpsy/3.4bpp");
-const u32 gFieldObjectPic_KelpsyBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/kelpsy/4.4bpp");
-const u32 gFieldObjectPic_KelpsyBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/kelpsy/5.4bpp");
-const u32 gFieldObjectPic_WepearBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wepear/0.4bpp");
-const u32 gFieldObjectPic_WepearBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wepear/1.4bpp");
-const u32 gFieldObjectPic_WepearBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wepear/2.4bpp");
-const u32 gFieldObjectPic_WepearBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wepear/3.4bpp");
-const u32 gFieldObjectPic_WepearBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wepear/4.4bpp");
-const u32 gFieldObjectPic_WepearBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wepear/5.4bpp");
-const u32 gFieldObjectPic_IapapaBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/iapapa/0.4bpp");
-const u32 gFieldObjectPic_IapapaBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/iapapa/1.4bpp");
-const u32 gFieldObjectPic_IapapaBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/iapapa/2.4bpp");
-const u32 gFieldObjectPic_IapapaBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/iapapa/3.4bpp");
-const u32 gFieldObjectPic_IapapaBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/iapapa/4.4bpp");
-const u32 gFieldObjectPic_IapapaBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/iapapa/5.4bpp");
-const u32 gFieldObjectPic_CheriBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cheri/0.4bpp");
-const u32 gFieldObjectPic_CheriBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cheri/1.4bpp");
-const u32 gFieldObjectPic_CheriBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cheri/2.4bpp");
-const u32 gFieldObjectPic_CheriBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cheri/3.4bpp");
-const u32 gFieldObjectPic_CheriBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cheri/4.4bpp");
-const u32 gFieldObjectPic_CheriBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cheri/5.4bpp");
-const u32 gFieldObjectPic_FigyBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/figy/0.4bpp");
-const u32 gFieldObjectPic_FigyBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/figy/1.4bpp");
-const u32 gFieldObjectPic_FigyBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/figy/2.4bpp");
-const u32 gFieldObjectPic_FigyBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/figy/3.4bpp");
-const u32 gFieldObjectPic_FigyBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/figy/4.4bpp");
-const u32 gFieldObjectPic_FigyBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/figy/5.4bpp");
-const u32 gFieldObjectPic_MagoBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/mago/0.4bpp");
-const u32 gFieldObjectPic_MagoBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/mago/1.4bpp");
-const u32 gFieldObjectPic_MagoBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/mago/2.4bpp");
-const u32 gFieldObjectPic_MagoBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/mago/3.4bpp");
-const u32 gFieldObjectPic_MagoBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/mago/4.4bpp");
-const u32 gFieldObjectPic_MagoBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/mago/5.4bpp");
-const u32 gFieldObjectPic_LumBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lum/0.4bpp");
-const u32 gFieldObjectPic_LumBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lum/1.4bpp");
-const u32 gFieldObjectPic_LumBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lum/2.4bpp");
-const u32 gFieldObjectPic_LumBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lum/3.4bpp");
-const u32 gFieldObjectPic_LumBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lum/4.4bpp");
-const u32 gFieldObjectPic_LumBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lum/5.4bpp");
-const u32 gFieldObjectPic_RazzBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/razz/0.4bpp");
-const u32 gFieldObjectPic_RazzBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/razz/1.4bpp");
-const u32 gFieldObjectPic_RazzBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/razz/2.4bpp");
-const u32 gFieldObjectPic_RazzBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/razz/3.4bpp");
-const u32 gFieldObjectPic_RazzBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/razz/4.4bpp");
-const u32 gFieldObjectPic_RazzBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/razz/5.4bpp");
-const u32 gFieldObjectPic_GrepaBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/grepa/0.4bpp");
-const u32 gFieldObjectPic_GrepaBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/grepa/1.4bpp");
-const u32 gFieldObjectPic_GrepaBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/grepa/2.4bpp");
-const u32 gFieldObjectPic_GrepaBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/grepa/3.4bpp");
-const u32 gFieldObjectPic_GrepaBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/grepa/4.4bpp");
-const u32 gFieldObjectPic_GrepaBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/grepa/5.4bpp");
-const u32 gFieldObjectPic_RabutaBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rabuta/0.4bpp");
-const u32 gFieldObjectPic_RabutaBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rabuta/1.4bpp");
-const u32 gFieldObjectPic_RabutaBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rabuta/2.4bpp");
-const u32 gFieldObjectPic_RabutaBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rabuta/3.4bpp");
-const u32 gFieldObjectPic_RabutaBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rabuta/4.4bpp");
-const u32 gFieldObjectPic_RabutaBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rabuta/5.4bpp");
-const u32 gFieldObjectPic_NomelBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/nomel/0.4bpp");
-const u32 gFieldObjectPic_NomelBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/nomel/1.4bpp");
-const u32 gFieldObjectPic_NomelBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/nomel/2.4bpp");
-const u32 gFieldObjectPic_NomelBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/nomel/3.4bpp");
-const u32 gFieldObjectPic_NomelBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/nomel/4.4bpp");
-const u32 gFieldObjectPic_NomelBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/nomel/5.4bpp");
-const u32 gFieldObjectPic_LeppaBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/leppa/0.4bpp");
-const u32 gFieldObjectPic_LeppaBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/leppa/1.4bpp");
-const u32 gFieldObjectPic_LeppaBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/leppa/2.4bpp");
-const u32 gFieldObjectPic_LeppaBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/leppa/3.4bpp");
-const u32 gFieldObjectPic_LeppaBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/leppa/4.4bpp");
-const u32 gFieldObjectPic_LeppaBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/leppa/5.4bpp");
-const u32 gFieldObjectPic_LiechiBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/liechi/0.4bpp");
-const u32 gFieldObjectPic_LiechiBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/liechi/1.4bpp");
-const u32 gFieldObjectPic_LiechiBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/liechi/2.4bpp");
-const u32 gFieldObjectPic_LiechiBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/liechi/3.4bpp");
-const u32 gFieldObjectPic_LiechiBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/liechi/4.4bpp");
-const u32 gFieldObjectPic_LiechiBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/liechi/5.4bpp");
-const u32 gFieldObjectPic_HondewBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/hondew/0.4bpp");
-const u32 gFieldObjectPic_HondewBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/hondew/1.4bpp");
-const u32 gFieldObjectPic_HondewBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/hondew/2.4bpp");
-const u32 gFieldObjectPic_HondewBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/hondew/3.4bpp");
-const u32 gFieldObjectPic_HondewBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/hondew/4.4bpp");
-const u32 gFieldObjectPic_HondewBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/hondew/5.4bpp");
-const u32 gFieldObjectPic_AguavBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aguav/0.4bpp");
-const u32 gFieldObjectPic_AguavBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aguav/1.4bpp");
-const u32 gFieldObjectPic_AguavBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aguav/2.4bpp");
-const u32 gFieldObjectPic_AguavBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aguav/3.4bpp");
-const u32 gFieldObjectPic_AguavBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aguav/4.4bpp");
-const u32 gFieldObjectPic_AguavBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aguav/5.4bpp");
-const u32 gFieldObjectPic_WikiBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wiki/0.4bpp");
-const u32 gFieldObjectPic_WikiBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wiki/1.4bpp");
-const u32 gFieldObjectPic_WikiBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wiki/2.4bpp");
-const u32 gFieldObjectPic_WikiBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wiki/3.4bpp");
-const u32 gFieldObjectPic_WikiBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wiki/4.4bpp");
-const u32 gFieldObjectPic_WikiBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wiki/5.4bpp");
-const u32 gFieldObjectPic_PomegBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pomeg/0.4bpp");
-const u32 gFieldObjectPic_PomegBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pomeg/1.4bpp");
-const u32 gFieldObjectPic_PomegBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pomeg/2.4bpp");
-const u32 gFieldObjectPic_PomegBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pomeg/3.4bpp");
-const u32 gFieldObjectPic_PomegBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pomeg/4.4bpp");
-const u32 gFieldObjectPic_PomegBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pomeg/5.4bpp");
-const u32 gFieldObjectPic_RawstBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rawst/0.4bpp");
-const u32 gFieldObjectPic_RawstBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rawst/1.4bpp");
-const u32 gFieldObjectPic_RawstBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rawst/2.4bpp");
-const u32 gFieldObjectPic_RawstBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rawst/3.4bpp");
-const u32 gFieldObjectPic_RawstBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rawst/4.4bpp");
-const u32 gFieldObjectPic_RawstBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rawst/5.4bpp");
-const u32 gFieldObjectPic_SpelonBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/spelon/0.4bpp");
-const u32 gFieldObjectPic_SpelonBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/spelon/1.4bpp");
-const u32 gFieldObjectPic_SpelonBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/spelon/2.4bpp");
-const u32 gFieldObjectPic_SpelonBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/spelon/3.4bpp");
-const u32 gFieldObjectPic_SpelonBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/spelon/4.4bpp");
-const u32 gFieldObjectPic_SpelonBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/spelon/5.4bpp");
-const u32 gFieldObjectPic_ChestoBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/chesto/0.4bpp");
-const u32 gFieldObjectPic_ChestoBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/chesto/1.4bpp");
-const u32 gFieldObjectPic_ChestoBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/chesto/2.4bpp");
-const u32 gFieldObjectPic_ChestoBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/chesto/3.4bpp");
-const u32 gFieldObjectPic_ChestoBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/chesto/4.4bpp");
-const u32 gFieldObjectPic_ChestoBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/chesto/5.4bpp");
-const u32 gFieldObjectPic_OranBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/oran/0.4bpp");
-const u32 gFieldObjectPic_OranBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/oran/1.4bpp");
-const u32 gFieldObjectPic_OranBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/oran/2.4bpp");
-const u32 gFieldObjectPic_OranBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/oran/3.4bpp");
-const u32 gFieldObjectPic_OranBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/oran/4.4bpp");
-const u32 gFieldObjectPic_OranBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/oran/5.4bpp");
-const u32 gFieldObjectPic_PersimBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/persim/0.4bpp");
-const u32 gFieldObjectPic_PersimBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/persim/1.4bpp");
-const u32 gFieldObjectPic_PersimBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/persim/2.4bpp");
-const u32 gFieldObjectPic_PersimBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/persim/3.4bpp");
-const u32 gFieldObjectPic_PersimBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/persim/4.4bpp");
-const u32 gFieldObjectPic_PersimBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/persim/5.4bpp");
-const u32 gFieldObjectPic_SitrusBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/sitrus/0.4bpp");
-const u32 gFieldObjectPic_SitrusBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/sitrus/1.4bpp");
-const u32 gFieldObjectPic_SitrusBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/sitrus/2.4bpp");
-const u32 gFieldObjectPic_SitrusBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/sitrus/3.4bpp");
-const u32 gFieldObjectPic_SitrusBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/sitrus/4.4bpp");
-const u32 gFieldObjectPic_SitrusBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/sitrus/5.4bpp");
-const u32 gFieldObjectPic_AspearBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aspear/0.4bpp");
-const u32 gFieldObjectPic_AspearBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aspear/1.4bpp");
-const u32 gFieldObjectPic_AspearBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aspear/2.4bpp");
-const u32 gFieldObjectPic_AspearBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aspear/3.4bpp");
-const u32 gFieldObjectPic_AspearBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aspear/4.4bpp");
-const u32 gFieldObjectPic_AspearBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aspear/5.4bpp");
-const u32 gFieldObjectPic_PamtreBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pamtre/0.4bpp");
-const u32 gFieldObjectPic_PamtreBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pamtre/1.4bpp");
-const u32 gFieldObjectPic_PamtreBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pamtre/2.4bpp");
-const u32 gFieldObjectPic_PamtreBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pamtre/3.4bpp");
-const u32 gFieldObjectPic_PamtreBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pamtre/4.4bpp");
-const u32 gFieldObjectPic_PamtreBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pamtre/5.4bpp");
-const u32 gFieldObjectPic_CornnBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cornn/0.4bpp");
-const u32 gFieldObjectPic_CornnBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cornn/1.4bpp");
-const u32 gFieldObjectPic_CornnBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cornn/2.4bpp");
-const u32 gFieldObjectPic_CornnBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cornn/3.4bpp");
-const u32 gFieldObjectPic_CornnBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cornn/4.4bpp");
-const u32 gFieldObjectPic_CornnBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cornn/5.4bpp");
-const u32 gFieldObjectPic_LansatBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lansat/0.4bpp");
-const u32 gFieldObjectPic_LansatBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lansat/1.4bpp");
-const u32 gFieldObjectPic_LansatBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lansat/2.4bpp");
-const u32 gFieldObjectPic_LansatBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lansat/3.4bpp");
-const u32 gFieldObjectPic_LansatBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lansat/4.4bpp");
-const u32 gFieldObjectPic_LansatBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lansat/5.4bpp");
-const u32 gFieldObjectPic_DurinBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/durin/0.4bpp");
-const u32 gFieldObjectPic_DurinBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/durin/1.4bpp");
-const u32 gFieldObjectPic_DurinBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/durin/2.4bpp");
-const u32 gFieldObjectPic_DurinBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/durin/3.4bpp");
-const u32 gFieldObjectPic_DurinBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/durin/4.4bpp");
-const u32 gFieldObjectPic_DurinBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/durin/5.4bpp");
-const u32 gFieldObjectPic_TamatoBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/tamato/0.4bpp");
-const u32 gFieldObjectPic_TamatoBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/tamato/1.4bpp");
-const u32 gFieldObjectPic_TamatoBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/tamato/2.4bpp");
-const u32 gFieldObjectPic_TamatoBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/tamato/3.4bpp");
-const u32 gFieldObjectPic_TamatoBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/tamato/4.4bpp");
-const u32 gFieldObjectPic_TamatoBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/tamato/5.4bpp");
-const u32 gFieldEffectObjectPic_SurfBlob_0[] = INCBIN_U32("graphics/map_objects/pics/effects/surf_blob/0.4bpp");
-const u32 gFieldEffectObjectPic_SurfBlob_1[] = INCBIN_U32("graphics/map_objects/pics/effects/surf_blob/1.4bpp");
-const u32 gFieldEffectObjectPic_SurfBlob_2[] = INCBIN_U32("graphics/map_objects/pics/effects/surf_blob/2.4bpp");
-const u32 gFieldObjectPic_QuintyPlump_0[] = INCBIN_U32("graphics/map_objects/pics/people/quinty_plump/0.4bpp");
-const u32 gFieldObjectPic_QuintyPlump_1[] = INCBIN_U32("graphics/map_objects/pics/people/quinty_plump/1.4bpp");
-const u32 gFieldObjectPic_QuintyPlump_2[] = INCBIN_U32("graphics/map_objects/pics/people/quinty_plump/2.4bpp");
-const u32 gFieldObjectPic_QuintyPlump_3[] = INCBIN_U32("graphics/map_objects/pics/people/quinty_plump/3.4bpp");
-const u32 gFieldObjectPic_QuintyPlump_4[] = INCBIN_U32("graphics/map_objects/pics/people/quinty_plump/4.4bpp");
-const u32 gFieldObjectPic_QuintyPlump_5[] = INCBIN_U32("graphics/map_objects/pics/people/quinty_plump/5.4bpp");
-const u32 gFieldObjectPic_QuintyPlump_6[] = INCBIN_U32("graphics/map_objects/pics/people/quinty_plump/6.4bpp");
-const u16 gFieldObjectPalette12[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_12.gbapal");
-const u16 gFieldObjectPalette13[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_13.gbapal");
-const u32 gFieldEffectObjectPic_ShadowSmall[] = INCBIN_U32("graphics/map_objects/pics/effects/shadow_small.4bpp");
-const u32 gFieldEffectObjectPic_ShadowMedium[] = INCBIN_U32("graphics/map_objects/pics/effects/shadow_medium.4bpp");
-const u32 gFieldEffectObjectPic_ShadowLarge[] = INCBIN_U32("graphics/map_objects/pics/effects/shadow_large.4bpp");
-const u32 gFieldEffectObjectPic_ShadowExtraLarge[] = INCBIN_U32("graphics/map_objects/pics/effects/shadow_extra_large.4bpp");
-const u32 gUnknown_084F6D38[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_4F6D38/0.4bpp");
-const u16 gFieldEffectObjectPalette6[] = INCBIN_U16("graphics/map_objects/palettes/field_effect_object_palette_06.gbapal");
-const u32 gFieldEffectObjectPic_Ripple_0[] = INCBIN_U32("graphics/map_objects/pics/effects/ripple/0.4bpp");
-const u32 gFieldEffectObjectPic_Ripple_1[] = INCBIN_U32("graphics/map_objects/pics/effects/ripple/1.4bpp");
-const u32 gFieldEffectObjectPic_Ripple_2[] = INCBIN_U32("graphics/map_objects/pics/effects/ripple/2.4bpp");
-const u32 gFieldEffectObjectPic_Ripple_3[] = INCBIN_U32("graphics/map_objects/pics/effects/ripple/3.4bpp");
-const u32 gFieldEffectObjectPic_Ripple_4[] = INCBIN_U32("graphics/map_objects/pics/effects/ripple/4.4bpp");
-const u32 gFieldEffectObjectPic_Ash_0[] = INCBIN_U32("graphics/map_objects/pics/effects/ash/0.4bpp");
-const u32 gFieldEffectObjectPic_Ash_1[] = INCBIN_U32("graphics/map_objects/pics/effects/ash/1.4bpp");
-const u32 gFieldEffectObjectPic_Ash_2[] = INCBIN_U32("graphics/map_objects/pics/effects/ash/2.4bpp");
-const u32 gFieldEffectObjectPic_Ash_3[] = INCBIN_U32("graphics/map_objects/pics/effects/ash/3.4bpp");
-const u32 gFieldEffectObjectPic_Ash_4[] = INCBIN_U32("graphics/map_objects/pics/effects/ash/4.4bpp");
-const u32 gFieldEffectObjectPic_Arrow_0[] = INCBIN_U32("graphics/map_objects/pics/effects/arrow/0.4bpp");
-const u32 gFieldEffectObjectPic_Arrow_1[] = INCBIN_U32("graphics/map_objects/pics/effects/arrow/1.4bpp");
-const u32 gFieldEffectObjectPic_Arrow_2[] = INCBIN_U32("graphics/map_objects/pics/effects/arrow/2.4bpp");
-const u32 gFieldEffectObjectPic_Arrow_3[] = INCBIN_U32("graphics/map_objects/pics/effects/arrow/3.4bpp");
-const u32 gFieldEffectObjectPic_Arrow_4[] = INCBIN_U32("graphics/map_objects/pics/effects/arrow/4.4bpp");
-const u32 gFieldEffectObjectPic_Arrow_5[] = INCBIN_U32("graphics/map_objects/pics/effects/arrow/5.4bpp");
-const u32 gFieldEffectObjectPic_Arrow_6[] = INCBIN_U32("graphics/map_objects/pics/effects/arrow/6.4bpp");
-const u32 gFieldEffectObjectPic_Arrow_7[] = INCBIN_U32("graphics/map_objects/pics/effects/arrow/7.4bpp");
-const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/map_objects/palettes/field_effect_object_palette_00.gbapal");
-const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/map_objects/palettes/field_effect_object_palette_01.gbapal");
-const u32 gFieldEffectObjectPic_GroundImpactDust_0[] = INCBIN_U32("graphics/map_objects/pics/effects/ground_impact_dust/0.4bpp");
-const u32 gFieldEffectObjectPic_GroundImpactDust_1[] = INCBIN_U32("graphics/map_objects/pics/effects/ground_impact_dust/1.4bpp");
-const u32 gFieldEffectObjectPic_GroundImpactDust_2[] = INCBIN_U32("graphics/map_objects/pics/effects/ground_impact_dust/2.4bpp");
-const u32 gFieldEffectObjectPic_BikeHopTallGrass_0[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_hop_tall_grass/0.4bpp");
-const u32 gFieldEffectObjectPic_BikeHopTallGrass_1[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_hop_tall_grass/1.4bpp");
-const u32 gFieldEffectObjectPic_BikeHopTallGrass_2[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_hop_tall_grass/2.4bpp");
-const u32 gFieldEffectObjectPic_BikeHopTallGrass_3[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_hop_tall_grass/3.4bpp");
-const u32 gUnusedGrass_0[] = INCBIN_U32("graphics/map_objects/pics/effects/unused_grass/0.4bpp");	
-const u32 gUnusedGrass_1[] = INCBIN_U32("graphics/map_objects/pics/effects/unused_grass/1.4bpp");	
-const u32 gUnusedGrass_2[] = INCBIN_U32("graphics/map_objects/pics/effects/unused_grass/2.4bpp");	
-const u32 gUnusedGrass_3[] = INCBIN_U32("graphics/map_objects/pics/effects/unused_grass/3.4bpp");
-const u32 gFieldEffectObjectPic_Unknown16_0[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_16/0.4bpp");
-const u32 gFieldEffectObjectPic_Unknown16_1[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_16/1.4bpp");
-const u32 gFieldEffectObjectPic_Unknown16_2[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_16/2.4bpp");
-const u32 gFieldEffectObjectPic_Unknown16_3[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_16/3.4bpp");
-const u32 gFieldEffectObjectPic_Unknown16_4[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_16/4.4bpp");
-const u32 gUnknown_084F7E38[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_4F7E38/0.4bpp");
-const u32 gFieldEffectObjectPic_Unknown16_5[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_16/5.4bpp");
-const u32 gFieldEffectObjectPic_Unknown17_0[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_17/0.4bpp");
-const u32 gFieldEffectObjectPic_Unknown17_1[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_17/1.4bpp");
-const u32 gFieldEffectObjectPic_Unknown17_2[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_17/2.4bpp");
-const u32 gFieldEffectObjectPic_Unknown17_3[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_17/3.4bpp");
-const u32 gFieldEffectObjectPic_Unknown17_4[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_17/4.4bpp");
-const u32 gFieldEffectObjectPic_Unknown17_5[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_17/5.4bpp");
-const u32 gFieldEffectObjectPic_Unknown17_6[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_17/6.4bpp");
-const u32 gFieldEffectObjectPic_Unknown17_7[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_17/7.4bpp");
-const u32 gFieldEffectObjectPic_Unknown18_0[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_18/0.4bpp");
-const u32 gFieldEffectObjectPic_Unknown18_1[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_18/1.4bpp");
-const u32 gFieldEffectObjectPic_Unknown18_2[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_18/2.4bpp");
-const u32 gFieldEffectObjectPic_Unknown18_3[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_18/3.4bpp");
-const u32 gFieldEffectObjectPic_LongGrass_0[] = INCBIN_U32("graphics/map_objects/pics/effects/long_grass/0.4bpp");
-const u32 gFieldEffectObjectPic_LongGrass_1[] = INCBIN_U32("graphics/map_objects/pics/effects/long_grass/1.4bpp");
-const u32 gFieldEffectObjectPic_LongGrass_2[] = INCBIN_U32("graphics/map_objects/pics/effects/long_grass/2.4bpp");
-const u32 gFieldEffectObjectPic_LongGrass_3[] = INCBIN_U32("graphics/map_objects/pics/effects/long_grass/3.4bpp");
-const u32 gFieldEffectObjectPic_TallGrass_0[] = INCBIN_U32("graphics/map_objects/pics/effects/tall_grass/0.4bpp");
-const u32 gFieldEffectObjectPic_TallGrass_1[] = INCBIN_U32("graphics/map_objects/pics/effects/tall_grass/1.4bpp");
-const u32 gFieldEffectObjectPic_TallGrass_2[] = INCBIN_U32("graphics/map_objects/pics/effects/tall_grass/2.4bpp");
-const u32 gFieldEffectObjectPic_TallGrass_3[] = INCBIN_U32("graphics/map_objects/pics/effects/tall_grass/3.4bpp");
-const u32 gFieldEffectObjectPic_TallGrass_4[] = INCBIN_U32("graphics/map_objects/pics/effects/tall_grass/4.4bpp");
-const u32 gFieldEffectObjectPic_ShortGrass_0[] = INCBIN_U32("graphics/map_objects/pics/effects/short_grass/0.4bpp");
-const u32 gFieldEffectObjectPic_ShortGrass_1[] = INCBIN_U32("graphics/map_objects/pics/effects/short_grass/1.4bpp");
-const u32 gFieldEffectObjectPic_SandFootprints_0[] = INCBIN_U32("graphics/map_objects/pics/effects/sand_footprints/0.4bpp");
-const u32 gFieldEffectObjectPic_SandFootprints_1[] = INCBIN_U32("graphics/map_objects/pics/effects/sand_footprints/1.4bpp");
-const u32 gFieldEffectObjectPic_DeepSandFootprints_0[] = INCBIN_U32("graphics/map_objects/pics/effects/deep_sand_footprints/0.4bpp");
-const u32 gFieldEffectObjectPic_DeepSandFootprints_1[] = INCBIN_U32("graphics/map_objects/pics/effects/deep_sand_footprints/1.4bpp");
-const u32 gFieldEffectObjectPic_BikeTireTracks_0[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_tire_tracks/0.4bpp");
-const u32 gFieldEffectObjectPic_BikeTireTracks_1[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_tire_tracks/1.4bpp");
-const u32 gFieldEffectObjectPic_BikeTireTracks_2[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_tire_tracks/2.4bpp");
-const u32 gFieldEffectObjectPic_BikeTireTracks_3[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_tire_tracks/3.4bpp");
-const u32 gFieldEffectObjectPic_Unknown19_0[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_19/0.4bpp");
-const u32 gFieldEffectObjectPic_Unknown19_1[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_19/1.4bpp");
-const u32 gFieldEffectObjectPic_Unknown19_2[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_19/2.4bpp");
-const u32 gFieldEffectObjectPic_Unknown19_3[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_19/3.4bpp");
-const u32 gFieldEffectObjectPic_Unknown29_0[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_29/0.4bpp");
-const u32 gFieldEffectObjectPic_Unknown29_1[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_29/1.4bpp");
-const u32 gFieldEffectObjectPic_Unknown29_2[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_29/2.4bpp");
-const u32 gFieldEffectObjectPic_BikeHopBigSplash_0[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_hop_big_splash/0.4bpp");
-const u32 gFieldEffectObjectPic_BikeHopBigSplash_1[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_hop_big_splash/1.4bpp");
-const u32 gFieldEffectObjectPic_BikeHopBigSplash_2[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_hop_big_splash/2.4bpp");
-const u32 gFieldEffectObjectPic_BikeHopBigSplash_3[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_hop_big_splash/3.4bpp");
-const u32 gFieldEffectObjectPic_Splash_0[] = INCBIN_U32("graphics/map_objects/pics/effects/splash/0.4bpp");
-const u32 gFieldEffectObjectPic_Splash_1[] = INCBIN_U32("graphics/map_objects/pics/effects/splash/1.4bpp");
-const u32 gFieldEffectObjectPic_BikeHopSmallSplash_0[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_hop_small_splash/0.4bpp");
-const u32 gFieldEffectObjectPic_BikeHopSmallSplash_1[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_hop_small_splash/1.4bpp");
-const u32 gFieldEffectObjectPic_BikeHopSmallSplash_2[] = INCBIN_U32("graphics/map_objects/pics/effects/bike_hop_small_splash/2.4bpp");
-const u32 gFieldEffectObjectPic_Unknown20_0[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_20/0.4bpp");
-const u32 gFieldEffectObjectPic_Unknown20_1[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_20/1.4bpp");
-const u32 gFieldEffectObjectPic_Unknown20_2[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_20/2.4bpp");
-const u32 gFieldEffectObjectPic_Unknown20_3[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_20/3.4bpp");
-const u32 gFieldEffectObjectPic_Unknown20_4[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_20/4.4bpp");
-const u32 gFieldEffectObjectPic_TreeDisguise_0[] = INCBIN_U32("graphics/map_objects/pics/effects/tree_disguise/0.4bpp");
-const u32 gFieldEffectObjectPic_TreeDisguise_1[] = INCBIN_U32("graphics/map_objects/pics/effects/tree_disguise/1.4bpp");
-const u32 gFieldEffectObjectPic_TreeDisguise_2[] = INCBIN_U32("graphics/map_objects/pics/effects/tree_disguise/2.4bpp");
-const u32 gFieldEffectObjectPic_TreeDisguise_3[] = INCBIN_U32("graphics/map_objects/pics/effects/tree_disguise/3.4bpp");
-const u32 gFieldEffectObjectPic_TreeDisguise_4[] = INCBIN_U32("graphics/map_objects/pics/effects/tree_disguise/4.4bpp");
-const u32 gFieldEffectObjectPic_TreeDisguise_5[] = INCBIN_U32("graphics/map_objects/pics/effects/tree_disguise/5.4bpp");
-const u32 gFieldEffectObjectPic_TreeDisguise_6[] = INCBIN_U32("graphics/map_objects/pics/effects/tree_disguise/6.4bpp");
-const u32 gFieldEffectObjectPic_MountainDisguise_0[] = INCBIN_U32("graphics/map_objects/pics/effects/mountain_disguise/0.4bpp");
-const u32 gFieldEffectObjectPic_MountainDisguise_1[] = INCBIN_U32("graphics/map_objects/pics/effects/mountain_disguise/1.4bpp");
-const u32 gFieldEffectObjectPic_MountainDisguise_2[] = INCBIN_U32("graphics/map_objects/pics/effects/mountain_disguise/2.4bpp");
-const u32 gFieldEffectObjectPic_MountainDisguise_3[] = INCBIN_U32("graphics/map_objects/pics/effects/mountain_disguise/3.4bpp");
-const u32 gFieldEffectObjectPic_MountainDisguise_4[] = INCBIN_U32("graphics/map_objects/pics/effects/mountain_disguise/4.4bpp");
-const u32 gFieldEffectObjectPic_MountainDisguise_5[] = INCBIN_U32("graphics/map_objects/pics/effects/mountain_disguise/5.4bpp");
-const u32 gFieldEffectObjectPic_MountainDisguise_6[] = INCBIN_U32("graphics/map_objects/pics/effects/mountain_disguise/6.4bpp");
-const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_0[] = INCBIN_U32("graphics/map_objects/pics/effects/sand_disguise_placeholder/0.4bpp");
-const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_1[] = INCBIN_U32("graphics/map_objects/pics/effects/sand_disguise_placeholder/1.4bpp");
-const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_2[] = INCBIN_U32("graphics/map_objects/pics/effects/sand_disguise_placeholder/2.4bpp");
-const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_3[] = INCBIN_U32("graphics/map_objects/pics/effects/sand_disguise_placeholder/3.4bpp");
-const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_4[] = INCBIN_U32("graphics/map_objects/pics/effects/sand_disguise_placeholder/4.4bpp");
-const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_5[] = INCBIN_U32("graphics/map_objects/pics/effects/sand_disguise_placeholder/5.4bpp");
-const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_6[] = INCBIN_U32("graphics/map_objects/pics/effects/sand_disguise_placeholder/6.4bpp");
-const u32 gFieldEffectObjectPic_HotSpringsWater[] = INCBIN_U32("graphics/map_objects/pics/effects/hot_springs_water.4bpp");
-const u16 gFieldEffectObjectPalette2[] = INCBIN_U16("graphics/map_objects/palettes/field_effect_object_palette_02.gbapal");
-const u32 gFieldEffectObjectPic_JumpOutOfAsh_0[] = INCBIN_U32("graphics/map_objects/pics/effects/jump_out_of_ash/0.4bpp");
-const u32 gFieldEffectObjectPic_JumpOutOfAsh_1[] = INCBIN_U32("graphics/map_objects/pics/effects/jump_out_of_ash/1.4bpp");
-const u32 gFieldEffectObjectPic_JumpOutOfAsh_2[] = INCBIN_U32("graphics/map_objects/pics/effects/jump_out_of_ash/2.4bpp");
-const u32 gFieldEffectObjectPic_JumpOutOfAsh_3[] = INCBIN_U32("graphics/map_objects/pics/effects/jump_out_of_ash/3.4bpp");
-const u32 gFieldEffectObjectPic_JumpOutOfAsh_4[] = INCBIN_U32("graphics/map_objects/pics/effects/jump_out_of_ash/4.4bpp");
-const u32 gFieldEffectObjectPic_Unknown33_0[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_33/0.4bpp");
-const u32 gFieldEffectObjectPic_Unknown33_1[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_33/1.4bpp");
-const u32 gFieldEffectObjectPic_Unknown33_2[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_33/2.4bpp");
-const u32 gFieldEffectObjectPic_Unknown33_3[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_33/3.4bpp");
-const u32 gFieldEffectObjectPic_Unknown33_4[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_33/4.4bpp");
-const u32 gFieldEffectObjectPic_Bubbles_0[] = INCBIN_U32("graphics/map_objects/pics/effects/bubbles/0.4bpp");
-const u32 gFieldEffectObjectPic_Bubbles_1[] = INCBIN_U32("graphics/map_objects/pics/effects/bubbles/1.4bpp");
-const u32 gFieldEffectObjectPic_Bubbles_2[] = INCBIN_U32("graphics/map_objects/pics/effects/bubbles/2.4bpp");
-const u32 gFieldEffectObjectPic_Bubbles_3[] = INCBIN_U32("graphics/map_objects/pics/effects/bubbles/3.4bpp");
-const u32 gFieldEffectObjectPic_Bubbles_4[] = INCBIN_U32("graphics/map_objects/pics/effects/bubbles/4.4bpp");
-const u32 gFieldEffectObjectPic_Bubbles_5[] = INCBIN_U32("graphics/map_objects/pics/effects/bubbles/5.4bpp");
-const u32 gFieldEffectObjectPic_Bubbles_6[] = INCBIN_U32("graphics/map_objects/pics/effects/bubbles/6.4bpp");
-const u32 gFieldEffectObjectPic_Bubbles_7[] = INCBIN_U32("graphics/map_objects/pics/effects/bubbles/7.4bpp");
-const u32 gFieldEffectObjectPic_Unknown35_0[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_35/0.4bpp");
-const u32 gFieldEffectObjectPic_Unknown35_1[] = INCBIN_U32("graphics/map_objects/pics/effects/unknown_35/1.4bpp");
-const u16 gFieldEffectObjectPalette3[] = INCBIN_U16("graphics/map_objects/palettes/field_effect_object_palette_03.gbapal");
-const u32 gFieldEffectObjectPic_Bird[] = INCBIN_U32("graphics/map_objects/pics/effects/bird.4bpp");
-const u32 gFieldObjectPic_Juan_0[] = INCBIN_U32("graphics/map_objects/pics/people/juan/0.4bpp");
-const u32 gFieldObjectPic_Juan_1[] = INCBIN_U32("graphics/map_objects/pics/people/juan/1.4bpp");
-const u32 gFieldObjectPic_Juan_2[] = INCBIN_U32("graphics/map_objects/pics/people/juan/2.4bpp");
-const u32 gFieldObjectPic_Juan_3[] = INCBIN_U32("graphics/map_objects/pics/people/juan/3.4bpp");
-const u32 gFieldObjectPic_Juan_4[] = INCBIN_U32("graphics/map_objects/pics/people/juan/4.4bpp");
-const u32 gFieldObjectPic_Juan_5[] = INCBIN_U32("graphics/map_objects/pics/people/juan/5.4bpp");
-const u32 gFieldObjectPic_Juan_6[] = INCBIN_U32("graphics/map_objects/pics/people/juan/6.4bpp");
-const u32 gFieldObjectPic_Juan_7[] = INCBIN_U32("graphics/map_objects/pics/people/juan/7.4bpp");
-const u32 gFieldObjectPic_Juan_8[] = INCBIN_U32("graphics/map_objects/pics/people/juan/8.4bpp");
-const u32 gFieldObjectPic_Scott_0[] = INCBIN_U32("graphics/map_objects/pics/people/scott/0.4bpp");
-const u32 gFieldObjectPic_Scott_1[] = INCBIN_U32("graphics/map_objects/pics/people/scott/1.4bpp");
-const u32 gFieldObjectPic_Scott_2[] = INCBIN_U32("graphics/map_objects/pics/people/scott/2.4bpp");
-const u32 gFieldObjectPic_Scott_3[] = INCBIN_U32("graphics/map_objects/pics/people/scott/3.4bpp");
-const u32 gFieldObjectPic_Scott_4[] = INCBIN_U32("graphics/map_objects/pics/people/scott/4.4bpp");
-const u32 gFieldObjectPic_Scott_5[] = INCBIN_U32("graphics/map_objects/pics/people/scott/5.4bpp");
-const u32 gFieldObjectPic_Scott_6[] = INCBIN_U32("graphics/map_objects/pics/people/scott/6.4bpp");
-const u32 gFieldObjectPic_Scott_7[] = INCBIN_U32("graphics/map_objects/pics/people/scott/7.4bpp");
-const u32 gFieldObjectPic_Scott_8[] = INCBIN_U32("graphics/map_objects/pics/people/scott/8.4bpp");
-const u32 gFieldObjectPic_Statue[] = INCBIN_U32("graphics/map_objects/pics/misc/statue.4bpp");
-const u32 gFieldObjectPic_Kirlia_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kirlia/0.4bpp");
-const u32 gFieldObjectPic_Kirlia_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kirlia/1.4bpp");
-const u32 gFieldObjectPic_Kirlia_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kirlia/2.4bpp");
-const u32 gFieldObjectPic_Kirlia_3[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kirlia/3.4bpp");
-const u32 gFieldObjectPic_Kirlia_4[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kirlia/4.4bpp");
-const u32 gFieldObjectPic_Kirlia_5[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kirlia/5.4bpp");
-const u32 gFieldObjectPic_Kirlia_6[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kirlia/6.4bpp");
-const u32 gFieldObjectPic_Kirlia_7[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kirlia/7.4bpp");
-const u32 gFieldObjectPic_Kirlia_8[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kirlia/8.4bpp");
-const u32 gFieldObjectPic_Dusclops_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/dusclops/0.4bpp");
-const u32 gFieldObjectPic_Dusclops_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/dusclops/1.4bpp");
-const u32 gFieldObjectPic_Dusclops_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/dusclops/2.4bpp");
-const u32 gFieldObjectPic_Dusclops_3[] = INCBIN_U32("graphics/map_objects/pics/pokemon/dusclops/3.4bpp");
-const u32 gFieldObjectPic_Dusclops_4[] = INCBIN_U32("graphics/map_objects/pics/pokemon/dusclops/4.4bpp");
-const u32 gFieldObjectPic_Dusclops_5[] = INCBIN_U32("graphics/map_objects/pics/pokemon/dusclops/5.4bpp");
-const u32 gFieldObjectPic_Dusclops_6[] = INCBIN_U32("graphics/map_objects/pics/pokemon/dusclops/6.4bpp");
-const u32 gFieldObjectPic_Dusclops_7[] = INCBIN_U32("graphics/map_objects/pics/pokemon/dusclops/7.4bpp");
-const u32 gFieldObjectPic_Dusclops_8[] = INCBIN_U32("graphics/map_objects/pics/pokemon/dusclops/8.4bpp");
-const u32 gFieldObjectPic_MysteryEventDeliveryman_0[] = INCBIN_U32("graphics/map_objects/pics/people/mystery_event_deliveryman/0.4bpp");
-const u32 gFieldObjectPic_MysteryEventDeliveryman_1[] = INCBIN_U32("graphics/map_objects/pics/people/mystery_event_deliveryman/1.4bpp");
-const u32 gFieldObjectPic_MysteryEventDeliveryman_2[] = INCBIN_U32("graphics/map_objects/pics/people/mystery_event_deliveryman/2.4bpp");
-const u32 gFieldObjectPic_UnionRoomAttendant_0[] = INCBIN_U32("graphics/map_objects/pics/people/union_room_attendant/0.4bpp");
-const u32 gFieldObjectPic_UnionRoomAttendant_1[] = INCBIN_U32("graphics/map_objects/pics/people/union_room_attendant/1.4bpp");
-const u32 gFieldObjectPic_UnionRoomAttendant_2[] = INCBIN_U32("graphics/map_objects/pics/people/union_room_attendant/2.4bpp");
-const u32 gFieldObjectPic_MovingBox[] = INCBIN_U32("graphics/map_objects/pics/misc/moving_box.4bpp");
-const u16 gFieldObjectPalette19[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_19.gbapal");
-const u32 gFieldObjectPic_Sudowoodo_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/sudowoodo/0.4bpp");
-const u32 gFieldObjectPic_Sudowoodo_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/sudowoodo/1.4bpp");
-const u32 gFieldObjectPic_Sudowoodo_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/sudowoodo/2.4bpp");
-const u32 gFieldObjectPic_Mew_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/mew/0.4bpp");
-const u32 gFieldObjectPic_Mew_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/mew/1.4bpp");
-const u32 gFieldObjectPic_Mew_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/mew/2.4bpp");
-const u32 gFieldObjectPic_Mew_3[] = INCBIN_U32("graphics/map_objects/pics/pokemon/mew/3.4bpp");
-const u32 gFieldObjectPic_Mew_4[] = INCBIN_U32("graphics/map_objects/pics/pokemon/mew/4.4bpp");
-const u32 gFieldObjectPic_Mew_5[] = INCBIN_U32("graphics/map_objects/pics/pokemon/mew/5.4bpp");
-const u32 gFieldObjectPic_Mew_6[] = INCBIN_U32("graphics/map_objects/pics/pokemon/mew/6.4bpp");
-const u32 gFieldObjectPic_Mew_7[] = INCBIN_U32("graphics/map_objects/pics/pokemon/mew/7.4bpp");
-const u32 gFieldObjectPic_Mew_8[] = INCBIN_U32("graphics/map_objects/pics/pokemon/mew/8.4bpp");
-const u16 gFieldObjectPalette28[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_28.gbapal");
-const u32 gFieldObjectPic_Red_0[] = INCBIN_U32("graphics/map_objects/pics/people/red/0.4bpp");
-const u32 gFieldObjectPic_Red_1[] = INCBIN_U32("graphics/map_objects/pics/people/red/1.4bpp");
-const u32 gFieldObjectPic_Red_2[] = INCBIN_U32("graphics/map_objects/pics/people/red/2.4bpp");
-const u32 gFieldObjectPic_Red_3[] = INCBIN_U32("graphics/map_objects/pics/people/red/3.4bpp");
-const u32 gFieldObjectPic_Red_4[] = INCBIN_U32("graphics/map_objects/pics/people/red/4.4bpp");
-const u32 gFieldObjectPic_Red_5[] = INCBIN_U32("graphics/map_objects/pics/people/red/5.4bpp");
-const u32 gFieldObjectPic_Red_6[] = INCBIN_U32("graphics/map_objects/pics/people/red/6.4bpp");
-const u32 gFieldObjectPic_Red_7[] = INCBIN_U32("graphics/map_objects/pics/people/red/7.4bpp");
-const u32 gFieldObjectPic_Red_8[] = INCBIN_U32("graphics/map_objects/pics/people/red/8.4bpp");
-const u32 gFieldObjectPic_Leaf_0[] = INCBIN_U32("graphics/map_objects/pics/people/leaf/0.4bpp");
-const u32 gFieldObjectPic_Leaf_1[] = INCBIN_U32("graphics/map_objects/pics/people/leaf/1.4bpp");
-const u32 gFieldObjectPic_Leaf_2[] = INCBIN_U32("graphics/map_objects/pics/people/leaf/2.4bpp");
-const u32 gFieldObjectPic_Leaf_3[] = INCBIN_U32("graphics/map_objects/pics/people/leaf/3.4bpp");
-const u32 gFieldObjectPic_Leaf_4[] = INCBIN_U32("graphics/map_objects/pics/people/leaf/4.4bpp");
-const u32 gFieldObjectPic_Leaf_5[] = INCBIN_U32("graphics/map_objects/pics/people/leaf/5.4bpp");
-const u32 gFieldObjectPic_Leaf_6[] = INCBIN_U32("graphics/map_objects/pics/people/leaf/6.4bpp");
-const u32 gFieldObjectPic_Leaf_7[] = INCBIN_U32("graphics/map_objects/pics/people/leaf/7.4bpp");
-const u32 gFieldObjectPic_Leaf_8[] = INCBIN_U32("graphics/map_objects/pics/people/leaf/8.4bpp");
-const u16 gFieldObjectPalette30[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_30.gbapal");
-const u32 gFieldObjectPic_BirthIslandStone[] = INCBIN_U32("graphics/map_objects/pics/misc/birth_island_stone.4bpp");
-const u16 gFieldObjectPalette29[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_29.gbapal");
-const u32 gFieldObjectPic_Deoxys_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/deoxys/0.4bpp");
-const u32 gFieldObjectPic_Deoxys_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/deoxys/1.4bpp");
-const u32 gFieldObjectPic_Anabel_0[] = INCBIN_U32("graphics/map_objects/pics/people/anabel/0.4bpp");
-const u32 gFieldObjectPic_Anabel_1[] = INCBIN_U32("graphics/map_objects/pics/people/anabel/1.4bpp");
-const u32 gFieldObjectPic_Anabel_2[] = INCBIN_U32("graphics/map_objects/pics/people/anabel/2.4bpp");
-const u32 gFieldObjectPic_Anabel_3[] = INCBIN_U32("graphics/map_objects/pics/people/anabel/3.4bpp");
-const u32 gFieldObjectPic_Anabel_4[] = INCBIN_U32("graphics/map_objects/pics/people/anabel/4.4bpp");
-const u32 gFieldObjectPic_Anabel_5[] = INCBIN_U32("graphics/map_objects/pics/people/anabel/5.4bpp");
-const u32 gFieldObjectPic_Anabel_6[] = INCBIN_U32("graphics/map_objects/pics/people/anabel/6.4bpp");
-const u32 gFieldObjectPic_Anabel_7[] = INCBIN_U32("graphics/map_objects/pics/people/anabel/7.4bpp");
-const u32 gFieldObjectPic_Anabel_8[] = INCBIN_U32("graphics/map_objects/pics/people/anabel/8.4bpp");
-const u32 gFieldObjectPic_Tucker_0[] = INCBIN_U32("graphics/map_objects/pics/people/tucker/0.4bpp");
-const u32 gFieldObjectPic_Tucker_1[] = INCBIN_U32("graphics/map_objects/pics/people/tucker/1.4bpp");
-const u32 gFieldObjectPic_Tucker_2[] = INCBIN_U32("graphics/map_objects/pics/people/tucker/2.4bpp");
-const u32 gFieldObjectPic_Tucker_3[] = INCBIN_U32("graphics/map_objects/pics/people/tucker/3.4bpp");
-const u32 gFieldObjectPic_Tucker_4[] = INCBIN_U32("graphics/map_objects/pics/people/tucker/4.4bpp");
-const u32 gFieldObjectPic_Tucker_5[] = INCBIN_U32("graphics/map_objects/pics/people/tucker/5.4bpp");
-const u32 gFieldObjectPic_Tucker_6[] = INCBIN_U32("graphics/map_objects/pics/people/tucker/6.4bpp");
-const u32 gFieldObjectPic_Tucker_7[] = INCBIN_U32("graphics/map_objects/pics/people/tucker/7.4bpp");
-const u32 gFieldObjectPic_Tucker_8[] = INCBIN_U32("graphics/map_objects/pics/people/tucker/8.4bpp");
-const u32 gFieldObjectPic_Spenser_0[] = INCBIN_U32("graphics/map_objects/pics/people/spenser/0.4bpp");
-const u32 gFieldObjectPic_Spenser_1[] = INCBIN_U32("graphics/map_objects/pics/people/spenser/1.4bpp");
-const u32 gFieldObjectPic_Spenser_2[] = INCBIN_U32("graphics/map_objects/pics/people/spenser/2.4bpp");
-const u32 gFieldObjectPic_Spenser_3[] = INCBIN_U32("graphics/map_objects/pics/people/spenser/3.4bpp");
-const u32 gFieldObjectPic_Spenser_4[] = INCBIN_U32("graphics/map_objects/pics/people/spenser/4.4bpp");
-const u32 gFieldObjectPic_Spenser_5[] = INCBIN_U32("graphics/map_objects/pics/people/spenser/5.4bpp");
-const u32 gFieldObjectPic_Spenser_6[] = INCBIN_U32("graphics/map_objects/pics/people/spenser/6.4bpp");
-const u32 gFieldObjectPic_Spenser_7[] = INCBIN_U32("graphics/map_objects/pics/people/spenser/7.4bpp");
-const u32 gFieldObjectPic_Spenser_8[] = INCBIN_U32("graphics/map_objects/pics/people/spenser/8.4bpp");
-const u32 gFieldObjectPic_Greta_0[] = INCBIN_U32("graphics/map_objects/pics/people/greta/0.4bpp");
-const u32 gFieldObjectPic_Greta_1[] = INCBIN_U32("graphics/map_objects/pics/people/greta/1.4bpp");
-const u32 gFieldObjectPic_Greta_2[] = INCBIN_U32("graphics/map_objects/pics/people/greta/2.4bpp");
-const u32 gFieldObjectPic_Greta_3[] = INCBIN_U32("graphics/map_objects/pics/people/greta/3.4bpp");
-const u32 gFieldObjectPic_Greta_4[] = INCBIN_U32("graphics/map_objects/pics/people/greta/4.4bpp");
-const u32 gFieldObjectPic_Greta_5[] = INCBIN_U32("graphics/map_objects/pics/people/greta/5.4bpp");
-const u32 gFieldObjectPic_Greta_6[] = INCBIN_U32("graphics/map_objects/pics/people/greta/6.4bpp");
-const u32 gFieldObjectPic_Greta_7[] = INCBIN_U32("graphics/map_objects/pics/people/greta/7.4bpp");
-const u32 gFieldObjectPic_Greta_8[] = INCBIN_U32("graphics/map_objects/pics/people/greta/8.4bpp");
-const u32 gFieldObjectPic_Noland_0[] = INCBIN_U32("graphics/map_objects/pics/people/noland/0.4bpp");
-const u32 gFieldObjectPic_Noland_1[] = INCBIN_U32("graphics/map_objects/pics/people/noland/1.4bpp");
-const u32 gFieldObjectPic_Noland_2[] = INCBIN_U32("graphics/map_objects/pics/people/noland/2.4bpp");
-const u32 gFieldObjectPic_Noland_3[] = INCBIN_U32("graphics/map_objects/pics/people/noland/3.4bpp");
-const u32 gFieldObjectPic_Noland_4[] = INCBIN_U32("graphics/map_objects/pics/people/noland/4.4bpp");
-const u32 gFieldObjectPic_Noland_5[] = INCBIN_U32("graphics/map_objects/pics/people/noland/5.4bpp");
-const u32 gFieldObjectPic_Noland_6[] = INCBIN_U32("graphics/map_objects/pics/people/noland/6.4bpp");
-const u32 gFieldObjectPic_Noland_7[] = INCBIN_U32("graphics/map_objects/pics/people/noland/7.4bpp");
-const u32 gFieldObjectPic_Noland_8[] = INCBIN_U32("graphics/map_objects/pics/people/noland/8.4bpp");
-const u32 gFieldObjectPic_Lucy_0[] = INCBIN_U32("graphics/map_objects/pics/people/lucy/0.4bpp");
-const u32 gFieldObjectPic_Lucy_1[] = INCBIN_U32("graphics/map_objects/pics/people/lucy/1.4bpp");
-const u32 gFieldObjectPic_Lucy_2[] = INCBIN_U32("graphics/map_objects/pics/people/lucy/2.4bpp");
-const u32 gFieldObjectPic_Lucy_3[] = INCBIN_U32("graphics/map_objects/pics/people/lucy/3.4bpp");
-const u32 gFieldObjectPic_Lucy_4[] = INCBIN_U32("graphics/map_objects/pics/people/lucy/4.4bpp");
-const u32 gFieldObjectPic_Lucy_5[] = INCBIN_U32("graphics/map_objects/pics/people/lucy/5.4bpp");
-const u32 gFieldObjectPic_Lucy_6[] = INCBIN_U32("graphics/map_objects/pics/people/lucy/6.4bpp");
-const u32 gFieldObjectPic_Lucy_7[] = INCBIN_U32("graphics/map_objects/pics/people/lucy/7.4bpp");
-const u32 gFieldObjectPic_Lucy_8[] = INCBIN_U32("graphics/map_objects/pics/people/lucy/8.4bpp");
-const u32 gFieldObjectPic_Brandon_0[] = INCBIN_U32("graphics/map_objects/pics/people/brandon/0.4bpp");
-const u32 gFieldObjectPic_Brandon_1[] = INCBIN_U32("graphics/map_objects/pics/people/brandon/1.4bpp");
-const u32 gFieldObjectPic_Brandon_2[] = INCBIN_U32("graphics/map_objects/pics/people/brandon/2.4bpp");
-const u32 gFieldObjectPic_Brandon_3[] = INCBIN_U32("graphics/map_objects/pics/people/brandon/3.4bpp");
-const u32 gFieldObjectPic_Brandon_4[] = INCBIN_U32("graphics/map_objects/pics/people/brandon/4.4bpp");
-const u32 gFieldObjectPic_Brandon_5[] = INCBIN_U32("graphics/map_objects/pics/people/brandon/5.4bpp");
-const u32 gFieldObjectPic_Brandon_6[] = INCBIN_U32("graphics/map_objects/pics/people/brandon/6.4bpp");
-const u32 gFieldObjectPic_Brandon_7[] = INCBIN_U32("graphics/map_objects/pics/people/brandon/7.4bpp");
-const u32 gFieldObjectPic_Brandon_8[] = INCBIN_U32("graphics/map_objects/pics/people/brandon/8.4bpp");
-const u32 gFieldObjectPic_Lugia_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/lugia/0.4bpp");
-const u32 gFieldObjectPic_Lugia_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/lugia/1.4bpp");
-const u16 gFieldObjectPalette32[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_32.gbapal");
-const u32 gFieldObjectPic_HoOh_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/ho_oh/0.4bpp");
-const u32 gFieldObjectPic_HoOh_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/ho_oh/1.4bpp");
-const u16 gFieldObjectPalette31[] = INCBIN_U16("graphics/map_objects/palettes/field_object_palette_31.gbapal");
+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
index 774109472..14ef4983d 100755
--- a/src/data/field_event_obj/event_object_graphics_info.h
+++ b/src/data/field_event_obj/event_object_graphics_info.h
@@ -1,250 +1,250 @@
 #ifndef GUARD_EVENT_OBJECT_GRAPHICS_INFO_H
 #define GUARD_EVENT_OBJECT_GRAPHICS_INFO_H
 
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanNormal = {0xFFFF, 0x1100, 0x1102, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_BrendanMayNormal, gFieldObjectPicTable_BrendanNormal, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanMachBike = {0xFFFF, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_BrendanMachBike, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanAcroBike = {0xFFFF, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_AcroBike, gFieldObjectPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanSurfing = {0xFFFF, 0x1100, 0x11FF, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Surfing, gFieldObjectPicTable_BrendanSurfing, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanFieldMove = {0xFFFF, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_FieldMove, gFieldObjectPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_QuintyPlump = {0xFFFF, 0x110B, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_L, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_QuintyPlump, gFieldObjectPicTable_QuintyPlump, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_LittleBoy1 = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_LittleBoy1, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_LittleGirl1 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_LittleGirl1, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Boy1 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Boy1, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Girl1 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Girl1, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Boy2 = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Boy2, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Girl2 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Girl2, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_LittleBoy2 = {0xFFFF, 0x1106, 0x11FF, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_LittleBoy2, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_LittleGirl2 = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_LittleGirl2, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Boy3 = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Boy3, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Girl3 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Girl3, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Boy4 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Boy4, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Woman1 = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Woman1, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_FatMan = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_FatMan, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Woman2 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Woman2, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Man1 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Man1, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Woman3 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Woman3, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_OldMan1 = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_OldMan1, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_OldWoman1 = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_OldWoman1, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Man2 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Man2, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Woman4 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Woman4, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Man3 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Man3, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Woman5 = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Woman5, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Cook = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Cook, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Woman6 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Woman6, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_OldMan2 = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_OldMan2, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_OldWoman2 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_OldWoman2, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Camper = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Camper, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Picnicker = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Picnicker, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Man4 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Man4, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Woman7 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Woman7, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Youngster = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Youngster, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BugCatcher = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_BugCatcher, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_PsychicM = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_PsychicM, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SchoolKidM = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_SchoolKidM, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Maniac = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Maniac, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_HexManiac = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_HexManiac, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Rayquaza1 = {0xFFFF, 0x1105, 0x11FF, 2048, 64, 64, 4, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldObjectBaseOam_64x64, gFieldObjectSpriteOamTables_64x64, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_RayquazaStill, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SwimmerM = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_SwimmerM, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SwimmerF = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_SwimmerF, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BlackBelt = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_BlackBelt, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Beauty = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Beauty, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Scientist1 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Scientist1, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Lass = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Lass, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Gentleman = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Gentleman, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Sailor = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Sailor, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Fisherman = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Fisherman, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RunningTriathleteM = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_RunningTriathleteM, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RunningTriathleteF = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_RunningTriathleteF, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_TuberF = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_TuberF, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_TuberM = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_TuberM, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Hiker = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Hiker, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_CyclingTriathleteM = {0xFFFF, 0x1105, 0x11FF, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_AcroBike, gFieldObjectPicTable_CyclingTriathleteM, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_CyclingTriathleteF = {0xFFFF, 0x1103, 0x11FF, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_AcroBike, gFieldObjectPicTable_CyclingTriathleteF, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Nurse = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Nurse, gFieldObjectPicTable_Nurse, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ItemBall = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_ItemBall, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BerryTree = {0xFFFF, 0x1103, 0x11FF, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, NULL, gFieldObjectImageAnimTable_BerryTree, gFieldObjectPicTable_PechaBerryTree, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BerryTreeEarlyStages = {0xFFFF, 0x1103, 0x11FF, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_BerryTree, gFieldObjectPicTable_PechaBerryTree, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BerryTreeLateStages = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_BerryTree, gFieldObjectPicTable_PechaBerryTree, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ProfBirch = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_ProfBirch, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Man5 = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Man5, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Man6 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Man6, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ReporterM = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_ReporterM, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ReporterF = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_ReporterF, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Bard = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Hipster = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Trader = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Storyteller = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Giddy = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedMauvilleOldMan1 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedMauvilleOldMan2 = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedNatuDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_UnusedNatuDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedMagnemiteDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_UnusedMagnemiteDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedSquirtleDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_UnusedSquirtleDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedWooperDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_UnusedWooperDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedPikachuDoll = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_UnusedPikachuDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedPorygon2Doll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_UnusedPorygon2Doll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_CuttableTree = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_CuttableTree, gFieldObjectPicTable_CuttableTree, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MartEmployee = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MartEmployee, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RooftopSaleWoman = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_RooftopSaleWoman, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Teala = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Teala, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BreakableRock = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_BreakableRock, gFieldObjectPicTable_BreakableRock, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_PushableBoulder = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_PushableBoulder, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MrBrineysBoat = {0xFFFF, 0x1105, 0x11FF, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MrBrineysBoat, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayNormal = {0xFFFF, 0x1110, 0x1102, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_BrendanMayNormal, gFieldObjectPicTable_MayNormal, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayMachBike = {0xFFFF, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MayMachBike, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayAcroBike = {0xFFFF, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_AcroBike, gFieldObjectPicTable_MayAcroBike, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MaySurfing = {0xFFFF, 0x1110, 0x11FF, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Surfing, gFieldObjectPicTable_MaySurfing, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayFieldMove = {0xFFFF, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_FieldMove, gFieldObjectPicTable_MayFieldMove, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Truck = {0xFFFF, 0x110D, 0x11FF, 1152, 48, 48, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_Truck, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_Truck, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_VigorothCarryingBox = {0xFFFF, 0x110E, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_VigorothCarryingBox, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_VigorothFacingAway = {0xFFFF, 0x110E, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_VigorothFacingAway, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BirchsBag = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BirchsBag, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_EnemyZigzagoon = {0xFFFF, 0x110F, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_EnemyZigzagoon, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Poochyena = {0xFFFF, 0x111C, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Poochyena, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Artist = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Artist, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalBrendanNormal = {0xFFFF, 0x1100, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_BrendanMayNormal, gFieldObjectPicTable_BrendanNormal, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalBrendanMachBike = {0xFFFF, 0x1100, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_BrendanMachBike, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalBrendanAcroBike = {0xFFFF, 0x1100, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_AcroBike, gFieldObjectPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalBrendanSurfing = {0xFFFF, 0x1100, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Surfing, gFieldObjectPicTable_BrendanSurfing, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalBrendanFieldMove = {0xFFFF, 0x1100, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_FieldMove, gFieldObjectPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalMayNormal = {0xFFFF, 0x1110, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_BrendanMayNormal, gFieldObjectPicTable_MayNormal, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalMayMachBike = {0xFFFF, 0x1110, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MayMachBike, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalMayAcroBike = {0xFFFF, 0x1110, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_AcroBike, gFieldObjectPicTable_MayAcroBike, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalMaySurfing = {0xFFFF, 0x1110, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Surfing, gFieldObjectPicTable_MaySurfing, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalMayFieldMove = {0xFFFF, 0x1110, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_FieldMove, gFieldObjectPicTable_MayFieldMove, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Cameraman = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Cameraman, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanUnderwater = {0xFFFF, 0x1115, 0x11FF, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_BrendanUnderwater, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayUnderwater = {0xFFFF, 0x1115, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MayUnderwater, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MovingBox = {0xFFFF, 0x1112, 0x11FF, 128, 16, 16, 10, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_MovingBox, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_CableCar = {0xFFFF, 0x1113, 0x11FF, 2048, 64, 64, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_64x64, gFieldObjectSpriteOamTables_64x64, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_CableCar, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Scientist2 = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Scientist2, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Man7 = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Man7, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_AquaMemberM = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_AquaMemberM, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_AquaMemberF = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_AquaMemberF, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MagmaMemberM = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MagmaMemberM, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MagmaMemberF = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MagmaMemberF, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Sidney = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Sidney, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Phoebe = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Phoebe, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Glacia = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Glacia, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Drake = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Drake, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Roxanne = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Roxanne, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Brawly = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Brawly, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Wattson = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Wattson, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Flannery = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Flannery, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Norman = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Norman, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Winona = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Winona, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Liza = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Liza, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Tate = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Tate, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Wallace = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Wallace, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Steven = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Steven, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Wally = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Wally, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RubySapphireLittleBoy = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_RubySapphireLittleBoy, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanFishing = {0xFFFF, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Fishing, gFieldObjectPicTable_BrendanFishing, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayFishing = {0xFFFF, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Fishing, gFieldObjectPicTable_MayFishing, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_HotSpringsOldWoman = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_HotSpringsOldWoman, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SSTidal = {0xFFFF, 0x1114, 0x11FF, 1920, 96, 40, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_8x8, gFieldObjectSpriteOamTables_SSTidal, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_SSTidal, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SubmarineShadow = {0xFFFF, 0x111B, 0x11FF, 1408, 88, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_8x8, gFieldObjectSpriteOamTables_SubmarineShadow, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_SubmarineShadow, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_PichuDoll = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_PichuDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_PikachuDoll = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_PikachuDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MarillDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_MarillDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_TogepiDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_TogepiDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_CyndaquilDoll = {0xFFFF, 0x1106, 0x11FF, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_CyndaquilDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ChikoritaDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_ChikoritaDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_TotodileDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_TotodileDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_JigglypuffDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_JigglypuffDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MeowthDoll = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_MeowthDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ClefairyDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_ClefairyDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_DittoDoll = {0xFFFF, 0x1106, 0x11FF, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_DittoDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SmoochumDoll = {0xFFFF, 0x1106, 0x11FF, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_SmoochumDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_TreeckoDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_TreeckoDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_TorchicDoll = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_TorchicDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MudkipDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_MudkipDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_DuskullDoll = {0xFFFF, 0x1106, 0x11FF, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_DuskullDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_WynautDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_WynautDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BaltoyDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BaltoyDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_KecleonDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_KecleonDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_AzurillDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_AzurillDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SkittyDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_SkittyDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SwabluDoll = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_SwabluDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_GulpinDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_GulpinDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_LotadDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_LotadDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SeedotDoll = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_SeedotDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_PikaCushion = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_PikaCushion, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RoundCushion = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_RoundCushion, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_KissCushion = {0xFFFF, 0x1106, 0x11FF, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_KissCushion, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ZigzagCushion = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_ZigzagCushion, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SpinCushion = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_SpinCushion, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_DiamondCushion = {0xFFFF, 0x1106, 0x11FF, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_DiamondCushion, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BallCushion = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BallCushion, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_GrassCushion = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_GrassCushion, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_FireCushion = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_FireCushion, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_WaterCushion = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_WaterCushion, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigSnorlaxDoll = {0xFFFF, 0x1106, 0x11FF, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BigSnorlaxDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigRhydonDoll = {0xFFFF, 0x1106, 0x11FF, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BigRhydonDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigLaprasDoll = {0xFFFF, 0x1103, 0x11FF, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BigLaprasDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigVenusaurDoll = {0xFFFF, 0x1105, 0x11FF, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BigVenusaurDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigCharizardDoll = {0xFFFF, 0x1104, 0x11FF, 512, 32, 32, 3, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BigCharizardDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigBlastoiseDoll = {0xFFFF, 0x1103, 0x11FF, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BigBlastoiseDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigWailmerDoll = {0xFFFF, 0x1106, 0x11FF, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BigWailmerDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigRegirockDoll = {0xFFFF, 0x1103, 0x11FF, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BigRegirockDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigRegiceDoll = {0xFFFF, 0x1105, 0x11FF, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BigRegiceDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigRegisteelDoll = {0xFFFF, 0x1106, 0x11FF, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BigRegisteelDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Latias = {0xFFFF, 0x1104, 0x11FF, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_LatiasLatios, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Latios = {0xFFFF, 0x1103, 0x11FF, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_LatiasLatios, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Boy5 = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Boy5, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ContestOldMan = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_ContestOldMan, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanWatering = {0xFFFF, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_BrendanWatering, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayWatering = {0xFFFF, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MayWatering, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanDecorating = {0xFFFF, 0x1100, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BrendanDecorating, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayDecorating = {0xFFFF, 0x1110, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_MayDecorating, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Archie = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Archie, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Maxie = {0xFFFF, 0x1104, 0x11FF, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Maxie, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Kyogre1 = {0xFFFF, 0x1106, 0x11FF, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_KyogreFront, gFieldObjectRotScalAnimTable_KyogreGroudon};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Groudon1 = {0xFFFF, 0x1105, 0x11FF, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_GroudonFront, gFieldObjectRotScalAnimTable_KyogreGroudon};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Kyogre3 = {0xFFFF, 0x1106, 0x11FF, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_KyogreSide, gFieldObjectRotScalAnimTable_KyogreGroudon};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Groudon3 = {0xFFFF, 0x1105, 0x11FF, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Groudon3, gFieldObjectPicTable_GroudonSide, gFieldObjectRotScalAnimTable_KyogreGroudon};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Fossil = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_Fossil, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Regirock = {0xFFFF, 0x1104, 0x11FF, 512, 32, 32, 3, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Regi, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Regice = {0xFFFF, 0x1105, 0x11FF, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Regi, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Registeel = {0xFFFF, 0x1106, 0x11FF, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Regi, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Skitty = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Skitty, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Kecleon1 = {0xFFFF, 0x1105, 0x11FF, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Kecleon, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Kyogre2 = {0xFFFF, 0x1116, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_KyogreFront, gFieldObjectRotScalAnimTable_KyogreGroudon};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Groudon2 = {0xFFFF, 0x1118, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_GroudonFront, gFieldObjectRotScalAnimTable_KyogreGroudon};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Rayquaza2 = {0xFFFF, 0x1105, 0x11FF, 2048, 64, 64, 4, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldObjectBaseOam_64x64, gFieldObjectSpriteOamTables_64x64, gFieldObjectImageAnimTable_Rayquaza2, gFieldObjectPicTable_Rayquaza, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Zigzagoon = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Zigzagoon, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Pikachu = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Pikachu, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Azumarill = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Azumarill, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Wingull = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Wingull, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Kecleon2 = {0xFFFF, 0x1105, 0x1102, 128, 16, 16, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Kecleon, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_TuberMSwimming = {0xFFFF, 0x1104, 0x11FF, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_TuberMSwimming, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Azurill = {0xFFFF, 0x1103, 0x11FF, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x16, gFieldObjectSpriteOamTables_16x16, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Azurill, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Mom = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Mom, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_LinkBrendan = {0xFFFF, 0x1110, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_BrendanMayNormal, gFieldObjectPicTable_BrendanNormal, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_LinkMay = {0xFFFF, 0x1110, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_BrendanMayNormal, gFieldObjectPicTable_MayNormal, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Juan = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Juan, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Scott = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Scott, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MysteryEventDeliveryman = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_MysteryEventDeliveryman, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Statue = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_Statue, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Kirlia = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_S, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Kirlia, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Dusclops = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Dusclops, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnionRoomAttendant = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_UnionRoomAttendant, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Red = {0xFFFF, 0x111D, 0x11FF, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Red, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Leaf = {0xFFFF, 0x111D, 0x11FF, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Leaf, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Sudowoodo = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Sudowoodo, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Mew = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Mew, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Deoxys = {0xFFFF, 0x111E, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Deoxys, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BirthIslandStone = {0xFFFF, 0x111F, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Inanimate, gFieldObjectPicTable_BirthIslandStone, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Anabel = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Anabel, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Tucker = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Tucker, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Greta = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Greta, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Spenser = {0xFFFF, 0x1103, 0x11FF, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Spenser, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Noland = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Noland, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Lucy = {0xFFFF, 0x1106, 0x11FF, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Lucy, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Brandon = {0xFFFF, 0x1105, 0x11FF, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Brandon, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RubySapphireBrendan = {0xFFFF, 0x1122, 0x11FF, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_RubySapphireBrendan, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RubySapphireMay = {0xFFFF, 0x1123, 0x11FF, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_16x32, gFieldObjectSpriteOamTables_16x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_RubySapphireMay, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Lugia = {0xFFFF, 0x1121, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_Standard, gFieldObjectPicTable_Lugia, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_HoOh = {0xFFFF, 0x1120, 0x11FF, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldObjectBaseOam_32x32, gFieldObjectSpriteOamTables_32x32, gFieldObjectImageAnimTable_HoOh, gFieldObjectPicTable_HoOh, gDummySpriteAffineAnimTable};
+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
index 6793a9487..c0ca57b60 100755
--- a/src/data/field_event_obj/event_object_graphics_info_pointers.h
+++ b/src/data/field_event_obj/event_object_graphics_info_pointers.h
@@ -1,504 +1,504 @@
 #ifndef GUARD_EVENT_OBJECT_GRAPHICS_INFO_POINTERS_H
 #define GUARD_EVENT_OBJECT_GRAPHICS_INFO_POINTERS_H
 
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanNormal;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanMachBike;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanSurfing;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanFieldMove;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_QuintyPlump;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_LittleBoy1;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_LittleGirl1;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Boy1;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Girl1;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Boy2;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Girl2;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_LittleBoy2;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_LittleGirl2;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Boy3;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Girl3;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Boy4;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Woman1;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_FatMan;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Woman2;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Man1;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Woman3;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_OldMan1;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_OldWoman1;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Man2;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Woman4;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Man3;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Woman5;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Cook;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Woman6;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_OldMan2;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_OldWoman2;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Camper;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Picnicker;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Man4;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Woman7;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Youngster;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BugCatcher;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_PsychicM;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SchoolKidM;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Maniac;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_HexManiac;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Rayquaza1;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SwimmerM;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SwimmerF;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BlackBelt;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Beauty;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Scientist1;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Lass;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Gentleman;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Sailor;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Fisherman;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RunningTriathleteM;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RunningTriathleteF;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_TuberF;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_TuberM;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Hiker;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_CyclingTriathleteM;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_CyclingTriathleteF;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Nurse;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ItemBall;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BerryTree;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BerryTreeEarlyStages;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BerryTreeLateStages;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanAcroBike;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ProfBirch;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Man5;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Man6;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ReporterM;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ReporterF;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Bard;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Anabel;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Tucker;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Greta;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Spenser;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Noland;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Lucy;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedNatuDoll;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedMagnemiteDoll;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedSquirtleDoll;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedWooperDoll;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedPikachuDoll;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedPorygon2Doll;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_CuttableTree;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MartEmployee;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RooftopSaleWoman;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Teala;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BreakableRock;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_PushableBoulder;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MrBrineysBoat;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayNormal;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayMachBike;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayAcroBike;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MaySurfing;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayFieldMove;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Truck;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_VigorothCarryingBox;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_VigorothFacingAway;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BirchsBag;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_EnemyZigzagoon;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Artist;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalBrendanNormal;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalBrendanMachBike;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalBrendanAcroBike;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalBrendanSurfing;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalBrendanFieldMove;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalMayNormal;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalMayMachBike;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalMayAcroBike;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalMaySurfing;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RivalMayFieldMove;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Cameraman;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanUnderwater;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayUnderwater;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MovingBox;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_CableCar;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Scientist2;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Man7;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_AquaMemberM;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_AquaMemberF;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MagmaMemberM;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MagmaMemberF;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Sidney;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Phoebe;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Glacia;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Drake;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Roxanne;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Brawly;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Wattson;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Flannery;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Norman;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Winona;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Liza;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Tate;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Wallace;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Steven;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Wally;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RubySapphireLittleBoy;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanFishing;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayFishing;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_HotSpringsOldWoman;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SSTidal;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SubmarineShadow;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_PichuDoll;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_PikachuDoll;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MarillDoll;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_TogepiDoll;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_CyndaquilDoll;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ChikoritaDoll;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_TotodileDoll;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_JigglypuffDoll;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MeowthDoll;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ClefairyDoll;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_DittoDoll;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SmoochumDoll;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_TreeckoDoll;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_TorchicDoll;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MudkipDoll;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_DuskullDoll;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_WynautDoll;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BaltoyDoll;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_KecleonDoll;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_AzurillDoll;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SkittyDoll;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SwabluDoll;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_GulpinDoll;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_LotadDoll;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SeedotDoll;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_PikaCushion;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RoundCushion;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_KissCushion;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ZigzagCushion;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_SpinCushion;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_DiamondCushion;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BallCushion;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_GrassCushion;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_FireCushion;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_WaterCushion;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigSnorlaxDoll;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigRhydonDoll;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigLaprasDoll;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigVenusaurDoll;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigCharizardDoll;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigBlastoiseDoll;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigWailmerDoll;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigRegirockDoll;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigRegiceDoll;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BigRegisteelDoll;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Latias;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Latios;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Boy5;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_ContestOldMan;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanWatering;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayWatering;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BrendanDecorating;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MayDecorating;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Archie;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Maxie;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Kyogre1;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Groudon1;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Fossil;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Regirock;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Regice;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Registeel;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Skitty;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Kecleon1;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Kyogre2;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Groudon2;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Rayquaza2;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Zigzagoon;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Pikachu;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Azumarill;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Wingull;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Kecleon2;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_TuberMSwimming;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Azurill;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Mom;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_LinkBrendan;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_LinkMay;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Juan;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Scott;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Poochyena;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Kyogre3;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Groudon3;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_MysteryEventDeliveryman;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Statue;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Kirlia;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Dusclops;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnionRoomAttendant;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Sudowoodo;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Mew;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Red;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Leaf;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Deoxys;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_BirthIslandStone;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Brandon;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RubySapphireBrendan;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_RubySapphireMay;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Lugia;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_HoOh;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Bard;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Hipster;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Trader;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Storyteller;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_Giddy;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedMauvilleOldMan1;
-const struct MapObjectGraphicsInfo gFieldObjectGraphicsInfo_UnusedMauvilleOldMan2;
+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 MapObjectGraphicsInfo *const gFieldObjectGraphicsInfoPointers[] = {
-	&gFieldObjectGraphicsInfo_BrendanNormal,
-	&gFieldObjectGraphicsInfo_BrendanMachBike,
-	&gFieldObjectGraphicsInfo_BrendanSurfing,
-	&gFieldObjectGraphicsInfo_BrendanFieldMove,
-	&gFieldObjectGraphicsInfo_QuintyPlump,
-	&gFieldObjectGraphicsInfo_LittleBoy1,
-	&gFieldObjectGraphicsInfo_LittleGirl1,
-	&gFieldObjectGraphicsInfo_Boy1,
-	&gFieldObjectGraphicsInfo_Girl1,
-	&gFieldObjectGraphicsInfo_Boy2,
-	&gFieldObjectGraphicsInfo_Girl2,
-	&gFieldObjectGraphicsInfo_LittleBoy2,
-	&gFieldObjectGraphicsInfo_LittleGirl2,
-	&gFieldObjectGraphicsInfo_Boy3,
-	&gFieldObjectGraphicsInfo_Girl3,
-	&gFieldObjectGraphicsInfo_Boy4,
-	&gFieldObjectGraphicsInfo_Woman1,
-	&gFieldObjectGraphicsInfo_FatMan,
-	&gFieldObjectGraphicsInfo_Woman2,
-	&gFieldObjectGraphicsInfo_Man1,
-	&gFieldObjectGraphicsInfo_Woman3,
-	&gFieldObjectGraphicsInfo_OldMan1,
-	&gFieldObjectGraphicsInfo_OldWoman1,
-	&gFieldObjectGraphicsInfo_Man2,
-	&gFieldObjectGraphicsInfo_Woman4,
-	&gFieldObjectGraphicsInfo_Man3,
-	&gFieldObjectGraphicsInfo_Woman5,
-	&gFieldObjectGraphicsInfo_Cook,
-	&gFieldObjectGraphicsInfo_Woman6,
-	&gFieldObjectGraphicsInfo_OldMan2,
-	&gFieldObjectGraphicsInfo_OldWoman2,
-	&gFieldObjectGraphicsInfo_Camper,
-	&gFieldObjectGraphicsInfo_Picnicker,
-	&gFieldObjectGraphicsInfo_Man4,
-	&gFieldObjectGraphicsInfo_Woman7,
-	&gFieldObjectGraphicsInfo_Youngster,
-	&gFieldObjectGraphicsInfo_BugCatcher,
-	&gFieldObjectGraphicsInfo_PsychicM,
-	&gFieldObjectGraphicsInfo_SchoolKidM,
-	&gFieldObjectGraphicsInfo_Maniac,
-	&gFieldObjectGraphicsInfo_HexManiac,
-	&gFieldObjectGraphicsInfo_Rayquaza1,
-	&gFieldObjectGraphicsInfo_SwimmerM,
-	&gFieldObjectGraphicsInfo_SwimmerF,
-	&gFieldObjectGraphicsInfo_BlackBelt,
-	&gFieldObjectGraphicsInfo_Beauty,
-	&gFieldObjectGraphicsInfo_Scientist1,
-	&gFieldObjectGraphicsInfo_Lass,
-	&gFieldObjectGraphicsInfo_Gentleman,
-	&gFieldObjectGraphicsInfo_Sailor,
-	&gFieldObjectGraphicsInfo_Fisherman,
-	&gFieldObjectGraphicsInfo_RunningTriathleteM,
-	&gFieldObjectGraphicsInfo_RunningTriathleteF,
-	&gFieldObjectGraphicsInfo_TuberF,
-	&gFieldObjectGraphicsInfo_TuberM,
-	&gFieldObjectGraphicsInfo_Hiker,
-	&gFieldObjectGraphicsInfo_CyclingTriathleteM,
-	&gFieldObjectGraphicsInfo_CyclingTriathleteF,
-	&gFieldObjectGraphicsInfo_Nurse,
-	&gFieldObjectGraphicsInfo_ItemBall,
-	&gFieldObjectGraphicsInfo_BerryTree,
-	&gFieldObjectGraphicsInfo_BerryTreeEarlyStages,
-	&gFieldObjectGraphicsInfo_BerryTreeLateStages,
-	&gFieldObjectGraphicsInfo_BrendanAcroBike,
-	&gFieldObjectGraphicsInfo_ProfBirch,
-	&gFieldObjectGraphicsInfo_Man5,
-	&gFieldObjectGraphicsInfo_Man6,
-	&gFieldObjectGraphicsInfo_ReporterM,
-	&gFieldObjectGraphicsInfo_ReporterF,
-	&gFieldObjectGraphicsInfo_Bard,
-	&gFieldObjectGraphicsInfo_Anabel,
-	&gFieldObjectGraphicsInfo_Tucker,
-	&gFieldObjectGraphicsInfo_Greta,
-	&gFieldObjectGraphicsInfo_Spenser,
-	&gFieldObjectGraphicsInfo_Noland,
-	&gFieldObjectGraphicsInfo_Lucy,
-	&gFieldObjectGraphicsInfo_UnusedNatuDoll,
-	&gFieldObjectGraphicsInfo_UnusedMagnemiteDoll,
-	&gFieldObjectGraphicsInfo_UnusedSquirtleDoll,
-	&gFieldObjectGraphicsInfo_UnusedWooperDoll,
-	&gFieldObjectGraphicsInfo_UnusedPikachuDoll,
-	&gFieldObjectGraphicsInfo_UnusedPorygon2Doll,
-	&gFieldObjectGraphicsInfo_CuttableTree,
-	&gFieldObjectGraphicsInfo_MartEmployee,
-	&gFieldObjectGraphicsInfo_RooftopSaleWoman,
-	&gFieldObjectGraphicsInfo_Teala,
-	&gFieldObjectGraphicsInfo_BreakableRock,
-	&gFieldObjectGraphicsInfo_PushableBoulder,
-	&gFieldObjectGraphicsInfo_MrBrineysBoat,
-	&gFieldObjectGraphicsInfo_MayNormal,
-	&gFieldObjectGraphicsInfo_MayMachBike,
-	&gFieldObjectGraphicsInfo_MayAcroBike,
-	&gFieldObjectGraphicsInfo_MaySurfing,
-	&gFieldObjectGraphicsInfo_MayFieldMove,
-	&gFieldObjectGraphicsInfo_Truck,
-	&gFieldObjectGraphicsInfo_VigorothCarryingBox,
-	&gFieldObjectGraphicsInfo_VigorothFacingAway,
-	&gFieldObjectGraphicsInfo_BirchsBag,
-	&gFieldObjectGraphicsInfo_EnemyZigzagoon,
-	&gFieldObjectGraphicsInfo_Artist,
-	&gFieldObjectGraphicsInfo_RivalBrendanNormal,
-	&gFieldObjectGraphicsInfo_RivalBrendanMachBike,
-	&gFieldObjectGraphicsInfo_RivalBrendanAcroBike,
-	&gFieldObjectGraphicsInfo_RivalBrendanSurfing,
-	&gFieldObjectGraphicsInfo_RivalBrendanFieldMove,
-	&gFieldObjectGraphicsInfo_RivalMayNormal,
-	&gFieldObjectGraphicsInfo_RivalMayMachBike,
-	&gFieldObjectGraphicsInfo_RivalMayAcroBike,
-	&gFieldObjectGraphicsInfo_RivalMaySurfing,
-	&gFieldObjectGraphicsInfo_RivalMayFieldMove,
-	&gFieldObjectGraphicsInfo_Cameraman,
-	&gFieldObjectGraphicsInfo_BrendanUnderwater,
-	&gFieldObjectGraphicsInfo_MayUnderwater,
-	&gFieldObjectGraphicsInfo_MovingBox,
-	&gFieldObjectGraphicsInfo_CableCar,
-	&gFieldObjectGraphicsInfo_Scientist2,
-	&gFieldObjectGraphicsInfo_Man7,
-	&gFieldObjectGraphicsInfo_AquaMemberM,
-	&gFieldObjectGraphicsInfo_AquaMemberF,
-	&gFieldObjectGraphicsInfo_MagmaMemberM,
-	&gFieldObjectGraphicsInfo_MagmaMemberF,
-	&gFieldObjectGraphicsInfo_Sidney,
-	&gFieldObjectGraphicsInfo_Phoebe,
-	&gFieldObjectGraphicsInfo_Glacia,
-	&gFieldObjectGraphicsInfo_Drake,
-	&gFieldObjectGraphicsInfo_Roxanne,
-	&gFieldObjectGraphicsInfo_Brawly,
-	&gFieldObjectGraphicsInfo_Wattson,
-	&gFieldObjectGraphicsInfo_Flannery,
-	&gFieldObjectGraphicsInfo_Norman,
-	&gFieldObjectGraphicsInfo_Winona,
-	&gFieldObjectGraphicsInfo_Liza,
-	&gFieldObjectGraphicsInfo_Tate,
-	&gFieldObjectGraphicsInfo_Wallace,
-	&gFieldObjectGraphicsInfo_Steven,
-	&gFieldObjectGraphicsInfo_Wally,
-	&gFieldObjectGraphicsInfo_RubySapphireLittleBoy,
-	&gFieldObjectGraphicsInfo_BrendanFishing,
-	&gFieldObjectGraphicsInfo_MayFishing,
-	&gFieldObjectGraphicsInfo_HotSpringsOldWoman,
-	&gFieldObjectGraphicsInfo_SSTidal,
-	&gFieldObjectGraphicsInfo_SubmarineShadow,
-	&gFieldObjectGraphicsInfo_PichuDoll,
-	&gFieldObjectGraphicsInfo_PikachuDoll,
-	&gFieldObjectGraphicsInfo_MarillDoll,
-	&gFieldObjectGraphicsInfo_TogepiDoll,
-	&gFieldObjectGraphicsInfo_CyndaquilDoll,
-	&gFieldObjectGraphicsInfo_ChikoritaDoll,
-	&gFieldObjectGraphicsInfo_TotodileDoll,
-	&gFieldObjectGraphicsInfo_JigglypuffDoll,
-	&gFieldObjectGraphicsInfo_MeowthDoll,
-	&gFieldObjectGraphicsInfo_ClefairyDoll,
-	&gFieldObjectGraphicsInfo_DittoDoll,
-	&gFieldObjectGraphicsInfo_SmoochumDoll,
-	&gFieldObjectGraphicsInfo_TreeckoDoll,
-	&gFieldObjectGraphicsInfo_TorchicDoll,
-	&gFieldObjectGraphicsInfo_MudkipDoll,
-	&gFieldObjectGraphicsInfo_DuskullDoll,
-	&gFieldObjectGraphicsInfo_WynautDoll,
-	&gFieldObjectGraphicsInfo_BaltoyDoll,
-	&gFieldObjectGraphicsInfo_KecleonDoll,
-	&gFieldObjectGraphicsInfo_AzurillDoll,
-	&gFieldObjectGraphicsInfo_SkittyDoll,
-	&gFieldObjectGraphicsInfo_SwabluDoll,
-	&gFieldObjectGraphicsInfo_GulpinDoll,
-	&gFieldObjectGraphicsInfo_LotadDoll,
-	&gFieldObjectGraphicsInfo_SeedotDoll,
-	&gFieldObjectGraphicsInfo_PikaCushion,
-	&gFieldObjectGraphicsInfo_RoundCushion,
-	&gFieldObjectGraphicsInfo_KissCushion,
-	&gFieldObjectGraphicsInfo_ZigzagCushion,
-	&gFieldObjectGraphicsInfo_SpinCushion,
-	&gFieldObjectGraphicsInfo_DiamondCushion,
-	&gFieldObjectGraphicsInfo_BallCushion,
-	&gFieldObjectGraphicsInfo_GrassCushion,
-	&gFieldObjectGraphicsInfo_FireCushion,
-	&gFieldObjectGraphicsInfo_WaterCushion,
-	&gFieldObjectGraphicsInfo_BigSnorlaxDoll,
-	&gFieldObjectGraphicsInfo_BigRhydonDoll,
-	&gFieldObjectGraphicsInfo_BigLaprasDoll,
-	&gFieldObjectGraphicsInfo_BigVenusaurDoll,
-	&gFieldObjectGraphicsInfo_BigCharizardDoll,
-	&gFieldObjectGraphicsInfo_BigBlastoiseDoll,
-	&gFieldObjectGraphicsInfo_BigWailmerDoll,
-	&gFieldObjectGraphicsInfo_BigRegirockDoll,
-	&gFieldObjectGraphicsInfo_BigRegiceDoll,
-	&gFieldObjectGraphicsInfo_BigRegisteelDoll,
-	&gFieldObjectGraphicsInfo_Latias,
-	&gFieldObjectGraphicsInfo_Latios,
-	&gFieldObjectGraphicsInfo_Boy5,
-	&gFieldObjectGraphicsInfo_ContestOldMan,
-	&gFieldObjectGraphicsInfo_BrendanWatering,
-	&gFieldObjectGraphicsInfo_MayWatering,
-	&gFieldObjectGraphicsInfo_BrendanDecorating,
-	&gFieldObjectGraphicsInfo_MayDecorating,
-	&gFieldObjectGraphicsInfo_Archie,
-	&gFieldObjectGraphicsInfo_Maxie,
-	&gFieldObjectGraphicsInfo_Kyogre1,
-	&gFieldObjectGraphicsInfo_Groudon1,
-	&gFieldObjectGraphicsInfo_Fossil,
-	&gFieldObjectGraphicsInfo_Regirock,
-	&gFieldObjectGraphicsInfo_Regice,
-	&gFieldObjectGraphicsInfo_Registeel,
-	&gFieldObjectGraphicsInfo_Skitty,
-	&gFieldObjectGraphicsInfo_Kecleon1,
-	&gFieldObjectGraphicsInfo_Kyogre2,
-	&gFieldObjectGraphicsInfo_Groudon2,
-	&gFieldObjectGraphicsInfo_Rayquaza2,
-	&gFieldObjectGraphicsInfo_Zigzagoon,
-	&gFieldObjectGraphicsInfo_Pikachu,
-	&gFieldObjectGraphicsInfo_Azumarill,
-	&gFieldObjectGraphicsInfo_Wingull,
-	&gFieldObjectGraphicsInfo_Kecleon2,
-	&gFieldObjectGraphicsInfo_TuberMSwimming,
-	&gFieldObjectGraphicsInfo_Azurill,
-	&gFieldObjectGraphicsInfo_Mom,
-	&gFieldObjectGraphicsInfo_LinkBrendan,
-	&gFieldObjectGraphicsInfo_LinkMay,
-	&gFieldObjectGraphicsInfo_Juan,
-	&gFieldObjectGraphicsInfo_Scott,
-	&gFieldObjectGraphicsInfo_Poochyena,
-	&gFieldObjectGraphicsInfo_Kyogre3,
-	&gFieldObjectGraphicsInfo_Groudon3,
-	&gFieldObjectGraphicsInfo_MysteryEventDeliveryman,
-	&gFieldObjectGraphicsInfo_Statue,
-	&gFieldObjectGraphicsInfo_Kirlia,
-	&gFieldObjectGraphicsInfo_Dusclops,
-	&gFieldObjectGraphicsInfo_UnionRoomAttendant,
-	&gFieldObjectGraphicsInfo_Sudowoodo,
-	&gFieldObjectGraphicsInfo_Mew,
-	&gFieldObjectGraphicsInfo_Red,
-	&gFieldObjectGraphicsInfo_Leaf,
-	&gFieldObjectGraphicsInfo_Deoxys,
-	&gFieldObjectGraphicsInfo_BirthIslandStone,
-	&gFieldObjectGraphicsInfo_Brandon,
-	&gFieldObjectGraphicsInfo_RubySapphireBrendan,
-	&gFieldObjectGraphicsInfo_RubySapphireMay,
-	&gFieldObjectGraphicsInfo_Lugia,
-	&gFieldObjectGraphicsInfo_HoOh,
+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 MapObjectGraphicsInfo *const gMauvilleOldManGraphicsInfoPointers[] = {
-	&gFieldObjectGraphicsInfo_Bard,
-	&gFieldObjectGraphicsInfo_Hipster,
-	&gFieldObjectGraphicsInfo_Trader,
-	&gFieldObjectGraphicsInfo_Storyteller,
-	&gFieldObjectGraphicsInfo_Giddy,
-	&gFieldObjectGraphicsInfo_UnusedMauvilleOldMan1,
-	&gFieldObjectGraphicsInfo_UnusedMauvilleOldMan2,
+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
index f5d6a24c3..892af7e9b 100755
--- a/src/data/field_event_obj/event_object_pic_tables.h
+++ b/src/data/field_event_obj/event_object_pic_tables.h
@@ -1,2179 +1,2179 @@
 #ifndef GUARD_EVENT_OBJECT_PIC_TABLES_H
 #define GUARD_EVENT_OBJECT_PIC_TABLES_H
 
-const struct SpriteFrameImage gFieldObjectPicTable_BrendanNormal[] = {
-    obj_frame_tiles(gFieldObjectPic_BrendanNormal_0),
-    obj_frame_tiles(gFieldObjectPic_BrendanNormal_1),
-    obj_frame_tiles(gFieldObjectPic_BrendanNormal_2),
-    obj_frame_tiles(gFieldObjectPic_BrendanNormal_3),
-    obj_frame_tiles(gFieldObjectPic_BrendanNormal_4),
-    obj_frame_tiles(gFieldObjectPic_BrendanNormal_5),
-    obj_frame_tiles(gFieldObjectPic_BrendanNormal_6),
-    obj_frame_tiles(gFieldObjectPic_BrendanNormal_7),
-    obj_frame_tiles(gFieldObjectPic_BrendanNormal_8),
-    obj_frame_tiles(gFieldObjectPic_BrendanNormal_9),
-    obj_frame_tiles(gFieldObjectPic_BrendanNormal_10),
-    obj_frame_tiles(gFieldObjectPic_BrendanNormal_11),
-    obj_frame_tiles(gFieldObjectPic_BrendanNormal_12),
-    obj_frame_tiles(gFieldObjectPic_BrendanNormal_13),
-    obj_frame_tiles(gFieldObjectPic_BrendanNormal_14),
-    obj_frame_tiles(gFieldObjectPic_BrendanNormal_15),
-    obj_frame_tiles(gFieldObjectPic_BrendanNormal_16),
-    obj_frame_tiles(gFieldObjectPic_BrendanNormal_17),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_BrendanMachBike[] = {
-    obj_frame_tiles(gFieldObjectPic_BrendanMachBike_0),
-    obj_frame_tiles(gFieldObjectPic_BrendanMachBike_1),
-    obj_frame_tiles(gFieldObjectPic_BrendanMachBike_2),
-    obj_frame_tiles(gFieldObjectPic_BrendanMachBike_3),
-    obj_frame_tiles(gFieldObjectPic_BrendanMachBike_4),
-    obj_frame_tiles(gFieldObjectPic_BrendanMachBike_5),
-    obj_frame_tiles(gFieldObjectPic_BrendanMachBike_6),
-    obj_frame_tiles(gFieldObjectPic_BrendanMachBike_7),
-    obj_frame_tiles(gFieldObjectPic_BrendanMachBike_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_BrendanAcroBike[] = {
-    obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_0),
-    obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_1),
-    obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_2),
-    obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_3),
-    obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_4),
-    obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_5),
-    obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_6),
-    obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_7),
-    obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_8),
-    obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_9),
-    obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_10),
-    obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_11),
-    obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_12),
-    obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_13),
-    obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_14),
-    obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_15),
-    obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_16),
-    obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_17),
-    obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_18),
-    obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_19),
-    obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_20),
-    obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_21),
-    obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_22),
-    obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_23),
-    obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_24),
-    obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_25),
-    obj_frame_tiles(gFieldObjectPic_BrendanAcroBike_26),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_BrendanSurfing[] = {
-    obj_frame_tiles(gFieldObjectPic_BrendanSurfing_0),
-    obj_frame_tiles(gFieldObjectPic_BrendanSurfing_1),
-    obj_frame_tiles(gFieldObjectPic_BrendanSurfing_2),
-    obj_frame_tiles(gFieldObjectPic_BrendanSurfing_0),
-    obj_frame_tiles(gFieldObjectPic_BrendanSurfing_0),
-    obj_frame_tiles(gFieldObjectPic_BrendanSurfing_1),
-    obj_frame_tiles(gFieldObjectPic_BrendanSurfing_1),
-    obj_frame_tiles(gFieldObjectPic_BrendanSurfing_2),
-    obj_frame_tiles(gFieldObjectPic_BrendanSurfing_2),
-    obj_frame_tiles(gFieldObjectPic_BrendanSurfing_3),
-    obj_frame_tiles(gFieldObjectPic_BrendanSurfing_4),
-    obj_frame_tiles(gFieldObjectPic_BrendanSurfing_5),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_BrendanUnderwater[] = {
-    obj_frame_tiles(gFieldObjectPic_BrendanUnderwater_0),
-    obj_frame_tiles(gFieldObjectPic_BrendanUnderwater_1),
-    obj_frame_tiles(gFieldObjectPic_BrendanUnderwater_2),
-    obj_frame_tiles(gFieldObjectPic_BrendanUnderwater_0),
-    obj_frame_tiles(gFieldObjectPic_BrendanUnderwater_0),
-    obj_frame_tiles(gFieldObjectPic_BrendanUnderwater_1),
-    obj_frame_tiles(gFieldObjectPic_BrendanUnderwater_1),
-    obj_frame_tiles(gFieldObjectPic_BrendanUnderwater_2),
-    obj_frame_tiles(gFieldObjectPic_BrendanUnderwater_2),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_BrendanFieldMove[] = {
-    obj_frame_tiles(gFieldObjectPic_BrendanFieldMove_0),
-    obj_frame_tiles(gFieldObjectPic_BrendanFieldMove_1),
-    obj_frame_tiles(gFieldObjectPic_BrendanFieldMove_2),
-    obj_frame_tiles(gFieldObjectPic_BrendanFieldMove_3),
-    obj_frame_tiles(gFieldObjectPic_BrendanFieldMove_4),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_QuintyPlump[] = {
-    obj_frame_tiles(gFieldObjectPic_QuintyPlump_0),
-    obj_frame_tiles(gFieldObjectPic_QuintyPlump_1),
-    obj_frame_tiles(gFieldObjectPic_QuintyPlump_2),
-    obj_frame_tiles(gFieldObjectPic_QuintyPlump_3),
-    obj_frame_tiles(gFieldObjectPic_QuintyPlump_4),
-    obj_frame_tiles(gFieldObjectPic_QuintyPlump_5),
-    obj_frame_tiles(gFieldObjectPic_QuintyPlump_6),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_LittleBoy1[] = {
-    obj_frame_tiles(gFieldObjectPic_LittleBoy1_0),
-    obj_frame_tiles(gFieldObjectPic_LittleBoy1_1),
-    obj_frame_tiles(gFieldObjectPic_LittleBoy1_2),
-    obj_frame_tiles(gFieldObjectPic_LittleBoy1_3),
-    obj_frame_tiles(gFieldObjectPic_LittleBoy1_4),
-    obj_frame_tiles(gFieldObjectPic_LittleBoy1_5),
-    obj_frame_tiles(gFieldObjectPic_LittleBoy1_6),
-    obj_frame_tiles(gFieldObjectPic_LittleBoy1_7),
-    obj_frame_tiles(gFieldObjectPic_LittleBoy1_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_LittleGirl1[] = {
-    obj_frame_tiles(gFieldObjectPic_LittleGirl1_0),
-    obj_frame_tiles(gFieldObjectPic_LittleGirl1_1),
-    obj_frame_tiles(gFieldObjectPic_LittleGirl1_2),
-    obj_frame_tiles(gFieldObjectPic_LittleGirl1_3),
-    obj_frame_tiles(gFieldObjectPic_LittleGirl1_4),
-    obj_frame_tiles(gFieldObjectPic_LittleGirl1_5),
-    obj_frame_tiles(gFieldObjectPic_LittleGirl1_6),
-    obj_frame_tiles(gFieldObjectPic_LittleGirl1_7),
-    obj_frame_tiles(gFieldObjectPic_LittleGirl1_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Boy1[] = {
-    obj_frame_tiles(gFieldObjectPic_Boy1_0),
-    obj_frame_tiles(gFieldObjectPic_Boy1_1),
-    obj_frame_tiles(gFieldObjectPic_Boy1_2),
-    obj_frame_tiles(gFieldObjectPic_Boy1_3),
-    obj_frame_tiles(gFieldObjectPic_Boy1_4),
-    obj_frame_tiles(gFieldObjectPic_Boy1_5),
-    obj_frame_tiles(gFieldObjectPic_Boy1_6),
-    obj_frame_tiles(gFieldObjectPic_Boy1_7),
-    obj_frame_tiles(gFieldObjectPic_Boy1_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Girl1[] = {
-    obj_frame_tiles(gFieldObjectPic_Girl1_0),
-    obj_frame_tiles(gFieldObjectPic_Girl1_1),
-    obj_frame_tiles(gFieldObjectPic_Girl1_2),
-    obj_frame_tiles(gFieldObjectPic_Girl1_3),
-    obj_frame_tiles(gFieldObjectPic_Girl1_4),
-    obj_frame_tiles(gFieldObjectPic_Girl1_5),
-    obj_frame_tiles(gFieldObjectPic_Girl1_6),
-    obj_frame_tiles(gFieldObjectPic_Girl1_7),
-    obj_frame_tiles(gFieldObjectPic_Girl1_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Boy2[] = {
-    obj_frame_tiles(gFieldObjectPic_Boy2_0),
-    obj_frame_tiles(gFieldObjectPic_Boy2_1),
-    obj_frame_tiles(gFieldObjectPic_Boy2_2),
-    obj_frame_tiles(gFieldObjectPic_Boy2_3),
-    obj_frame_tiles(gFieldObjectPic_Boy2_4),
-    obj_frame_tiles(gFieldObjectPic_Boy2_5),
-    obj_frame_tiles(gFieldObjectPic_Boy2_6),
-    obj_frame_tiles(gFieldObjectPic_Boy2_7),
-    obj_frame_tiles(gFieldObjectPic_Boy2_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Girl2[] = {
-    obj_frame_tiles(gFieldObjectPic_Girl2_0),
-    obj_frame_tiles(gFieldObjectPic_Girl2_1),
-    obj_frame_tiles(gFieldObjectPic_Girl2_2),
-    obj_frame_tiles(gFieldObjectPic_Girl2_3),
-    obj_frame_tiles(gFieldObjectPic_Girl2_4),
-    obj_frame_tiles(gFieldObjectPic_Girl2_5),
-    obj_frame_tiles(gFieldObjectPic_Girl2_6),
-    obj_frame_tiles(gFieldObjectPic_Girl2_7),
-    obj_frame_tiles(gFieldObjectPic_Girl2_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_LittleBoy2[] = {
-    obj_frame_tiles(gFieldObjectPic_LittleBoy2_0),
-    obj_frame_tiles(gFieldObjectPic_LittleBoy2_1),
-    obj_frame_tiles(gFieldObjectPic_LittleBoy2_2),
-    obj_frame_tiles(gFieldObjectPic_LittleBoy2_3),
-    obj_frame_tiles(gFieldObjectPic_LittleBoy2_4),
-    obj_frame_tiles(gFieldObjectPic_LittleBoy2_5),
-    obj_frame_tiles(gFieldObjectPic_LittleBoy2_6),
-    obj_frame_tiles(gFieldObjectPic_LittleBoy2_7),
-    obj_frame_tiles(gFieldObjectPic_LittleBoy2_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_LittleGirl2[] = {
-    obj_frame_tiles(gFieldObjectPic_LittleGirl2_0),
-    obj_frame_tiles(gFieldObjectPic_LittleGirl2_1),
-    obj_frame_tiles(gFieldObjectPic_LittleGirl2_2),
-    obj_frame_tiles(gFieldObjectPic_LittleGirl2_3),
-    obj_frame_tiles(gFieldObjectPic_LittleGirl2_4),
-    obj_frame_tiles(gFieldObjectPic_LittleGirl2_5),
-    obj_frame_tiles(gFieldObjectPic_LittleGirl2_6),
-    obj_frame_tiles(gFieldObjectPic_LittleGirl2_7),
-    obj_frame_tiles(gFieldObjectPic_LittleGirl2_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Boy3[] = {
-    obj_frame_tiles(gFieldObjectPic_Boy3_0),
-    obj_frame_tiles(gFieldObjectPic_Boy3_1),
-    obj_frame_tiles(gFieldObjectPic_Boy3_2),
-    obj_frame_tiles(gFieldObjectPic_Boy3_3),
-    obj_frame_tiles(gFieldObjectPic_Boy3_4),
-    obj_frame_tiles(gFieldObjectPic_Boy3_5),
-    obj_frame_tiles(gFieldObjectPic_Boy3_6),
-    obj_frame_tiles(gFieldObjectPic_Boy3_7),
-    obj_frame_tiles(gFieldObjectPic_Boy3_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Girl3[] = {
-    obj_frame_tiles(gFieldObjectPic_Girl3_0),
-    obj_frame_tiles(gFieldObjectPic_Girl3_1),
-    obj_frame_tiles(gFieldObjectPic_Girl3_2),
-    obj_frame_tiles(gFieldObjectPic_Girl3_3),
-    obj_frame_tiles(gFieldObjectPic_Girl3_4),
-    obj_frame_tiles(gFieldObjectPic_Girl3_5),
-    obj_frame_tiles(gFieldObjectPic_Girl3_6),
-    obj_frame_tiles(gFieldObjectPic_Girl3_7),
-    obj_frame_tiles(gFieldObjectPic_Girl3_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Boy4[] = {
-    obj_frame_tiles(gFieldObjectPic_Boy4_0),
-    obj_frame_tiles(gFieldObjectPic_Boy4_1),
-    obj_frame_tiles(gFieldObjectPic_Boy4_2),
-    obj_frame_tiles(gFieldObjectPic_Boy4_3),
-    obj_frame_tiles(gFieldObjectPic_Boy4_4),
-    obj_frame_tiles(gFieldObjectPic_Boy4_5),
-    obj_frame_tiles(gFieldObjectPic_Boy4_6),
-    obj_frame_tiles(gFieldObjectPic_Boy4_7),
-    obj_frame_tiles(gFieldObjectPic_Boy4_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Woman1[] = {
-    obj_frame_tiles(gFieldObjectPic_Woman1_0),
-    obj_frame_tiles(gFieldObjectPic_Woman1_1),
-    obj_frame_tiles(gFieldObjectPic_Woman1_2),
-    obj_frame_tiles(gFieldObjectPic_Woman1_3),
-    obj_frame_tiles(gFieldObjectPic_Woman1_4),
-    obj_frame_tiles(gFieldObjectPic_Woman1_5),
-    obj_frame_tiles(gFieldObjectPic_Woman1_6),
-    obj_frame_tiles(gFieldObjectPic_Woman1_7),
-    obj_frame_tiles(gFieldObjectPic_Woman1_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_FatMan[] = {
-    obj_frame_tiles(gFieldObjectPic_FatMan_0),
-    obj_frame_tiles(gFieldObjectPic_FatMan_1),
-    obj_frame_tiles(gFieldObjectPic_FatMan_2),
-    obj_frame_tiles(gFieldObjectPic_FatMan_3),
-    obj_frame_tiles(gFieldObjectPic_FatMan_4),
-    obj_frame_tiles(gFieldObjectPic_FatMan_5),
-    obj_frame_tiles(gFieldObjectPic_FatMan_6),
-    obj_frame_tiles(gFieldObjectPic_FatMan_7),
-    obj_frame_tiles(gFieldObjectPic_FatMan_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Woman2[] = {
-    obj_frame_tiles(gFieldObjectPic_Woman2_0),
-    obj_frame_tiles(gFieldObjectPic_Woman2_1),
-    obj_frame_tiles(gFieldObjectPic_Woman2_2),
-    obj_frame_tiles(gFieldObjectPic_Woman2_3),
-    obj_frame_tiles(gFieldObjectPic_Woman2_4),
-    obj_frame_tiles(gFieldObjectPic_Woman2_5),
-    obj_frame_tiles(gFieldObjectPic_Woman2_6),
-    obj_frame_tiles(gFieldObjectPic_Woman2_7),
-    obj_frame_tiles(gFieldObjectPic_Woman2_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Man1[] = {
-    obj_frame_tiles(gFieldObjectPic_Man1_0),
-    obj_frame_tiles(gFieldObjectPic_Man1_1),
-    obj_frame_tiles(gFieldObjectPic_Man1_2),
-    obj_frame_tiles(gFieldObjectPic_Man1_3),
-    obj_frame_tiles(gFieldObjectPic_Man1_4),
-    obj_frame_tiles(gFieldObjectPic_Man1_5),
-    obj_frame_tiles(gFieldObjectPic_Man1_6),
-    obj_frame_tiles(gFieldObjectPic_Man1_7),
-    obj_frame_tiles(gFieldObjectPic_Man1_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Woman3[] = {
-    obj_frame_tiles(gFieldObjectPic_Woman3_0),
-    obj_frame_tiles(gFieldObjectPic_Woman3_1),
-    obj_frame_tiles(gFieldObjectPic_Woman3_2),
-    obj_frame_tiles(gFieldObjectPic_Woman3_3),
-    obj_frame_tiles(gFieldObjectPic_Woman3_4),
-    obj_frame_tiles(gFieldObjectPic_Woman3_5),
-    obj_frame_tiles(gFieldObjectPic_Woman3_6),
-    obj_frame_tiles(gFieldObjectPic_Woman3_7),
-    obj_frame_tiles(gFieldObjectPic_Woman3_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_OldMan1[] = {
-    obj_frame_tiles(gFieldObjectPic_OldMan1_0),
-    obj_frame_tiles(gFieldObjectPic_OldMan1_1),
-    obj_frame_tiles(gFieldObjectPic_OldMan1_2),
-    obj_frame_tiles(gFieldObjectPic_OldMan1_3),
-    obj_frame_tiles(gFieldObjectPic_OldMan1_4),
-    obj_frame_tiles(gFieldObjectPic_OldMan1_5),
-    obj_frame_tiles(gFieldObjectPic_OldMan1_6),
-    obj_frame_tiles(gFieldObjectPic_OldMan1_7),
-    obj_frame_tiles(gFieldObjectPic_OldMan1_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_OldWoman1[] = {
-    obj_frame_tiles(gFieldObjectPic_OldWoman1_0),
-    obj_frame_tiles(gFieldObjectPic_OldWoman1_1),
-    obj_frame_tiles(gFieldObjectPic_OldWoman1_2),
-    obj_frame_tiles(gFieldObjectPic_OldWoman1_3),
-    obj_frame_tiles(gFieldObjectPic_OldWoman1_4),
-    obj_frame_tiles(gFieldObjectPic_OldWoman1_5),
-    obj_frame_tiles(gFieldObjectPic_OldWoman1_6),
-    obj_frame_tiles(gFieldObjectPic_OldWoman1_7),
-    obj_frame_tiles(gFieldObjectPic_OldWoman1_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Man2[] = {
-    obj_frame_tiles(gFieldObjectPic_Man2_0),
-    obj_frame_tiles(gFieldObjectPic_Man2_1),
-    obj_frame_tiles(gFieldObjectPic_Man2_2),
-    obj_frame_tiles(gFieldObjectPic_Man2_3),
-    obj_frame_tiles(gFieldObjectPic_Man2_4),
-    obj_frame_tiles(gFieldObjectPic_Man2_5),
-    obj_frame_tiles(gFieldObjectPic_Man2_6),
-    obj_frame_tiles(gFieldObjectPic_Man2_7),
-    obj_frame_tiles(gFieldObjectPic_Man2_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Woman4[] = {
-    obj_frame_tiles(gFieldObjectPic_Woman4_0),
-    obj_frame_tiles(gFieldObjectPic_Woman4_1),
-    obj_frame_tiles(gFieldObjectPic_Woman4_2),
-    obj_frame_tiles(gFieldObjectPic_Woman4_3),
-    obj_frame_tiles(gFieldObjectPic_Woman4_4),
-    obj_frame_tiles(gFieldObjectPic_Woman4_5),
-    obj_frame_tiles(gFieldObjectPic_Woman4_6),
-    obj_frame_tiles(gFieldObjectPic_Woman4_7),
-    obj_frame_tiles(gFieldObjectPic_Woman4_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Man3[] = {
-    obj_frame_tiles(gFieldObjectPic_Man3_0),
-    obj_frame_tiles(gFieldObjectPic_Man3_1),
-    obj_frame_tiles(gFieldObjectPic_Man3_2),
-    obj_frame_tiles(gFieldObjectPic_Man3_3),
-    obj_frame_tiles(gFieldObjectPic_Man3_4),
-    obj_frame_tiles(gFieldObjectPic_Man3_5),
-    obj_frame_tiles(gFieldObjectPic_Man3_6),
-    obj_frame_tiles(gFieldObjectPic_Man3_7),
-    obj_frame_tiles(gFieldObjectPic_Man3_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Woman5[] = {
-    obj_frame_tiles(gFieldObjectPic_Woman5_0),
-    obj_frame_tiles(gFieldObjectPic_Woman5_1),
-    obj_frame_tiles(gFieldObjectPic_Woman5_2),
-    obj_frame_tiles(gFieldObjectPic_Woman5_3),
-    obj_frame_tiles(gFieldObjectPic_Woman5_4),
-    obj_frame_tiles(gFieldObjectPic_Woman5_5),
-    obj_frame_tiles(gFieldObjectPic_Woman5_6),
-    obj_frame_tiles(gFieldObjectPic_Woman5_7),
-    obj_frame_tiles(gFieldObjectPic_Woman5_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Cook[] = {
-    obj_frame_tiles(gFieldObjectPic_Cook_0),
-    obj_frame_tiles(gFieldObjectPic_Cook_1),
-    obj_frame_tiles(gFieldObjectPic_Cook_2),
-    obj_frame_tiles(gFieldObjectPic_Cook_0),
-    obj_frame_tiles(gFieldObjectPic_Cook_0),
-    obj_frame_tiles(gFieldObjectPic_Cook_1),
-    obj_frame_tiles(gFieldObjectPic_Cook_1),
-    obj_frame_tiles(gFieldObjectPic_Cook_2),
-    obj_frame_tiles(gFieldObjectPic_Cook_2),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Woman6[] = {
-    obj_frame_tiles(gFieldObjectPic_Woman6_0),
-    obj_frame_tiles(gFieldObjectPic_Woman6_1),
-    obj_frame_tiles(gFieldObjectPic_Woman6_2),
-    obj_frame_tiles(gFieldObjectPic_Woman6_3),
-    obj_frame_tiles(gFieldObjectPic_Woman6_4),
-    obj_frame_tiles(gFieldObjectPic_Woman6_5),
-    obj_frame_tiles(gFieldObjectPic_Woman6_6),
-    obj_frame_tiles(gFieldObjectPic_Woman6_7),
-    obj_frame_tiles(gFieldObjectPic_Woman6_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_OldMan2[] = {
-    obj_frame_tiles(gFieldObjectPic_OldMan2_0),
-    obj_frame_tiles(gFieldObjectPic_OldMan2_1),
-    obj_frame_tiles(gFieldObjectPic_OldMan2_2),
-    obj_frame_tiles(gFieldObjectPic_OldMan2_0),
-    obj_frame_tiles(gFieldObjectPic_OldMan2_0),
-    obj_frame_tiles(gFieldObjectPic_OldMan2_1),
-    obj_frame_tiles(gFieldObjectPic_OldMan2_1),
-    obj_frame_tiles(gFieldObjectPic_OldMan2_2),
-    obj_frame_tiles(gFieldObjectPic_OldMan2_2),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_OldWoman2[] = {
-    obj_frame_tiles(gFieldObjectPic_OldWoman2_0),
-    obj_frame_tiles(gFieldObjectPic_OldWoman2_1),
-    obj_frame_tiles(gFieldObjectPic_OldWoman2_2),
-    obj_frame_tiles(gFieldObjectPic_OldWoman2_3),
-    obj_frame_tiles(gFieldObjectPic_OldWoman2_4),
-    obj_frame_tiles(gFieldObjectPic_OldWoman2_5),
-    obj_frame_tiles(gFieldObjectPic_OldWoman2_6),
-    obj_frame_tiles(gFieldObjectPic_OldWoman2_7),
-    obj_frame_tiles(gFieldObjectPic_OldWoman2_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Camper[] = {
-    obj_frame_tiles(gFieldObjectPic_Camper_0),
-    obj_frame_tiles(gFieldObjectPic_Camper_1),
-    obj_frame_tiles(gFieldObjectPic_Camper_2),
-    obj_frame_tiles(gFieldObjectPic_Camper_3),
-    obj_frame_tiles(gFieldObjectPic_Camper_4),
-    obj_frame_tiles(gFieldObjectPic_Camper_5),
-    obj_frame_tiles(gFieldObjectPic_Camper_6),
-    obj_frame_tiles(gFieldObjectPic_Camper_7),
-    obj_frame_tiles(gFieldObjectPic_Camper_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Picnicker[] = {
-    obj_frame_tiles(gFieldObjectPic_Picnicker_0),
-    obj_frame_tiles(gFieldObjectPic_Picnicker_1),
-    obj_frame_tiles(gFieldObjectPic_Picnicker_2),
-    obj_frame_tiles(gFieldObjectPic_Picnicker_3),
-    obj_frame_tiles(gFieldObjectPic_Picnicker_4),
-    obj_frame_tiles(gFieldObjectPic_Picnicker_5),
-    obj_frame_tiles(gFieldObjectPic_Picnicker_6),
-    obj_frame_tiles(gFieldObjectPic_Picnicker_7),
-    obj_frame_tiles(gFieldObjectPic_Picnicker_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Man4[] = {
-    obj_frame_tiles(gFieldObjectPic_Man4_0),
-    obj_frame_tiles(gFieldObjectPic_Man4_1),
-    obj_frame_tiles(gFieldObjectPic_Man4_2),
-    obj_frame_tiles(gFieldObjectPic_Man4_3),
-    obj_frame_tiles(gFieldObjectPic_Man4_4),
-    obj_frame_tiles(gFieldObjectPic_Man4_5),
-    obj_frame_tiles(gFieldObjectPic_Man4_6),
-    obj_frame_tiles(gFieldObjectPic_Man4_7),
-    obj_frame_tiles(gFieldObjectPic_Man4_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Woman7[] = {
-    obj_frame_tiles(gFieldObjectPic_Woman7_0),
-    obj_frame_tiles(gFieldObjectPic_Woman7_1),
-    obj_frame_tiles(gFieldObjectPic_Woman7_2),
-    obj_frame_tiles(gFieldObjectPic_Woman7_3),
-    obj_frame_tiles(gFieldObjectPic_Woman7_4),
-    obj_frame_tiles(gFieldObjectPic_Woman7_5),
-    obj_frame_tiles(gFieldObjectPic_Woman7_6),
-    obj_frame_tiles(gFieldObjectPic_Woman7_7),
-    obj_frame_tiles(gFieldObjectPic_Woman7_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Youngster[] = {
-    obj_frame_tiles(gFieldObjectPic_Youngster_0),
-    obj_frame_tiles(gFieldObjectPic_Youngster_1),
-    obj_frame_tiles(gFieldObjectPic_Youngster_2),
-    obj_frame_tiles(gFieldObjectPic_Youngster_3),
-    obj_frame_tiles(gFieldObjectPic_Youngster_4),
-    obj_frame_tiles(gFieldObjectPic_Youngster_5),
-    obj_frame_tiles(gFieldObjectPic_Youngster_6),
-    obj_frame_tiles(gFieldObjectPic_Youngster_7),
-    obj_frame_tiles(gFieldObjectPic_Youngster_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_BugCatcher[] = {
-    obj_frame_tiles(gFieldObjectPic_BugCatcher_0),
-    obj_frame_tiles(gFieldObjectPic_BugCatcher_1),
-    obj_frame_tiles(gFieldObjectPic_BugCatcher_2),
-    obj_frame_tiles(gFieldObjectPic_BugCatcher_3),
-    obj_frame_tiles(gFieldObjectPic_BugCatcher_4),
-    obj_frame_tiles(gFieldObjectPic_BugCatcher_5),
-    obj_frame_tiles(gFieldObjectPic_BugCatcher_6),
-    obj_frame_tiles(gFieldObjectPic_BugCatcher_7),
-    obj_frame_tiles(gFieldObjectPic_BugCatcher_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_PsychicM[] = {
-    obj_frame_tiles(gFieldObjectPic_PsychicM_0),
-    obj_frame_tiles(gFieldObjectPic_PsychicM_1),
-    obj_frame_tiles(gFieldObjectPic_PsychicM_2),
-    obj_frame_tiles(gFieldObjectPic_PsychicM_3),
-    obj_frame_tiles(gFieldObjectPic_PsychicM_4),
-    obj_frame_tiles(gFieldObjectPic_PsychicM_5),
-    obj_frame_tiles(gFieldObjectPic_PsychicM_6),
-    obj_frame_tiles(gFieldObjectPic_PsychicM_7),
-    obj_frame_tiles(gFieldObjectPic_PsychicM_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_SchoolKidM[] = {
-    obj_frame_tiles(gFieldObjectPic_SchoolKidM_0),
-    obj_frame_tiles(gFieldObjectPic_SchoolKidM_1),
-    obj_frame_tiles(gFieldObjectPic_SchoolKidM_2),
-    obj_frame_tiles(gFieldObjectPic_SchoolKidM_3),
-    obj_frame_tiles(gFieldObjectPic_SchoolKidM_4),
-    obj_frame_tiles(gFieldObjectPic_SchoolKidM_5),
-    obj_frame_tiles(gFieldObjectPic_SchoolKidM_6),
-    obj_frame_tiles(gFieldObjectPic_SchoolKidM_7),
-    obj_frame_tiles(gFieldObjectPic_SchoolKidM_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Maniac[] = {
-    obj_frame_tiles(gFieldObjectPic_Maniac_0),
-    obj_frame_tiles(gFieldObjectPic_Maniac_1),
-    obj_frame_tiles(gFieldObjectPic_Maniac_2),
-    obj_frame_tiles(gFieldObjectPic_Maniac_3),
-    obj_frame_tiles(gFieldObjectPic_Maniac_4),
-    obj_frame_tiles(gFieldObjectPic_Maniac_5),
-    obj_frame_tiles(gFieldObjectPic_Maniac_6),
-    obj_frame_tiles(gFieldObjectPic_Maniac_7),
-    obj_frame_tiles(gFieldObjectPic_Maniac_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_HexManiac[] = {
-    obj_frame_tiles(gFieldObjectPic_HexManiac_0),
-    obj_frame_tiles(gFieldObjectPic_HexManiac_1),
-    obj_frame_tiles(gFieldObjectPic_HexManiac_2),
-    obj_frame_tiles(gFieldObjectPic_HexManiac_3),
-    obj_frame_tiles(gFieldObjectPic_HexManiac_4),
-    obj_frame_tiles(gFieldObjectPic_HexManiac_5),
-    obj_frame_tiles(gFieldObjectPic_HexManiac_6),
-    obj_frame_tiles(gFieldObjectPic_HexManiac_7),
-    obj_frame_tiles(gFieldObjectPic_HexManiac_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_SwimmerM[] = {
-    obj_frame_tiles(gFieldObjectPic_SwimmerM_0),
-    obj_frame_tiles(gFieldObjectPic_SwimmerM_1),
-    obj_frame_tiles(gFieldObjectPic_SwimmerM_2),
-    obj_frame_tiles(gFieldObjectPic_SwimmerM_3),
-    obj_frame_tiles(gFieldObjectPic_SwimmerM_4),
-    obj_frame_tiles(gFieldObjectPic_SwimmerM_5),
-    obj_frame_tiles(gFieldObjectPic_SwimmerM_6),
-    obj_frame_tiles(gFieldObjectPic_SwimmerM_7),
-    obj_frame_tiles(gFieldObjectPic_SwimmerM_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_SwimmerF[] = {
-    obj_frame_tiles(gFieldObjectPic_SwimmerF_0),
-    obj_frame_tiles(gFieldObjectPic_SwimmerF_1),
-    obj_frame_tiles(gFieldObjectPic_SwimmerF_2),
-    obj_frame_tiles(gFieldObjectPic_SwimmerF_3),
-    obj_frame_tiles(gFieldObjectPic_SwimmerF_4),
-    obj_frame_tiles(gFieldObjectPic_SwimmerF_5),
-    obj_frame_tiles(gFieldObjectPic_SwimmerF_6),
-    obj_frame_tiles(gFieldObjectPic_SwimmerF_7),
-    obj_frame_tiles(gFieldObjectPic_SwimmerF_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_BlackBelt[] = {
-    obj_frame_tiles(gFieldObjectPic_BlackBelt_0),
-    obj_frame_tiles(gFieldObjectPic_BlackBelt_1),
-    obj_frame_tiles(gFieldObjectPic_BlackBelt_2),
-    obj_frame_tiles(gFieldObjectPic_BlackBelt_3),
-    obj_frame_tiles(gFieldObjectPic_BlackBelt_4),
-    obj_frame_tiles(gFieldObjectPic_BlackBelt_5),
-    obj_frame_tiles(gFieldObjectPic_BlackBelt_6),
-    obj_frame_tiles(gFieldObjectPic_BlackBelt_7),
-    obj_frame_tiles(gFieldObjectPic_BlackBelt_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Beauty[] = {
-    obj_frame_tiles(gFieldObjectPic_Beauty_0),
-    obj_frame_tiles(gFieldObjectPic_Beauty_1),
-    obj_frame_tiles(gFieldObjectPic_Beauty_2),
-    obj_frame_tiles(gFieldObjectPic_Beauty_3),
-    obj_frame_tiles(gFieldObjectPic_Beauty_4),
-    obj_frame_tiles(gFieldObjectPic_Beauty_5),
-    obj_frame_tiles(gFieldObjectPic_Beauty_6),
-    obj_frame_tiles(gFieldObjectPic_Beauty_7),
-    obj_frame_tiles(gFieldObjectPic_Beauty_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Scientist1[] = {
-    obj_frame_tiles(gFieldObjectPic_Scientist1_0),
-    obj_frame_tiles(gFieldObjectPic_Scientist1_1),
-    obj_frame_tiles(gFieldObjectPic_Scientist1_2),
-    obj_frame_tiles(gFieldObjectPic_Scientist1_3),
-    obj_frame_tiles(gFieldObjectPic_Scientist1_4),
-    obj_frame_tiles(gFieldObjectPic_Scientist1_5),
-    obj_frame_tiles(gFieldObjectPic_Scientist1_6),
-    obj_frame_tiles(gFieldObjectPic_Scientist1_7),
-    obj_frame_tiles(gFieldObjectPic_Scientist1_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Lass[] = {
-    obj_frame_tiles(gFieldObjectPic_Lass_0),
-    obj_frame_tiles(gFieldObjectPic_Lass_1),
-    obj_frame_tiles(gFieldObjectPic_Lass_2),
-    obj_frame_tiles(gFieldObjectPic_Lass_3),
-    obj_frame_tiles(gFieldObjectPic_Lass_4),
-    obj_frame_tiles(gFieldObjectPic_Lass_5),
-    obj_frame_tiles(gFieldObjectPic_Lass_6),
-    obj_frame_tiles(gFieldObjectPic_Lass_7),
-    obj_frame_tiles(gFieldObjectPic_Lass_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Gentleman[] = {
-    obj_frame_tiles(gFieldObjectPic_Gentleman_0),
-    obj_frame_tiles(gFieldObjectPic_Gentleman_1),
-    obj_frame_tiles(gFieldObjectPic_Gentleman_2),
-    obj_frame_tiles(gFieldObjectPic_Gentleman_3),
-    obj_frame_tiles(gFieldObjectPic_Gentleman_4),
-    obj_frame_tiles(gFieldObjectPic_Gentleman_5),
-    obj_frame_tiles(gFieldObjectPic_Gentleman_6),
-    obj_frame_tiles(gFieldObjectPic_Gentleman_7),
-    obj_frame_tiles(gFieldObjectPic_Gentleman_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Sailor[] = {
-    obj_frame_tiles(gFieldObjectPic_Sailor_0),
-    obj_frame_tiles(gFieldObjectPic_Sailor_1),
-    obj_frame_tiles(gFieldObjectPic_Sailor_2),
-    obj_frame_tiles(gFieldObjectPic_Sailor_3),
-    obj_frame_tiles(gFieldObjectPic_Sailor_4),
-    obj_frame_tiles(gFieldObjectPic_Sailor_5),
-    obj_frame_tiles(gFieldObjectPic_Sailor_6),
-    obj_frame_tiles(gFieldObjectPic_Sailor_7),
-    obj_frame_tiles(gFieldObjectPic_Sailor_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Fisherman[] = {
-    obj_frame_tiles(gFieldObjectPic_Fisherman_0),
-    obj_frame_tiles(gFieldObjectPic_Fisherman_1),
-    obj_frame_tiles(gFieldObjectPic_Fisherman_2),
-    obj_frame_tiles(gFieldObjectPic_Fisherman_3),
-    obj_frame_tiles(gFieldObjectPic_Fisherman_4),
-    obj_frame_tiles(gFieldObjectPic_Fisherman_5),
-    obj_frame_tiles(gFieldObjectPic_Fisherman_6),
-    obj_frame_tiles(gFieldObjectPic_Fisherman_7),
-    obj_frame_tiles(gFieldObjectPic_Fisherman_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_RunningTriathleteM[] = {
-    obj_frame_tiles(gFieldObjectPic_RunningTriathleteM_0),
-    obj_frame_tiles(gFieldObjectPic_RunningTriathleteM_1),
-    obj_frame_tiles(gFieldObjectPic_RunningTriathleteM_2),
-    obj_frame_tiles(gFieldObjectPic_RunningTriathleteM_3),
-    obj_frame_tiles(gFieldObjectPic_RunningTriathleteM_4),
-    obj_frame_tiles(gFieldObjectPic_RunningTriathleteM_5),
-    obj_frame_tiles(gFieldObjectPic_RunningTriathleteM_6),
-    obj_frame_tiles(gFieldObjectPic_RunningTriathleteM_7),
-    obj_frame_tiles(gFieldObjectPic_RunningTriathleteM_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_RunningTriathleteF[] = {
-    obj_frame_tiles(gFieldObjectPic_RunningTriathleteF_0),
-    obj_frame_tiles(gFieldObjectPic_RunningTriathleteF_1),
-    obj_frame_tiles(gFieldObjectPic_RunningTriathleteF_2),
-    obj_frame_tiles(gFieldObjectPic_RunningTriathleteF_3),
-    obj_frame_tiles(gFieldObjectPic_RunningTriathleteF_4),
-    obj_frame_tiles(gFieldObjectPic_RunningTriathleteF_5),
-    obj_frame_tiles(gFieldObjectPic_RunningTriathleteF_6),
-    obj_frame_tiles(gFieldObjectPic_RunningTriathleteF_7),
-    obj_frame_tiles(gFieldObjectPic_RunningTriathleteF_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_TuberF[] = {
-    obj_frame_tiles(gFieldObjectPic_TuberF_0),
-    obj_frame_tiles(gFieldObjectPic_TuberF_1),
-    obj_frame_tiles(gFieldObjectPic_TuberF_2),
-    obj_frame_tiles(gFieldObjectPic_TuberF_3),
-    obj_frame_tiles(gFieldObjectPic_TuberF_4),
-    obj_frame_tiles(gFieldObjectPic_TuberF_5),
-    obj_frame_tiles(gFieldObjectPic_TuberF_6),
-    obj_frame_tiles(gFieldObjectPic_TuberF_7),
-    obj_frame_tiles(gFieldObjectPic_TuberF_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_TuberM[] = {
-    obj_frame_tiles(gFieldObjectPic_TuberM_0),
-    obj_frame_tiles(gFieldObjectPic_TuberM_1),
-    obj_frame_tiles(gFieldObjectPic_TuberM_2),
-    obj_frame_tiles(gFieldObjectPic_TuberM_3),
-    obj_frame_tiles(gFieldObjectPic_TuberM_4),
-    obj_frame_tiles(gFieldObjectPic_TuberM_5),
-    obj_frame_tiles(gFieldObjectPic_TuberM_6),
-    obj_frame_tiles(gFieldObjectPic_TuberM_7),
-    obj_frame_tiles(gFieldObjectPic_TuberM_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Hiker[] = {
-    obj_frame_tiles(gFieldObjectPic_Hiker_0),
-    obj_frame_tiles(gFieldObjectPic_Hiker_1),
-    obj_frame_tiles(gFieldObjectPic_Hiker_2),
-    obj_frame_tiles(gFieldObjectPic_Hiker_3),
-    obj_frame_tiles(gFieldObjectPic_Hiker_4),
-    obj_frame_tiles(gFieldObjectPic_Hiker_5),
-    obj_frame_tiles(gFieldObjectPic_Hiker_6),
-    obj_frame_tiles(gFieldObjectPic_Hiker_7),
-    obj_frame_tiles(gFieldObjectPic_Hiker_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_CyclingTriathleteM[] = {
-    obj_frame_tiles(gFieldObjectPic_CyclingTriathleteM_0),
-    obj_frame_tiles(gFieldObjectPic_CyclingTriathleteM_1),
-    obj_frame_tiles(gFieldObjectPic_CyclingTriathleteM_2),
-    obj_frame_tiles(gFieldObjectPic_CyclingTriathleteM_3),
-    obj_frame_tiles(gFieldObjectPic_CyclingTriathleteM_4),
-    obj_frame_tiles(gFieldObjectPic_CyclingTriathleteM_5),
-    obj_frame_tiles(gFieldObjectPic_CyclingTriathleteM_6),
-    obj_frame_tiles(gFieldObjectPic_CyclingTriathleteM_7),
-    obj_frame_tiles(gFieldObjectPic_CyclingTriathleteM_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_CyclingTriathleteF[] = {
-    obj_frame_tiles(gFieldObjectPic_CyclingTriathleteF_0),
-    obj_frame_tiles(gFieldObjectPic_CyclingTriathleteF_1),
-    obj_frame_tiles(gFieldObjectPic_CyclingTriathleteF_2),
-    obj_frame_tiles(gFieldObjectPic_CyclingTriathleteF_3),
-    obj_frame_tiles(gFieldObjectPic_CyclingTriathleteF_4),
-    obj_frame_tiles(gFieldObjectPic_CyclingTriathleteF_5),
-    obj_frame_tiles(gFieldObjectPic_CyclingTriathleteF_6),
-    obj_frame_tiles(gFieldObjectPic_CyclingTriathleteF_7),
-    obj_frame_tiles(gFieldObjectPic_CyclingTriathleteF_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Nurse[] = {
-    obj_frame_tiles(gFieldObjectPic_Nurse_0),
-    obj_frame_tiles(gFieldObjectPic_Nurse_1),
-    obj_frame_tiles(gFieldObjectPic_Nurse_2),
-    obj_frame_tiles(gFieldObjectPic_Nurse_0),
-    obj_frame_tiles(gFieldObjectPic_Nurse_0),
-    obj_frame_tiles(gFieldObjectPic_Nurse_1),
-    obj_frame_tiles(gFieldObjectPic_Nurse_1),
-    obj_frame_tiles(gFieldObjectPic_Nurse_2),
-    obj_frame_tiles(gFieldObjectPic_Nurse_2),
-    obj_frame_tiles(gFieldObjectPic_Nurse_3),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_ItemBall[] = {
-    obj_frame_tiles(gFieldObjectPic_ItemBall),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_ProfBirch[] = {
-    obj_frame_tiles(gFieldObjectPic_ProfBirch_0),
-    obj_frame_tiles(gFieldObjectPic_ProfBirch_1),
-    obj_frame_tiles(gFieldObjectPic_ProfBirch_2),
-    obj_frame_tiles(gFieldObjectPic_ProfBirch_3),
-    obj_frame_tiles(gFieldObjectPic_ProfBirch_4),
-    obj_frame_tiles(gFieldObjectPic_ProfBirch_5),
-    obj_frame_tiles(gFieldObjectPic_ProfBirch_6),
-    obj_frame_tiles(gFieldObjectPic_ProfBirch_7),
-    obj_frame_tiles(gFieldObjectPic_ProfBirch_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Man5[] = {
-    obj_frame_tiles(gFieldObjectPic_Man5_0),
-    obj_frame_tiles(gFieldObjectPic_Man5_1),
-    obj_frame_tiles(gFieldObjectPic_Man5_2),
-    obj_frame_tiles(gFieldObjectPic_Man5_3),
-    obj_frame_tiles(gFieldObjectPic_Man5_4),
-    obj_frame_tiles(gFieldObjectPic_Man5_5),
-    obj_frame_tiles(gFieldObjectPic_Man5_6),
-    obj_frame_tiles(gFieldObjectPic_Man5_7),
-    obj_frame_tiles(gFieldObjectPic_Man5_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Man6[] = {
-    obj_frame_tiles(gFieldObjectPic_Man6_0),
-    obj_frame_tiles(gFieldObjectPic_Man6_1),
-    obj_frame_tiles(gFieldObjectPic_Man6_2),
-    obj_frame_tiles(gFieldObjectPic_Man6_3),
-    obj_frame_tiles(gFieldObjectPic_Man6_4),
-    obj_frame_tiles(gFieldObjectPic_Man6_5),
-    obj_frame_tiles(gFieldObjectPic_Man6_6),
-    obj_frame_tiles(gFieldObjectPic_Man6_7),
-    obj_frame_tiles(gFieldObjectPic_Man6_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_ReporterM[] = {
-    obj_frame_tiles(gFieldObjectPic_ReporterM_0),
-    obj_frame_tiles(gFieldObjectPic_ReporterM_1),
-    obj_frame_tiles(gFieldObjectPic_ReporterM_2),
-    obj_frame_tiles(gFieldObjectPic_ReporterM_3),
-    obj_frame_tiles(gFieldObjectPic_ReporterM_4),
-    obj_frame_tiles(gFieldObjectPic_ReporterM_5),
-    obj_frame_tiles(gFieldObjectPic_ReporterM_6),
-    obj_frame_tiles(gFieldObjectPic_ReporterM_7),
-    obj_frame_tiles(gFieldObjectPic_ReporterM_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_ReporterF[] = {
-    obj_frame_tiles(gFieldObjectPic_ReporterF_0),
-    obj_frame_tiles(gFieldObjectPic_ReporterF_1),
-    obj_frame_tiles(gFieldObjectPic_ReporterF_2),
-    obj_frame_tiles(gFieldObjectPic_ReporterF_3),
-    obj_frame_tiles(gFieldObjectPic_ReporterF_4),
-    obj_frame_tiles(gFieldObjectPic_ReporterF_5),
-    obj_frame_tiles(gFieldObjectPic_ReporterF_6),
-    obj_frame_tiles(gFieldObjectPic_ReporterF_7),
-    obj_frame_tiles(gFieldObjectPic_ReporterF_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_MauvilleOldMan1[] = {
-    obj_frame_tiles(gFieldObjectPic_MauvilleOldMan1_0),
-    obj_frame_tiles(gFieldObjectPic_MauvilleOldMan1_1),
-    obj_frame_tiles(gFieldObjectPic_MauvilleOldMan1_2),
-    obj_frame_tiles(gFieldObjectPic_MauvilleOldMan1_3),
-    obj_frame_tiles(gFieldObjectPic_MauvilleOldMan1_4),
-    obj_frame_tiles(gFieldObjectPic_MauvilleOldMan1_5),
-    obj_frame_tiles(gFieldObjectPic_MauvilleOldMan1_6),
-    obj_frame_tiles(gFieldObjectPic_MauvilleOldMan1_7),
-    obj_frame_tiles(gFieldObjectPic_MauvilleOldMan1_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_MauvilleOldMan2[] = {
-    obj_frame_tiles(gFieldObjectPic_MauvilleOldMan2_0),
-    obj_frame_tiles(gFieldObjectPic_MauvilleOldMan2_1),
-    obj_frame_tiles(gFieldObjectPic_MauvilleOldMan2_2),
-    obj_frame_tiles(gFieldObjectPic_MauvilleOldMan2_3),
-    obj_frame_tiles(gFieldObjectPic_MauvilleOldMan2_4),
-    obj_frame_tiles(gFieldObjectPic_MauvilleOldMan2_5),
-    obj_frame_tiles(gFieldObjectPic_MauvilleOldMan2_6),
-    obj_frame_tiles(gFieldObjectPic_MauvilleOldMan2_7),
-    obj_frame_tiles(gFieldObjectPic_MauvilleOldMan2_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_UnusedNatuDoll[] = {
-    obj_frame_tiles(gFieldObjectPic_UnusedNatuDoll),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_UnusedMagnemiteDoll[] = {
-    obj_frame_tiles(gFieldObjectPic_UnusedMagnemiteDoll),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_UnusedSquirtleDoll[] = {
-    obj_frame_tiles(gFieldObjectPic_UnusedSquirtleDoll),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_UnusedWooperDoll[] = {
-    obj_frame_tiles(gFieldObjectPic_UnusedWooperDoll),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_UnusedPikachuDoll[] = {
-    obj_frame_tiles(gFieldObjectPic_UnusedPikachuDoll),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_UnusedPorygon2Doll[] = {
-    obj_frame_tiles(gFieldObjectPic_UnusedPorygon2Doll),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_CuttableTree[] = {
-    obj_frame_tiles(gFieldObjectPic_CuttableTree_0),
-    obj_frame_tiles(gFieldObjectPic_CuttableTree_1),
-    obj_frame_tiles(gFieldObjectPic_CuttableTree_2),
-    obj_frame_tiles(gFieldObjectPic_CuttableTree_3),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_MartEmployee[] = {
-    obj_frame_tiles(gFieldObjectPic_MartEmployee_0),
-    obj_frame_tiles(gFieldObjectPic_MartEmployee_1),
-    obj_frame_tiles(gFieldObjectPic_MartEmployee_2),
-    obj_frame_tiles(gFieldObjectPic_MartEmployee_3),
-    obj_frame_tiles(gFieldObjectPic_MartEmployee_4),
-    obj_frame_tiles(gFieldObjectPic_MartEmployee_5),
-    obj_frame_tiles(gFieldObjectPic_MartEmployee_6),
-    obj_frame_tiles(gFieldObjectPic_MartEmployee_7),
-    obj_frame_tiles(gFieldObjectPic_MartEmployee_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_RooftopSaleWoman[] = {
-    obj_frame_tiles(gFieldObjectPic_RooftopSaleWoman_0),
-    obj_frame_tiles(gFieldObjectPic_RooftopSaleWoman_1),
-    obj_frame_tiles(gFieldObjectPic_RooftopSaleWoman_2),
-    obj_frame_tiles(gFieldObjectPic_RooftopSaleWoman_3),
-    obj_frame_tiles(gFieldObjectPic_RooftopSaleWoman_4),
-    obj_frame_tiles(gFieldObjectPic_RooftopSaleWoman_5),
-    obj_frame_tiles(gFieldObjectPic_RooftopSaleWoman_6),
-    obj_frame_tiles(gFieldObjectPic_RooftopSaleWoman_7),
-    obj_frame_tiles(gFieldObjectPic_RooftopSaleWoman_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Teala[] = {
-    obj_frame_tiles(gFieldObjectPic_Teala_0),
-    obj_frame_tiles(gFieldObjectPic_Teala_1),
-    obj_frame_tiles(gFieldObjectPic_Teala_2),
-    obj_frame_tiles(gFieldObjectPic_Teala_3),
-    obj_frame_tiles(gFieldObjectPic_Teala_4),
-    obj_frame_tiles(gFieldObjectPic_Teala_5),
-    obj_frame_tiles(gFieldObjectPic_Teala_6),
-    obj_frame_tiles(gFieldObjectPic_Teala_7),
-    obj_frame_tiles(gFieldObjectPic_Teala_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_BreakableRock[] = {
-    obj_frame_tiles(gFieldObjectPic_BreakableRock_0),
-    obj_frame_tiles(gFieldObjectPic_BreakableRock_1),
-    obj_frame_tiles(gFieldObjectPic_BreakableRock_2),
-    obj_frame_tiles(gFieldObjectPic_BreakableRock_3),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_PushableBoulder[] = {
-    obj_frame_tiles(gFieldObjectPic_PushableBoulder),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_MrBrineysBoat[] = {
-    obj_frame_tiles(gFieldObjectPic_MrBrineysBoat_0),
-    obj_frame_tiles(gFieldObjectPic_MrBrineysBoat_1),
-    obj_frame_tiles(gFieldObjectPic_MrBrineysBoat_2),
-    obj_frame_tiles(gFieldObjectPic_MrBrineysBoat_0),
-    obj_frame_tiles(gFieldObjectPic_MrBrineysBoat_0),
-    obj_frame_tiles(gFieldObjectPic_MrBrineysBoat_1),
-    obj_frame_tiles(gFieldObjectPic_MrBrineysBoat_1),
-    obj_frame_tiles(gFieldObjectPic_MrBrineysBoat_2),
-    obj_frame_tiles(gFieldObjectPic_MrBrineysBoat_2),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Truck[] = {
-    obj_frame_tiles(gFieldObjectPic_Truck),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_VigorothCarryingBox[] = {
-    obj_frame_tiles(gFieldObjectPic_VigorothCarryingBox_0),
-    obj_frame_tiles(gFieldObjectPic_VigorothCarryingBox_0),
-    obj_frame_tiles(gFieldObjectPic_VigorothCarryingBox_0),
-    obj_frame_tiles(gFieldObjectPic_VigorothCarryingBox_1),
-    obj_frame_tiles(gFieldObjectPic_VigorothCarryingBox_2),
-    obj_frame_tiles(gFieldObjectPic_VigorothCarryingBox_1),
-    obj_frame_tiles(gFieldObjectPic_VigorothCarryingBox_2),
-    obj_frame_tiles(gFieldObjectPic_VigorothCarryingBox_1),
-    obj_frame_tiles(gFieldObjectPic_VigorothCarryingBox_2),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_VigorothFacingAway[] = {
-    obj_frame_tiles(gFieldObjectPic_VigorothFacingAway_0),
-    obj_frame_tiles(gFieldObjectPic_VigorothFacingAway_0),
-    obj_frame_tiles(gFieldObjectPic_VigorothFacingAway_0),
-    obj_frame_tiles(gFieldObjectPic_VigorothFacingAway_1),
-    obj_frame_tiles(gFieldObjectPic_VigorothFacingAway_1),
-    obj_frame_tiles(gFieldObjectPic_VigorothFacingAway_1),
-    obj_frame_tiles(gFieldObjectPic_VigorothFacingAway_1),
-    obj_frame_tiles(gFieldObjectPic_VigorothFacingAway_1),
-    obj_frame_tiles(gFieldObjectPic_VigorothFacingAway_1),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_BirchsBag[] = {
-    obj_frame_tiles(gFieldObjectPic_BirchsBag),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_EnemyZigzagoon[] = {
-    obj_frame_tiles(gFieldObjectPic_EnemyZigzagoon_0),
-    obj_frame_tiles(gFieldObjectPic_EnemyZigzagoon_1),
-    obj_frame_tiles(gFieldObjectPic_EnemyZigzagoon_2),
-    obj_frame_tiles(gFieldObjectPic_EnemyZigzagoon_3),
-    obj_frame_tiles(gFieldObjectPic_EnemyZigzagoon_4),
-    obj_frame_tiles(gFieldObjectPic_EnemyZigzagoon_5),
-    obj_frame_tiles(gFieldObjectPic_EnemyZigzagoon_6),
-    obj_frame_tiles(gFieldObjectPic_EnemyZigzagoon_7),
-    obj_frame_tiles(gFieldObjectPic_EnemyZigzagoon_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Poochyena[] = {
-    obj_frame_tiles(gFieldObjectPic_Poochyena_0),
-    obj_frame_tiles(gFieldObjectPic_Poochyena_1),
-    obj_frame_tiles(gFieldObjectPic_Poochyena_2),
-    obj_frame_tiles(gFieldObjectPic_Poochyena_3),
-    obj_frame_tiles(gFieldObjectPic_Poochyena_4),
-    obj_frame_tiles(gFieldObjectPic_Poochyena_5),
-    obj_frame_tiles(gFieldObjectPic_Poochyena_6),
-    obj_frame_tiles(gFieldObjectPic_Poochyena_7),
-    obj_frame_tiles(gFieldObjectPic_Poochyena_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Artist[] = {
-    obj_frame_tiles(gFieldObjectPic_Artist_0),
-    obj_frame_tiles(gFieldObjectPic_Artist_1),
-    obj_frame_tiles(gFieldObjectPic_Artist_2),
-    obj_frame_tiles(gFieldObjectPic_Artist_3),
-    obj_frame_tiles(gFieldObjectPic_Artist_4),
-    obj_frame_tiles(gFieldObjectPic_Artist_5),
-    obj_frame_tiles(gFieldObjectPic_Artist_6),
-    obj_frame_tiles(gFieldObjectPic_Artist_7),
-    obj_frame_tiles(gFieldObjectPic_Artist_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_MayNormal[] = {
-    obj_frame_tiles(gFieldObjectPic_MayNormal_0),
-    obj_frame_tiles(gFieldObjectPic_MayNormal_1),
-    obj_frame_tiles(gFieldObjectPic_MayNormal_2),
-    obj_frame_tiles(gFieldObjectPic_MayNormal_3),
-    obj_frame_tiles(gFieldObjectPic_MayNormal_4),
-    obj_frame_tiles(gFieldObjectPic_MayNormal_5),
-    obj_frame_tiles(gFieldObjectPic_MayNormal_6),
-    obj_frame_tiles(gFieldObjectPic_MayNormal_7),
-    obj_frame_tiles(gFieldObjectPic_MayNormal_8),
-    obj_frame_tiles(gFieldObjectPic_MayNormal_9),
-    obj_frame_tiles(gFieldObjectPic_MayNormal_10),
-    obj_frame_tiles(gFieldObjectPic_MayNormal_11),
-    obj_frame_tiles(gFieldObjectPic_MayNormal_12),
-    obj_frame_tiles(gFieldObjectPic_MayNormal_13),
-    obj_frame_tiles(gFieldObjectPic_MayNormal_14),
-    obj_frame_tiles(gFieldObjectPic_MayNormal_15),
-    obj_frame_tiles(gFieldObjectPic_MayNormal_16),
-    obj_frame_tiles(gFieldObjectPic_MayNormal_17),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_MayMachBike[] = {
-    obj_frame_tiles(gFieldObjectPic_MayMachBike_0),
-    obj_frame_tiles(gFieldObjectPic_MayMachBike_1),
-    obj_frame_tiles(gFieldObjectPic_MayMachBike_2),
-    obj_frame_tiles(gFieldObjectPic_MayMachBike_3),
-    obj_frame_tiles(gFieldObjectPic_MayMachBike_4),
-    obj_frame_tiles(gFieldObjectPic_MayMachBike_5),
-    obj_frame_tiles(gFieldObjectPic_MayMachBike_6),
-    obj_frame_tiles(gFieldObjectPic_MayMachBike_7),
-    obj_frame_tiles(gFieldObjectPic_MayMachBike_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_MayAcroBike[] = {
-    obj_frame_tiles(gFieldObjectPic_MayAcroBike_0),
-    obj_frame_tiles(gFieldObjectPic_MayAcroBike_1),
-    obj_frame_tiles(gFieldObjectPic_MayAcroBike_2),
-    obj_frame_tiles(gFieldObjectPic_MayAcroBike_3),
-    obj_frame_tiles(gFieldObjectPic_MayAcroBike_4),
-    obj_frame_tiles(gFieldObjectPic_MayAcroBike_5),
-    obj_frame_tiles(gFieldObjectPic_MayAcroBike_6),
-    obj_frame_tiles(gFieldObjectPic_MayAcroBike_7),
-    obj_frame_tiles(gFieldObjectPic_MayAcroBike_8),
-    obj_frame_tiles(gFieldObjectPic_MayAcroBike_9),
-    obj_frame_tiles(gFieldObjectPic_MayAcroBike_10),
-    obj_frame_tiles(gFieldObjectPic_MayAcroBike_11),
-    obj_frame_tiles(gFieldObjectPic_MayAcroBike_12),
-    obj_frame_tiles(gFieldObjectPic_MayAcroBike_13),
-    obj_frame_tiles(gFieldObjectPic_MayAcroBike_14),
-    obj_frame_tiles(gFieldObjectPic_MayAcroBike_15),
-    obj_frame_tiles(gFieldObjectPic_MayAcroBike_16),
-    obj_frame_tiles(gFieldObjectPic_MayAcroBike_17),
-    obj_frame_tiles(gFieldObjectPic_MayAcroBike_18),
-    obj_frame_tiles(gFieldObjectPic_MayAcroBike_19),
-    obj_frame_tiles(gFieldObjectPic_MayAcroBike_20),
-    obj_frame_tiles(gFieldObjectPic_MayAcroBike_21),
-    obj_frame_tiles(gFieldObjectPic_MayAcroBike_22),
-    obj_frame_tiles(gFieldObjectPic_MayAcroBike_23),
-    obj_frame_tiles(gFieldObjectPic_MayAcroBike_24),
-    obj_frame_tiles(gFieldObjectPic_MayAcroBike_25),
-    obj_frame_tiles(gFieldObjectPic_MayAcroBike_26),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_MaySurfing[] = {
-    obj_frame_tiles(gFieldObjectPic_MaySurfing_0),
-    obj_frame_tiles(gFieldObjectPic_MaySurfing_1),
-    obj_frame_tiles(gFieldObjectPic_MaySurfing_2),
-    obj_frame_tiles(gFieldObjectPic_MaySurfing_0),
-    obj_frame_tiles(gFieldObjectPic_MaySurfing_0),
-    obj_frame_tiles(gFieldObjectPic_MaySurfing_1),
-    obj_frame_tiles(gFieldObjectPic_MaySurfing_1),
-    obj_frame_tiles(gFieldObjectPic_MaySurfing_2),
-    obj_frame_tiles(gFieldObjectPic_MaySurfing_2),
-    obj_frame_tiles(gFieldObjectPic_MaySurfing_3),
-    obj_frame_tiles(gFieldObjectPic_MaySurfing_4),
-    obj_frame_tiles(gFieldObjectPic_MaySurfing_5),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_MayUnderwater[] = {
-    obj_frame_tiles(gFieldObjectPic_MayUnderwater_0),
-    obj_frame_tiles(gFieldObjectPic_MayUnderwater_1),
-    obj_frame_tiles(gFieldObjectPic_MayUnderwater_2),
-    obj_frame_tiles(gFieldObjectPic_MayUnderwater_0),
-    obj_frame_tiles(gFieldObjectPic_MayUnderwater_0),
-    obj_frame_tiles(gFieldObjectPic_MayUnderwater_1),
-    obj_frame_tiles(gFieldObjectPic_MayUnderwater_1),
-    obj_frame_tiles(gFieldObjectPic_MayUnderwater_2),
-    obj_frame_tiles(gFieldObjectPic_MayUnderwater_2),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_MayFieldMove[] = {
-    obj_frame_tiles(gFieldObjectPic_MayFieldMove_0),
-    obj_frame_tiles(gFieldObjectPic_MayFieldMove_1),
-    obj_frame_tiles(gFieldObjectPic_MayFieldMove_2),
-    obj_frame_tiles(gFieldObjectPic_MayFieldMove_3),
-    obj_frame_tiles(gFieldObjectPic_MayFieldMove_4),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Cameraman[] = {
-    obj_frame_tiles(gFieldObjectPic_Cameraman_0),
-    obj_frame_tiles(gFieldObjectPic_Cameraman_1),
-    obj_frame_tiles(gFieldObjectPic_Cameraman_2),
-    obj_frame_tiles(gFieldObjectPic_Cameraman_3),
-    obj_frame_tiles(gFieldObjectPic_Cameraman_4),
-    obj_frame_tiles(gFieldObjectPic_Cameraman_5),
-    obj_frame_tiles(gFieldObjectPic_Cameraman_6),
-    obj_frame_tiles(gFieldObjectPic_Cameraman_7),
-    obj_frame_tiles(gFieldObjectPic_Cameraman_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_MovingBox[] = {
-    obj_frame_tiles(gFieldObjectPic_MovingBox),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_CableCar[] = {
-    obj_frame_tiles(gFieldObjectPic_CableCar),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Scientist2[] = {
-    obj_frame_tiles(gFieldObjectPic_Scientist2_0),
-    obj_frame_tiles(gFieldObjectPic_Scientist2_1),
-    obj_frame_tiles(gFieldObjectPic_Scientist2_2),
-    obj_frame_tiles(gFieldObjectPic_Scientist2_3),
-    obj_frame_tiles(gFieldObjectPic_Scientist2_4),
-    obj_frame_tiles(gFieldObjectPic_Scientist2_5),
-    obj_frame_tiles(gFieldObjectPic_Scientist2_6),
-    obj_frame_tiles(gFieldObjectPic_Scientist2_7),
-    obj_frame_tiles(gFieldObjectPic_Scientist2_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Man7[] = {
-    obj_frame_tiles(gFieldObjectPic_Man7_0),
-    obj_frame_tiles(gFieldObjectPic_Man7_1),
-    obj_frame_tiles(gFieldObjectPic_Man7_2),
-    obj_frame_tiles(gFieldObjectPic_Man7_3),
-    obj_frame_tiles(gFieldObjectPic_Man7_4),
-    obj_frame_tiles(gFieldObjectPic_Man7_5),
-    obj_frame_tiles(gFieldObjectPic_Man7_6),
-    obj_frame_tiles(gFieldObjectPic_Man7_7),
-    obj_frame_tiles(gFieldObjectPic_Man7_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_AquaMemberM[] = {
-    obj_frame_tiles(gFieldObjectPic_AquaMemberM_0),
-    obj_frame_tiles(gFieldObjectPic_AquaMemberM_1),
-    obj_frame_tiles(gFieldObjectPic_AquaMemberM_2),
-    obj_frame_tiles(gFieldObjectPic_AquaMemberM_3),
-    obj_frame_tiles(gFieldObjectPic_AquaMemberM_4),
-    obj_frame_tiles(gFieldObjectPic_AquaMemberM_5),
-    obj_frame_tiles(gFieldObjectPic_AquaMemberM_6),
-    obj_frame_tiles(gFieldObjectPic_AquaMemberM_7),
-    obj_frame_tiles(gFieldObjectPic_AquaMemberM_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_AquaMemberF[] = {
-    obj_frame_tiles(gFieldObjectPic_AquaMemberF_0),
-    obj_frame_tiles(gFieldObjectPic_AquaMemberF_1),
-    obj_frame_tiles(gFieldObjectPic_AquaMemberF_2),
-    obj_frame_tiles(gFieldObjectPic_AquaMemberF_3),
-    obj_frame_tiles(gFieldObjectPic_AquaMemberF_4),
-    obj_frame_tiles(gFieldObjectPic_AquaMemberF_5),
-    obj_frame_tiles(gFieldObjectPic_AquaMemberF_6),
-    obj_frame_tiles(gFieldObjectPic_AquaMemberF_7),
-    obj_frame_tiles(gFieldObjectPic_AquaMemberF_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_MagmaMemberM[] = {
-    obj_frame_tiles(gFieldObjectPic_MagmaMemberM_0),
-    obj_frame_tiles(gFieldObjectPic_MagmaMemberM_1),
-    obj_frame_tiles(gFieldObjectPic_MagmaMemberM_2),
-    obj_frame_tiles(gFieldObjectPic_MagmaMemberM_3),
-    obj_frame_tiles(gFieldObjectPic_MagmaMemberM_4),
-    obj_frame_tiles(gFieldObjectPic_MagmaMemberM_5),
-    obj_frame_tiles(gFieldObjectPic_MagmaMemberM_6),
-    obj_frame_tiles(gFieldObjectPic_MagmaMemberM_7),
-    obj_frame_tiles(gFieldObjectPic_MagmaMemberM_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_MagmaMemberF[] = {
-    obj_frame_tiles(gFieldObjectPic_MagmaMemberF_0),
-    obj_frame_tiles(gFieldObjectPic_MagmaMemberF_1),
-    obj_frame_tiles(gFieldObjectPic_MagmaMemberF_2),
-    obj_frame_tiles(gFieldObjectPic_MagmaMemberF_3),
-    obj_frame_tiles(gFieldObjectPic_MagmaMemberF_4),
-    obj_frame_tiles(gFieldObjectPic_MagmaMemberF_5),
-    obj_frame_tiles(gFieldObjectPic_MagmaMemberF_6),
-    obj_frame_tiles(gFieldObjectPic_MagmaMemberF_7),
-    obj_frame_tiles(gFieldObjectPic_MagmaMemberF_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Sidney[] = {
-    obj_frame_tiles(gFieldObjectPic_Sidney_0),
-    obj_frame_tiles(gFieldObjectPic_Sidney_1),
-    obj_frame_tiles(gFieldObjectPic_Sidney_2),
-    obj_frame_tiles(gFieldObjectPic_Sidney_0),
-    obj_frame_tiles(gFieldObjectPic_Sidney_0),
-    obj_frame_tiles(gFieldObjectPic_Sidney_1),
-    obj_frame_tiles(gFieldObjectPic_Sidney_1),
-    obj_frame_tiles(gFieldObjectPic_Sidney_2),
-    obj_frame_tiles(gFieldObjectPic_Sidney_2),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Phoebe[] = {
-    obj_frame_tiles(gFieldObjectPic_Phoebe_0),
-    obj_frame_tiles(gFieldObjectPic_Phoebe_1),
-    obj_frame_tiles(gFieldObjectPic_Phoebe_2),
-    obj_frame_tiles(gFieldObjectPic_Phoebe_0),
-    obj_frame_tiles(gFieldObjectPic_Phoebe_0),
-    obj_frame_tiles(gFieldObjectPic_Phoebe_1),
-    obj_frame_tiles(gFieldObjectPic_Phoebe_1),
-    obj_frame_tiles(gFieldObjectPic_Phoebe_2),
-    obj_frame_tiles(gFieldObjectPic_Phoebe_2),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Glacia[] = {
-    obj_frame_tiles(gFieldObjectPic_Glacia_0),
-    obj_frame_tiles(gFieldObjectPic_Glacia_1),
-    obj_frame_tiles(gFieldObjectPic_Glacia_2),
-    obj_frame_tiles(gFieldObjectPic_Glacia_0),
-    obj_frame_tiles(gFieldObjectPic_Glacia_0),
-    obj_frame_tiles(gFieldObjectPic_Glacia_1),
-    obj_frame_tiles(gFieldObjectPic_Glacia_1),
-    obj_frame_tiles(gFieldObjectPic_Glacia_2),
-    obj_frame_tiles(gFieldObjectPic_Glacia_2),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Drake[] = {
-    obj_frame_tiles(gFieldObjectPic_Drake_0),
-    obj_frame_tiles(gFieldObjectPic_Drake_1),
-    obj_frame_tiles(gFieldObjectPic_Drake_2),
-    obj_frame_tiles(gFieldObjectPic_Drake_0),
-    obj_frame_tiles(gFieldObjectPic_Drake_0),
-    obj_frame_tiles(gFieldObjectPic_Drake_1),
-    obj_frame_tiles(gFieldObjectPic_Drake_1),
-    obj_frame_tiles(gFieldObjectPic_Drake_2),
-    obj_frame_tiles(gFieldObjectPic_Drake_2),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Roxanne[] = {
-    obj_frame_tiles(gFieldObjectPic_Roxanne_0),
-    obj_frame_tiles(gFieldObjectPic_Roxanne_1),
-    obj_frame_tiles(gFieldObjectPic_Roxanne_2),
-    obj_frame_tiles(gFieldObjectPic_Roxanne_0),
-    obj_frame_tiles(gFieldObjectPic_Roxanne_0),
-    obj_frame_tiles(gFieldObjectPic_Roxanne_1),
-    obj_frame_tiles(gFieldObjectPic_Roxanne_1),
-    obj_frame_tiles(gFieldObjectPic_Roxanne_2),
-    obj_frame_tiles(gFieldObjectPic_Roxanne_2),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Brawly[] = {
-    obj_frame_tiles(gFieldObjectPic_Brawly_0),
-    obj_frame_tiles(gFieldObjectPic_Brawly_1),
-    obj_frame_tiles(gFieldObjectPic_Brawly_2),
-    obj_frame_tiles(gFieldObjectPic_Brawly_0),
-    obj_frame_tiles(gFieldObjectPic_Brawly_0),
-    obj_frame_tiles(gFieldObjectPic_Brawly_1),
-    obj_frame_tiles(gFieldObjectPic_Brawly_1),
-    obj_frame_tiles(gFieldObjectPic_Brawly_2),
-    obj_frame_tiles(gFieldObjectPic_Brawly_2),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Wattson[] = {
-    obj_frame_tiles(gFieldObjectPic_Wattson_0),
-    obj_frame_tiles(gFieldObjectPic_Wattson_1),
-    obj_frame_tiles(gFieldObjectPic_Wattson_2),
-    obj_frame_tiles(gFieldObjectPic_Wattson_0),
-    obj_frame_tiles(gFieldObjectPic_Wattson_0),
-    obj_frame_tiles(gFieldObjectPic_Wattson_1),
-    obj_frame_tiles(gFieldObjectPic_Wattson_1),
-    obj_frame_tiles(gFieldObjectPic_Wattson_2),
-    obj_frame_tiles(gFieldObjectPic_Wattson_2),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Flannery[] = {
-    obj_frame_tiles(gFieldObjectPic_Flannery_0),
-    obj_frame_tiles(gFieldObjectPic_Flannery_1),
-    obj_frame_tiles(gFieldObjectPic_Flannery_2),
-    obj_frame_tiles(gFieldObjectPic_Flannery_0),
-    obj_frame_tiles(gFieldObjectPic_Flannery_0),
-    obj_frame_tiles(gFieldObjectPic_Flannery_1),
-    obj_frame_tiles(gFieldObjectPic_Flannery_1),
-    obj_frame_tiles(gFieldObjectPic_Flannery_2),
-    obj_frame_tiles(gFieldObjectPic_Flannery_2),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Norman[] = {
-    obj_frame_tiles(gFieldObjectPic_Norman_0),
-    obj_frame_tiles(gFieldObjectPic_Norman_1),
-    obj_frame_tiles(gFieldObjectPic_Norman_2),
-    obj_frame_tiles(gFieldObjectPic_Norman_3),
-    obj_frame_tiles(gFieldObjectPic_Norman_4),
-    obj_frame_tiles(gFieldObjectPic_Norman_5),
-    obj_frame_tiles(gFieldObjectPic_Norman_6),
-    obj_frame_tiles(gFieldObjectPic_Norman_7),
-    obj_frame_tiles(gFieldObjectPic_Norman_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Winona[] = {
-    obj_frame_tiles(gFieldObjectPic_Winona_0),
-    obj_frame_tiles(gFieldObjectPic_Winona_1),
-    obj_frame_tiles(gFieldObjectPic_Winona_2),
-    obj_frame_tiles(gFieldObjectPic_Winona_0),
-    obj_frame_tiles(gFieldObjectPic_Winona_0),
-    obj_frame_tiles(gFieldObjectPic_Winona_1),
-    obj_frame_tiles(gFieldObjectPic_Winona_1),
-    obj_frame_tiles(gFieldObjectPic_Winona_2),
-    obj_frame_tiles(gFieldObjectPic_Winona_2),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Liza[] = {
-    obj_frame_tiles(gFieldObjectPic_Liza_0),
-    obj_frame_tiles(gFieldObjectPic_Liza_1),
-    obj_frame_tiles(gFieldObjectPic_Liza_2),
-    obj_frame_tiles(gFieldObjectPic_Liza_0),
-    obj_frame_tiles(gFieldObjectPic_Liza_0),
-    obj_frame_tiles(gFieldObjectPic_Liza_1),
-    obj_frame_tiles(gFieldObjectPic_Liza_1),
-    obj_frame_tiles(gFieldObjectPic_Liza_2),
-    obj_frame_tiles(gFieldObjectPic_Liza_2),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Tate[] = {
-    obj_frame_tiles(gFieldObjectPic_Tate_0),
-    obj_frame_tiles(gFieldObjectPic_Tate_1),
-    obj_frame_tiles(gFieldObjectPic_Tate_2),
-    obj_frame_tiles(gFieldObjectPic_Tate_0),
-    obj_frame_tiles(gFieldObjectPic_Tate_0),
-    obj_frame_tiles(gFieldObjectPic_Tate_1),
-    obj_frame_tiles(gFieldObjectPic_Tate_1),
-    obj_frame_tiles(gFieldObjectPic_Tate_2),
-    obj_frame_tiles(gFieldObjectPic_Tate_2),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Wallace[] = {
-    obj_frame_tiles(gFieldObjectPic_Wallace_0),
-    obj_frame_tiles(gFieldObjectPic_Wallace_1),
-    obj_frame_tiles(gFieldObjectPic_Wallace_2),
-    obj_frame_tiles(gFieldObjectPic_Wallace_3),
-    obj_frame_tiles(gFieldObjectPic_Wallace_4),
-    obj_frame_tiles(gFieldObjectPic_Wallace_5),
-    obj_frame_tiles(gFieldObjectPic_Wallace_6),
-    obj_frame_tiles(gFieldObjectPic_Wallace_7),
-    obj_frame_tiles(gFieldObjectPic_Wallace_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Steven[] = {
-    obj_frame_tiles(gFieldObjectPic_Steven_0),
-    obj_frame_tiles(gFieldObjectPic_Steven_1),
-    obj_frame_tiles(gFieldObjectPic_Steven_2),
-    obj_frame_tiles(gFieldObjectPic_Steven_3),
-    obj_frame_tiles(gFieldObjectPic_Steven_4),
-    obj_frame_tiles(gFieldObjectPic_Steven_5),
-    obj_frame_tiles(gFieldObjectPic_Steven_6),
-    obj_frame_tiles(gFieldObjectPic_Steven_7),
-    obj_frame_tiles(gFieldObjectPic_Steven_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Wally[] = {
-    obj_frame_tiles(gFieldObjectPic_Wally_0),
-    obj_frame_tiles(gFieldObjectPic_Wally_1),
-    obj_frame_tiles(gFieldObjectPic_Wally_2),
-    obj_frame_tiles(gFieldObjectPic_Wally_3),
-    obj_frame_tiles(gFieldObjectPic_Wally_4),
-    obj_frame_tiles(gFieldObjectPic_Wally_5),
-    obj_frame_tiles(gFieldObjectPic_Wally_6),
-    obj_frame_tiles(gFieldObjectPic_Wally_7),
-    obj_frame_tiles(gFieldObjectPic_Wally_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_RubySapphireLittleBoy[] = {
-    obj_frame_tiles(gFieldObjectPic_RubySapphireLittleBoy_0),
-    obj_frame_tiles(gFieldObjectPic_RubySapphireLittleBoy_1),
-    obj_frame_tiles(gFieldObjectPic_RubySapphireLittleBoy_2),
-    obj_frame_tiles(gFieldObjectPic_RubySapphireLittleBoy_3),
-    obj_frame_tiles(gFieldObjectPic_RubySapphireLittleBoy_4),
-    obj_frame_tiles(gFieldObjectPic_RubySapphireLittleBoy_5),
-    obj_frame_tiles(gFieldObjectPic_RubySapphireLittleBoy_6),
-    obj_frame_tiles(gFieldObjectPic_RubySapphireLittleBoy_7),
-    obj_frame_tiles(gFieldObjectPic_RubySapphireLittleBoy_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_BrendanFishing[] = {
-    obj_frame_tiles(gFieldObjectPic_BrendanFishing_0),
-    obj_frame_tiles(gFieldObjectPic_BrendanFishing_1),
-    obj_frame_tiles(gFieldObjectPic_BrendanFishing_2),
-    obj_frame_tiles(gFieldObjectPic_BrendanFishing_3),
-    obj_frame_tiles(gFieldObjectPic_BrendanFishing_4),
-    obj_frame_tiles(gFieldObjectPic_BrendanFishing_5),
-    obj_frame_tiles(gFieldObjectPic_BrendanFishing_6),
-    obj_frame_tiles(gFieldObjectPic_BrendanFishing_7),
-    obj_frame_tiles(gFieldObjectPic_BrendanFishing_8),
-    obj_frame_tiles(gFieldObjectPic_BrendanFishing_9),
-    obj_frame_tiles(gFieldObjectPic_BrendanFishing_10),
-    obj_frame_tiles(gFieldObjectPic_BrendanFishing_11),
+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 gFieldObjectPicTable_MayFishing[] = {
-    obj_frame_tiles(gFieldObjectPic_MayFishing_0),
-    obj_frame_tiles(gFieldObjectPic_MayFishing_1),
-    obj_frame_tiles(gFieldObjectPic_MayFishing_2),
-    obj_frame_tiles(gFieldObjectPic_MayFishing_3),
-    obj_frame_tiles(gFieldObjectPic_MayFishing_4),
-    obj_frame_tiles(gFieldObjectPic_MayFishing_5),
-    obj_frame_tiles(gFieldObjectPic_MayFishing_6),
-    obj_frame_tiles(gFieldObjectPic_MayFishing_7),
-    obj_frame_tiles(gFieldObjectPic_MayFishing_8),
-    obj_frame_tiles(gFieldObjectPic_MayFishing_9),
-    obj_frame_tiles(gFieldObjectPic_MayFishing_10),
-    obj_frame_tiles(gFieldObjectPic_MayFishing_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 gFieldObjectPicTable_HotSpringsOldWoman[] = {
-    obj_frame_tiles(gFieldObjectPic_HotSpringsOldWoman_0),
-    obj_frame_tiles(gFieldObjectPic_HotSpringsOldWoman_1),
-    obj_frame_tiles(gFieldObjectPic_HotSpringsOldWoman_2),
-    obj_frame_tiles(gFieldObjectPic_HotSpringsOldWoman_3),
-    obj_frame_tiles(gFieldObjectPic_HotSpringsOldWoman_4),
-    obj_frame_tiles(gFieldObjectPic_HotSpringsOldWoman_5),
-    obj_frame_tiles(gFieldObjectPic_HotSpringsOldWoman_6),
-    obj_frame_tiles(gFieldObjectPic_HotSpringsOldWoman_7),
-    obj_frame_tiles(gFieldObjectPic_HotSpringsOldWoman_8),
+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 gFieldObjectPicTable_SSTidal[] = {
-    obj_frame_tiles(gFieldObjectPic_SSTidal),
-    obj_frame_tiles(gFieldObjectPic_SSTidal),
-    obj_frame_tiles(gFieldObjectPic_SSTidal),
-    obj_frame_tiles(gFieldObjectPic_SSTidal),
-    obj_frame_tiles(gFieldObjectPic_SSTidal),
-    obj_frame_tiles(gFieldObjectPic_SSTidal),
-    obj_frame_tiles(gFieldObjectPic_SSTidal),
-    obj_frame_tiles(gFieldObjectPic_SSTidal),
-    obj_frame_tiles(gFieldObjectPic_SSTidal),
+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 gFieldObjectPicTable_SubmarineShadow[] = {
-    obj_frame_tiles(gFieldObjectPic_SubmarineShadow),
-    obj_frame_tiles(gFieldObjectPic_SubmarineShadow),
-    obj_frame_tiles(gFieldObjectPic_SubmarineShadow),
-    obj_frame_tiles(gFieldObjectPic_SubmarineShadow),
-    obj_frame_tiles(gFieldObjectPic_SubmarineShadow),
-    obj_frame_tiles(gFieldObjectPic_SubmarineShadow),
-    obj_frame_tiles(gFieldObjectPic_SubmarineShadow),
-    obj_frame_tiles(gFieldObjectPic_SubmarineShadow),
-    obj_frame_tiles(gFieldObjectPic_SubmarineShadow),
+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 gFieldObjectPicTable_PichuDoll[] = {
-    obj_frame_tiles(gFieldObjectPic_PichuDoll),
+const struct SpriteFrameImage gEventObjectPicTable_PichuDoll[] = {
+    obj_frame_tiles(gEventObjectPic_PichuDoll),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_PikachuDoll[] = {
-    obj_frame_tiles(gFieldObjectPic_PikachuDoll),
+const struct SpriteFrameImage gEventObjectPicTable_PikachuDoll[] = {
+    obj_frame_tiles(gEventObjectPic_PikachuDoll),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_MarillDoll[] = {
-    obj_frame_tiles(gFieldObjectPic_MarillDoll),
+const struct SpriteFrameImage gEventObjectPicTable_MarillDoll[] = {
+    obj_frame_tiles(gEventObjectPic_MarillDoll),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_TogepiDoll[] = {
-    obj_frame_tiles(gFieldObjectPic_TogepiDoll),
+const struct SpriteFrameImage gEventObjectPicTable_TogepiDoll[] = {
+    obj_frame_tiles(gEventObjectPic_TogepiDoll),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_CyndaquilDoll[] = {
-    obj_frame_tiles(gFieldObjectPic_CyndaquilDoll),
+const struct SpriteFrameImage gEventObjectPicTable_CyndaquilDoll[] = {
+    obj_frame_tiles(gEventObjectPic_CyndaquilDoll),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_ChikoritaDoll[] = {
-    obj_frame_tiles(gFieldObjectPic_ChikoritaDoll),
+const struct SpriteFrameImage gEventObjectPicTable_ChikoritaDoll[] = {
+    obj_frame_tiles(gEventObjectPic_ChikoritaDoll),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_TotodileDoll[] = {
-    obj_frame_tiles(gFieldObjectPic_TotodileDoll),
+const struct SpriteFrameImage gEventObjectPicTable_TotodileDoll[] = {
+    obj_frame_tiles(gEventObjectPic_TotodileDoll),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_JigglypuffDoll[] = {
-    obj_frame_tiles(gFieldObjectPic_JigglypuffDoll),
+const struct SpriteFrameImage gEventObjectPicTable_JigglypuffDoll[] = {
+    obj_frame_tiles(gEventObjectPic_JigglypuffDoll),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_MeowthDoll[] = {
-    obj_frame_tiles(gFieldObjectPic_MeowthDoll),
+const struct SpriteFrameImage gEventObjectPicTable_MeowthDoll[] = {
+    obj_frame_tiles(gEventObjectPic_MeowthDoll),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_ClefairyDoll[] = {
-    obj_frame_tiles(gFieldObjectPic_ClefairyDoll),
+const struct SpriteFrameImage gEventObjectPicTable_ClefairyDoll[] = {
+    obj_frame_tiles(gEventObjectPic_ClefairyDoll),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_DittoDoll[] = {
-    obj_frame_tiles(gFieldObjectPic_DittoDoll),
+const struct SpriteFrameImage gEventObjectPicTable_DittoDoll[] = {
+    obj_frame_tiles(gEventObjectPic_DittoDoll),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_SmoochumDoll[] = {
-    obj_frame_tiles(gFieldObjectPic_SmoochumDoll),
+const struct SpriteFrameImage gEventObjectPicTable_SmoochumDoll[] = {
+    obj_frame_tiles(gEventObjectPic_SmoochumDoll),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_TreeckoDoll[] = {
-    obj_frame_tiles(gFieldObjectPic_TreeckoDoll),
+const struct SpriteFrameImage gEventObjectPicTable_TreeckoDoll[] = {
+    obj_frame_tiles(gEventObjectPic_TreeckoDoll),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_TorchicDoll[] = {
-    obj_frame_tiles(gFieldObjectPic_TorchicDoll),
+const struct SpriteFrameImage gEventObjectPicTable_TorchicDoll[] = {
+    obj_frame_tiles(gEventObjectPic_TorchicDoll),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_MudkipDoll[] = {
-    obj_frame_tiles(gFieldObjectPic_MudkipDoll),
+const struct SpriteFrameImage gEventObjectPicTable_MudkipDoll[] = {
+    obj_frame_tiles(gEventObjectPic_MudkipDoll),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_DuskullDoll[] = {
-    obj_frame_tiles(gFieldObjectPic_DuskullDoll),
+const struct SpriteFrameImage gEventObjectPicTable_DuskullDoll[] = {
+    obj_frame_tiles(gEventObjectPic_DuskullDoll),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_WynautDoll[] = {
-    obj_frame_tiles(gFieldObjectPic_WynautDoll),
+const struct SpriteFrameImage gEventObjectPicTable_WynautDoll[] = {
+    obj_frame_tiles(gEventObjectPic_WynautDoll),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_BaltoyDoll[] = {
-    obj_frame_tiles(gFieldObjectPic_BaltoyDoll),
+const struct SpriteFrameImage gEventObjectPicTable_BaltoyDoll[] = {
+    obj_frame_tiles(gEventObjectPic_BaltoyDoll),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_KecleonDoll[] = {
-    obj_frame_tiles(gFieldObjectPic_KecleonDoll),
+const struct SpriteFrameImage gEventObjectPicTable_KecleonDoll[] = {
+    obj_frame_tiles(gEventObjectPic_KecleonDoll),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_AzurillDoll[] = {
-    obj_frame_tiles(gFieldObjectPic_AzurillDoll),
+const struct SpriteFrameImage gEventObjectPicTable_AzurillDoll[] = {
+    obj_frame_tiles(gEventObjectPic_AzurillDoll),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_SkittyDoll[] = {
-    obj_frame_tiles(gFieldObjectPic_SkittyDoll),
+const struct SpriteFrameImage gEventObjectPicTable_SkittyDoll[] = {
+    obj_frame_tiles(gEventObjectPic_SkittyDoll),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_SwabluDoll[] = {
-    obj_frame_tiles(gFieldObjectPic_SwabluDoll),
+const struct SpriteFrameImage gEventObjectPicTable_SwabluDoll[] = {
+    obj_frame_tiles(gEventObjectPic_SwabluDoll),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_GulpinDoll[] = {
-    obj_frame_tiles(gFieldObjectPic_GulpinDoll),
+const struct SpriteFrameImage gEventObjectPicTable_GulpinDoll[] = {
+    obj_frame_tiles(gEventObjectPic_GulpinDoll),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_LotadDoll[] = {
-    obj_frame_tiles(gFieldObjectPic_LotadDoll),
+const struct SpriteFrameImage gEventObjectPicTable_LotadDoll[] = {
+    obj_frame_tiles(gEventObjectPic_LotadDoll),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_SeedotDoll[] = {
-    obj_frame_tiles(gFieldObjectPic_SeedotDoll),
+const struct SpriteFrameImage gEventObjectPicTable_SeedotDoll[] = {
+    obj_frame_tiles(gEventObjectPic_SeedotDoll),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_PikaCushion[] = {
-    obj_frame_tiles(gFieldObjectPic_PikaCushion),
+const struct SpriteFrameImage gEventObjectPicTable_PikaCushion[] = {
+    obj_frame_tiles(gEventObjectPic_PikaCushion),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_RoundCushion[] = {
-    obj_frame_tiles(gFieldObjectPic_RoundCushion),
+const struct SpriteFrameImage gEventObjectPicTable_RoundCushion[] = {
+    obj_frame_tiles(gEventObjectPic_RoundCushion),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_KissCushion[] = {
-    obj_frame_tiles(gFieldObjectPic_KissCushion),
+const struct SpriteFrameImage gEventObjectPicTable_KissCushion[] = {
+    obj_frame_tiles(gEventObjectPic_KissCushion),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_ZigzagCushion[] = {
-    obj_frame_tiles(gFieldObjectPic_ZigzagCushion),
+const struct SpriteFrameImage gEventObjectPicTable_ZigzagCushion[] = {
+    obj_frame_tiles(gEventObjectPic_ZigzagCushion),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_SpinCushion[] = {
-    obj_frame_tiles(gFieldObjectPic_SpinCushion),
+const struct SpriteFrameImage gEventObjectPicTable_SpinCushion[] = {
+    obj_frame_tiles(gEventObjectPic_SpinCushion),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_DiamondCushion[] = {
-    obj_frame_tiles(gFieldObjectPic_DiamondCushion),
+const struct SpriteFrameImage gEventObjectPicTable_DiamondCushion[] = {
+    obj_frame_tiles(gEventObjectPic_DiamondCushion),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_BallCushion[] = {
-    obj_frame_tiles(gFieldObjectPic_BallCushion),
+const struct SpriteFrameImage gEventObjectPicTable_BallCushion[] = {
+    obj_frame_tiles(gEventObjectPic_BallCushion),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_GrassCushion[] = {
-    obj_frame_tiles(gFieldObjectPic_GrassCushion),
+const struct SpriteFrameImage gEventObjectPicTable_GrassCushion[] = {
+    obj_frame_tiles(gEventObjectPic_GrassCushion),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_FireCushion[] = {
-    obj_frame_tiles(gFieldObjectPic_FireCushion),
+const struct SpriteFrameImage gEventObjectPicTable_FireCushion[] = {
+    obj_frame_tiles(gEventObjectPic_FireCushion),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_WaterCushion[] = {
-    obj_frame_tiles(gFieldObjectPic_WaterCushion),
+const struct SpriteFrameImage gEventObjectPicTable_WaterCushion[] = {
+    obj_frame_tiles(gEventObjectPic_WaterCushion),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_BigSnorlaxDoll[] = {
-    obj_frame_tiles(gFieldObjectPic_BigSnorlaxDoll),
+const struct SpriteFrameImage gEventObjectPicTable_BigSnorlaxDoll[] = {
+    obj_frame_tiles(gEventObjectPic_BigSnorlaxDoll),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_BigRhydonDoll[] = {
-    obj_frame_tiles(gFieldObjectPic_BigRhydonDoll),
+const struct SpriteFrameImage gEventObjectPicTable_BigRhydonDoll[] = {
+    obj_frame_tiles(gEventObjectPic_BigRhydonDoll),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_BigLaprasDoll[] = {
-    obj_frame_tiles(gFieldObjectPic_BigLaprasDoll),
+const struct SpriteFrameImage gEventObjectPicTable_BigLaprasDoll[] = {
+    obj_frame_tiles(gEventObjectPic_BigLaprasDoll),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_BigVenusaurDoll[] = {
-    obj_frame_tiles(gFieldObjectPic_BigVenusaurDoll),
+const struct SpriteFrameImage gEventObjectPicTable_BigVenusaurDoll[] = {
+    obj_frame_tiles(gEventObjectPic_BigVenusaurDoll),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_BigCharizardDoll[] = {
-    obj_frame_tiles(gFieldObjectPic_BigCharizardDoll),
+const struct SpriteFrameImage gEventObjectPicTable_BigCharizardDoll[] = {
+    obj_frame_tiles(gEventObjectPic_BigCharizardDoll),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_BigBlastoiseDoll[] = {
-    obj_frame_tiles(gFieldObjectPic_BigBlastoiseDoll),
+const struct SpriteFrameImage gEventObjectPicTable_BigBlastoiseDoll[] = {
+    obj_frame_tiles(gEventObjectPic_BigBlastoiseDoll),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_BigWailmerDoll[] = {
-    obj_frame_tiles(gFieldObjectPic_BigWailmerDoll),
+const struct SpriteFrameImage gEventObjectPicTable_BigWailmerDoll[] = {
+    obj_frame_tiles(gEventObjectPic_BigWailmerDoll),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_BigRegirockDoll[] = {
-    obj_frame_tiles(gFieldObjectPic_BigRegirockDoll),
+const struct SpriteFrameImage gEventObjectPicTable_BigRegirockDoll[] = {
+    obj_frame_tiles(gEventObjectPic_BigRegirockDoll),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_BigRegiceDoll[] = {
-    obj_frame_tiles(gFieldObjectPic_BigRegiceDoll),
+const struct SpriteFrameImage gEventObjectPicTable_BigRegiceDoll[] = {
+    obj_frame_tiles(gEventObjectPic_BigRegiceDoll),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_BigRegisteelDoll[] = {
-    obj_frame_tiles(gFieldObjectPic_BigRegisteelDoll),
+const struct SpriteFrameImage gEventObjectPicTable_BigRegisteelDoll[] = {
+    obj_frame_tiles(gEventObjectPic_BigRegisteelDoll),
 };
 
-const struct SpriteFrameImage gFieldObjectPicTable_LatiasLatios[] = {
-    obj_frame_tiles(gFieldObjectPic_LatiasLatios_0),
-    obj_frame_tiles(gFieldObjectPic_LatiasLatios_0),
-    obj_frame_tiles(gFieldObjectPic_LatiasLatios_0),
-    obj_frame_tiles(gFieldObjectPic_LatiasLatios_1),
-    obj_frame_tiles(gFieldObjectPic_LatiasLatios_2),
-    obj_frame_tiles(gFieldObjectPic_LatiasLatios_1),
-    obj_frame_tiles(gFieldObjectPic_LatiasLatios_2),
-    obj_frame_tiles(gFieldObjectPic_LatiasLatios_1),
-    obj_frame_tiles(gFieldObjectPic_LatiasLatios_2),
+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 gFieldObjectPicTable_Boy5[] = {
-    obj_frame_tiles(gFieldObjectPic_Boy5_0),
-    obj_frame_tiles(gFieldObjectPic_Boy5_1),
-    obj_frame_tiles(gFieldObjectPic_Boy5_2),
-    obj_frame_tiles(gFieldObjectPic_Boy5_0),
-    obj_frame_tiles(gFieldObjectPic_Boy5_0),
-    obj_frame_tiles(gFieldObjectPic_Boy5_1),
-    obj_frame_tiles(gFieldObjectPic_Boy5_1),
-    obj_frame_tiles(gFieldObjectPic_Boy5_2),
-    obj_frame_tiles(gFieldObjectPic_Boy5_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 gFieldObjectPicTable_ContestOldMan[] = {
-    obj_frame_tiles(gFieldObjectPic_ContestOldMan_0),
-    obj_frame_tiles(gFieldObjectPic_ContestOldMan_1),
-    obj_frame_tiles(gFieldObjectPic_ContestOldMan_2),
-    obj_frame_tiles(gFieldObjectPic_ContestOldMan_3),
-    obj_frame_tiles(gFieldObjectPic_ContestOldMan_4),
-    obj_frame_tiles(gFieldObjectPic_ContestOldMan_5),
-    obj_frame_tiles(gFieldObjectPic_ContestOldMan_6),
-    obj_frame_tiles(gFieldObjectPic_ContestOldMan_7),
-    obj_frame_tiles(gFieldObjectPic_ContestOldMan_8),
+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 gFieldObjectPicTable_BrendanWatering[] = {
-    obj_frame_tiles(gFieldObjectPic_BrendanWatering_0),
-    obj_frame_tiles(gFieldObjectPic_BrendanWatering_1),
-    obj_frame_tiles(gFieldObjectPic_BrendanWatering_2),
-    obj_frame_tiles(gFieldObjectPic_BrendanWatering_3),
-    obj_frame_tiles(gFieldObjectPic_BrendanWatering_3),
-    obj_frame_tiles(gFieldObjectPic_BrendanWatering_4),
-    obj_frame_tiles(gFieldObjectPic_BrendanWatering_4),
-    obj_frame_tiles(gFieldObjectPic_BrendanWatering_5),
-    obj_frame_tiles(gFieldObjectPic_BrendanWatering_5),
+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 gFieldObjectPicTable_MayWatering[] = {
-    obj_frame_tiles(gFieldObjectPic_MayWatering_0),
-    obj_frame_tiles(gFieldObjectPic_MayWatering_1),
-    obj_frame_tiles(gFieldObjectPic_MayWatering_2),
-    obj_frame_tiles(gFieldObjectPic_MayWatering_3),
-    obj_frame_tiles(gFieldObjectPic_MayWatering_3),
-    obj_frame_tiles(gFieldObjectPic_MayWatering_4),
-    obj_frame_tiles(gFieldObjectPic_MayWatering_4),
-    obj_frame_tiles(gFieldObjectPic_MayWatering_5),
-    obj_frame_tiles(gFieldObjectPic_MayWatering_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 gFieldObjectPicTable_BrendanDecorating[] = {
-    obj_frame_tiles(gFieldObjectPic_BrendanDecorating),
+const struct SpriteFrameImage gEventObjectPicTable_BrendanDecorating[] = {
+    obj_frame_tiles(gEventObjectPic_BrendanDecorating),
 };
-
-const struct SpriteFrameImage gFieldObjectPicTable_MayDecorating[] = {
-    obj_frame_tiles(gFieldObjectPic_MayDecorating),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Archie[] = {
-    obj_frame_tiles(gFieldObjectPic_Archie_0),
-    obj_frame_tiles(gFieldObjectPic_Archie_1),
-    obj_frame_tiles(gFieldObjectPic_Archie_2),
-    obj_frame_tiles(gFieldObjectPic_Archie_3),
-    obj_frame_tiles(gFieldObjectPic_Archie_4),
-    obj_frame_tiles(gFieldObjectPic_Archie_5),
-    obj_frame_tiles(gFieldObjectPic_Archie_6),
-    obj_frame_tiles(gFieldObjectPic_Archie_7),
-    obj_frame_tiles(gFieldObjectPic_Archie_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Maxie[] = {
-    obj_frame_tiles(gFieldObjectPic_Maxie_0),
-    obj_frame_tiles(gFieldObjectPic_Maxie_1),
-    obj_frame_tiles(gFieldObjectPic_Maxie_2),
-    obj_frame_tiles(gFieldObjectPic_Maxie_3),
-    obj_frame_tiles(gFieldObjectPic_Maxie_4),
-    obj_frame_tiles(gFieldObjectPic_Maxie_5),
-    obj_frame_tiles(gFieldObjectPic_Maxie_6),
-    obj_frame_tiles(gFieldObjectPic_Maxie_7),
-    obj_frame_tiles(gFieldObjectPic_Maxie_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_KyogreFront[] = {
-    obj_frame_tiles(gFieldObjectPic_KyogreFront_0),
-    obj_frame_tiles(gFieldObjectPic_KyogreFront_0),
-    obj_frame_tiles(gFieldObjectPic_KyogreFront_0),
-    obj_frame_tiles(gFieldObjectPic_KyogreFront_1),
-    obj_frame_tiles(gFieldObjectPic_KyogreFront_1),
-    obj_frame_tiles(gFieldObjectPic_KyogreFront_1),
-    obj_frame_tiles(gFieldObjectPic_KyogreFront_1),
-    obj_frame_tiles(gFieldObjectPic_KyogreFront_1),
-    obj_frame_tiles(gFieldObjectPic_KyogreFront_1),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_GroudonFront[] = {
-    obj_frame_tiles(gFieldObjectPic_GroudonFront_0),
-    obj_frame_tiles(gFieldObjectPic_GroudonFront_0),
-    obj_frame_tiles(gFieldObjectPic_GroudonFront_0),
-    obj_frame_tiles(gFieldObjectPic_GroudonFront_1),
-    obj_frame_tiles(gFieldObjectPic_GroudonFront_1),
-    obj_frame_tiles(gFieldObjectPic_GroudonFront_1),
-    obj_frame_tiles(gFieldObjectPic_GroudonFront_1),
-    obj_frame_tiles(gFieldObjectPic_GroudonFront_1),
-    obj_frame_tiles(gFieldObjectPic_GroudonFront_1),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_KyogreSide[] = {
-    obj_frame_tiles(gFieldObjectPic_KyogreSide_0),
-    obj_frame_tiles(gFieldObjectPic_KyogreSide_0),
-    obj_frame_tiles(gFieldObjectPic_KyogreSide_0),
-    obj_frame_tiles(gFieldObjectPic_KyogreSide_1),
-    obj_frame_tiles(gFieldObjectPic_KyogreSide_1),
-    obj_frame_tiles(gFieldObjectPic_KyogreSide_1),
-    obj_frame_tiles(gFieldObjectPic_KyogreSide_1),
-    obj_frame_tiles(gFieldObjectPic_KyogreSide_1),
-    obj_frame_tiles(gFieldObjectPic_KyogreSide_1),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_GroudonSide[] = {
-    obj_frame_tiles(gFieldObjectPic_GroudonSide_0),
-    obj_frame_tiles(gFieldObjectPic_GroudonSide_0),
-    obj_frame_tiles(gFieldObjectPic_GroudonSide_0),
-    obj_frame_tiles(gFieldObjectPic_GroudonSide_1),
-    obj_frame_tiles(gFieldObjectPic_GroudonSide_1),
-    obj_frame_tiles(gFieldObjectPic_GroudonSide_1),
-    obj_frame_tiles(gFieldObjectPic_GroudonSide_1),
-    obj_frame_tiles(gFieldObjectPic_GroudonSide_1),
-    obj_frame_tiles(gFieldObjectPic_GroudonSide_1),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Fossil[] = {
-    obj_frame_tiles(gFieldObjectPic_Fossil),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Regi[] = {
-    obj_frame_tiles(gFieldObjectPic_Regi),
-    obj_frame_tiles(gFieldObjectPic_Regi),
-    obj_frame_tiles(gFieldObjectPic_Regi),
-    obj_frame_tiles(gFieldObjectPic_Regi),
-    obj_frame_tiles(gFieldObjectPic_Regi),
-    obj_frame_tiles(gFieldObjectPic_Regi),
-    obj_frame_tiles(gFieldObjectPic_Regi),
-    obj_frame_tiles(gFieldObjectPic_Regi),
-    obj_frame_tiles(gFieldObjectPic_Regi),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Skitty[] = {
-    obj_frame_tiles(gFieldObjectPic_Skitty_0),
-    obj_frame_tiles(gFieldObjectPic_Skitty_1),
-    obj_frame_tiles(gFieldObjectPic_Skitty_2),
-    obj_frame_tiles(gFieldObjectPic_Skitty_0),
-    obj_frame_tiles(gFieldObjectPic_Skitty_0),
-    obj_frame_tiles(gFieldObjectPic_Skitty_1),
-    obj_frame_tiles(gFieldObjectPic_Skitty_1),
-    obj_frame_tiles(gFieldObjectPic_Skitty_2),
-    obj_frame_tiles(gFieldObjectPic_Skitty_2),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Kecleon[] = {
-    obj_frame_tiles(gFieldObjectPic_Kecleon_0),
-    obj_frame_tiles(gFieldObjectPic_Kecleon_1),
-    obj_frame_tiles(gFieldObjectPic_Kecleon_2),
-    obj_frame_tiles(gFieldObjectPic_Kecleon_0),
-    obj_frame_tiles(gFieldObjectPic_Kecleon_0),
-    obj_frame_tiles(gFieldObjectPic_Kecleon_1),
-    obj_frame_tiles(gFieldObjectPic_Kecleon_1),
-    obj_frame_tiles(gFieldObjectPic_Kecleon_2),
-    obj_frame_tiles(gFieldObjectPic_Kecleon_2),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Rayquaza[] = {
-    obj_frame_tiles(gFieldObjectPic_Rayquaza_0),
-    obj_frame_tiles(gFieldObjectPic_Rayquaza_1),
-    obj_frame_tiles(gFieldObjectPic_Rayquaza_2),
-    obj_frame_tiles(gFieldObjectPic_Rayquaza_3),
-    obj_frame_tiles(gFieldObjectPic_Rayquaza_4),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_RayquazaStill[] = {
-    obj_frame_tiles(gFieldObjectPic_RayquazaStill),
-    obj_frame_tiles(gFieldObjectPic_RayquazaStill),
-    obj_frame_tiles(gFieldObjectPic_RayquazaStill),
-    obj_frame_tiles(gFieldObjectPic_RayquazaStill),
-    obj_frame_tiles(gFieldObjectPic_RayquazaStill),
-    obj_frame_tiles(gFieldObjectPic_RayquazaStill),
-    obj_frame_tiles(gFieldObjectPic_RayquazaStill),
-    obj_frame_tiles(gFieldObjectPic_RayquazaStill),
-    obj_frame_tiles(gFieldObjectPic_RayquazaStill),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Zigzagoon[] = {
-    obj_frame_tiles(gFieldObjectPic_Zigzagoon_0),
-    obj_frame_tiles(gFieldObjectPic_Zigzagoon_1),
-    obj_frame_tiles(gFieldObjectPic_Zigzagoon_2),
-    obj_frame_tiles(gFieldObjectPic_Zigzagoon_0),
-    obj_frame_tiles(gFieldObjectPic_Zigzagoon_0),
-    obj_frame_tiles(gFieldObjectPic_Zigzagoon_1),
-    obj_frame_tiles(gFieldObjectPic_Zigzagoon_1),
-    obj_frame_tiles(gFieldObjectPic_Zigzagoon_2),
-    obj_frame_tiles(gFieldObjectPic_Zigzagoon_2),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Pikachu[] = {
-    obj_frame_tiles(gFieldObjectPic_Pikachu_0),
-    obj_frame_tiles(gFieldObjectPic_Pikachu_1),
-    obj_frame_tiles(gFieldObjectPic_Pikachu_2),
-    obj_frame_tiles(gFieldObjectPic_Pikachu_0),
-    obj_frame_tiles(gFieldObjectPic_Pikachu_0),
-    obj_frame_tiles(gFieldObjectPic_Pikachu_1),
-    obj_frame_tiles(gFieldObjectPic_Pikachu_1),
-    obj_frame_tiles(gFieldObjectPic_Pikachu_2),
-    obj_frame_tiles(gFieldObjectPic_Pikachu_2),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Azumarill[] = {
-    obj_frame_tiles(gFieldObjectPic_Azumarill_0),
-    obj_frame_tiles(gFieldObjectPic_Azumarill_1),
-    obj_frame_tiles(gFieldObjectPic_Azumarill_2),
-    obj_frame_tiles(gFieldObjectPic_Azumarill_0),
-    obj_frame_tiles(gFieldObjectPic_Azumarill_0),
-    obj_frame_tiles(gFieldObjectPic_Azumarill_1),
-    obj_frame_tiles(gFieldObjectPic_Azumarill_1),
-    obj_frame_tiles(gFieldObjectPic_Azumarill_2),
-    obj_frame_tiles(gFieldObjectPic_Azumarill_2),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Wingull[] = {
-    obj_frame_tiles(gFieldObjectPic_Wingull_0),
-    obj_frame_tiles(gFieldObjectPic_Wingull_1),
-    obj_frame_tiles(gFieldObjectPic_Wingull_2),
-    obj_frame_tiles(gFieldObjectPic_Wingull_3),
-    obj_frame_tiles(gFieldObjectPic_Wingull_3),
-    obj_frame_tiles(gFieldObjectPic_Wingull_4),
-    obj_frame_tiles(gFieldObjectPic_Wingull_4),
-    obj_frame_tiles(gFieldObjectPic_Wingull_5),
-    obj_frame_tiles(gFieldObjectPic_Wingull_5),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_TuberMSwimming[] = {
-    obj_frame_tiles(gFieldObjectPic_TuberMSwimming_0),
-    obj_frame_tiles(gFieldObjectPic_TuberMSwimming_1),
-    obj_frame_tiles(gFieldObjectPic_TuberMSwimming_2),
-    obj_frame_tiles(gFieldObjectPic_TuberMSwimming_3),
-    obj_frame_tiles(gFieldObjectPic_TuberMSwimming_4),
-    obj_frame_tiles(gFieldObjectPic_TuberMSwimming_5),
-    obj_frame_tiles(gFieldObjectPic_TuberMSwimming_6),
-    obj_frame_tiles(gFieldObjectPic_TuberMSwimming_7),
-    obj_frame_tiles(gFieldObjectPic_TuberMSwimming_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Azurill[] = {
-    obj_frame_tiles(gFieldObjectPic_Azurill_0),
-    obj_frame_tiles(gFieldObjectPic_Azurill_1),
-    obj_frame_tiles(gFieldObjectPic_Azurill_2),
-    obj_frame_tiles(gFieldObjectPic_Azurill_0),
-    obj_frame_tiles(gFieldObjectPic_Azurill_0),
-    obj_frame_tiles(gFieldObjectPic_Azurill_1),
-    obj_frame_tiles(gFieldObjectPic_Azurill_1),
-    obj_frame_tiles(gFieldObjectPic_Azurill_2),
-    obj_frame_tiles(gFieldObjectPic_Azurill_2),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Mom[] = {
-    obj_frame_tiles(gFieldObjectPic_Mom_0),
-    obj_frame_tiles(gFieldObjectPic_Mom_1),
-    obj_frame_tiles(gFieldObjectPic_Mom_2),
-    obj_frame_tiles(gFieldObjectPic_Mom_3),
-    obj_frame_tiles(gFieldObjectPic_Mom_4),
-    obj_frame_tiles(gFieldObjectPic_Mom_5),
-    obj_frame_tiles(gFieldObjectPic_Mom_6),
-    obj_frame_tiles(gFieldObjectPic_Mom_7),
-    obj_frame_tiles(gFieldObjectPic_Mom_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Scott[] = {
-    obj_frame_tiles(gFieldObjectPic_Scott_0),
-    obj_frame_tiles(gFieldObjectPic_Scott_1),
-    obj_frame_tiles(gFieldObjectPic_Scott_2),
-    obj_frame_tiles(gFieldObjectPic_Scott_3),
-    obj_frame_tiles(gFieldObjectPic_Scott_4),
-    obj_frame_tiles(gFieldObjectPic_Scott_5),
-    obj_frame_tiles(gFieldObjectPic_Scott_6),
-    obj_frame_tiles(gFieldObjectPic_Scott_7),
-    obj_frame_tiles(gFieldObjectPic_Scott_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Juan[] = {
-    obj_frame_tiles(gFieldObjectPic_Juan_0),
-    obj_frame_tiles(gFieldObjectPic_Juan_1),
-    obj_frame_tiles(gFieldObjectPic_Juan_2),
-    obj_frame_tiles(gFieldObjectPic_Juan_3),
-    obj_frame_tiles(gFieldObjectPic_Juan_4),
-    obj_frame_tiles(gFieldObjectPic_Juan_5),
-    obj_frame_tiles(gFieldObjectPic_Juan_6),
-    obj_frame_tiles(gFieldObjectPic_Juan_7),
-    obj_frame_tiles(gFieldObjectPic_Juan_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_MysteryEventDeliveryman[] = {
-    obj_frame_tiles(gFieldObjectPic_MysteryEventDeliveryman_0),
-    obj_frame_tiles(gFieldObjectPic_MysteryEventDeliveryman_1),
-    obj_frame_tiles(gFieldObjectPic_MysteryEventDeliveryman_2),
-    obj_frame_tiles(gFieldObjectPic_MysteryEventDeliveryman_0),
-    obj_frame_tiles(gFieldObjectPic_MysteryEventDeliveryman_0),
-    obj_frame_tiles(gFieldObjectPic_MysteryEventDeliveryman_1),
-    obj_frame_tiles(gFieldObjectPic_MysteryEventDeliveryman_1),
-    obj_frame_tiles(gFieldObjectPic_MysteryEventDeliveryman_2),
-    obj_frame_tiles(gFieldObjectPic_MysteryEventDeliveryman_2),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Statue[] = {
-    obj_frame_tiles(gFieldObjectPic_Statue),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Dusclops[] = {
-    obj_frame_tiles(gFieldObjectPic_Dusclops_0),
-    obj_frame_tiles(gFieldObjectPic_Dusclops_1),
-    obj_frame_tiles(gFieldObjectPic_Dusclops_2),
-    obj_frame_tiles(gFieldObjectPic_Dusclops_3),
-    obj_frame_tiles(gFieldObjectPic_Dusclops_4),
-    obj_frame_tiles(gFieldObjectPic_Dusclops_5),
-    obj_frame_tiles(gFieldObjectPic_Dusclops_6),
-    obj_frame_tiles(gFieldObjectPic_Dusclops_7),
-    obj_frame_tiles(gFieldObjectPic_Dusclops_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Kirlia[] = {
-    obj_frame_tiles(gFieldObjectPic_Kirlia_0),
-    obj_frame_tiles(gFieldObjectPic_Kirlia_1),
-    obj_frame_tiles(gFieldObjectPic_Kirlia_2),
-    obj_frame_tiles(gFieldObjectPic_Kirlia_3),
-    obj_frame_tiles(gFieldObjectPic_Kirlia_4),
-    obj_frame_tiles(gFieldObjectPic_Kirlia_5),
-    obj_frame_tiles(gFieldObjectPic_Kirlia_6),
-    obj_frame_tiles(gFieldObjectPic_Kirlia_7),
-    obj_frame_tiles(gFieldObjectPic_Kirlia_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_UnionRoomAttendant[] = {
-    obj_frame_tiles(gFieldObjectPic_UnionRoomAttendant_0),
-    obj_frame_tiles(gFieldObjectPic_UnionRoomAttendant_1),
-    obj_frame_tiles(gFieldObjectPic_UnionRoomAttendant_2),
-    obj_frame_tiles(gFieldObjectPic_UnionRoomAttendant_0),
-    obj_frame_tiles(gFieldObjectPic_UnionRoomAttendant_0),
-    obj_frame_tiles(gFieldObjectPic_UnionRoomAttendant_1),
-    obj_frame_tiles(gFieldObjectPic_UnionRoomAttendant_1),
-    obj_frame_tiles(gFieldObjectPic_UnionRoomAttendant_2),
-    obj_frame_tiles(gFieldObjectPic_UnionRoomAttendant_2),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Sudowoodo[] = {
-    obj_frame_tiles(gFieldObjectPic_Sudowoodo_0),
-    obj_frame_tiles(gFieldObjectPic_Sudowoodo_0),
-    obj_frame_tiles(gFieldObjectPic_Sudowoodo_1),
-    obj_frame_tiles(gFieldObjectPic_Sudowoodo_0),
-    obj_frame_tiles(gFieldObjectPic_Sudowoodo_0),
-    obj_frame_tiles(gFieldObjectPic_Sudowoodo_0),
-    obj_frame_tiles(gFieldObjectPic_Sudowoodo_0),
-    obj_frame_tiles(gFieldObjectPic_Sudowoodo_1),
-    obj_frame_tiles(gFieldObjectPic_Sudowoodo_2),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Mew[] = {
-    obj_frame_tiles(gFieldObjectPic_Mew_0),
-    obj_frame_tiles(gFieldObjectPic_Mew_1),
-    obj_frame_tiles(gFieldObjectPic_Mew_2),
-    obj_frame_tiles(gFieldObjectPic_Mew_3),
-    obj_frame_tiles(gFieldObjectPic_Mew_4),
-    obj_frame_tiles(gFieldObjectPic_Mew_5),
-    obj_frame_tiles(gFieldObjectPic_Mew_6),
-    obj_frame_tiles(gFieldObjectPic_Mew_7),
-    obj_frame_tiles(gFieldObjectPic_Mew_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Red[] = {
-    obj_frame_tiles(gFieldObjectPic_Red_0),
-    obj_frame_tiles(gFieldObjectPic_Red_1),
-    obj_frame_tiles(gFieldObjectPic_Red_2),
-    obj_frame_tiles(gFieldObjectPic_Red_3),
-    obj_frame_tiles(gFieldObjectPic_Red_4),
-    obj_frame_tiles(gFieldObjectPic_Red_5),
-    obj_frame_tiles(gFieldObjectPic_Red_6),
-    obj_frame_tiles(gFieldObjectPic_Red_7),
-    obj_frame_tiles(gFieldObjectPic_Red_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Leaf[] = {
-    obj_frame_tiles(gFieldObjectPic_Leaf_0),
-    obj_frame_tiles(gFieldObjectPic_Leaf_1),
-    obj_frame_tiles(gFieldObjectPic_Leaf_2),
-    obj_frame_tiles(gFieldObjectPic_Leaf_3),
-    obj_frame_tiles(gFieldObjectPic_Leaf_4),
-    obj_frame_tiles(gFieldObjectPic_Leaf_5),
-    obj_frame_tiles(gFieldObjectPic_Leaf_6),
-    obj_frame_tiles(gFieldObjectPic_Leaf_7),
-    obj_frame_tiles(gFieldObjectPic_Leaf_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Deoxys[] = {
-    obj_frame_tiles(gFieldObjectPic_Deoxys_0),
-    obj_frame_tiles(gFieldObjectPic_Deoxys_0),
-    obj_frame_tiles(gFieldObjectPic_Deoxys_0),
-    obj_frame_tiles(gFieldObjectPic_Deoxys_0),
-    obj_frame_tiles(gFieldObjectPic_Deoxys_1),
-    obj_frame_tiles(gFieldObjectPic_Deoxys_0),
-    obj_frame_tiles(gFieldObjectPic_Deoxys_1),
-    obj_frame_tiles(gFieldObjectPic_Deoxys_0),
-    obj_frame_tiles(gFieldObjectPic_Deoxys_0),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_BirthIslandStone[] = {
-    obj_frame_tiles(gFieldObjectPic_BirthIslandStone),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Anabel[] = {
-    obj_frame_tiles(gFieldObjectPic_Anabel_0),
-    obj_frame_tiles(gFieldObjectPic_Anabel_1),
-    obj_frame_tiles(gFieldObjectPic_Anabel_2),
-    obj_frame_tiles(gFieldObjectPic_Anabel_3),
-    obj_frame_tiles(gFieldObjectPic_Anabel_4),
-    obj_frame_tiles(gFieldObjectPic_Anabel_5),
-    obj_frame_tiles(gFieldObjectPic_Anabel_6),
-    obj_frame_tiles(gFieldObjectPic_Anabel_7),
-    obj_frame_tiles(gFieldObjectPic_Anabel_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Tucker[] = {
-    obj_frame_tiles(gFieldObjectPic_Tucker_0),
-    obj_frame_tiles(gFieldObjectPic_Tucker_1),
-    obj_frame_tiles(gFieldObjectPic_Tucker_2),
-    obj_frame_tiles(gFieldObjectPic_Tucker_3),
-    obj_frame_tiles(gFieldObjectPic_Tucker_4),
-    obj_frame_tiles(gFieldObjectPic_Tucker_5),
-    obj_frame_tiles(gFieldObjectPic_Tucker_6),
-    obj_frame_tiles(gFieldObjectPic_Tucker_7),
-    obj_frame_tiles(gFieldObjectPic_Tucker_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Spenser[] = {
-    obj_frame_tiles(gFieldObjectPic_Spenser_0),
-    obj_frame_tiles(gFieldObjectPic_Spenser_1),
-    obj_frame_tiles(gFieldObjectPic_Spenser_2),
-    obj_frame_tiles(gFieldObjectPic_Spenser_3),
-    obj_frame_tiles(gFieldObjectPic_Spenser_4),
-    obj_frame_tiles(gFieldObjectPic_Spenser_5),
-    obj_frame_tiles(gFieldObjectPic_Spenser_6),
-    obj_frame_tiles(gFieldObjectPic_Spenser_7),
-    obj_frame_tiles(gFieldObjectPic_Spenser_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Greta[] = {
-    obj_frame_tiles(gFieldObjectPic_Greta_0),
-    obj_frame_tiles(gFieldObjectPic_Greta_1),
-    obj_frame_tiles(gFieldObjectPic_Greta_2),
-    obj_frame_tiles(gFieldObjectPic_Greta_3),
-    obj_frame_tiles(gFieldObjectPic_Greta_4),
-    obj_frame_tiles(gFieldObjectPic_Greta_5),
-    obj_frame_tiles(gFieldObjectPic_Greta_6),
-    obj_frame_tiles(gFieldObjectPic_Greta_7),
-    obj_frame_tiles(gFieldObjectPic_Greta_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Noland[] = {
-    obj_frame_tiles(gFieldObjectPic_Noland_0),
-    obj_frame_tiles(gFieldObjectPic_Noland_1),
-    obj_frame_tiles(gFieldObjectPic_Noland_2),
-    obj_frame_tiles(gFieldObjectPic_Noland_3),
-    obj_frame_tiles(gFieldObjectPic_Noland_4),
-    obj_frame_tiles(gFieldObjectPic_Noland_5),
-    obj_frame_tiles(gFieldObjectPic_Noland_6),
-    obj_frame_tiles(gFieldObjectPic_Noland_7),
-    obj_frame_tiles(gFieldObjectPic_Noland_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Lucy[] = {
-    obj_frame_tiles(gFieldObjectPic_Lucy_0),
-    obj_frame_tiles(gFieldObjectPic_Lucy_1),
-    obj_frame_tiles(gFieldObjectPic_Lucy_2),
-    obj_frame_tiles(gFieldObjectPic_Lucy_3),
-    obj_frame_tiles(gFieldObjectPic_Lucy_4),
-    obj_frame_tiles(gFieldObjectPic_Lucy_5),
-    obj_frame_tiles(gFieldObjectPic_Lucy_6),
-    obj_frame_tiles(gFieldObjectPic_Lucy_7),
-    obj_frame_tiles(gFieldObjectPic_Lucy_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Brandon[] = {
-    obj_frame_tiles(gFieldObjectPic_Brandon_0),
-    obj_frame_tiles(gFieldObjectPic_Brandon_1),
-    obj_frame_tiles(gFieldObjectPic_Brandon_2),
-    obj_frame_tiles(gFieldObjectPic_Brandon_3),
-    obj_frame_tiles(gFieldObjectPic_Brandon_4),
-    obj_frame_tiles(gFieldObjectPic_Brandon_5),
-    obj_frame_tiles(gFieldObjectPic_Brandon_6),
-    obj_frame_tiles(gFieldObjectPic_Brandon_7),
-    obj_frame_tiles(gFieldObjectPic_Brandon_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_Lugia[] = {
-    obj_frame_tiles(gFieldObjectPic_Lugia_0),
-    obj_frame_tiles(gFieldObjectPic_Lugia_0),
-    obj_frame_tiles(gFieldObjectPic_Lugia_0),
-    obj_frame_tiles(gFieldObjectPic_Lugia_0),
-    obj_frame_tiles(gFieldObjectPic_Lugia_1),
-    obj_frame_tiles(gFieldObjectPic_Lugia_0),
-    obj_frame_tiles(gFieldObjectPic_Lugia_1),
-    obj_frame_tiles(gFieldObjectPic_Lugia_0),
-    obj_frame_tiles(gFieldObjectPic_Lugia_1),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_HoOh[] = {
-    obj_frame_tiles(gFieldObjectPic_HoOh_0),
-    obj_frame_tiles(gFieldObjectPic_HoOh_0),
-    obj_frame_tiles(gFieldObjectPic_HoOh_0),
-    obj_frame_tiles(gFieldObjectPic_HoOh_0),
-    obj_frame_tiles(gFieldObjectPic_HoOh_1),
-    obj_frame_tiles(gFieldObjectPic_HoOh_0),
-    obj_frame_tiles(gFieldObjectPic_HoOh_1),
-    obj_frame_tiles(gFieldObjectPic_HoOh_0),
-    obj_frame_tiles(gFieldObjectPic_HoOh_1),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_RubySapphireBrendan[] = {
-    obj_frame_tiles(gFieldObjectPic_RubySapphireBrendan_0),
-    obj_frame_tiles(gFieldObjectPic_RubySapphireBrendan_1),
-    obj_frame_tiles(gFieldObjectPic_RubySapphireBrendan_2),
-    obj_frame_tiles(gFieldObjectPic_RubySapphireBrendan_3),
-    obj_frame_tiles(gFieldObjectPic_RubySapphireBrendan_4),
-    obj_frame_tiles(gFieldObjectPic_RubySapphireBrendan_5),
-    obj_frame_tiles(gFieldObjectPic_RubySapphireBrendan_6),
-    obj_frame_tiles(gFieldObjectPic_RubySapphireBrendan_7),
-    obj_frame_tiles(gFieldObjectPic_RubySapphireBrendan_8),
-};
-
-const struct SpriteFrameImage gFieldObjectPicTable_RubySapphireMay[] = {
-    obj_frame_tiles(gFieldObjectPic_RubySapphireMay_0),
-    obj_frame_tiles(gFieldObjectPic_RubySapphireMay_1),
-    obj_frame_tiles(gFieldObjectPic_RubySapphireMay_2),
-    obj_frame_tiles(gFieldObjectPic_RubySapphireMay_3),
-    obj_frame_tiles(gFieldObjectPic_RubySapphireMay_4),
-    obj_frame_tiles(gFieldObjectPic_RubySapphireMay_5),
-    obj_frame_tiles(gFieldObjectPic_RubySapphireMay_6),
-    obj_frame_tiles(gFieldObjectPic_RubySapphireMay_7),
-    obj_frame_tiles(gFieldObjectPic_RubySapphireMay_8),
+
+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
index 2ed9023fa..db5fddf1e 100755
--- a/src/data/field_event_obj/event_object_subsprites.h
+++ b/src/data/field_event_obj/event_object_subsprites.h
@@ -1,105 +1,105 @@
 #ifndef GUARD_EVENT_OBJECT_SUBSPRITES_H
 #define GUARD_EVENT_OBJECT_SUBSPRITES_H
 
-const struct Subsprite gFieldObjectSpriteOamTable_16x16_0[] = {
+const struct Subsprite gEventObjectSpriteOamTable_16x16_0[] = {
     { -8,  -8, 0, 1, 0, 2}
 };
 
-const struct Subsprite gFieldObjectSpriteOamTable_16x16_1[] = {
+const struct Subsprite gEventObjectSpriteOamTable_16x16_1[] = {
     { -8,  -8, 0, 1, 0, 1}
 };
 
-const struct Subsprite gFieldObjectSpriteOamTable_16x16_2[] = {
+const struct Subsprite gEventObjectSpriteOamTable_16x16_2[] = {
     { -8,  -8, 1, 0, 0, 2},
     { -8,   0, 1, 0, 2, 3}
 };
 
-const struct Subsprite gFieldObjectSpriteOamTable_16x16_3[] = {
+const struct Subsprite gEventObjectSpriteOamTable_16x16_3[] = {
     { -8,  -8, 0, 1, 0, 2},
     { -8,  -8, 0, 1, 0, 3}
 };
 
-const struct Subsprite gFieldObjectSpriteOamTable_16x16_4[] = {
+const struct Subsprite gEventObjectSpriteOamTable_16x16_4[] = {
     { -8,  -8, 0, 1, 0, 1},
     { -8,  -8, 0, 1, 0, 3}
 };
 
-const struct SubspriteTable gFieldObjectSpriteOamTables_16x16[] = {
+const struct SubspriteTable gEventObjectSpriteOamTables_16x16[] = {
     {0, NULL},
-    {1, gFieldObjectSpriteOamTable_16x16_0},
-    {1, gFieldObjectSpriteOamTable_16x16_1},
-    {2, gFieldObjectSpriteOamTable_16x16_2},
-    {2, gFieldObjectSpriteOamTable_16x16_3},
-    {2, gFieldObjectSpriteOamTable_16x16_4}
+    {1, gEventObjectSpriteOamTable_16x16_0},
+    {1, gEventObjectSpriteOamTable_16x16_1},
+    {2, gEventObjectSpriteOamTable_16x16_2},
+    {2, gEventObjectSpriteOamTable_16x16_3},
+    {2, gEventObjectSpriteOamTable_16x16_4}
 };
 
-const struct Subsprite gFieldObjectSpriteOamTable_16x32_0[] = {
+const struct Subsprite gEventObjectSpriteOamTable_16x32_0[] = {
     { -8, -16, 2, 2, 0, 2}
 };
 
-const struct Subsprite gFieldObjectSpriteOamTable_16x32_1[] = {
+const struct Subsprite gEventObjectSpriteOamTable_16x32_1[] = {
     { -8, -16, 2, 2, 0, 1}
 };
 
-const struct Subsprite gFieldObjectSpriteOamTable_16x32_2[] = {
+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 gFieldObjectSpriteOamTable_16x32_3[] = {
+const struct Subsprite gEventObjectSpriteOamTable_16x32_3[] = {
     { -8, -16, 0, 1, 0, 2},
     { -8,   0, 0, 1, 4, 3}
 };
 
-const struct Subsprite gFieldObjectSpriteOamTable_16x32_4[] = {
+const struct Subsprite gEventObjectSpriteOamTable_16x32_4[] = {
     { -8, -16, 0, 1, 0, 1},
     { -8,   0, 0, 1, 4, 3}
 };
 
-const struct SubspriteTable gFieldObjectSpriteOamTables_16x32[] = {
+const struct SubspriteTable gEventObjectSpriteOamTables_16x32[] = {
     {0, NULL},
-    {1, gFieldObjectSpriteOamTable_16x32_0},
-    {1, gFieldObjectSpriteOamTable_16x32_1},
-    {3, gFieldObjectSpriteOamTable_16x32_2},
-    {2, gFieldObjectSpriteOamTable_16x32_3},
-    {2, gFieldObjectSpriteOamTable_16x32_4}
+    {1, gEventObjectSpriteOamTable_16x32_0},
+    {1, gEventObjectSpriteOamTable_16x32_1},
+    {3, gEventObjectSpriteOamTable_16x32_2},
+    {2, gEventObjectSpriteOamTable_16x32_3},
+    {2, gEventObjectSpriteOamTable_16x32_4}
 };
 
-const struct Subsprite gFieldObjectSpriteOamTable_32x32_0[] = {
+const struct Subsprite gEventObjectSpriteOamTable_32x32_0[] = {
     {-16, -16, 0, 2, 0, 2}
 };
 
-const struct Subsprite gFieldObjectSpriteOamTable_32x32_1[] = {
+const struct Subsprite gEventObjectSpriteOamTable_32x32_1[] = {
     {-16, -16, 0, 2, 0, 1}
 };
 
-const struct Subsprite gFieldObjectSpriteOamTable_32x32_2[] = {
+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 gFieldObjectSpriteOamTable_32x32_3[] = {
+const struct Subsprite gEventObjectSpriteOamTable_32x32_3[] = {
     {-16, -16, 1, 2, 0, 2},
     {-16,   0, 1, 2, 8, 3}
 };
 
-const struct Subsprite gFieldObjectSpriteOamTable_32x32_4[] = {
+const struct Subsprite gEventObjectSpriteOamTable_32x32_4[] = {
     {-16, -16, 1, 2, 0, 1},
     {-16,   0, 1, 2, 8, 3}
 };
 
-const struct SubspriteTable gFieldObjectSpriteOamTables_32x32[] = {
+const struct SubspriteTable gEventObjectSpriteOamTables_32x32[] = {
     {0, NULL},
-    {1, gFieldObjectSpriteOamTable_32x32_0},
-    {1, gFieldObjectSpriteOamTable_32x32_1},
-    {3, gFieldObjectSpriteOamTable_32x32_2},
-    {2, gFieldObjectSpriteOamTable_32x32_3},
-    {2, gFieldObjectSpriteOamTable_32x32_4}
+    {1, gEventObjectSpriteOamTable_32x32_0},
+    {1, gEventObjectSpriteOamTable_32x32_1},
+    {3, gEventObjectSpriteOamTable_32x32_2},
+    {2, gEventObjectSpriteOamTable_32x32_3},
+    {2, gEventObjectSpriteOamTable_32x32_4}
 };
 
-const struct Subsprite gFieldObjectSpriteOamTable_Truck_0[] = {
+const struct Subsprite gEventObjectSpriteOamTable_Truck_0[] = {
     {-24, -24, 1, 1, 0, 2},
     {  8, -24, 1, 0, 4, 2},
     {-24, -16, 1, 1, 6, 2},
@@ -114,66 +114,66 @@ const struct Subsprite gFieldObjectSpriteOamTable_Truck_0[] = {
     {  8,  16, 1, 0, 34, 2}
 };
 
-const struct SubspriteTable gFieldObjectSpriteOamTables_Truck[] = {
-    {12, gFieldObjectSpriteOamTable_Truck_0},
-    {12, gFieldObjectSpriteOamTable_Truck_0},
-    {12, gFieldObjectSpriteOamTable_Truck_0},
-    {12, gFieldObjectSpriteOamTable_Truck_0},
-    {12, gFieldObjectSpriteOamTable_Truck_0},
-    {12, gFieldObjectSpriteOamTable_Truck_0}
+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 gFieldObjectSpriteOamTable_Unused_0[] = {
+const struct Subsprite gEventObjectSpriteOamTable_Unused_0[] = {
     {-32, -16, 1, 3, 0, 2}
 };
 
-const struct Subsprite gFieldObjectSpriteOamTable_Unused_1[] = {
+const struct Subsprite gEventObjectSpriteOamTable_Unused_1[] = {
     {-32, -16, 1, 3, 0, 1}
 };
 
-const struct Subsprite gFieldObjectSpriteOamTable_Unused_2[] = {
+const struct Subsprite gEventObjectSpriteOamTable_Unused_2[] = {
     {-32, -16, 1, 3, 0, 2}
 };
 
-const struct Subsprite gFieldObjectSpriteOamTable_Unused_3[] = {
+const struct Subsprite gEventObjectSpriteOamTable_Unused_3[] = {
     {-32, -16, 1, 3, 0, 2}
 };
 
-const struct SubspriteTable gFieldObjectSpriteOamTables_Unused[] = {
+const struct SubspriteTable gEventObjectSpriteOamTables_Unused[] = {
     {0, NULL},
-    {1, gFieldObjectSpriteOamTable_Unused_0},
-    {1, gFieldObjectSpriteOamTable_Unused_1},
-    {1, gFieldObjectSpriteOamTable_Unused_2},
-    {1, gFieldObjectSpriteOamTable_Unused_3},
-    {1, gFieldObjectSpriteOamTable_Unused_3}
+    {1, gEventObjectSpriteOamTable_Unused_0},
+    {1, gEventObjectSpriteOamTable_Unused_1},
+    {1, gEventObjectSpriteOamTable_Unused_2},
+    {1, gEventObjectSpriteOamTable_Unused_3},
+    {1, gEventObjectSpriteOamTable_Unused_3}
 };
 
-const struct Subsprite gFieldObjectSpriteOamTable_64x64_0[] = {
+const struct Subsprite gEventObjectSpriteOamTable_64x64_0[] = {
     {-32, -32, 0, 3, 0, 2}
 };
 
-const struct Subsprite gFieldObjectSpriteOamTable_64x64_1[] = {
+const struct Subsprite gEventObjectSpriteOamTable_64x64_1[] = {
     {-32, -32, 0, 3, 0, 1}
 };
 
-const struct Subsprite gFieldObjectSpriteOamTable_64x64_2[] = {
+const struct Subsprite gEventObjectSpriteOamTable_64x64_2[] = {
     {-32, -32, 0, 3, 0, 2}
 };
 
-const struct Subsprite gFieldObjectSpriteOamTable_64x64_3[] = {
+const struct Subsprite gEventObjectSpriteOamTable_64x64_3[] = {
     {-32, -32, 0, 3, 0, 2}
 };
 
-const struct SubspriteTable gFieldObjectSpriteOamTables_64x64[] = {
+const struct SubspriteTable gEventObjectSpriteOamTables_64x64[] = {
     {0, NULL},
-    {1, gFieldObjectSpriteOamTable_64x64_0},
-    {1, gFieldObjectSpriteOamTable_64x64_1},
-    {1, gFieldObjectSpriteOamTable_64x64_2},
-    {1, gFieldObjectSpriteOamTable_64x64_3},
-    {1, gFieldObjectSpriteOamTable_64x64_3}
+    {1, gEventObjectSpriteOamTable_64x64_0},
+    {1, gEventObjectSpriteOamTable_64x64_1},
+    {1, gEventObjectSpriteOamTable_64x64_2},
+    {1, gEventObjectSpriteOamTable_64x64_3},
+    {1, gEventObjectSpriteOamTable_64x64_3}
 };
 
-const struct Subsprite gFieldObjectSpriteOamTable_SSTidal_0[] = {
+const struct Subsprite gEventObjectSpriteOamTable_SSTidal_0[] = {
     {-48, -20, 1, 1, 0, 2},
     {-16, -20, 1, 1, 4, 2},
     { 16, -20, 1, 1, 8, 2},
@@ -191,7 +191,7 @@ const struct Subsprite gFieldObjectSpriteOamTable_SSTidal_0[] = {
     { 16,  12, 1, 1, 56, 2}
 };
 
-const struct Subsprite gFieldObjectSpriteOamTable_SSTidal_1[] = {
+const struct Subsprite gEventObjectSpriteOamTable_SSTidal_1[] = {
     {-48, -20, 1, 1, 0, 1},
     {-16, -20, 1, 1, 4, 1},
     { 16, -20, 1, 1, 8, 1},
@@ -209,7 +209,7 @@ const struct Subsprite gFieldObjectSpriteOamTable_SSTidal_1[] = {
     { 16,  12, 1, 1, 56, 1}
 };
 
-const struct Subsprite gFieldObjectSpriteOamTable_SSTidal_2[] = {
+const struct Subsprite gEventObjectSpriteOamTable_SSTidal_2[] = {
     {-48, -20, 1, 1, 0, 2},
     {-16, -20, 1, 1, 4, 2},
     { 16, -20, 1, 1, 8, 2},
@@ -227,7 +227,7 @@ const struct Subsprite gFieldObjectSpriteOamTable_SSTidal_2[] = {
     { 16,  12, 1, 1, 56, 2}
 };
 
-const struct Subsprite gFieldObjectSpriteOamTable_SSTidal_3[] = {
+const struct Subsprite gEventObjectSpriteOamTable_SSTidal_3[] = {
     {-48, -20, 1, 1, 0, 1},
     {-16, -20, 1, 1, 4, 1},
     { 16, -20, 1, 1, 8, 1},
@@ -245,16 +245,16 @@ const struct Subsprite gFieldObjectSpriteOamTable_SSTidal_3[] = {
     { 16,  12, 1, 1, 56, 2}
 };
 
-const struct SubspriteTable gFieldObjectSpriteOamTables_SSTidal[] = {
-    {15, gFieldObjectSpriteOamTable_SSTidal_0},
-    {15, gFieldObjectSpriteOamTable_SSTidal_0},
-    {15, gFieldObjectSpriteOamTable_SSTidal_1},
-    {15, gFieldObjectSpriteOamTable_SSTidal_2},
-    {15, gFieldObjectSpriteOamTable_SSTidal_3},
-    {15, gFieldObjectSpriteOamTable_SSTidal_3}
+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 gFieldObjectSpriteOamTable_SubmarineShadow_0[] = {
+const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_0[] = {
     {-48, -20, 1, 1, 0, 2},
     {-16, -20, 1, 1, 4, 2},
     { 16, -20, 1, 0, 8, 2},
@@ -273,7 +273,7 @@ const struct Subsprite gFieldObjectSpriteOamTable_SubmarineShadow_0[] = {
     { 32,   4, 0, 0, 43, 2}
 };
 
-const struct Subsprite gFieldObjectSpriteOamTable_SubmarineShadow_1[] = {
+const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_1[] = {
     {-48, -20, 1, 1, 0, 1},
     {-16, -20, 1, 1, 4, 1},
     { 16, -20, 1, 0, 8, 1},
@@ -292,7 +292,7 @@ const struct Subsprite gFieldObjectSpriteOamTable_SubmarineShadow_1[] = {
     { 32,   4, 0, 0, 43, 1}
 };
 
-const struct Subsprite gFieldObjectSpriteOamTable_SubmarineShadow_2[] = {
+const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_2[] = {
     {-48, -20, 1, 1, 0, 2},
     {-16, -20, 1, 1, 4, 2},
     { 16, -20, 1, 0, 8, 2},
@@ -311,7 +311,7 @@ const struct Subsprite gFieldObjectSpriteOamTable_SubmarineShadow_2[] = {
     { 32,   4, 0, 0, 43, 2}
 };
 
-const struct Subsprite gFieldObjectSpriteOamTable_SubmarineShadow_3[] = {
+const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_3[] = {
     {-48, -20, 1, 1, 0, 1},
     {-16, -20, 1, 1, 4, 1},
     { 16, -20, 1, 0, 8, 1},
@@ -330,13 +330,13 @@ const struct Subsprite gFieldObjectSpriteOamTable_SubmarineShadow_3[] = {
     { 32,   4, 0, 0, 43, 2}
 };
 
-const struct SubspriteTable gFieldObjectSpriteOamTables_SubmarineShadow[] = {
-    {16, gFieldObjectSpriteOamTable_SubmarineShadow_0},
-    {16, gFieldObjectSpriteOamTable_SubmarineShadow_0},
-    {16, gFieldObjectSpriteOamTable_SubmarineShadow_1},
-    {16, gFieldObjectSpriteOamTable_SubmarineShadow_2},
-    {16, gFieldObjectSpriteOamTable_SubmarineShadow_3},
-    {16, gFieldObjectSpriteOamTable_SubmarineShadow_3}
+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_objects.h b/src/data/field_event_obj/field_effect_objects.h
index 30a2297bd..c8633daa7 100755
--- a/src/data/field_event_obj/field_effect_objects.h
+++ b/src/data/field_event_obj/field_effect_objects.h
@@ -32,13 +32,13 @@ const struct SpriteFrameImage gFieldEffectObjectPicTable_ShadowExtraLarge[] = {
 	obj_frame_tiles(gFieldEffectObjectPic_ShadowExtraLarge),
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowSmall = {0xFFFF, 0xFFFF, &gFieldObjectBaseOam_8x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowSmall, gDummySpriteAffineAnimTable, oamc_shadow};
+const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowSmall = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_8x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowSmall, gDummySpriteAffineAnimTable, oamc_shadow};
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowMedium = {0xFFFF, 0xFFFF, &gFieldObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowMedium, 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, &gFieldObjectBaseOam_32x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowLarge, 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, &gFieldObjectBaseOam_64x32, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowExtraLarge, 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),
@@ -63,7 +63,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_TallGrass[] =
     gFieldEffectObjectImageAnim_850CA84,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_TallGrass = {0xFFFF, 0x1005, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_TallGrass, gFieldEffectObjectPicTable_TallGrass, gDummySpriteAffineAnimTable, unc_grass_normal};
+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),
@@ -91,7 +91,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Ripple[] =
     gFieldEffectObjectImageAnim_850CAE0,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_Ripple = {0xFFFF, 0x1005, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Ripple, gFieldEffectObjectPicTable_Ripple, gDummySpriteAffineAnimTable, sub_81561D0};
+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),
@@ -116,7 +116,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Ash[] =
     gFieldEffectObjectImageAnim_850CB48,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_Ash = {0xFFFF, 0x1005, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Ash, gFieldEffectObjectPicTable_Ash, gDummySpriteAffineAnimTable, sub_8155460};
+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),
@@ -156,7 +156,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_SurfBlob[] =
     gFieldEffectObjectImageAnim_850CBAC,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_SurfBlob = {0xFFFF, 0xFFFF, &gFieldObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_SurfBlob, gFieldEffectObjectPicTable_SurfBlob, gDummySpriteAffineAnimTable, sub_8155658};
+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),
@@ -205,7 +205,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Arrow[] =
     gFieldEffectObjectImageAnim_850CC40,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_Arrow = {0xFFFF, 0xFFFF, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Arrow, gFieldEffectObjectPicTable_Arrow, gDummySpriteAffineAnimTable, SpriteCallbackDummy};
+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),
@@ -226,7 +226,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_GroundImpactDust[] =
     gFieldEffectObjectImageAnim_850CC8C,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_GroundImpactDust = {0xFFFF, 0x1004, &gFieldObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_GroundImpactDust, gFieldEffectObjectPicTable_GroundImpactDust, gDummySpriteAffineAnimTable, sub_8156194};
+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),
@@ -249,7 +249,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeHopTallGrass[] =
     gFieldEffectObjectImageAnim_850CCD8,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopTallGrass = {0xFFFF, 0x1005, &gFieldObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_BikeHopTallGrass, gFieldEffectObjectPicTable_BikeHopTallGrass, gDummySpriteAffineAnimTable, sub_8156194};
+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),
@@ -289,7 +289,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_SandFootprints[] =
     gFieldEffectObjectImageAnim_850CD30,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_SandFootprints = {0xFFFF, 0x1004, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_SandFootprints, gFieldEffectObjectPicTable_SandFootprints, gDummySpriteAffineAnimTable, sub_8154C60};
+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),
@@ -329,7 +329,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_DeepSandFootprints[]
     gFieldEffectObjectImageAnim_850CD8C,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_DeepSandFootprints = {0xFFFF, 0x1004, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_DeepSandFootprints, gFieldEffectObjectPicTable_DeepSandFootprints, gDummySpriteAffineAnimTable, sub_8154C60};
+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),
@@ -399,7 +399,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeTireTracks[] =
     gFieldEffectObjectImageAnim_850CE18,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_BikeTireTracks = {0xFFFF, 0x1004, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_BikeTireTracks, gFieldEffectObjectPicTable_BikeTireTracks, gDummySpriteAffineAnimTable, sub_8154C60};
+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),
@@ -422,7 +422,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeHopBigSplash[] =
     gFieldEffectObjectImageAnim_850CE7C,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopBigSplash = {0xFFFF, 0x1004, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_BikeHopBigSplash, gFieldEffectObjectPicTable_BikeHopBigSplash, gDummySpriteAffineAnimTable, sub_8156194};
+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),
@@ -455,7 +455,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Splash[] =
     gFieldEffectObjectImageAnim_850CEC8,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_Splash = {0xFFFF, 0x1004, &gFieldObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_Splash, gFieldEffectObjectPicTable_Splash, gDummySpriteAffineAnimTable, sub_8154D90};
+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),
@@ -476,7 +476,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeHopSmallSplash[]
     gFieldEffectObjectImageAnim_850CF24,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopSmallSplash = {0xFFFF, 0x1004, &gFieldObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_BikeHopSmallSplash, gFieldEffectObjectPicTable_BikeHopSmallSplash, gDummySpriteAffineAnimTable, sub_8156194};
+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),
@@ -502,7 +502,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_LongGrass[] =
     gFieldEffectObjectImageAnim_850CF70,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_LongGrass = {0xFFFF, 0x1005, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_LongGrass, gFieldEffectObjectPicTable_LongGrass, gDummySpriteAffineAnimTable, unc_grass_tall};
+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),
@@ -529,7 +529,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown16[] =
     gFieldEffectObjectImageAnim_850CFDC,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown16 = {0xFFFF, 0x1005, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown16, gFieldEffectObjectPicTable_Unknown16, gDummySpriteAffineAnimTable, sub_8156194};
+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),
@@ -562,7 +562,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown17[] =
     gFieldEffectObjectImageAnim_850D05C,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown17 = {0xFFFF, 0x1005, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown17, gFieldEffectObjectPicTable_Unknown17, gDummySpriteAffineAnimTable, sub_81561D0};
+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),
@@ -587,7 +587,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown18[] =
     gFieldEffectObjectImageAnim_850D0C0,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown18 = {0xFFFF, 0x1005, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown18, gFieldEffectObjectPicTable_Unknown18, gDummySpriteAffineAnimTable, sub_81561D0};
+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),
@@ -610,7 +610,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown19[] =
     gFieldEffectObjectImageAnim_850D118,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown19 = {0xFFFF, 0x1004, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown19, gFieldEffectObjectPicTable_Unknown19, gDummySpriteAffineAnimTable, sub_81561D0};
+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),
@@ -631,7 +631,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown29[] =
     gFieldEffectObjectImageAnim_850D160,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown29 = {0xFFFF, 0x1004, &gFieldObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_Unknown29, gFieldEffectObjectPicTable_Unknown29, gDummySpriteAffineAnimTable, sub_81559BC};
+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),
@@ -656,7 +656,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown20[] =
     gFieldEffectObjectImageAnim_850D1AC,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown20 = {0xFFFF, 0x1004, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown20, gFieldEffectObjectPicTable_Unknown20, gDummySpriteAffineAnimTable, sub_81561D0};
+const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown20 = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown20, gFieldEffectObjectPicTable_Unknown20, gDummySpriteAffineAnimTable, sub_81561D0};
 
 const union AffineAnimCmd gFieldEffectObjectRotScalAnim_850D1E4[] =
 {
@@ -733,7 +733,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_BerryTreeGrowthSpark
     gFieldEffectObjectImageAnim_850D2D4,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_BerryTreeGrowthSparkle = {0xFFFF, 0xFFFF, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_BerryTreeGrowthSparkle, gFieldEffectObjectPicTable_BerryTreeGrowthSparkle, gDummySpriteAffineAnimTable, sub_81561D0};
+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),
@@ -769,7 +769,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_TreeDisguise[] =
     gFieldEffectObjectImageAnim_850D384,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_TreeDisguise = {0xFFFF, 0xFFFF, &gFieldObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_TreeDisguise, gFieldEffectObjectPicTable_TreeDisguise, gDummySpriteAffineAnimTable, sub_8155C88};
+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),
@@ -805,7 +805,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_MountainDisguise[] =
     gFieldEffectObjectImageAnim_850D404,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_MountainDisguise = {0xFFFF, 0xFFFF, &gFieldObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_MountainDisguise, gFieldEffectObjectPicTable_MountainDisguise, gDummySpriteAffineAnimTable, sub_8155C88};
+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),
@@ -817,7 +817,7 @@ const struct SpriteFrameImage gFieldEffectObjectPicTable_SandDisguisePlaceholder
 	obj_frame_tiles(gFieldEffectObjectPic_SandDisguisePlaceholder_6),
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_SandDisguisePlaceholder = {0xFFFF, 0xFFFF, &gFieldObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_TreeDisguise, gFieldEffectObjectPicTable_SandDisguisePlaceholder, gDummySpriteAffineAnimTable, sub_8155C88};
+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),
@@ -834,7 +834,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Bird[] =
     gFieldEffectObjectImageAnim_850D49C,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_Bird = {0xFFFF, 0xFFFF, &gFieldObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_Bird, gFieldEffectObjectPicTable_Bird, gDummySpriteAffineAnimTable, SpriteCallbackDummy};
+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),
@@ -853,7 +853,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_ShortGrass[] =
     gFieldEffectObjectImageAnim_850D4D0,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_ShortGrass = {0xFFFF, 0x1005, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_ShortGrass, gFieldEffectObjectPicTable_ShortGrass, gDummySpriteAffineAnimTable, sub_8154A10};
+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),
@@ -870,7 +870,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_HotSpringsWater[] =
     gFieldEffectObjectImageAnim_850D500,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_HotSpringsWater = {0xFFFF, 0x1005, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_HotSpringsWater, gFieldEffectObjectPicTable_HotSpringsWater, gDummySpriteAffineAnimTable, sub_8155158};
+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),
@@ -895,7 +895,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_JumpOutOfAsh[] =
     gFieldEffectObjectImageAnim_850D54C,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_JumpOutOfAsh = {0xFFFF, 0x100D, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_JumpOutOfAsh, gFieldEffectObjectPicTable_JumpOutOfAsh, gDummySpriteAffineAnimTable, sub_80B7CAC};
+const struct SpriteTemplate gFieldEffectObjectTemplate_JumpOutOfAsh = {0xFFFF, 0x100D, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_JumpOutOfAsh, gFieldEffectObjectPicTable_JumpOutOfAsh, gDummySpriteAffineAnimTable, sub_80B7CAC};
 
 const struct SpritePalette gFieldEffectObjectPaletteInfo2 = {gFieldEffectObjectPalette2, 0x100D};
 
@@ -922,7 +922,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown33[] =
     gFieldEffectObjectImageAnim_850D5B0,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown33 = {0xFFFF, 0x100D, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown33, gFieldEffectObjectPicTable_Unknown33, gDummySpriteAffineAnimTable, sub_80B7A58};
+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),
@@ -953,7 +953,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Bubbles[] =
     gFieldEffectObjectImageAnim_850D624,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles = {0xFFFF, 0x1004, &gFieldObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_Bubbles, gFieldEffectObjectPicTable_Bubbles, gDummySpriteAffineAnimTable, sub_8155AEC};
+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),
@@ -973,7 +973,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown35[] =
     gFieldEffectObjectImageAnim_850D674,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown35 = {0xFFFF, 0x100F, &gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown35, gFieldEffectObjectPicTable_Unknown35, gDummySpriteAffineAnimTable, sub_8155E50};
+const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown35 = {0xFFFF, 0x100F, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown35, gFieldEffectObjectPicTable_Unknown35, gDummySpriteAffineAnimTable, sub_8155E50};
 
 const struct SpritePalette gFieldEffectObjectPaletteInfo3 = {gFieldEffectObjectPalette3, 0x100F};
 
@@ -987,11 +987,11 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Rayquaza[] = {
 };
 
 const struct SpriteFrameImage  gFieldEffectObjectPicTable_Rayquaza[] = {
-	{.data = (u8*)gFieldObjectPic_Rayquaza_0, .size = (sizeof gFieldObjectPic_Rayquaza_0) / 4}
+	{.data = (u8*)gEventObjectPic_Rayquaza_0, .size = (sizeof gEventObjectPic_Rayquaza_0) / 4}
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_Rayquaza = {0xFFFF, 0xFFFF, &gFieldObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_Rayquaza, gFieldEffectObjectPicTable_Rayquaza, gDummySpriteAffineAnimTable, sub_8155F80};
+const struct SpriteTemplate gFieldEffectObjectTemplate_Rayquaza = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_Rayquaza, gFieldEffectObjectPicTable_Rayquaza, gDummySpriteAffineAnimTable, sub_8155F80};
 
-const struct SpritePalette gFieldEffectObjectPaletteInfoUnused = {gFieldObjectPalette2, 0x1011};
+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
index d5b7b8911..519ca771a 100755
--- a/src/data/field_event_obj/movement_action_func_tables.h
+++ b/src/data/field_event_obj/movement_action_func_tables.h
@@ -1,430 +1,430 @@
 #ifndef GUARD_MOVEMENT_ACTION_FUNC_TABLES_H
 #define GUARD_MOVEMENT_ACTION_FUNC_TABLES_H
 
-u8 MovementAction_FaceDown_Step0(struct MapObject *, struct Sprite *);
-u8 sub_8093950(struct MapObject *, struct Sprite *);
-u8 sub_80964BC(struct MapObject *, struct Sprite *);
-u8 sub_8093960(struct MapObject *, struct Sprite *);
-u8 sub_8093970(struct MapObject *, struct Sprite *);
-u8 sub_8093980(struct MapObject *, struct Sprite *);
-u8 sub_8093BC4(struct MapObject *, struct Sprite *);
-u8 sub_8093BC4_2(struct MapObject *, struct Sprite *);
-u8 sub_8093C04(struct MapObject *, struct Sprite *);
-u8 sub_8093C04_2(struct MapObject *, struct Sprite *);
-u8 sub_8093C44(struct MapObject *, struct Sprite *);
-u8 sub_8093C44_2(struct MapObject *, struct Sprite *);
-u8 sub_8093C84(struct MapObject *, struct Sprite *);
-u8 sub_8093C84_2(struct MapObject *, struct Sprite *);
-u8 sub_8093CC4(struct MapObject *, struct Sprite *);
-u8 sub_8093CC4_2(struct MapObject *, struct Sprite *);
-u8 sub_8093D04(struct MapObject *, struct Sprite *);
-u8 sub_8093D04_2(struct MapObject *, struct Sprite *);
-u8 sub_8093D44(struct MapObject *, struct Sprite *);
-u8 sub_8093D44_2(struct MapObject *, struct Sprite *);
-u8 sub_8093D84(struct MapObject *, struct Sprite *);
-u8 sub_8093D84_2(struct MapObject *, struct Sprite *);
-u8 sub_8093DC4(struct MapObject *, struct Sprite *);
-u8 sub_8093DC4_2(struct MapObject *, struct Sprite *);
-u8 sub_8093E04(struct MapObject *, struct Sprite *);
-u8 sub_8093E04_2(struct MapObject *, struct Sprite *);
-u8 sub_8093E44(struct MapObject *, struct Sprite *);
-u8 sub_8093E44_2(struct MapObject *, struct Sprite *);
-u8 sub_8093E84(struct MapObject *, struct Sprite *);
-u8 sub_8093E84_2(struct MapObject *, struct Sprite *);
-u8 sub_8093EC4(struct MapObject *, struct Sprite *);
-u8 sub_8093EC4_2(struct MapObject *, struct Sprite *);
-u8 sub_8093F04(struct MapObject *, struct Sprite *);
-u8 sub_8093F04_2(struct MapObject *, struct Sprite *);
-u8 sub_8093F44(struct MapObject *, struct Sprite *);
-u8 sub_8093F44_2(struct MapObject *, struct Sprite *);
-u8 sub_8093F84(struct MapObject *, struct Sprite *);
-u8 sub_8093F84_2(struct MapObject *, struct Sprite *);
-u8 sub_8094230(struct MapObject *, struct Sprite *);
-u8 sub_8094230_2(struct MapObject *, struct Sprite *);
-u8 sub_8094288(struct MapObject *, struct Sprite *);
-u8 sub_8094288_2(struct MapObject *, struct Sprite *);
-u8 sub_80942E0(struct MapObject *, struct Sprite *);
-u8 sub_80942E0_2(struct MapObject *, struct Sprite *);
-u8 sub_8094338(struct MapObject *, struct Sprite *);
-u8 sub_8094338_2(struct MapObject *, struct Sprite *);
-u8 sub_80943B4(struct MapObject *, struct Sprite *);
-u8 sub_8094398(struct MapObject *, struct Sprite *);
-u8 sub_80964B8(struct MapObject *, struct Sprite *);
-u8 sub_80943D4(struct MapObject *, struct Sprite *);
-u8 sub_80943F4(struct MapObject *, struct Sprite *);
-u8 sub_8094414(struct MapObject *, struct Sprite *);
-u8 sub_8094434(struct MapObject *, struct Sprite *);
-u8 sub_8094454(struct MapObject *, struct Sprite *);
-u8 sub_8094454_2(struct MapObject *, struct Sprite *);
-u8 sub_8094494(struct MapObject *, struct Sprite *);
-u8 sub_8094494_2(struct MapObject *, struct Sprite *);
-u8 sub_80944D4(struct MapObject *, struct Sprite *);
-u8 sub_80944D4_2(struct MapObject *, struct Sprite *);
-u8 sub_8094514(struct MapObject *, struct Sprite *);
-u8 sub_8094514_2(struct MapObject *, struct Sprite *);
-u8 sub_8094600(struct MapObject *, struct Sprite *);
-u8 sub_80945C4(struct MapObject *, struct Sprite *);
-u8 sub_8094638(struct MapObject *, struct Sprite *);
-u8 sub_8094670(struct MapObject *, struct Sprite *);
-u8 sub_80946A8(struct MapObject *, struct Sprite *);
-u8 sub_80946E0(struct MapObject *, struct Sprite *);
-u8 sub_809459C(struct MapObject *, struct Sprite *);
-u8 sub_8094718(struct MapObject *, struct Sprite *);
-u8 sub_8094750(struct MapObject *, struct Sprite *);
-u8 sub_8094788(struct MapObject *, struct Sprite *);
-u8 sub_80947C0(struct MapObject *, struct Sprite *);
-u8 sub_80947F8(struct MapObject *, struct Sprite *);
-u8 sub_8094830(struct MapObject *, struct Sprite *);
-u8 sub_8094868(struct MapObject *, struct Sprite *);
-u8 sub_80948A0(struct MapObject *, struct Sprite *);
-u8 sub_80948D8(struct MapObject *, struct Sprite *);
-u8 sub_8094910(struct MapObject *, struct Sprite *);
-u8 sub_8094948(struct MapObject *, struct Sprite *);
-u8 sub_8094980(struct MapObject *, struct Sprite *);
-u8 sub_8094980_2(struct MapObject *, struct Sprite *);
-u8 sub_80949C0(struct MapObject *, struct Sprite *);
-u8 sub_80949C0_2(struct MapObject *, struct Sprite *);
-u8 sub_8094A00(struct MapObject *, struct Sprite *);
-u8 sub_8094A00_2(struct MapObject *, struct Sprite *);
-u8 sub_8094A40(struct MapObject *, struct Sprite *);
-u8 sub_8094A40_2(struct MapObject *, struct Sprite *);
-u8 sub_8094A80(struct MapObject *, struct Sprite *);
-u8 sub_8094A80_2(struct MapObject *, struct Sprite *);
-u8 sub_8094AC0(struct MapObject *, struct Sprite *);
-u8 sub_8094AC0_2(struct MapObject *, struct Sprite *);
-u8 sub_8094B00(struct MapObject *, struct Sprite *);
-u8 sub_8094B00_2(struct MapObject *, struct Sprite *);
-u8 sub_8094B40(struct MapObject *, struct Sprite *);
-u8 sub_8094B40_2(struct MapObject *, struct Sprite *);
-u8 sub_8094B80(struct MapObject *, struct Sprite *);
-u8 sub_8094B80_2(struct MapObject *, struct Sprite *);
-u8 sub_8094BC0(struct MapObject *, struct Sprite *);
-u8 sub_8094BC0_2(struct MapObject *, struct Sprite *);
-u8 sub_8094C00(struct MapObject *, struct Sprite *);
-u8 sub_8094C00_2(struct MapObject *, struct Sprite *);
-u8 sub_8094C40(struct MapObject *, struct Sprite *);
-u8 sub_8094C40_2(struct MapObject *, struct Sprite *);
-u8 sub_8094C80(struct MapObject *, struct Sprite *);
-u8 sub_8094C80_2(struct MapObject *, struct Sprite *);
-u8 sub_8094CC0(struct MapObject *, struct Sprite *);
-u8 sub_8094CC0_2(struct MapObject *, struct Sprite *);
-u8 sub_8094D00(struct MapObject *, struct Sprite *);
-u8 sub_8094D00_2(struct MapObject *, struct Sprite *);
-u8 sub_8094D40(struct MapObject *, struct Sprite *);
-u8 sub_8094D40_2(struct MapObject *, struct Sprite *);
-u8 sub_8094DAC(struct MapObject *, struct Sprite *);
-u8 sub_8094DC4(struct MapObject *, struct Sprite *);
-u8 sub_8094E18(struct MapObject *, struct Sprite *);
-u8 sub_8094E18_2(struct MapObject *, struct Sprite *);
-u8 sub_8094E60(struct MapObject *, struct Sprite *);
-u8 sub_8094E60_2(struct MapObject *, struct Sprite *);
-u8 sub_8094EB8(struct MapObject *, struct Sprite *);
-u8 sub_8094EB8_2(struct MapObject *, struct Sprite *);
-u8 sub_8094710(struct MapObject *, struct Sprite *);
-u8 sub_8094710_2(struct MapObject *, struct Sprite *);
-u8 sub_8094F38(struct MapObject *, struct Sprite *);
-u8 sub_8094F94(struct MapObject *, struct Sprite *);
-u8 sub_8094FF8(struct MapObject *, struct Sprite *);
-u8 sub_8095008(struct MapObject *, struct Sprite *);
-u8 sub_8095018(struct MapObject *, struct Sprite *);
-u8 sub_8095018_2(struct MapObject *, struct Sprite *);
-u8 sub_8095070(struct MapObject *, struct Sprite *);
-u8 sub_8095070_2(struct MapObject *, struct Sprite *);
-u8 sub_80950C8(struct MapObject *, struct Sprite *);
-u8 sub_80950C8_2(struct MapObject *, struct Sprite *);
-u8 sub_8095120(struct MapObject *, struct Sprite *);
-u8 sub_8095120_2(struct MapObject *, struct Sprite *);
-u8 sub_8095178(struct MapObject *, struct Sprite *);
-u8 sub_8095178_2(struct MapObject *, struct Sprite *);
-u8 sub_80951D0(struct MapObject *, struct Sprite *);
-u8 sub_80951D0_2(struct MapObject *, struct Sprite *);
-u8 sub_8095228(struct MapObject *, struct Sprite *);
-u8 sub_8095228_2(struct MapObject *, struct Sprite *);
-u8 sub_8095280(struct MapObject *, struct Sprite *);
-u8 sub_8095280_2(struct MapObject *, struct Sprite *);
-u8 sub_80952D8(struct MapObject *, struct Sprite *);
-u8 sub_80952D8_2(struct MapObject *, struct Sprite *);
-u8 sub_8095330(struct MapObject *, struct Sprite *);
-u8 sub_8095330_2(struct MapObject *, struct Sprite *);
-u8 sub_8095388(struct MapObject *, struct Sprite *);
-u8 sub_8095388_2(struct MapObject *, struct Sprite *);
-u8 sub_80953E0(struct MapObject *, struct Sprite *);
-u8 sub_80953E0_2(struct MapObject *, struct Sprite *);
-u8 sub_8095438(struct MapObject *, struct Sprite *);
-u8 sub_8095450(struct MapObject *, struct Sprite *);
-u8 sub_8095460(struct MapObject *, struct Sprite *);
-u8 sub_8095470(struct MapObject *, struct Sprite *);
-u8 sub_8095480(struct MapObject *, struct Sprite *);
-u8 sub_8095490(struct MapObject *, struct Sprite *);
-u8 sub_80954BC(struct MapObject *, struct Sprite *);
-u8 sub_80954CC(struct MapObject *, struct Sprite *);
-u8 do_exclamation_mark_bubble_1(struct MapObject *, struct Sprite *);
-u8 do_exclamation_mark_bubble_2(struct MapObject *, struct Sprite *);
-u8 do_heart_bubble(struct MapObject *, struct Sprite *);
-u8 sub_8095548(struct MapObject *, struct Sprite *);
-u8 sub_809558C(struct MapObject *, struct Sprite *);
-u8 sub_80955AC(struct MapObject *, struct Sprite *);
-u8 sub_80955C8(struct MapObject *, struct Sprite *);
-u8 sub_80955EC(struct MapObject *, struct Sprite *);
-u8 sub_8095628(struct MapObject *, struct Sprite *);
-u8 sub_8095644(struct MapObject *, struct Sprite *);
-u8 sub_8095668(struct MapObject *, struct Sprite *);
-u8 sub_80956A4(struct MapObject *, struct Sprite *);
-u8 sub_80956B4(struct MapObject *, struct Sprite *);
-u8 sub_80956C4(struct MapObject *, struct Sprite *);
-u8 sub_80956F4(struct MapObject *, struct Sprite *);
-u8 sub_8095724(struct MapObject *, struct Sprite *);
-u8 sub_8095730(struct MapObject *, struct Sprite *);
-u8 sub_8095740(struct MapObject *, struct Sprite *);
-u8 sub_8095740_2(struct MapObject *, struct Sprite *);
-u8 sub_80957A0(struct MapObject *, struct Sprite *);
-u8 sub_80957A0_2(struct MapObject *, struct Sprite *);
-u8 sub_8095800(struct MapObject *, struct Sprite *);
-u8 sub_8095800_2(struct MapObject *, struct Sprite *);
-u8 sub_8095860(struct MapObject *, struct Sprite *);
-u8 sub_8095860_2(struct MapObject *, struct Sprite *);
-u8 sub_8095900(struct MapObject *, struct Sprite *);
-u8 sub_8095910(struct MapObject *, struct Sprite *);
-u8 sub_8095920(struct MapObject *, struct Sprite *);
-u8 sub_8095930(struct MapObject *, struct Sprite *);
-u8 sub_8095940(struct MapObject *, struct Sprite *);
-u8 sub_8095964(struct MapObject *, struct Sprite *);
-u8 sub_8095988(struct MapObject *, struct Sprite *);
-u8 sub_80959AC(struct MapObject *, struct Sprite *);
-u8 sub_80959D0(struct MapObject *, struct Sprite *);
-u8 sub_80959F4(struct MapObject *, struct Sprite *);
-u8 sub_8095A18(struct MapObject *, struct Sprite *);
-u8 sub_8095A3C(struct MapObject *, struct Sprite *);
-u8 sub_8095A60(struct MapObject *, struct Sprite *);
-u8 sub_8095A84(struct MapObject *, struct Sprite *);
-u8 sub_8095AA8(struct MapObject *, struct Sprite *);
-u8 sub_8095ACC(struct MapObject *, struct Sprite *);
-u8 sub_8095B44(struct MapObject *, struct Sprite *);
-u8 sub_8095B64(struct MapObject *, struct Sprite *);
-u8 sub_8095BC8(struct MapObject *, struct Sprite *);
-u8 sub_8095BC8_2(struct MapObject *, struct Sprite *);
-u8 sub_8095C20(struct MapObject *, struct Sprite *);
-u8 sub_8095C20_2(struct MapObject *, struct Sprite *);
-u8 sub_8095C78(struct MapObject *, struct Sprite *);
-u8 sub_8095C78_2(struct MapObject *, struct Sprite *);
-u8 sub_8095CD0(struct MapObject *, struct Sprite *);
-u8 sub_8095CD0_2(struct MapObject *, struct Sprite *);
-u8 sub_8095D28(struct MapObject *, struct Sprite *);
-u8 sub_8095D28_2(struct MapObject *, struct Sprite *);
-u8 sub_8095D80(struct MapObject *, struct Sprite *);
-u8 sub_8095D80_2(struct MapObject *, struct Sprite *);
-u8 sub_8095DD8(struct MapObject *, struct Sprite *);
-u8 sub_8095DD8_2(struct MapObject *, struct Sprite *);
-u8 sub_8095E30(struct MapObject *, struct Sprite *);
-u8 sub_8095E30_2(struct MapObject *, struct Sprite *);
-u8 sub_8095E88(struct MapObject *, struct Sprite *);
-u8 sub_8095E88_2(struct MapObject *, struct Sprite *);
-u8 sub_8095EE0(struct MapObject *, struct Sprite *);
-u8 sub_8095EE0_2(struct MapObject *, struct Sprite *);
-u8 sub_8095F38(struct MapObject *, struct Sprite *);
-u8 sub_8095F38_2(struct MapObject *, struct Sprite *);
-u8 sub_8095F90(struct MapObject *, struct Sprite *);
-u8 sub_8095F90_2(struct MapObject *, struct Sprite *);
-u8 sub_8095FE8(struct MapObject *, struct Sprite *);
-u8 sub_8096020(struct MapObject *, struct Sprite *);
-u8 sub_8096058(struct MapObject *, struct Sprite *);
-u8 sub_8096090(struct MapObject *, struct Sprite *);
-u8 sub_8096100(struct MapObject *, struct Sprite *);
-u8 sub_8096100_2(struct MapObject *, struct Sprite *);
-u8 sub_8096140(struct MapObject *, struct Sprite *);
-u8 sub_8096140_2(struct MapObject *, struct Sprite *);
-u8 sub_8096180(struct MapObject *, struct Sprite *);
-u8 sub_8096180_2(struct MapObject *, struct Sprite *);
-u8 sub_80961C0(struct MapObject *, struct Sprite *);
-u8 sub_80961C0_2(struct MapObject *, struct Sprite *);
-u8 sub_8096230(struct MapObject *, struct Sprite *);
-u8 sub_8096230_2(struct MapObject *, struct Sprite *);
-u8 sub_8096270(struct MapObject *, struct Sprite *);
-u8 sub_8096270_2(struct MapObject *, struct Sprite *);
-u8 sub_80962B0(struct MapObject *, struct Sprite *);
-u8 sub_80962B0_2(struct MapObject *, struct Sprite *);
-u8 sub_80962F0(struct MapObject *, struct Sprite *);
-u8 sub_80962F0_2(struct MapObject *, struct Sprite *);
-u8 sub_8096368(struct MapObject *, struct Sprite *);
-u8 sub_8096368_2(struct MapObject *, struct Sprite *);
-u8 sub_80963A8(struct MapObject *, struct Sprite *);
-u8 sub_80963A8_2(struct MapObject *, struct Sprite *);
-u8 sub_80963E8(struct MapObject *, struct Sprite *);
-u8 sub_80963E8_2(struct MapObject *, struct Sprite *);
-u8 sub_8096428(struct MapObject *, struct Sprite *);
-u8 sub_8096428_2(struct MapObject *, struct Sprite *);
-u8 sub_8096468(struct MapObject *, struct Sprite *);
-u8 sub_809647C(struct MapObject *, struct Sprite *);
-u8 sub_8096494(struct MapObject *, struct Sprite *);
-u8 sub_8097E50(struct MapObject *, struct Sprite *);
-u8 sub_80964B8(struct MapObject *, struct Sprite *);
-u8 sub_8097EF0(struct MapObject *, struct Sprite *);
-u8 sub_80980C0(struct MapObject *, struct Sprite *);
-u8 sub_80980D0(struct MapObject *, struct Sprite *);
-u8 sub_8098124(struct MapObject *, struct Sprite *);
-u8 sub_80980F4(struct MapObject *, struct Sprite *);
-u8 sub_8098108(struct MapObject *, struct Sprite *);
-
-u8 (*const gUnknown_0850DEC8[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850DED0[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850DED8[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850DEE0[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850DF2C[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850DF38[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850DF44[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850DF50[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850DF8C[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850DF98[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850DFA4[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850DFB0[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850DFC8[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850DFD4[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850DFE0[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850DFEC[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850DFF8[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E004[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E010[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E01C[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E028[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E034[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E040[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E04C[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E058[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E064[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E070[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E07C[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E088[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E094[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E0A0[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E0AC[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E0B8[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E0C4[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E0D0[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E0DC[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E0E8[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E0F4[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E100[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E10C[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E118[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E124[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E130[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E13C[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E148[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E154[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E160[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E16C[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E178[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E184[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E190[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E19C[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E1A8[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E1B4[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E1C0[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E1CC[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E1D8[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E1E4[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E1F0[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E1FC[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E208[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E214[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E220[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E228[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E230[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E238[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E240[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E24C[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E258[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E264[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E270[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E27C[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E288[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E294[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E2A0[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E2AC[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E2B8[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E2C4[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E2D0[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E2D8[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E2E4[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E2EC[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E2F4[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E2FC[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E304[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E30C[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E314[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E31C[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E324[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E32C[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E338[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E348[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E358[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E360[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E368[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E370[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E378[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E380[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E388[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E394[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E3B8[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E3C0[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E3C8[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E3D0[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E3D8[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E3E4[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E3F0[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E3FC[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E408[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E414[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E420[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E42C[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E474[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E480[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E48C[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E498[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E4A4[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E4B0[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E4BC[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E4C8[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E4D4[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E4E0[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E4EC[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E4F8[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E504[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E510[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E51C[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E528[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E534[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E540[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E54C[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E558[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E564[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E570[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E57C[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E588[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E594[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E5A0[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E5AC[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E5B8[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850DF5C[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850DF68[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850DF74[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850DF80[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850DEFC[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850DF08[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850DF14[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850DF20[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E854[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E85C[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E3A0[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E3AC[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E5C4[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E5CC[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E5D4[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E468[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E864[])(struct MapObject *, struct Sprite *);
-u8 (*const gUnknown_0850E870[])(struct MapObject *, struct Sprite *);
-
-u8 (*const *const gUnknown_0850DC50[])(struct MapObject *, struct Sprite *) = {
+u8 MovementAction_FaceDown_Step0(struct EventObject *, struct Sprite *);
+u8 sub_8093950(struct EventObject *, struct Sprite *);
+u8 sub_80964BC(struct EventObject *, struct Sprite *);
+u8 sub_8093960(struct EventObject *, struct Sprite *);
+u8 sub_8093970(struct EventObject *, struct Sprite *);
+u8 sub_8093980(struct EventObject *, struct Sprite *);
+u8 sub_8093BC4(struct EventObject *, struct Sprite *);
+u8 sub_8093BC4_2(struct EventObject *, struct Sprite *);
+u8 sub_8093C04(struct EventObject *, struct Sprite *);
+u8 sub_8093C04_2(struct EventObject *, struct Sprite *);
+u8 sub_8093C44(struct EventObject *, struct Sprite *);
+u8 sub_8093C44_2(struct EventObject *, struct Sprite *);
+u8 sub_8093C84(struct EventObject *, struct Sprite *);
+u8 sub_8093C84_2(struct EventObject *, struct Sprite *);
+u8 sub_8093CC4(struct EventObject *, struct Sprite *);
+u8 sub_8093CC4_2(struct EventObject *, struct Sprite *);
+u8 sub_8093D04(struct EventObject *, struct Sprite *);
+u8 sub_8093D04_2(struct EventObject *, struct Sprite *);
+u8 sub_8093D44(struct EventObject *, struct Sprite *);
+u8 sub_8093D44_2(struct EventObject *, struct Sprite *);
+u8 sub_8093D84(struct EventObject *, struct Sprite *);
+u8 sub_8093D84_2(struct EventObject *, struct Sprite *);
+u8 sub_8093DC4(struct EventObject *, struct Sprite *);
+u8 sub_8093DC4_2(struct EventObject *, struct Sprite *);
+u8 sub_8093E04(struct EventObject *, struct Sprite *);
+u8 sub_8093E04_2(struct EventObject *, struct Sprite *);
+u8 sub_8093E44(struct EventObject *, struct Sprite *);
+u8 sub_8093E44_2(struct EventObject *, struct Sprite *);
+u8 sub_8093E84(struct EventObject *, struct Sprite *);
+u8 sub_8093E84_2(struct EventObject *, struct Sprite *);
+u8 sub_8093EC4(struct EventObject *, struct Sprite *);
+u8 sub_8093EC4_2(struct EventObject *, struct Sprite *);
+u8 sub_8093F04(struct EventObject *, struct Sprite *);
+u8 sub_8093F04_2(struct EventObject *, struct Sprite *);
+u8 sub_8093F44(struct EventObject *, struct Sprite *);
+u8 sub_8093F44_2(struct EventObject *, struct Sprite *);
+u8 sub_8093F84(struct EventObject *, struct Sprite *);
+u8 sub_8093F84_2(struct EventObject *, struct Sprite *);
+u8 sub_8094230(struct EventObject *, struct Sprite *);
+u8 sub_8094230_2(struct EventObject *, struct Sprite *);
+u8 sub_8094288(struct EventObject *, struct Sprite *);
+u8 sub_8094288_2(struct EventObject *, struct Sprite *);
+u8 sub_80942E0(struct EventObject *, struct Sprite *);
+u8 sub_80942E0_2(struct EventObject *, struct Sprite *);
+u8 sub_8094338(struct EventObject *, struct Sprite *);
+u8 sub_8094338_2(struct EventObject *, struct Sprite *);
+u8 sub_80943B4(struct EventObject *, struct Sprite *);
+u8 sub_8094398(struct EventObject *, struct Sprite *);
+u8 sub_80964B8(struct EventObject *, struct Sprite *);
+u8 sub_80943D4(struct EventObject *, struct Sprite *);
+u8 sub_80943F4(struct EventObject *, struct Sprite *);
+u8 sub_8094414(struct EventObject *, struct Sprite *);
+u8 sub_8094434(struct EventObject *, struct Sprite *);
+u8 sub_8094454(struct EventObject *, struct Sprite *);
+u8 sub_8094454_2(struct EventObject *, struct Sprite *);
+u8 sub_8094494(struct EventObject *, struct Sprite *);
+u8 sub_8094494_2(struct EventObject *, struct Sprite *);
+u8 sub_80944D4(struct EventObject *, struct Sprite *);
+u8 sub_80944D4_2(struct EventObject *, struct Sprite *);
+u8 sub_8094514(struct EventObject *, struct Sprite *);
+u8 sub_8094514_2(struct EventObject *, struct Sprite *);
+u8 sub_8094600(struct EventObject *, struct Sprite *);
+u8 sub_80945C4(struct EventObject *, struct Sprite *);
+u8 sub_8094638(struct EventObject *, struct Sprite *);
+u8 sub_8094670(struct EventObject *, struct Sprite *);
+u8 sub_80946A8(struct EventObject *, struct Sprite *);
+u8 sub_80946E0(struct EventObject *, struct Sprite *);
+u8 sub_809459C(struct EventObject *, struct Sprite *);
+u8 sub_8094718(struct EventObject *, struct Sprite *);
+u8 sub_8094750(struct EventObject *, struct Sprite *);
+u8 sub_8094788(struct EventObject *, struct Sprite *);
+u8 sub_80947C0(struct EventObject *, struct Sprite *);
+u8 sub_80947F8(struct EventObject *, struct Sprite *);
+u8 sub_8094830(struct EventObject *, struct Sprite *);
+u8 sub_8094868(struct EventObject *, struct Sprite *);
+u8 sub_80948A0(struct EventObject *, struct Sprite *);
+u8 sub_80948D8(struct EventObject *, struct Sprite *);
+u8 sub_8094910(struct EventObject *, struct Sprite *);
+u8 sub_8094948(struct EventObject *, struct Sprite *);
+u8 sub_8094980(struct EventObject *, struct Sprite *);
+u8 sub_8094980_2(struct EventObject *, struct Sprite *);
+u8 sub_80949C0(struct EventObject *, struct Sprite *);
+u8 sub_80949C0_2(struct EventObject *, struct Sprite *);
+u8 sub_8094A00(struct EventObject *, struct Sprite *);
+u8 sub_8094A00_2(struct EventObject *, struct Sprite *);
+u8 sub_8094A40(struct EventObject *, struct Sprite *);
+u8 sub_8094A40_2(struct EventObject *, struct Sprite *);
+u8 sub_8094A80(struct EventObject *, struct Sprite *);
+u8 sub_8094A80_2(struct EventObject *, struct Sprite *);
+u8 sub_8094AC0(struct EventObject *, struct Sprite *);
+u8 sub_8094AC0_2(struct EventObject *, struct Sprite *);
+u8 sub_8094B00(struct EventObject *, struct Sprite *);
+u8 sub_8094B00_2(struct EventObject *, struct Sprite *);
+u8 sub_8094B40(struct EventObject *, struct Sprite *);
+u8 sub_8094B40_2(struct EventObject *, struct Sprite *);
+u8 sub_8094B80(struct EventObject *, struct Sprite *);
+u8 sub_8094B80_2(struct EventObject *, struct Sprite *);
+u8 sub_8094BC0(struct EventObject *, struct Sprite *);
+u8 sub_8094BC0_2(struct EventObject *, struct Sprite *);
+u8 sub_8094C00(struct EventObject *, struct Sprite *);
+u8 sub_8094C00_2(struct EventObject *, struct Sprite *);
+u8 sub_8094C40(struct EventObject *, struct Sprite *);
+u8 sub_8094C40_2(struct EventObject *, struct Sprite *);
+u8 sub_8094C80(struct EventObject *, struct Sprite *);
+u8 sub_8094C80_2(struct EventObject *, struct Sprite *);
+u8 sub_8094CC0(struct EventObject *, struct Sprite *);
+u8 sub_8094CC0_2(struct EventObject *, struct Sprite *);
+u8 sub_8094D00(struct EventObject *, struct Sprite *);
+u8 sub_8094D00_2(struct EventObject *, struct Sprite *);
+u8 sub_8094D40(struct EventObject *, struct Sprite *);
+u8 sub_8094D40_2(struct EventObject *, struct Sprite *);
+u8 sub_8094DAC(struct EventObject *, struct Sprite *);
+u8 sub_8094DC4(struct EventObject *, struct Sprite *);
+u8 sub_8094E18(struct EventObject *, struct Sprite *);
+u8 sub_8094E18_2(struct EventObject *, struct Sprite *);
+u8 sub_8094E60(struct EventObject *, struct Sprite *);
+u8 sub_8094E60_2(struct EventObject *, struct Sprite *);
+u8 sub_8094EB8(struct EventObject *, struct Sprite *);
+u8 sub_8094EB8_2(struct EventObject *, struct Sprite *);
+u8 sub_8094710(struct EventObject *, struct Sprite *);
+u8 sub_8094710_2(struct EventObject *, struct Sprite *);
+u8 sub_8094F38(struct EventObject *, struct Sprite *);
+u8 sub_8094F94(struct EventObject *, struct Sprite *);
+u8 sub_8094FF8(struct EventObject *, struct Sprite *);
+u8 sub_8095008(struct EventObject *, struct Sprite *);
+u8 sub_8095018(struct EventObject *, struct Sprite *);
+u8 sub_8095018_2(struct EventObject *, struct Sprite *);
+u8 sub_8095070(struct EventObject *, struct Sprite *);
+u8 sub_8095070_2(struct EventObject *, struct Sprite *);
+u8 sub_80950C8(struct EventObject *, struct Sprite *);
+u8 sub_80950C8_2(struct EventObject *, struct Sprite *);
+u8 sub_8095120(struct EventObject *, struct Sprite *);
+u8 sub_8095120_2(struct EventObject *, struct Sprite *);
+u8 sub_8095178(struct EventObject *, struct Sprite *);
+u8 sub_8095178_2(struct EventObject *, struct Sprite *);
+u8 sub_80951D0(struct EventObject *, struct Sprite *);
+u8 sub_80951D0_2(struct EventObject *, struct Sprite *);
+u8 sub_8095228(struct EventObject *, struct Sprite *);
+u8 sub_8095228_2(struct EventObject *, struct Sprite *);
+u8 sub_8095280(struct EventObject *, struct Sprite *);
+u8 sub_8095280_2(struct EventObject *, struct Sprite *);
+u8 sub_80952D8(struct EventObject *, struct Sprite *);
+u8 sub_80952D8_2(struct EventObject *, struct Sprite *);
+u8 sub_8095330(struct EventObject *, struct Sprite *);
+u8 sub_8095330_2(struct EventObject *, struct Sprite *);
+u8 sub_8095388(struct EventObject *, struct Sprite *);
+u8 sub_8095388_2(struct EventObject *, struct Sprite *);
+u8 sub_80953E0(struct EventObject *, struct Sprite *);
+u8 sub_80953E0_2(struct EventObject *, struct Sprite *);
+u8 sub_8095438(struct EventObject *, struct Sprite *);
+u8 sub_8095450(struct EventObject *, struct Sprite *);
+u8 sub_8095460(struct EventObject *, struct Sprite *);
+u8 sub_8095470(struct EventObject *, struct Sprite *);
+u8 sub_8095480(struct EventObject *, struct Sprite *);
+u8 sub_8095490(struct EventObject *, struct Sprite *);
+u8 sub_80954BC(struct EventObject *, struct Sprite *);
+u8 sub_80954CC(struct EventObject *, struct Sprite *);
+u8 do_exclamation_mark_bubble_1(struct EventObject *, struct Sprite *);
+u8 do_exclamation_mark_bubble_2(struct EventObject *, struct Sprite *);
+u8 do_heart_bubble(struct EventObject *, struct Sprite *);
+u8 sub_8095548(struct EventObject *, struct Sprite *);
+u8 sub_809558C(struct EventObject *, struct Sprite *);
+u8 sub_80955AC(struct EventObject *, struct Sprite *);
+u8 sub_80955C8(struct EventObject *, struct Sprite *);
+u8 sub_80955EC(struct EventObject *, struct Sprite *);
+u8 sub_8095628(struct EventObject *, struct Sprite *);
+u8 sub_8095644(struct EventObject *, struct Sprite *);
+u8 sub_8095668(struct EventObject *, struct Sprite *);
+u8 sub_80956A4(struct EventObject *, struct Sprite *);
+u8 sub_80956B4(struct EventObject *, struct Sprite *);
+u8 sub_80956C4(struct EventObject *, struct Sprite *);
+u8 sub_80956F4(struct EventObject *, struct Sprite *);
+u8 sub_8095724(struct EventObject *, struct Sprite *);
+u8 sub_8095730(struct EventObject *, struct Sprite *);
+u8 sub_8095740(struct EventObject *, struct Sprite *);
+u8 sub_8095740_2(struct EventObject *, struct Sprite *);
+u8 sub_80957A0(struct EventObject *, struct Sprite *);
+u8 sub_80957A0_2(struct EventObject *, struct Sprite *);
+u8 sub_8095800(struct EventObject *, struct Sprite *);
+u8 sub_8095800_2(struct EventObject *, struct Sprite *);
+u8 sub_8095860(struct EventObject *, struct Sprite *);
+u8 sub_8095860_2(struct EventObject *, struct Sprite *);
+u8 sub_8095900(struct EventObject *, struct Sprite *);
+u8 sub_8095910(struct EventObject *, struct Sprite *);
+u8 sub_8095920(struct EventObject *, struct Sprite *);
+u8 sub_8095930(struct EventObject *, struct Sprite *);
+u8 sub_8095940(struct EventObject *, struct Sprite *);
+u8 sub_8095964(struct EventObject *, struct Sprite *);
+u8 sub_8095988(struct EventObject *, struct Sprite *);
+u8 sub_80959AC(struct EventObject *, struct Sprite *);
+u8 sub_80959D0(struct EventObject *, struct Sprite *);
+u8 sub_80959F4(struct EventObject *, struct Sprite *);
+u8 sub_8095A18(struct EventObject *, struct Sprite *);
+u8 sub_8095A3C(struct EventObject *, struct Sprite *);
+u8 sub_8095A60(struct EventObject *, struct Sprite *);
+u8 sub_8095A84(struct EventObject *, struct Sprite *);
+u8 sub_8095AA8(struct EventObject *, struct Sprite *);
+u8 sub_8095ACC(struct EventObject *, struct Sprite *);
+u8 sub_8095B44(struct EventObject *, struct Sprite *);
+u8 sub_8095B64(struct EventObject *, struct Sprite *);
+u8 sub_8095BC8(struct EventObject *, struct Sprite *);
+u8 sub_8095BC8_2(struct EventObject *, struct Sprite *);
+u8 sub_8095C20(struct EventObject *, struct Sprite *);
+u8 sub_8095C20_2(struct EventObject *, struct Sprite *);
+u8 sub_8095C78(struct EventObject *, struct Sprite *);
+u8 sub_8095C78_2(struct EventObject *, struct Sprite *);
+u8 sub_8095CD0(struct EventObject *, struct Sprite *);
+u8 sub_8095CD0_2(struct EventObject *, struct Sprite *);
+u8 sub_8095D28(struct EventObject *, struct Sprite *);
+u8 sub_8095D28_2(struct EventObject *, struct Sprite *);
+u8 sub_8095D80(struct EventObject *, struct Sprite *);
+u8 sub_8095D80_2(struct EventObject *, struct Sprite *);
+u8 sub_8095DD8(struct EventObject *, struct Sprite *);
+u8 sub_8095DD8_2(struct EventObject *, struct Sprite *);
+u8 sub_8095E30(struct EventObject *, struct Sprite *);
+u8 sub_8095E30_2(struct EventObject *, struct Sprite *);
+u8 sub_8095E88(struct EventObject *, struct Sprite *);
+u8 sub_8095E88_2(struct EventObject *, struct Sprite *);
+u8 sub_8095EE0(struct EventObject *, struct Sprite *);
+u8 sub_8095EE0_2(struct EventObject *, struct Sprite *);
+u8 sub_8095F38(struct EventObject *, struct Sprite *);
+u8 sub_8095F38_2(struct EventObject *, struct Sprite *);
+u8 sub_8095F90(struct EventObject *, struct Sprite *);
+u8 sub_8095F90_2(struct EventObject *, struct Sprite *);
+u8 sub_8095FE8(struct EventObject *, struct Sprite *);
+u8 sub_8096020(struct EventObject *, struct Sprite *);
+u8 sub_8096058(struct EventObject *, struct Sprite *);
+u8 sub_8096090(struct EventObject *, struct Sprite *);
+u8 sub_8096100(struct EventObject *, struct Sprite *);
+u8 sub_8096100_2(struct EventObject *, struct Sprite *);
+u8 sub_8096140(struct EventObject *, struct Sprite *);
+u8 sub_8096140_2(struct EventObject *, struct Sprite *);
+u8 sub_8096180(struct EventObject *, struct Sprite *);
+u8 sub_8096180_2(struct EventObject *, struct Sprite *);
+u8 sub_80961C0(struct EventObject *, struct Sprite *);
+u8 sub_80961C0_2(struct EventObject *, struct Sprite *);
+u8 sub_8096230(struct EventObject *, struct Sprite *);
+u8 sub_8096230_2(struct EventObject *, struct Sprite *);
+u8 sub_8096270(struct EventObject *, struct Sprite *);
+u8 sub_8096270_2(struct EventObject *, struct Sprite *);
+u8 sub_80962B0(struct EventObject *, struct Sprite *);
+u8 sub_80962B0_2(struct EventObject *, struct Sprite *);
+u8 sub_80962F0(struct EventObject *, struct Sprite *);
+u8 sub_80962F0_2(struct EventObject *, struct Sprite *);
+u8 sub_8096368(struct EventObject *, struct Sprite *);
+u8 sub_8096368_2(struct EventObject *, struct Sprite *);
+u8 sub_80963A8(struct EventObject *, struct Sprite *);
+u8 sub_80963A8_2(struct EventObject *, struct Sprite *);
+u8 sub_80963E8(struct EventObject *, struct Sprite *);
+u8 sub_80963E8_2(struct EventObject *, struct Sprite *);
+u8 sub_8096428(struct EventObject *, struct Sprite *);
+u8 sub_8096428_2(struct EventObject *, struct Sprite *);
+u8 sub_8096468(struct EventObject *, struct Sprite *);
+u8 sub_809647C(struct EventObject *, struct Sprite *);
+u8 sub_8096494(struct EventObject *, struct Sprite *);
+u8 sub_8097E50(struct EventObject *, struct Sprite *);
+u8 sub_80964B8(struct EventObject *, struct Sprite *);
+u8 sub_8097EF0(struct EventObject *, struct Sprite *);
+u8 sub_80980C0(struct EventObject *, struct Sprite *);
+u8 sub_80980D0(struct EventObject *, struct Sprite *);
+u8 sub_8098124(struct EventObject *, struct Sprite *);
+u8 sub_80980F4(struct EventObject *, struct Sprite *);
+u8 sub_8098108(struct EventObject *, struct Sprite *);
+
+u8 (*const gUnknown_0850DEC8[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850DED0[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850DED8[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850DEE0[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850DF2C[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850DF38[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850DF44[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850DF50[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850DF8C[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850DF98[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850DFA4[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850DFB0[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850DFC8[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850DFD4[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850DFE0[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850DFEC[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850DFF8[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E004[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E010[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E01C[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E028[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E034[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E040[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E04C[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E058[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E064[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E070[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E07C[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E088[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E094[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E0A0[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E0AC[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E0B8[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E0C4[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E0D0[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E0DC[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E0E8[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E0F4[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E100[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E10C[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E118[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E124[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E130[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E13C[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E148[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E154[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E160[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E16C[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E178[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E184[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E190[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E19C[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E1A8[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E1B4[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E1C0[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E1CC[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E1D8[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E1E4[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E1F0[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E1FC[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E208[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E214[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E220[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E228[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E230[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E238[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E240[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E24C[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E258[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E264[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E270[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E27C[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E288[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E294[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E2A0[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E2AC[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E2B8[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E2C4[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E2D0[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E2D8[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E2E4[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E2EC[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E2F4[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E2FC[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E304[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E30C[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E314[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E31C[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E324[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E32C[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E338[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E348[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E358[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E360[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E368[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E370[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E378[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E380[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E388[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E394[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E3B8[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E3C0[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E3C8[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E3D0[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E3D8[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E3E4[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E3F0[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E3FC[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E408[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E414[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E420[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E42C[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E474[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E480[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E48C[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E498[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E4A4[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E4B0[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E4BC[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E4C8[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E4D4[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E4E0[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E4EC[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E4F8[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E504[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E510[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E51C[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E528[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E534[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E540[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E54C[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E558[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E564[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E570[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E57C[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E588[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E594[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E5A0[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E5AC[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E5B8[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850DF5C[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850DF68[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850DF74[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850DF80[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850DEFC[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850DF08[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850DF14[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850DF20[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E854[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E85C[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E3A0[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E3AC[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E5C4[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E5CC[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E5D4[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E468[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E864[])(struct EventObject *, struct Sprite *);
+u8 (*const gUnknown_0850E870[])(struct EventObject *, struct Sprite *);
+
+u8 (*const *const gUnknown_0850DC50[])(struct EventObject *, struct Sprite *) = {
 	gUnknown_0850DEC8,
 	gUnknown_0850DED0,
 	gUnknown_0850DED8,
@@ -585,22 +585,22 @@ u8 (*const *const gUnknown_0850DC50[])(struct MapObject *, struct Sprite *) = {
 	gUnknown_0850E870,
 };
 
-u8 (*const gUnknown_0850DEC8[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850DEC8[])(struct EventObject *, struct Sprite *) = {
 	sub_8093950,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850DED0[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850DED0[])(struct EventObject *, struct Sprite *) = {
 	sub_8093960,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850DED8[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850DED8[])(struct EventObject *, struct Sprite *) = {
 	sub_8093970,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850DEE0[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850DEE0[])(struct EventObject *, struct Sprite *) = {
 	sub_8093980,
 	sub_80964BC,
 };
@@ -613,97 +613,97 @@ u8 (*const gUnknown_0850DEE8[])(u8) = {
 	get_go_fastest_image_anim_num,
 };
 
-u8 (*const gUnknown_0850DEFC[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850DEFC[])(struct EventObject *, struct Sprite *) = {
 	sub_8093BC4,
 	sub_8093BC4_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850DF08[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850DF08[])(struct EventObject *, struct Sprite *) = {
 	sub_8093C04,
 	sub_8093C04_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850DF14[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850DF14[])(struct EventObject *, struct Sprite *) = {
 	sub_8093C44,
 	sub_8093C44_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850DF20[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850DF20[])(struct EventObject *, struct Sprite *) = {
 	sub_8093C84,
 	sub_8093C84_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850DF2C[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850DF2C[])(struct EventObject *, struct Sprite *) = {
 	sub_8093CC4,
 	sub_8093CC4_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850DF38[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850DF38[])(struct EventObject *, struct Sprite *) = {
 	sub_8093D04,
 	sub_8093D04_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850DF44[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850DF44[])(struct EventObject *, struct Sprite *) = {
 	sub_8093D44,
 	sub_8093D44_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850DF50[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850DF50[])(struct EventObject *, struct Sprite *) = {
 	sub_8093D84,
 	sub_8093D84_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850DF5C[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850DF5C[])(struct EventObject *, struct Sprite *) = {
 	sub_8093DC4,
 	sub_8093DC4_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850DF68[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850DF68[])(struct EventObject *, struct Sprite *) = {
 	sub_8093E04,
 	sub_8093E04_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850DF74[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850DF74[])(struct EventObject *, struct Sprite *) = {
 	sub_8093E44,
 	sub_8093E44_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850DF80[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850DF80[])(struct EventObject *, struct Sprite *) = {
 	sub_8093E84,
 	sub_8093E84_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850DF8C[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850DF8C[])(struct EventObject *, struct Sprite *) = {
 	sub_8093EC4,
 	sub_8093EC4_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850DF98[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850DF98[])(struct EventObject *, struct Sprite *) = {
 	sub_8093F04,
 	sub_8093F04_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850DFA4[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850DFA4[])(struct EventObject *, struct Sprite *) = {
 	sub_8093F44,
 	sub_8093F44_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850DFB0[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850DFB0[])(struct EventObject *, struct Sprite *) = {
 	sub_8093F84,
 	sub_8093F84_2,
 	sub_80964BC,
@@ -712,591 +712,591 @@ u8 (*const gUnknown_0850DFB0[])(struct MapObject *, struct Sprite *) = {
 const s16 gUnknown_0850DFBC[] = {0, 1, 1};
 const s16 gUnknown_0850DFC2[] = {0, 0, 1};
 
-u8 (*const gUnknown_0850DFC8[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850DFC8[])(struct EventObject *, struct Sprite *) = {
 	sub_8094230,
 	sub_8094230_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850DFD4[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850DFD4[])(struct EventObject *, struct Sprite *) = {
 	sub_8094288,
 	sub_8094288_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850DFE0[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850DFE0[])(struct EventObject *, struct Sprite *) = {
 	sub_80942E0,
 	sub_80942E0_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850DFEC[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850DFEC[])(struct EventObject *, struct Sprite *) = {
 	sub_8094338,
 	sub_8094338_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850DFF8[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850DFF8[])(struct EventObject *, struct Sprite *) = {
 	sub_80943B4,
 	sub_8094398,
 	sub_80964B8,
 };
 
-u8 (*const gUnknown_0850E004[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E004[])(struct EventObject *, struct Sprite *) = {
 	sub_80943D4,
 	sub_8094398,
 	sub_80964B8,
 };
 
-u8 (*const gUnknown_0850E010[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E010[])(struct EventObject *, struct Sprite *) = {
 	sub_80943F4,
 	sub_8094398,
 	sub_80964B8,
 };
 
-u8 (*const gUnknown_0850E01C[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E01C[])(struct EventObject *, struct Sprite *) = {
 	sub_8094414,
 	sub_8094398,
 	sub_80964B8,
 };
 
-u8 (*const gUnknown_0850E028[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E028[])(struct EventObject *, struct Sprite *) = {
 	sub_8094434,
 	sub_8094398,
 	sub_80964B8,
 };
 
-u8 (*const gUnknown_0850E034[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E034[])(struct EventObject *, struct Sprite *) = {
 	sub_8094454,
 	sub_8094454_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E040[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E040[])(struct EventObject *, struct Sprite *) = {
 	sub_8094494,
 	sub_8094494_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E04C[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E04C[])(struct EventObject *, struct Sprite *) = {
 	sub_80944D4,
 	sub_80944D4_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E058[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E058[])(struct EventObject *, struct Sprite *) = {
 	sub_8094514,
 	sub_8094514_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E064[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E064[])(struct EventObject *, struct Sprite *) = {
 	sub_8094600,
 	sub_80945C4,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E070[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E070[])(struct EventObject *, struct Sprite *) = {
 	sub_8094638,
 	sub_80945C4,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E07C[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E07C[])(struct EventObject *, struct Sprite *) = {
 	sub_8094670,
 	sub_80945C4,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E088[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E088[])(struct EventObject *, struct Sprite *) = {
 	sub_80946A8,
 	sub_80945C4,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E094[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E094[])(struct EventObject *, struct Sprite *) = {
 	sub_80946E0,
 	sub_809459C,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E0A0[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E0A0[])(struct EventObject *, struct Sprite *) = {
 	sub_8094718,
 	sub_809459C,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E0AC[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E0AC[])(struct EventObject *, struct Sprite *) = {
 	sub_8094750,
 	sub_809459C,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E0B8[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E0B8[])(struct EventObject *, struct Sprite *) = {
 	sub_8094788,
 	sub_809459C,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E0C4[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E0C4[])(struct EventObject *, struct Sprite *) = {
 	sub_80947C0,
 	sub_809459C,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E0D0[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E0D0[])(struct EventObject *, struct Sprite *) = {
 	sub_80947F8,
 	sub_809459C,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E0DC[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E0DC[])(struct EventObject *, struct Sprite *) = {
 	sub_8094830,
 	sub_809459C,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E0E8[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E0E8[])(struct EventObject *, struct Sprite *) = {
 	sub_8094868,
 	sub_809459C,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E0F4[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E0F4[])(struct EventObject *, struct Sprite *) = {
 	sub_80948A0,
 	sub_809459C,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E100[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E100[])(struct EventObject *, struct Sprite *) = {
 	sub_80948D8,
 	sub_809459C,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E10C[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E10C[])(struct EventObject *, struct Sprite *) = {
 	sub_8094910,
 	sub_809459C,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E118[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E118[])(struct EventObject *, struct Sprite *) = {
 	sub_8094948,
 	sub_809459C,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E124[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E124[])(struct EventObject *, struct Sprite *) = {
 	sub_8094980,
 	sub_8094980_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E130[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E130[])(struct EventObject *, struct Sprite *) = {
 	sub_80949C0,
 	sub_80949C0_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E13C[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E13C[])(struct EventObject *, struct Sprite *) = {
 	sub_8094A00,
 	sub_8094A00_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E148[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E148[])(struct EventObject *, struct Sprite *) = {
 	sub_8094A40,
 	sub_8094A40_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E154[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E154[])(struct EventObject *, struct Sprite *) = {
 	sub_8094A80,
 	sub_8094A80_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E160[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E160[])(struct EventObject *, struct Sprite *) = {
 	sub_8094AC0,
 	sub_8094AC0_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E16C[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E16C[])(struct EventObject *, struct Sprite *) = {
 	sub_8094B00,
 	sub_8094B00_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E178[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E178[])(struct EventObject *, struct Sprite *) = {
 	sub_8094B40,
 	sub_8094B40_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E184[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E184[])(struct EventObject *, struct Sprite *) = {
 	sub_8094B80,
 	sub_8094B80_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E190[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E190[])(struct EventObject *, struct Sprite *) = {
 	sub_8094BC0,
 	sub_8094BC0_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E19C[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E19C[])(struct EventObject *, struct Sprite *) = {
 	sub_8094C00,
 	sub_8094C00_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E1A8[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E1A8[])(struct EventObject *, struct Sprite *) = {
 	sub_8094C40,
 	sub_8094C40_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E1B4[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E1B4[])(struct EventObject *, struct Sprite *) = {
 	sub_8094C80,
 	sub_8094C80_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E1C0[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E1C0[])(struct EventObject *, struct Sprite *) = {
 	sub_8094CC0,
 	sub_8094CC0_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E1CC[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E1CC[])(struct EventObject *, struct Sprite *) = {
 	sub_8094D00,
 	sub_8094D00_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E1D8[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E1D8[])(struct EventObject *, struct Sprite *) = {
 	sub_8094D40,
 	sub_8094D40_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E1E4[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E1E4[])(struct EventObject *, struct Sprite *) = {
 	sub_8094DAC,
 	sub_8094DC4,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E1F0[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E1F0[])(struct EventObject *, struct Sprite *) = {
 	sub_8094E18,
 	sub_8094E18_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E1FC[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E1FC[])(struct EventObject *, struct Sprite *) = {
 	sub_8094E60,
 	sub_8094E60_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E208[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E208[])(struct EventObject *, struct Sprite *) = {
 	sub_8094EB8,
 	sub_8094EB8_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E214[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E214[])(struct EventObject *, struct Sprite *) = {
 	sub_8094710,
 	sub_8094710_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E220[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E220[])(struct EventObject *, struct Sprite *) = {
 	sub_8094F38,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E228[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E228[])(struct EventObject *, struct Sprite *) = {
 	sub_8094F94,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E230[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E230[])(struct EventObject *, struct Sprite *) = {
 	sub_8094FF8,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E238[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E238[])(struct EventObject *, struct Sprite *) = {
 	sub_8095008,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E240[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E240[])(struct EventObject *, struct Sprite *) = {
 	sub_8095018,
 	sub_8095018_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E24C[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E24C[])(struct EventObject *, struct Sprite *) = {
 	sub_8095070,
 	sub_8095070_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E258[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E258[])(struct EventObject *, struct Sprite *) = {
 	sub_80950C8,
 	sub_80950C8_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E264[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E264[])(struct EventObject *, struct Sprite *) = {
 	sub_8095120,
 	sub_8095120_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E270[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E270[])(struct EventObject *, struct Sprite *) = {
 	sub_8095178,
 	sub_8095178_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E27C[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E27C[])(struct EventObject *, struct Sprite *) = {
 	sub_80951D0,
 	sub_80951D0_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E288[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E288[])(struct EventObject *, struct Sprite *) = {
 	sub_8095228,
 	sub_8095228_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E294[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E294[])(struct EventObject *, struct Sprite *) = {
 	sub_8095280,
 	sub_8095280_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E2A0[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E2A0[])(struct EventObject *, struct Sprite *) = {
 	sub_80952D8,
 	sub_80952D8_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E2AC[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E2AC[])(struct EventObject *, struct Sprite *) = {
 	sub_8095330,
 	sub_8095330_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E2B8[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E2B8[])(struct EventObject *, struct Sprite *) = {
 	sub_8095388,
 	sub_8095388_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E2C4[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E2C4[])(struct EventObject *, struct Sprite *) = {
 	sub_80953E0,
 	sub_80953E0_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E2D0[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E2D0[])(struct EventObject *, struct Sprite *) = {
 	sub_8095438,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E2D8[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E2D8[])(struct EventObject *, struct Sprite *) = {
 	sub_8095450,
 	sub_8094DC4,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E2E4[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E2E4[])(struct EventObject *, struct Sprite *) = {
 	sub_8095460,
 	sub_80964B8,
 };
 
-u8 (*const gUnknown_0850E2EC[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E2EC[])(struct EventObject *, struct Sprite *) = {
 	sub_8095470,
 	sub_80964B8,
 };
 
-u8 (*const gUnknown_0850E2F4[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E2F4[])(struct EventObject *, struct Sprite *) = {
 	sub_8095480,
 	sub_80964B8,
 };
 
-u8 (*const gUnknown_0850E2FC[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E2FC[])(struct EventObject *, struct Sprite *) = {
 	sub_8095490,
 	sub_80964B8,
 };
 
-u8 (*const gUnknown_0850E304[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E304[])(struct EventObject *, struct Sprite *) = {
 	sub_80954BC,
 	sub_80964B8,
 };
 
-u8 (*const gUnknown_0850E30C[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E30C[])(struct EventObject *, struct Sprite *) = {
 	sub_80954CC,
 	sub_80964B8,
 };
 
-u8 (*const gUnknown_0850E314[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E314[])(struct EventObject *, struct Sprite *) = {
 	do_exclamation_mark_bubble_1,
 	sub_80964B8,
 };
 
-u8 (*const gUnknown_0850E31C[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E31C[])(struct EventObject *, struct Sprite *) = {
 	do_exclamation_mark_bubble_2,
 	sub_80964B8,
 };
 
-u8 (*const gUnknown_0850E324[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E324[])(struct EventObject *, struct Sprite *) = {
 	do_heart_bubble,
 	sub_80964B8,
 };
 
-u8 (*const gUnknown_0850E32C[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E32C[])(struct EventObject *, struct Sprite *) = {
 	sub_8095548,
 	sub_809558C,
 	sub_80964B8,
 };
 
-u8 (*const gUnknown_0850E338[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E338[])(struct EventObject *, struct Sprite *) = {
 	sub_80955AC,
 	sub_80955C8,
 	sub_80955EC,
 	sub_80964B8,
 };
 
-u8 (*const gUnknown_0850E348[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E348[])(struct EventObject *, struct Sprite *) = {
 	sub_8095628,
 	sub_8095644,
 	sub_8095668,
 	sub_80964B8,
 };
 
-u8 (*const gUnknown_0850E358[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E358[])(struct EventObject *, struct Sprite *) = {
 	sub_80956A4,
 	sub_80964B8,
 };
 
-u8 (*const gUnknown_0850E360[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E360[])(struct EventObject *, struct Sprite *) = {
 	sub_80956B4,
 	sub_80964B8,
 };
 
-u8 (*const gUnknown_0850E368[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E368[])(struct EventObject *, struct Sprite *) = {
 	sub_80956C4,
 	sub_80964B8,
 };
 
-u8 (*const gUnknown_0850E370[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E370[])(struct EventObject *, struct Sprite *) = {
 	sub_80956F4,
 	sub_80964B8,
 };
 
-u8 (*const gUnknown_0850E378[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E378[])(struct EventObject *, struct Sprite *) = {
 	sub_8095724,
 	sub_80964B8,
 };
 
-u8 (*const gUnknown_0850E380[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E380[])(struct EventObject *, struct Sprite *) = {
 	sub_8095730,
 	sub_80964B8,
 };
 
-u8 (*const gUnknown_0850E388[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E388[])(struct EventObject *, struct Sprite *) = {
 	sub_8095740,
 	sub_8095740_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E394[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E394[])(struct EventObject *, struct Sprite *) = {
 	sub_80957A0,
 	sub_80957A0_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E3A0[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E3A0[])(struct EventObject *, struct Sprite *) = {
 	sub_8095800,
 	sub_8095800_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E3AC[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E3AC[])(struct EventObject *, struct Sprite *) = {
 	sub_8095860,
 	sub_8095860_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E3B8[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E3B8[])(struct EventObject *, struct Sprite *) = {
 	sub_8095900,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E3C0[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E3C0[])(struct EventObject *, struct Sprite *) = {
 	sub_8095910,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E3C8[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E3C8[])(struct EventObject *, struct Sprite *) = {
 	sub_8095920,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E3D0[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E3D0[])(struct EventObject *, struct Sprite *) = {
 	sub_8095930,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E3D8[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E3D8[])(struct EventObject *, struct Sprite *) = {
 	sub_8095940,
 	sub_8094DC4,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E3E4[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E3E4[])(struct EventObject *, struct Sprite *) = {
 	sub_8095964,
 	sub_8094DC4,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E3F0[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E3F0[])(struct EventObject *, struct Sprite *) = {
 	sub_8095988,
 	sub_8094DC4,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E3FC[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E3FC[])(struct EventObject *, struct Sprite *) = {
 	sub_80959AC,
 	sub_8094DC4,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E408[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E408[])(struct EventObject *, struct Sprite *) = {
 	sub_80959D0,
 	sub_8094DC4,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E414[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E414[])(struct EventObject *, struct Sprite *) = {
 	sub_80959F4,
 	sub_8094DC4,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E420[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E420[])(struct EventObject *, struct Sprite *) = {
 	sub_8095A18,
 	sub_8094DC4,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E42C[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E42C[])(struct EventObject *, struct Sprite *) = {
 	sub_8095A3C,
 	sub_8094DC4,
 	sub_80964BC,
@@ -1314,191 +1314,191 @@ u8 (*const gUnknown_0850E42C[])(struct MapObject *, struct Sprite *) = {
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E468[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E468[])(struct EventObject *, struct Sprite *) = {
 	sub_8095B44,
 	sub_8095B64,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E474[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E474[])(struct EventObject *, struct Sprite *) = {
 	sub_8095BC8,
 	sub_8095BC8_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E480[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E480[])(struct EventObject *, struct Sprite *) = {
 	sub_8095C20,
 	sub_8095C20_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E48C[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E48C[])(struct EventObject *, struct Sprite *) = {
 	sub_8095C78,
 	sub_8095C78_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E498[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E498[])(struct EventObject *, struct Sprite *) = {
 	sub_8095CD0,
 	sub_8095CD0_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E4A4[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E4A4[])(struct EventObject *, struct Sprite *) = {
 	sub_8095D28,
 	sub_8095D28_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E4B0[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E4B0[])(struct EventObject *, struct Sprite *) = {
 	sub_8095D80,
 	sub_8095D80_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E4BC[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E4BC[])(struct EventObject *, struct Sprite *) = {
 	sub_8095DD8,
 	sub_8095DD8_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E4C8[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E4C8[])(struct EventObject *, struct Sprite *) = {
 	sub_8095E30,
 	sub_8095E30_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E4D4[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E4D4[])(struct EventObject *, struct Sprite *) = {
 	sub_8095E88,
 	sub_8095E88_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E4E0[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E4E0[])(struct EventObject *, struct Sprite *) = {
 	sub_8095EE0,
 	sub_8095EE0_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E4EC[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E4EC[])(struct EventObject *, struct Sprite *) = {
 	sub_8095F38,
 	sub_8095F38_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E4F8[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E4F8[])(struct EventObject *, struct Sprite *) = {
 	sub_8095F90,
 	sub_8095F90_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E504[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E504[])(struct EventObject *, struct Sprite *) = {
 	sub_8095FE8,
 	sub_809459C,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E510[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E510[])(struct EventObject *, struct Sprite *) = {
 	sub_8096020,
 	sub_809459C,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E51C[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E51C[])(struct EventObject *, struct Sprite *) = {
 	sub_8096058,
 	sub_809459C,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E528[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E528[])(struct EventObject *, struct Sprite *) = {
 	sub_8096090,
 	sub_809459C,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E534[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E534[])(struct EventObject *, struct Sprite *) = {
 	sub_8096100,
 	sub_8096100_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E540[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E540[])(struct EventObject *, struct Sprite *) = {
 	sub_8096140,
 	sub_8096140_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E54C[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E54C[])(struct EventObject *, struct Sprite *) = {
 	sub_8096180,
 	sub_8096180_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E558[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E558[])(struct EventObject *, struct Sprite *) = {
 	sub_80961C0,
 	sub_80961C0_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E564[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E564[])(struct EventObject *, struct Sprite *) = {
 	sub_8096230,
 	sub_8096230_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E570[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E570[])(struct EventObject *, struct Sprite *) = {
 	sub_8096270,
 	sub_8096270_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E57C[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E57C[])(struct EventObject *, struct Sprite *) = {
 	sub_80962B0,
 	sub_80962B0_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E588[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E588[])(struct EventObject *, struct Sprite *) = {
 	sub_80962F0,
 	sub_80962F0_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E594[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E594[])(struct EventObject *, struct Sprite *) = {
 	sub_8096368,
 	sub_8096368_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E5A0[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E5A0[])(struct EventObject *, struct Sprite *) = {
 	sub_80963A8,
 	sub_80963A8_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E5AC[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E5AC[])(struct EventObject *, struct Sprite *) = {
 	sub_80963E8,
 	sub_80963E8_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E5B8[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E5B8[])(struct EventObject *, struct Sprite *) = {
 	sub_8096428,
 	sub_8096428_2,
 	sub_80964BC,
 };
 
-u8 (*const gUnknown_0850E5C4[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E5C4[])(struct EventObject *, struct Sprite *) = {
 	sub_8096468,
 	sub_80964B8,
 };
 
-u8 (*const gUnknown_0850E5CC[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E5CC[])(struct EventObject *, struct Sprite *) = {
 	sub_809647C,
 	sub_80964B8,
 };
 
-u8 (*const gUnknown_0850E5D4[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E5D4[])(struct EventObject *, struct Sprite *) = {
 	sub_8096494,
 	sub_80964B8,
 };
diff --git a/src/data/field_event_obj/movement_type_func_tables.h b/src/data/field_event_obj/movement_type_func_tables.h
index 3334c4b5e..3b18c90d1 100755
--- a/src/data/field_event_obj/movement_type_func_tables.h
+++ b/src/data/field_event_obj/movement_type_func_tables.h
@@ -1,7 +1,7 @@
 #ifndef GUARD_MOVEMENT_TYPE_FUNC_TABLES_H
 #define GUARD_MOVEMENT_TYPE_FUNC_TABLES_H
 
-u8 (*const gUnknown_0850D6F4[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850D6F4[])(struct EventObject *, struct Sprite *) = {
     sub_808F44C,
     sub_808F460,
     sub_808F48C,
@@ -27,7 +27,7 @@ u8 (*const gUnknown_0850D714[])(s16, s16, s16, s16) = {
     GetNonNorthRunningPastFacingDirection,
 };
 
-u8 (*const gUnknown_0850D740[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850D740[])(struct EventObject *, struct Sprite *) = {
     sub_808F988,
     sub_808F99C,
     sub_808F9C8,
@@ -35,7 +35,7 @@ u8 (*const gUnknown_0850D740[])(struct MapObject *, struct Sprite *) = {
     sub_808FA3C,
 };
 
-u8 (*const gUnknown_0850D754[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850D754[])(struct EventObject *, struct Sprite *) = {
     sub_808FAC8,
     sub_808FADC,
     sub_808FB08,
@@ -47,7 +47,7 @@ u8 (*const gUnknown_0850D754[])(struct MapObject *, struct Sprite *) = {
 
 const u8 gUnknown_0850D770[] = {DIR_SOUTH, DIR_NORTH};
 
-u8 (*const gUnknown_0850D774[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850D774[])(struct EventObject *, struct Sprite *) = {
     sub_808FC4C,
     sub_808FC60,
     sub_808FC8C,
@@ -59,13 +59,13 @@ u8 (*const gUnknown_0850D774[])(struct MapObject *, struct Sprite *) = {
 
 const u8 gUnknown_0850D790[] = {DIR_WEST, DIR_EAST};
 
-u8 (*const gUnknown_0850D794[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850D794[])(struct EventObject *, struct Sprite *) = {
     sub_808FDD0,
     sub_808FDFC,
     sub_808FE1C,
 };
 
-u8 (*const gUnknown_0850D7A0[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850D7A0[])(struct EventObject *, struct Sprite *) = {
     do_berry_tree_growth_sparkle_1,
     sub_808FF48,
     do_berry_tree_growth_sparkle_2,
@@ -73,7 +73,7 @@ u8 (*const gUnknown_0850D7A0[])(struct MapObject *, struct Sprite *) = {
     sub_8090004,
 };
 
-u8 (*const gUnknown_0850D7B4[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850D7B4[])(struct EventObject *, struct Sprite *) = {
     sub_8090094,
     sub_80900A8,
     sub_80900D4,
@@ -81,7 +81,7 @@ u8 (*const gUnknown_0850D7B4[])(struct MapObject *, struct Sprite *) = {
     sub_8090148,
 };
 
-u8 (*const gUnknown_0850D7C8[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850D7C8[])(struct EventObject *, struct Sprite *) = {
     sub_80901D4,
     sub_80901E8,
     sub_8090214,
@@ -89,7 +89,7 @@ u8 (*const gUnknown_0850D7C8[])(struct MapObject *, struct Sprite *) = {
     sub_8090288,
 };
 
-u8 (*const gUnknown_0850D7DC[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850D7DC[])(struct EventObject *, struct Sprite *) = {
     sub_8090314,
     sub_8090328,
     sub_8090354,
@@ -99,7 +99,7 @@ u8 (*const gUnknown_0850D7DC[])(struct MapObject *, struct Sprite *) = {
 
 const u8 gUnknown_0850D7F0[] = {DIR_NORTH, DIR_WEST};
 
-u8 (*const gUnknown_0850D7F4[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850D7F4[])(struct EventObject *, struct Sprite *) = {
     sub_8090454,
     sub_8090468,
     sub_8090494,
@@ -109,7 +109,7 @@ u8 (*const gUnknown_0850D7F4[])(struct MapObject *, struct Sprite *) = {
 
 const u8 gUnknown_0850D808[] = {DIR_NORTH, DIR_EAST};
 
-u8 (*const gUnknown_0850D80C[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850D80C[])(struct EventObject *, struct Sprite *) = {
     sub_8090594,
     sub_80905A8,
     sub_80905D4,
@@ -119,7 +119,7 @@ u8 (*const gUnknown_0850D80C[])(struct MapObject *, struct Sprite *) = {
 
 const u8 gUnknown_0850D820[] = {DIR_SOUTH, DIR_WEST};
 
-u8 (*const gUnknown_0850D824[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850D824[])(struct EventObject *, struct Sprite *) = {
     sub_80906D4,
     sub_80906E8,
     sub_8090714,
@@ -129,7 +129,7 @@ u8 (*const gUnknown_0850D824[])(struct MapObject *, struct Sprite *) = {
 
 const u8 gUnknown_0850D838[] = {DIR_SOUTH, DIR_EAST};
 
-u8 (*const gUnknown_0850D83C[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850D83C[])(struct EventObject *, struct Sprite *) = {
     sub_8090814,
     sub_8090828,
     sub_8090854,
@@ -139,7 +139,7 @@ u8 (*const gUnknown_0850D83C[])(struct MapObject *, struct Sprite *) = {
 
 const u8 gUnknown_0850D850[] = {DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_SOUTH};
 
-u8 (*const gUnknown_0850D854[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850D854[])(struct EventObject *, struct Sprite *) = {
     sub_8090954,
     sub_8090968,
     sub_8090994,
@@ -149,7 +149,7 @@ u8 (*const gUnknown_0850D854[])(struct MapObject *, struct Sprite *) = {
 
 const u8 gUnknown_0850D868[] = {DIR_SOUTH, DIR_NORTH, DIR_EAST, DIR_SOUTH};
 
-u8 (*const gUnknown_0850D86C[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850D86C[])(struct EventObject *, struct Sprite *) = {
     sub_8090A94,
     sub_8090AA8,
     sub_8090AD4,
@@ -159,7 +159,7 @@ u8 (*const gUnknown_0850D86C[])(struct MapObject *, struct Sprite *) = {
 
 const u8 gUnknown_0850D880[] = {DIR_NORTH, DIR_WEST, DIR_EAST, DIR_NORTH};
 
-u8 (*const gUnknown_0850D884[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850D884[])(struct EventObject *, struct Sprite *) = {
     sub_8090BD4,
     sub_8090BE8,
     sub_8090C14,
@@ -169,7 +169,7 @@ u8 (*const gUnknown_0850D884[])(struct MapObject *, struct Sprite *) = {
 
 const u8 gUnknown_0850D898[] = {DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_SOUTH};
 
-u8 (*const gUnknown_0850D89C[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850D89C[])(struct EventObject *, struct Sprite *) = {
     sub_8090D14,
     sub_8090D40,
     sub_8090D64,
@@ -178,7 +178,7 @@ u8 (*const gUnknown_0850D89C[])(struct MapObject *, struct Sprite *) = {
 
 const u8 gUnknown_0850D8AC[] = {DIR_SOUTH, DIR_EAST, DIR_WEST, DIR_SOUTH, DIR_NORTH};
 
-u8 (*const gUnknown_0850D8B4[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850D8B4[])(struct EventObject *, struct Sprite *) = {
     sub_8090E18,
     sub_8090E44,
     sub_8090E68,
@@ -187,14 +187,14 @@ u8 (*const gUnknown_0850D8B4[])(struct MapObject *, struct Sprite *) = {
 
 const u8 gUnknown_0850D8C4[] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH};
 
-u8 (*const gUnknown_0850D8CC[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850D8CC[])(struct EventObject *, struct Sprite *) = {
     sub_8090F1C,
     sub_8090F30,
     sub_8090F68,
     sub_8091020,
 };
 
-u8 (*const gUnknown_0850D8DC[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850D8DC[])(struct EventObject *, struct Sprite *) = {
     sub_8091048,
     sub_809117C,
     sub_8091110,
@@ -202,7 +202,7 @@ u8 (*const gUnknown_0850D8DC[])(struct MapObject *, struct Sprite *) = {
 
 const u8 gUnknown_0850D8E8[] = {DIR_NORTH, DIR_EAST, DIR_WEST, DIR_SOUTH};
 
-u8 (*const gUnknown_0850D8EC[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850D8EC[])(struct EventObject *, struct Sprite *) = {
     sub_8091048,
     sub_8091208,
     sub_8091110,
@@ -210,7 +210,7 @@ u8 (*const gUnknown_0850D8EC[])(struct MapObject *, struct Sprite *) = {
 
 const u8 gUnknown_0850D8F8[] = {DIR_EAST, DIR_WEST, DIR_SOUTH, DIR_NORTH};
 
-u8 (*const gUnknown_0850D8FC[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850D8FC[])(struct EventObject *, struct Sprite *) = {
     sub_8091048,
     sub_8091294,
     sub_8091110,
@@ -218,7 +218,7 @@ u8 (*const gUnknown_0850D8FC[])(struct MapObject *, struct Sprite *) = {
 
 const u8 gUnknown_0850D908[] = {DIR_SOUTH, DIR_NORTH, DIR_EAST, DIR_WEST};
 
-u8 (*const gUnknown_0850D90C[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850D90C[])(struct EventObject *, struct Sprite *) = {
     sub_8091048,
     sub_8091320,
     sub_8091110,
@@ -226,7 +226,7 @@ u8 (*const gUnknown_0850D90C[])(struct MapObject *, struct Sprite *) = {
 
 const u8 gUnknown_0850D918[] = {DIR_WEST, DIR_SOUTH, DIR_NORTH, DIR_EAST};
 
-u8 (*const gUnknown_0850D91C[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850D91C[])(struct EventObject *, struct Sprite *) = {
     sub_8091048,
     sub_80913AC,
     sub_8091110,
@@ -234,7 +234,7 @@ u8 (*const gUnknown_0850D91C[])(struct MapObject *, struct Sprite *) = {
 
 const u8 gUnknown_0850D928[] = {DIR_NORTH, DIR_WEST, DIR_EAST, DIR_SOUTH};
 
-u8 (*const gUnknown_0850D92C[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850D92C[])(struct EventObject *, struct Sprite *) = {
     sub_8091048,
     sub_8091438,
     sub_8091110,
@@ -242,13 +242,13 @@ u8 (*const gUnknown_0850D92C[])(struct MapObject *, struct Sprite *) = {
 
 const u8 gUnknown_0850D938[] = {DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_NORTH};
 
-u8 (*const gUnknown_0850D93C[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850D93C[])(struct EventObject *, struct Sprite *) = {
     sub_8091048,
     sub_80914C4,
     sub_8091110,
 };
 
-u8 (*const gUnknown_0850D948[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850D948[])(struct EventObject *, struct Sprite *) = {
     sub_8091048,
     sub_8091550,
     sub_8091110,
@@ -256,7 +256,7 @@ u8 (*const gUnknown_0850D948[])(struct MapObject *, struct Sprite *) = {
 
 const u8 gUnknown_0850D954[] = {DIR_EAST, DIR_SOUTH, DIR_NORTH, DIR_WEST};
 
-u8 (*const gUnknown_0850D958[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850D958[])(struct EventObject *, struct Sprite *) = {
     sub_8091048,
     sub_80915DC,
     sub_8091110,
@@ -264,7 +264,7 @@ u8 (*const gUnknown_0850D958[])(struct MapObject *, struct Sprite *) = {
 
 const u8 gUnknown_0850D964[] = {DIR_WEST, DIR_NORTH, DIR_SOUTH, DIR_EAST};
 
-u8 (*const gUnknown_0850D968[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850D968[])(struct EventObject *, struct Sprite *) = {
     sub_8091048,
     sub_8091668,
     sub_8091110,
@@ -272,7 +272,7 @@ u8 (*const gUnknown_0850D968[])(struct MapObject *, struct Sprite *) = {
 
 const u8 gUnknown_0850D974[] = {DIR_NORTH, DIR_SOUTH, DIR_EAST, DIR_WEST};
 
-u8 (*const gUnknown_0850D978[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850D978[])(struct EventObject *, struct Sprite *) = {
     sub_8091048,
     sub_80916F4,
     sub_8091110,
@@ -280,7 +280,7 @@ u8 (*const gUnknown_0850D978[])(struct MapObject *, struct Sprite *) = {
 
 const u8 gUnknown_0850D984[] = {DIR_EAST, DIR_WEST, DIR_NORTH, DIR_SOUTH};
 
-u8 (*const gUnknown_0850D988[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850D988[])(struct EventObject *, struct Sprite *) = {
     sub_8091048,
     sub_8091780,
     sub_8091110,
@@ -288,7 +288,7 @@ u8 (*const gUnknown_0850D988[])(struct MapObject *, struct Sprite *) = {
 
 const u8 gUnknown_0850D994[] = {DIR_SOUTH, DIR_EAST, DIR_WEST, DIR_NORTH};
 
-u8 (*const gUnknown_0850D998[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850D998[])(struct EventObject *, struct Sprite *) = {
     sub_8091048,
     sub_809180C,
     sub_8091110,
@@ -296,7 +296,7 @@ u8 (*const gUnknown_0850D998[])(struct MapObject *, struct Sprite *) = {
 
 const u8 gUnknown_0850D9A4[] = {DIR_EAST, DIR_NORTH, DIR_SOUTH, DIR_WEST};
 
-u8 (*const gUnknown_0850D9A8[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850D9A8[])(struct EventObject *, struct Sprite *) = {
     sub_8091048,
     sub_8091898,
     sub_8091110,
@@ -304,7 +304,7 @@ u8 (*const gUnknown_0850D9A8[])(struct MapObject *, struct Sprite *) = {
 
 const u8 gUnknown_0850D9B4[] = {DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_EAST};
 
-u8 (*const gUnknown_0850D9B8[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850D9B8[])(struct EventObject *, struct Sprite *) = {
     sub_8091048,
     sub_8091924,
     sub_8091110,
@@ -312,7 +312,7 @@ u8 (*const gUnknown_0850D9B8[])(struct MapObject *, struct Sprite *) = {
 
 const u8 gUnknown_0850D9C4[] = {DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH};
 
-u8 (*const gUnknown_0850D9C8[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850D9C8[])(struct EventObject *, struct Sprite *) = {
     sub_8091048,
     sub_80919B0,
     sub_8091110,
@@ -320,7 +320,7 @@ u8 (*const gUnknown_0850D9C8[])(struct MapObject *, struct Sprite *) = {
 
 const u8 gUnknown_0850D9D4[] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH};
 
-u8 (*const gUnknown_0850D9D8[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850D9D8[])(struct EventObject *, struct Sprite *) = {
     sub_8091048,
     sub_8091A3C,
     sub_8091110,
@@ -328,7 +328,7 @@ u8 (*const gUnknown_0850D9D8[])(struct MapObject *, struct Sprite *) = {
 
 const u8 gUnknown_0850D9E4[] = {DIR_NORTH, DIR_WEST, DIR_SOUTH, DIR_EAST};
 
-u8 (*const gUnknown_0850D9E8[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850D9E8[])(struct EventObject *, struct Sprite *) = {
     sub_8091048,
     sub_8091AC8,
     sub_8091110,
@@ -336,7 +336,7 @@ u8 (*const gUnknown_0850D9E8[])(struct MapObject *, struct Sprite *) = {
 
 const u8 gUnknown_0850D9F4[] = {DIR_SOUTH, DIR_EAST, DIR_NORTH, DIR_WEST};
 
-u8 (*const gUnknown_0850D9F8[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850D9F8[])(struct EventObject *, struct Sprite *) = {
     sub_8091048,
     sub_8091B54,
     sub_8091110,
@@ -344,7 +344,7 @@ u8 (*const gUnknown_0850D9F8[])(struct MapObject *, struct Sprite *) = {
 
 const u8 gUnknown_0850DA04[] = {DIR_WEST, DIR_SOUTH, DIR_EAST, DIR_NORTH};
 
-u8 (*const gUnknown_0850DA08[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850DA08[])(struct EventObject *, struct Sprite *) = {
     sub_8091048,
     sub_8091BE0,
     sub_8091110,
@@ -352,7 +352,7 @@ u8 (*const gUnknown_0850DA08[])(struct MapObject *, struct Sprite *) = {
 
 const u8 gUnknown_0850DA14[] = {DIR_EAST, DIR_NORTH, DIR_WEST, DIR_SOUTH};
 
-u8 (*const gUnknown_0850DA18[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850DA18[])(struct EventObject *, struct Sprite *) = {
     sub_8091048,
     sub_8091C6C,
     sub_8091110,
@@ -360,7 +360,7 @@ u8 (*const gUnknown_0850DA18[])(struct MapObject *, struct Sprite *) = {
 
 const u8 gUnknown_0850DA24[] = {DIR_NORTH, DIR_EAST, DIR_SOUTH, DIR_WEST};
 
-u8 (*const gUnknown_0850DA28[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850DA28[])(struct EventObject *, struct Sprite *) = {
     sub_8091048,
     sub_8091CF8,
     sub_8091110,
@@ -368,7 +368,7 @@ u8 (*const gUnknown_0850DA28[])(struct MapObject *, struct Sprite *) = {
 
 const u8 gUnknown_0850DA34[] = {DIR_SOUTH, DIR_WEST, DIR_NORTH, DIR_EAST};
 
-u8 (*const gUnknown_0850DA38[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850DA38[])(struct EventObject *, struct Sprite *) = {
     sub_8091048,
     sub_8091D84,
     sub_8091110,
@@ -376,7 +376,7 @@ u8 (*const gUnknown_0850DA38[])(struct MapObject *, struct Sprite *) = {
 
 const u8 gUnknown_0850DA44[] = {DIR_WEST, DIR_NORTH, DIR_EAST, DIR_SOUTH};
 
-u8 (*const gUnknown_0850DA48[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850DA48[])(struct EventObject *, struct Sprite *) = {
     sub_8091048,
     sub_8091E10,
     sub_8091110,
@@ -384,13 +384,13 @@ u8 (*const gUnknown_0850DA48[])(struct MapObject *, struct Sprite *) = {
 
 const u8 gUnknown_0850DA54[] = {DIR_EAST, DIR_SOUTH, DIR_WEST, DIR_NORTH};
 
-u8 (*const gUnknown_0850DA58[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850DA58[])(struct EventObject *, struct Sprite *) = {
     mss_npc_reset_oampriv3_1_unk2_unk3,
     sub_8091EC0,
     sub_8091F20,
 };
 
-bool8 (*const gUnknown_0850DA64[])(struct MapObject *, struct Sprite *, u8, bool8(u8)) = {
+bool8 (*const gUnknown_0850DA64[])(struct EventObject *, struct Sprite *, u8, bool8(u8)) = {
     sub_8091F48,
     sub_8091F4C,
     sub_8091F94,
@@ -404,37 +404,37 @@ bool8 (*const gUnknown_0850DA64[])(struct MapObject *, struct Sprite *, u8, bool
     sub_8091F48,
 };
 
-u8 (*const gUnknown_0850DA90[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850DA90[])(struct EventObject *, struct Sprite *) = {
     mss_npc_reset_oampriv3_1_unk2_unk3,
     mss_08062EA4,
     sub_8091F20,
 };
 
-u8 (*const gUnknown_0850DA9C[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850DA9C[])(struct EventObject *, struct Sprite *) = {
     sub_80926AC,
 };
 
-u8 (*const gUnknown_0850DAA0[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850DAA0[])(struct EventObject *, struct Sprite *) = {
     sub_8092718,
     sub_80926B8,
 };
 
-u8 (*const gUnknown_0850DAA8[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850DAA8[])(struct EventObject *, struct Sprite *) = {
     sub_8092788,
     sub_80926B8,
 };
 
-u8 (*const gUnknown_0850DAB0[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850DAB0[])(struct EventObject *, struct Sprite *) = {
     sub_80927F8,
     sub_80926B8,
 };
 
-u8 (*const gUnknown_0850DAB8[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850DAB8[])(struct EventObject *, struct Sprite *) = {
     sub_8092868,
     sub_80926B8,
 };
 
-u8 (*const gUnknown_0850DAC0[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850DAC0[])(struct EventObject *, struct Sprite *) = {
     sub_80928D8,
     sub_809290C,
     sub_809292C,
diff --git a/src/decoration.c b/src/decoration.c
index 2fbd247a6..83030ccb7 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -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;
         }
     }
@@ -2253,11 +2253,11 @@ void SetUpPuttingAwayDecorationPlayerAvatar(void)
     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 6647f629b..1582c00f8 100644
--- a/src/map_obj_lock.c
+++ b/src/event_obj_lock.c
@@ -2,7 +2,7 @@
 #include "event_data.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"
@@ -38,9 +38,9 @@ bool8 sub_80983C4(void)
 }
 
 
-void ScriptFreezeMapObjects(void)
+void ScriptFreezeEventObjects(void)
 {
-    FreezeMapObjects();
+    FreezeEventObjects();
     CreateTask(sub_80983A4, 80);
 }
 
@@ -53,9 +53,9 @@ static void sub_8098400(u8 taskId)
         sub_808B864();
         task->data[0] = 1;
     }
-    if (!task->data[1] && !gMapObjects[gSelectedMapObject].singleMovementActive)
+    if (!task->data[1] && !gEventObjects[gSelectedEventObject].singleMovementActive)
     {
-        FreezeMapObject(&gMapObjects[gSelectedMapObject]);
+        FreezeEventObject(&gEventObjects[gSelectedEventObject]);
         task->data[1] = 1;
     }
     if (task->data[0] && task->data[1])
@@ -75,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].singleMovementActive)
+    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);
+    EventObjectClearAnimIfSpecialAnimFinished(&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)
+        EventObjectClearAnimIfSpecialAnimFinished(&gEventObjects[gSelectedEventObject]);
+    objectId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0);
+    EventObjectClearAnimIfSpecialAnimFinished(&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]);
+    EventObjectClearAnimIfSpecialAnimActive(&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].singleMovementActive)
+    if (!task->data[1] && !gEventObjects[eventObjectId].singleMovementActive)
     {
-        FreezeMapObject(&gMapObjects[mapObjectId]);
+        FreezeEventObject(&gEventObjects[eventObjectId]);
         task->data[1] = 1;
     }
     if (task->data[0] && task->data[1])
@@ -139,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].singleMovementActive)
+        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].singleMovementActive)
+        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].singleMovementActive)
+        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
index 84900e48e..d23bba92b 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -21,7 +21,7 @@
 #include "sprite.h"
 #include "trainer_see.h"
 #include "util.h"
-#include "constants/map_objects.h"
+#include "constants/event_objects.h"
 
 // this file was known as evobjmv.c in Game Freak's original source
 
@@ -29,35 +29,33 @@ extern u8 gUnknown_020375B4;
 extern u16 gUnknown_020375B6;
 extern u8 *gUnknown_020375B8;
 
-// 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);
-static 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 u8 GetEventObjectIdByLocalId(u8);
+static u8 GetEventObjectIdByLocalIdAndMapInternal(u8, u8, u8);
+static bool8 GetAvailableEventObjectSlot(u16, u8, u8, u8 *);
+static void EventObjectHandleDynamicGraphicsId(struct EventObject *);
+static void RemoveEventObjectInternal (struct EventObject *);
+static u16 GetEventObjectFlagIdByEventObjectId(u8);
+static void sub_8096518(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 RemoveFieldObjectIfOutsideView(struct MapObject *);
+static void RemoveEventObjectIfOutsideView(struct EventObject *);
 static void sub_808E1B8(u8, s16, s16);
-static void SetPlayerAvatarFieldObjectIdAndObjectId(u8, u8);
-static void sub_808E38C(struct MapObject *);
+static void SetPlayerAvatarEventObjectIdAndObjectId(u8, u8);
+static void sub_808E38C(struct EventObject *);
 static u8 sub_808E8F4(const struct SpritePalette *);
-static u8 FindFieldObjectPaletteIndexByTag(u16);
+static u8 FindEventObjectPaletteIndexByTag(u16);
 static void sub_808EAB0(u16, u8);
-static bool8 FieldObjectDoesZCoordMatch(struct MapObject *, 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 MapObjectTemplate *FindFieldObjectTemplateInArrayByLocalId(u8 localId, struct MapObjectTemplate *templates, u8 count);
-static void npc_reset(struct MapObject *, struct Sprite *);
-static void FieldObjectSetRegularAnim(struct MapObject *, struct Sprite *, u8);
+static struct EventObjectTemplate *FindEventObjectTemplateInArrayByLocalId(u8 localId, struct EventObjectTemplate *templates, u8 count);
+static void npc_reset(struct EventObject *, struct Sprite *);
+static void EventObjectSetRegularAnim(struct EventObject *, struct Sprite *, u8);
 
 u8 sub_8093438(u32);
 u8 sub_80934BC(u32);
@@ -65,48 +63,48 @@ u8 sub_8093514(u32);
 u8 GetJumpLedgeAnimId(u32);
 void sub_8092F88(u32, s16 *, s16 *, s16, s16);
 
-bool8 FieldObjectExecRegularAnim(struct MapObject *, struct Sprite *);
-static void SetFieldObjectStepTimer(struct Sprite *, s16);
-bool8 RunFieldObjectStepTimer(struct Sprite *);
-bool8 npc_block_way__next_tile(struct MapObject *, u8);
+bool8 EventObjectExecRegularAnim(struct EventObject *, struct Sprite *);
+static void SetEventObjectStepTimer(struct Sprite *, s16);
+bool8 RunEventObjectStepTimer(struct Sprite *);
+bool8 npc_block_way__next_tile(struct EventObject *, 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 *);
-static void FieldObjectUpdateMetatileBehaviors(struct MapObject*);
-static void GetGroundEffectFlags_Reflection(struct MapObject*, u32*);
-static void GetGroundEffectFlags_TallGrassOnSpawn(struct MapObject*, u32*);
-static void GetGroundEffectFlags_LongGrassOnSpawn(struct MapObject*, u32*);
-static void GetGroundEffectFlags_SandHeap(struct MapObject*, u32*);
-static void GetGroundEffectFlags_ShallowFlowingWater(struct MapObject*, u32*);
-static void GetGroundEffectFlags_ShortGrass(struct MapObject*, u32*);
-static void GetGroundEffectFlags_HotSprings(struct MapObject*, u32*);
-static void GetGroundEffectFlags_TallGrassOnBeginStep(struct MapObject*, u32*);
-static void GetGroundEffectFlags_LongGrassOnBeginStep(struct MapObject*, u32*);
-static void GetGroundEffectFlags_Tracks(struct MapObject*, u32*);
-static void GetGroundEffectFlags_Puddle(struct MapObject*, u32*);
-static void GetGroundEffectFlags_Ripple(struct MapObject*, u32*);
-static void GetGroundEffectFlags_Seaweed(struct MapObject*, u32*);
-static void GetGroundEffectFlags_JumpLanding(struct MapObject*, u32*);
-static u8 FieldObjectCheckForReflectiveSurface(struct MapObject*);
+/*static*/ void sub_80964E8(struct EventObject *, struct Sprite *);
+static void EventObjectExecSpecialAnim(struct EventObject *, struct Sprite *);
+/*static*/ void npc_obj_transfer_image_anim_pause_flag(struct EventObject *, struct Sprite *);
+
+static bool8 IsCoordOutsideEventObjectMovementRect(struct EventObject *, s16, s16);
+static bool8 IsMetatileDirectionallyImpassable(struct EventObject *, s16, s16, u8);
+static bool8 CheckForCollisionBetweenEventObjects(struct EventObject *, s16, s16);
+bool8 sub_809558C(struct EventObject *, struct Sprite *);
+bool8 sub_8095B64(struct EventObject *, struct Sprite *);
+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 FieldObjectUpdateSubpriority(struct MapObject*, struct Sprite*);
-static void DoTracksGroundEffect_None(struct MapObject*, struct Sprite*, u8);
-static void DoTracksGroundEffect_Footprints(struct MapObject*, struct Sprite*, u8);
-static void DoTracksGroundEffect_BikeTireTracks(struct MapObject*, struct Sprite*, u8);
-static void DoRippleFieldEffect(struct MapObject*, struct Sprite*);
-static void DoGroundEffects_OnSpawn(struct MapObject*, struct Sprite*);
-static void DoGroundEffects_OnBeginStep(struct MapObject*, struct Sprite*);
-static void DoGroundEffects_OnFinishStep(struct MapObject*, struct Sprite*);
+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 sub_8097FE4(u8);
 
@@ -125,87 +123,87 @@ void (*const gCameraObjectFuncs[])(struct Sprite *) = {
 // movement type callbacks
 void (*const gUnknown_08505438[])(struct Sprite *) =
 {
-    FieldObjectCB_NoMovement1,
-    FieldObjectCB_LookRandomDirections,
-    FieldObjectCB_GoRandomDirections,
-    FieldObjectCB_RandomlyGoNorthOrSouth,
-    FieldObjectCB_RandomlyGoNorthOrSouth,
-    FieldObjectCB_RandomlyGoEastOrWest,
-    FieldObjectCB_RandomlyGoEastOrWest,
-    FieldObjectCB_FaceFixedDirection,
-    FieldObjectCB_FaceFixedDirection,
-    FieldObjectCB_FaceFixedDirection,
-    FieldObjectCB_FaceFixedDirection,
-    FieldObjectCB_NoMovement2,
-    FieldObjectCB_BerryTree,
-    FieldObjectCB_RandomlyLookNorthOrSouth,
-    FieldObjectCB_RandomlyLookEastOrWest,
-    FieldObjectCB_RandomlyLookNorthOrWest,
-    FieldObjectCB_RandomlyLookNorthOrEast,
-    FieldObjectCB_RandomlyLookSouthOrWest,
-    FieldObjectCB_RandomlyLookSouthOrEast,
-    FieldObjectCB_RandomlyLookNorthOrSouthOrWest,
-    FieldObjectCB_RandomlyLookNorthOrSouthOrEast,
-    FieldObjectCB_RandomlyLookNorthOrEastOrWest,
-    FieldObjectCB_RandomlyLookSouthOrEastOrWest,
-    FieldObjectCB_LookAroundCounterclockwise,
-    FieldObjectCB_LookAroundClockwise,
-    FieldObjectCB_AlternatelyGoInOppositeDirections,
-    FieldObjectCB_AlternatelyGoInOppositeDirections,
-    FieldObjectCB_AlternatelyGoInOppositeDirections,
-    FieldObjectCB_AlternatelyGoInOppositeDirections,
-    FieldObjectCB_GoInDirectionSequence1,
-    FieldObjectCB_GoInDirectionSequence2,
-    FieldObjectCB_GoInDirectionSequence3,
-    FieldObjectCB_GoInDirectionSequence4,
-    FieldObjectCB_GoInDirectionSequence5,
-    FieldObjectCB_GoInDirectionSequence6,
-    FieldObjectCB_GoInDirectionSequence7,
-    FieldObjectCB_GoInDirectionSequence8,
-    FieldObjectCB_GoInDirectionSequence9,
-    FieldObjectCB_GoInDirectionSequence10,
-    FieldObjectCB_GoInDirectionSequence11,
-    FieldObjectCB_GoInDirectionSequence12,
-    FieldObjectCB_GoInDirectionSequence13,
-    FieldObjectCB_GoInDirectionSequence14,
-    FieldObjectCB_GoInDirectionSequence15,
-    FieldObjectCB_GoInDirectionSequence16,
-    FieldObjectCB_GoInDirectionSequence17,
-    FieldObjectCB_GoInDirectionSequence18,
-    FieldObjectCB_GoInDirectionSequence19,
-    FieldObjectCB_GoInDirectionSequence20,
-    FieldObjectCB_GoInDirectionSequence21,
-    FieldObjectCB_GoInDirectionSequence22,
-    FieldObjectCB_GoInDirectionSequence23,
-    FieldObjectCB_GoInDirectionSequence24,
-    FieldObjectCB_CopyPlayer1,
-    FieldObjectCB_CopyPlayer1,
-    FieldObjectCB_CopyPlayer1,
-    FieldObjectCB_CopyPlayer1,
-    FieldObjectCB_TreeDisguise,
-    FieldObjectCB_MountainDisguise,
-    FieldObjectCB_CopyPlayer2,
-    FieldObjectCB_CopyPlayer2,
-    FieldObjectCB_CopyPlayer2,
-    FieldObjectCB_CopyPlayer2,
-    FieldObjectCB_Hidden1,
-    FieldObjectCB_WalkInPlace1,
-    FieldObjectCB_WalkInPlace1,
-    FieldObjectCB_WalkInPlace1,
-    FieldObjectCB_WalkInPlace1,
-    FieldObjectCB_WalkInPlace2,
-    FieldObjectCB_WalkInPlace2,
-    FieldObjectCB_WalkInPlace2,
-    FieldObjectCB_WalkInPlace2,
-    FieldObjectCB_WalkInPlace3,
-    FieldObjectCB_WalkInPlace3,
-    FieldObjectCB_WalkInPlace3,
-    FieldObjectCB_WalkInPlace3,
-    FieldObjectCB_Hidden2,
-    FieldObjectCB_WalkInPlace4,
-    FieldObjectCB_WalkInPlace4,
-    FieldObjectCB_WalkInPlace4,
-    FieldObjectCB_WalkInPlace4,
+    EventObjectCB_NoMovement1,
+    EventObjectCB_LookRandomDirections,
+    EventObjectCB_GoRandomDirections,
+    EventObjectCB_RandomlyGoNorthOrSouth,
+    EventObjectCB_RandomlyGoNorthOrSouth,
+    EventObjectCB_RandomlyGoEastOrWest,
+    EventObjectCB_RandomlyGoEastOrWest,
+    EventObjectCB_FaceFixedDirection,
+    EventObjectCB_FaceFixedDirection,
+    EventObjectCB_FaceFixedDirection,
+    EventObjectCB_FaceFixedDirection,
+    EventObjectCB_NoMovement2,
+    EventObjectCB_BerryTree,
+    EventObjectCB_RandomlyLookNorthOrSouth,
+    EventObjectCB_RandomlyLookEastOrWest,
+    EventObjectCB_RandomlyLookNorthOrWest,
+    EventObjectCB_RandomlyLookNorthOrEast,
+    EventObjectCB_RandomlyLookSouthOrWest,
+    EventObjectCB_RandomlyLookSouthOrEast,
+    EventObjectCB_RandomlyLookNorthOrSouthOrWest,
+    EventObjectCB_RandomlyLookNorthOrSouthOrEast,
+    EventObjectCB_RandomlyLookNorthOrEastOrWest,
+    EventObjectCB_RandomlyLookSouthOrEastOrWest,
+    EventObjectCB_LookAroundCounterclockwise,
+    EventObjectCB_LookAroundClockwise,
+    EventObjectCB_AlternatelyGoInOppositeDirections,
+    EventObjectCB_AlternatelyGoInOppositeDirections,
+    EventObjectCB_AlternatelyGoInOppositeDirections,
+    EventObjectCB_AlternatelyGoInOppositeDirections,
+    EventObjectCB_GoInDirectionSequence1,
+    EventObjectCB_GoInDirectionSequence2,
+    EventObjectCB_GoInDirectionSequence3,
+    EventObjectCB_GoInDirectionSequence4,
+    EventObjectCB_GoInDirectionSequence5,
+    EventObjectCB_GoInDirectionSequence6,
+    EventObjectCB_GoInDirectionSequence7,
+    EventObjectCB_GoInDirectionSequence8,
+    EventObjectCB_GoInDirectionSequence9,
+    EventObjectCB_GoInDirectionSequence10,
+    EventObjectCB_GoInDirectionSequence11,
+    EventObjectCB_GoInDirectionSequence12,
+    EventObjectCB_GoInDirectionSequence13,
+    EventObjectCB_GoInDirectionSequence14,
+    EventObjectCB_GoInDirectionSequence15,
+    EventObjectCB_GoInDirectionSequence16,
+    EventObjectCB_GoInDirectionSequence17,
+    EventObjectCB_GoInDirectionSequence18,
+    EventObjectCB_GoInDirectionSequence19,
+    EventObjectCB_GoInDirectionSequence20,
+    EventObjectCB_GoInDirectionSequence21,
+    EventObjectCB_GoInDirectionSequence22,
+    EventObjectCB_GoInDirectionSequence23,
+    EventObjectCB_GoInDirectionSequence24,
+    EventObjectCB_CopyPlayer1,
+    EventObjectCB_CopyPlayer1,
+    EventObjectCB_CopyPlayer1,
+    EventObjectCB_CopyPlayer1,
+    EventObjectCB_TreeDisguise,
+    EventObjectCB_MountainDisguise,
+    EventObjectCB_CopyPlayer2,
+    EventObjectCB_CopyPlayer2,
+    EventObjectCB_CopyPlayer2,
+    EventObjectCB_CopyPlayer2,
+    EventObjectCB_Hidden1,
+    EventObjectCB_WalkInPlace1,
+    EventObjectCB_WalkInPlace1,
+    EventObjectCB_WalkInPlace1,
+    EventObjectCB_WalkInPlace1,
+    EventObjectCB_WalkInPlace2,
+    EventObjectCB_WalkInPlace2,
+    EventObjectCB_WalkInPlace2,
+    EventObjectCB_WalkInPlace2,
+    EventObjectCB_WalkInPlace3,
+    EventObjectCB_WalkInPlace3,
+    EventObjectCB_WalkInPlace3,
+    EventObjectCB_WalkInPlace3,
+    EventObjectCB_Hidden2,
+    EventObjectCB_WalkInPlace4,
+    EventObjectCB_WalkInPlace4,
+    EventObjectCB_WalkInPlace4,
+    EventObjectCB_WalkInPlace4,
 };
 
 const u8 gRangedMovementTypes[] = {
@@ -385,41 +383,41 @@ const u8 gInitialMovementTypeFacingDirections[] = {
 #include "data/field_event_obj/event_object_graphics_info.h"
 
 const struct SpritePalette gUnknown_0850BBC8[] = {
-    {gFieldObjectPalette0,  0x1103},
-    {gFieldObjectPalette1,  0x1104},
-    {gFieldObjectPalette2,  0x1105},
-    {gFieldObjectPalette3,  0x1106},
-    {gFieldObjectPalette4,  0x1107},
-    {gFieldObjectPalette5,  0x1108},
-    {gFieldObjectPalette6,  0x1109},
-    {gFieldObjectPalette7,  0x110A},
-    {gFieldObjectPalette8,  0x1100},
-    {gFieldObjectPalette9,  0x1101},
-    {gFieldObjectPalette10, 0x1102},
-    {gFieldObjectPalette11, 0x1115},
-    {gFieldObjectPalette12, 0x110B},
-    {gFieldObjectPalette13, 0x110C},
-    {gFieldObjectPalette14, 0x110D},
-    {gFieldObjectPalette15, 0x110E},
-    {gFieldObjectPalette16, 0x110F},
-    {gFieldObjectPalette17, 0x1110},
-    {gFieldObjectPalette18, 0x1111},
-    {gFieldObjectPalette19, 0x1112},
-    {gFieldObjectPalette20, 0x1113},
-    {gFieldObjectPalette21, 0x1114},
-    {gFieldObjectPalette22, 0x1116},
-    {gFieldObjectPalette23, 0x1117},
-    {gFieldObjectPalette24, 0x1118},
-    {gFieldObjectPalette25, 0x1119},
-    {gFieldObjectPalette26, 0x111B},
-    {gFieldObjectPalette27, 0x111C},
-    {gFieldObjectPalette28, 0x111D},
-    {gFieldObjectPalette29, 0x111E},
-    {gFieldObjectPalette30, 0x111F},
-    {gFieldObjectPalette31, 0x1120},
-    {gFieldObjectPalette32, 0x1121},
-    {gFieldObjectPalette33, 0x1122},
-    {gFieldObjectPalette34, 0x1123},
+    {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},
 };
 
@@ -1077,28 +1075,28 @@ const u8 gUnknown_0850DC3F[][4] = {
 
 // Code
 
-static void npc_clear_ids_and_state(struct MapObject *mapObject)
+static void npc_clear_ids_and_state(struct EventObject *eventObject)
 {
-    *mapObject = (struct MapObject){};
-    mapObject->localId = 0xFF;
-    mapObject->mapNum = -1;
-    mapObject->mapGroup = -1;
-    mapObject->movementActionId = -1;
+    *eventObject = (struct EventObject){};
+    eventObject->localId = 0xFF;
+    eventObject->mapNum = -1;
+    eventObject->mapGroup = -1;
+    eventObject->movementActionId = -1;
 }
 
 static void npcs_clear_ids_and_state(void)
 {
     u8 i;
 
-    for (i = 0; i < NUM_FIELD_OBJECTS; i ++)
+    for (i = 0; i < NUM_EVENT_OBJECTS; i ++)
     {
-        npc_clear_ids_and_state(&gMapObjects[i]);
+        npc_clear_ids_and_state(&gEventObjects[i]);
     }
 }
 
 void sub_808D438(void)
 {
-    ZeroAllLinkPlayerMapObjects();
+    ZeroAllLinkPlayerEventObjects();
     npcs_clear_ids_and_state();
     ClearPlayerAvatarInfo();
     sub_808D450();
@@ -1125,9 +1123,9 @@ u8 sub_808D4F4(void)
 {
     u8 i;
 
-    for (i = 0; i < NUM_FIELD_OBJECTS; i ++)
+    for (i = 0; i < NUM_EVENT_OBJECTS; i ++)
     {
-        if (!gMapObjects[i].active)
+        if (!gEventObjects[i].active)
         {
             break;
         }
@@ -1135,32 +1133,32 @@ u8 sub_808D4F4(void)
     return i;
 }
 
-u8 GetFieldObjectIdByLocalIdAndMap(u8 localId, u8 mapId, u8 mapGroupId)
+u8 GetEventObjectIdByLocalIdAndMap(u8 localId, u8 mapId, u8 mapGroupId)
 {
     if (localId < 0xff)
     {
-        return GetFieldObjectIdByLocalIdAndMapInternal(localId, mapId, mapGroupId);
+        return GetEventObjectIdByLocalIdAndMapInternal(localId, mapId, mapGroupId);
     }
-    return GetFieldObjectIdByLocalId(localId);
+    return GetEventObjectIdByLocalId(localId);
 }
 
-bool8 TryGetFieldObjectIdByLocalIdAndMap(u8 localId, u8 mapId, u8 mapGroupId, u8 *fieldObjectId)
+bool8 TryGetEventObjectIdByLocalIdAndMap(u8 localId, u8 mapId, u8 mapGroupId, u8 *eventObjectId)
 {
-    *fieldObjectId = GetFieldObjectIdByLocalIdAndMap(localId, mapId, mapGroupId);
-    if (*fieldObjectId == NUM_FIELD_OBJECTS)
+    *eventObjectId = GetEventObjectIdByLocalIdAndMap(localId, mapId, mapGroupId);
+    if (*eventObjectId == NUM_EVENT_OBJECTS)
     {
         return TRUE;
     }
     return FALSE;
 }
 
-u8 GetFieldObjectIdByXY(s16 x, s16 y)
+u8 GetEventObjectIdByXY(s16 x, s16 y)
 {
     u8 i;
 
-    for (i = 0; i < NUM_FIELD_OBJECTS; i ++)
+    for (i = 0; i < NUM_EVENT_OBJECTS; i ++)
     {
-        if (gMapObjects[i].active && gMapObjects[i].currentCoords.x == x && gMapObjects[i].currentCoords.y == y)
+        if (gEventObjects[i].active && gEventObjects[i].currentCoords.x == x && gEventObjects[i].currentCoords.y == y)
         {
             break;
         }
@@ -1168,92 +1166,92 @@ u8 GetFieldObjectIdByXY(s16 x, s16 y)
     return i;
 }
 
-static u8 GetFieldObjectIdByLocalIdAndMapInternal(u8 localId, u8 mapId, u8 mapGroupId)
+static u8 GetEventObjectIdByLocalIdAndMapInternal(u8 localId, u8 mapId, u8 mapGroupId)
 {
     u8 i;
 
-    for (i = 0; i < NUM_FIELD_OBJECTS; i ++)
+    for (i = 0; i < NUM_EVENT_OBJECTS; i ++)
     {
-        if (gMapObjects[i].active && gMapObjects[i].localId == localId && gMapObjects[i].mapNum == mapId && gMapObjects[i].mapGroup == mapGroupId)
+        if (gEventObjects[i].active && gEventObjects[i].localId == localId && gEventObjects[i].mapNum == mapId && gEventObjects[i].mapGroup == mapGroupId)
         {
             return i;
         }
     }
-    return NUM_FIELD_OBJECTS;
+    return NUM_EVENT_OBJECTS;
 }
 
-static u8 GetFieldObjectIdByLocalId(u8 localId)
+static u8 GetEventObjectIdByLocalId(u8 localId)
 {
     u8 i;
 
-    for (i = 0; i < NUM_FIELD_OBJECTS; i ++)
+    for (i = 0; i < NUM_EVENT_OBJECTS; i ++)
     {
-        if (gMapObjects[i].active && gMapObjects[i].localId == localId)
+        if (gEventObjects[i].active && gEventObjects[i].localId == localId)
         {
             return i;
         }
     }
-    return NUM_FIELD_OBJECTS;
+    return NUM_EVENT_OBJECTS;
 }
 
 // This function has the same nonmatching quirk as in Ruby/Sapphire.
 #ifdef NONMATCHING
-static u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *template, u8 mapNum, u8 mapGroup)
+static u8 InitEventObjectStateFromTemplate(struct EventObjectTemplate *template, u8 mapNum, u8 mapGroup)
 {
-    struct MapObject *mapObject;
+    struct EventObject *eventObject;
     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))
+    if (GetAvailableEventObjectSlot(template->localId, mapNum, mapGroup, &slot))
     {
-        return NUM_FIELD_OBJECTS;
+        return NUM_EVENT_OBJECTS;
     }
-    mapObject = &gMapObjects[slot];
-    npc_clear_ids_and_state(mapObject);
+    eventObject = &gEventObjects[slot];
+    npc_clear_ids_and_state(eventObject);
     x = template->x + 7;
     y = template->y + 7;
-    mapObject->active = TRUE;
-    mapObject->triggerGroundEffectsOnMove = TRUE;
-    mapObject->graphicsId = template->graphicsId;
-    mapObject->movementType = template->movementType;
-    mapObject->localId = template->localId;
-    mapObject->mapNum = mapNum;
-    mapObject->mapGroup = mapGroup;
-    mapObject->initialCoords.x = x;
-    mapObject->initialCoords.y = y;
-    mapObject->currentCoords.x = x;
-    mapObject->currentCoords.y = y;
-    mapObject->previousCoords.x = x;
-    mapObject->previousCoords.y = y;
-    mapObject->currentElevation = template->elevation;
-    mapObject->previousElevation = template->elevation;
+    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
-    mapObject->range.as_nybbles.x = template->movementRangeX;
-    mapObject->range.as_nybbles.y = template->movementRangeY;
-    mapObject->trainerType = template->trainerType;
-    mapObject->trainerRange_berryTreeId = template->trainerRange_berryTreeId;
-    mapObject->previousMovementDirection = gInitialMovementTypeFacingDirections[template->movementType];
-    FieldObjectSetDirection(mapObject, mapObject->previousMovementDirection);
-    FieldObjectHandleDynamicGraphicsId(mapObject);
+    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];
+    EventObjectSetDirection(eventObject, eventObject->previousMovementDirection);
+    EventObjectHandleDynamicGraphicsId(eventObject);
 
-    if (gRangedMovementTypes[mapObject->movementType])
+    if (gRangedMovementTypes[eventObject->movementType])
     {
-        if ((mapObject->range.as_nybbles.x) == 0)
+        if ((eventObject->range.as_nybbles.x) == 0)
         {
             // r9 is invoked here
-            mapObject->range.as_nybbles.x ++;
+            eventObject->range.as_nybbles.x ++;
         }
-        if ((mapObject->range.as_nybbles.y) == 0)
+        if ((eventObject->range.as_nybbles.y) == 0)
         {
-            mapObject->range.as_nybbles.y ++;
+            eventObject->range.as_nybbles.y ++;
         }
     }
     return slot;
 }
 #else
-static NAKED u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *template, u8 mapId, u8 mapGroupId)
+static NAKED u8 InitEventObjectStateFromTemplate(struct EventObjectTemplate *template, u8 mapId, u8 mapGroupId)
 {
     asm_unified("\tpush {r4-r7,lr}\n"
                 "\tmov r7, r9\n"
@@ -1269,7 +1267,7 @@ static NAKED u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *templ
                 "\tadds r1, r6, 0\n"
                 "\tadds r2, r7, 0\n"
                 "\tmov r3, sp\n"
-                "\tbl GetAvailableFieldObjectSlot\n"
+                "\tbl GetAvailableEventObjectSlot\n"
                 "\tlsls r0, 24\n"
                 "\tcmp r0, 0\n"
                 "\tbeq _0808D66E\n"
@@ -1281,7 +1279,7 @@ static NAKED u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *templ
                 "\tlsls r0, r1, 3\n"
                 "\tadds r0, r1\n"
                 "\tlsls r0, 2\n"
-                "\tldr r1, =gMapObjects\n"
+                "\tldr r1, =gEventObjects\n"
                 "\tadds r4, r0, r1\n"
                 "\tadds r0, r4, 0\n"
                 "\tbl npc_clear_ids_and_state\n"
@@ -1358,9 +1356,9 @@ static NAKED u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *templ
                 "\tstrb r1, [r0]\n"
                 "\tldrb r1, [r0]\n"
                 "\tadds r0, r4, 0\n"
-                "\tbl FieldObjectSetDirection\n"
+                "\tbl EventObjectSetDirection\n"
                 "\tadds r0, r4, 0\n"
-                "\tbl FieldObjectHandleDynamicGraphicsId\n"
+                "\tbl EventObjectHandleDynamicGraphicsId\n"
                 "\tldr r1, =gRangedMovementTypes\n"
                 "\tldrb r0, [r4, 0x6]\n"
                 "\tadds r0, r1\n"
@@ -1413,7 +1411,7 @@ u8 unref_sub_808D77C(u8 localId)
 {
     u8 i;
     u8 nObjects;
-    struct MapObjectTemplate *template;
+    struct EventObjectTemplate *template;
 
     if (gMapHeader.events != NULL)
     {
@@ -1427,21 +1425,21 @@ u8 unref_sub_808D77C(u8 localId)
         }
         else
         {
-            nObjects = gMapHeader.events->mapObjectCount;
+            nObjects = gMapHeader.events->eventObjectCount;
         }
         for (i = 0; i < nObjects; i ++)
         {
-            template = &gSaveBlock1Ptr->mapObjectTemplates[i];
+            template = &gSaveBlock1Ptr->eventObjectTemplates[i];
             if (template->localId == localId && !FlagGet(template->flagId))
             {
-                return InitFieldObjectStateFromTemplate(template, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
+                return InitEventObjectStateFromTemplate(template, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
             }
         }
     }
-    return NUM_FIELD_OBJECTS;
+    return NUM_EVENT_OBJECTS;
 }
 
-static bool8 GetAvailableFieldObjectSlot(u16 localId, u8 mapNum, u8 mapGroup, u8 *result)
+static bool8 GetAvailableEventObjectSlot(u16 localId, u8 mapNum, u8 mapGroup, u8 *result)
 // Looks for an empty slot.
 // Returns FALSE and the location of the available slot
 // in *result.
@@ -1450,78 +1448,78 @@ static bool8 GetAvailableFieldObjectSlot(u16 localId, u8 mapNum, u8 mapGroup, u8
 {
     u8 i = 0;
 
-    for (i = 0; i < NUM_FIELD_OBJECTS; i ++)
+    for (i = 0; i < NUM_EVENT_OBJECTS; i ++)
     {
-        if (!gMapObjects[i].active)
+        if (!gEventObjects[i].active)
             break;
-        if (gMapObjects[i].localId == localId && gMapObjects[i].mapNum == mapNum && gMapObjects[i].mapGroup == mapGroup)
+        if (gEventObjects[i].localId == localId && gEventObjects[i].mapNum == mapNum && gEventObjects[i].mapGroup == mapGroup)
             return TRUE;
     }
-    if (i >= NUM_FIELD_OBJECTS)
+    if (i >= NUM_EVENT_OBJECTS)
         return TRUE;
     *result = i;
     do
     {
-        if (gMapObjects[i].active && gMapObjects[i].localId == localId && gMapObjects[i].mapNum == mapNum && gMapObjects[i].mapGroup == mapGroup)
+        if (gEventObjects[i].active && gEventObjects[i].localId == localId && gEventObjects[i].mapNum == mapNum && gEventObjects[i].mapGroup == mapGroup)
             return TRUE;
         i ++;
-    } while (i < NUM_FIELD_OBJECTS);
+    } while (i < NUM_EVENT_OBJECTS);
     return FALSE;
 }
 
-static void RemoveFieldObject(struct MapObject *mapObject)
+static void RemoveEventObject(struct EventObject *eventObject)
 {
-    mapObject->active = FALSE;
-    RemoveFieldObjectInternal(mapObject);
+    eventObject->active = FALSE;
+    RemoveEventObjectInternal(eventObject);
 }
 
-void RemoveFieldObjectByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup)
+void RemoveEventObjectByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup)
 {
     u8 index;
-    if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &index))
+    if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &index))
     {
-        FlagSet(GetFieldObjectFlagIdByFieldObjectId(index));
-        RemoveFieldObject(&gMapObjects[index]);
+        FlagSet(GetEventObjectFlagIdByEventObjectId(index));
+        RemoveEventObject(&gEventObjects[index]);
     }
 }
 
-static void RemoveFieldObjectInternal(struct MapObject *mapObject)
+static void RemoveEventObjectInternal(struct EventObject *eventObject)
 {
     struct SpriteFrameImage image;
-    image.size = GetFieldObjectGraphicsInfo(mapObject->graphicsId)->size;
-    gSprites[mapObject->spriteId].images = &image;
-    DestroySprite(&gSprites[mapObject->spriteId]);
+    image.size = GetEventObjectGraphicsInfo(eventObject->graphicsId)->size;
+    gSprites[eventObject->spriteId].images = &image;
+    DestroySprite(&gSprites[eventObject->spriteId]);
 }
 
 void unref_sub_808D958(void)
 {
     u8 i;
 
-    for (i = 0; i < NUM_FIELD_OBJECTS; i ++)
+    for (i = 0; i < NUM_EVENT_OBJECTS; i ++)
     {
-        if (i != gPlayerAvatar.mapObjectId)
+        if (i != gPlayerAvatar.eventObjectId)
         {
-            RemoveFieldObject(&gMapObjects[i]);
+            RemoveEventObject(&gEventObjects[i]);
         }
     }
 }
 
-static u8 SpawnFieldObjectInternal(struct MapObjectTemplate *mapObjectTemplate, struct SpriteTemplate *spriteTemplate, u8 mapNum, u8 mapGroup, s16 cameraX, s16 cameraY)
+static u8 SpawnEventObjectInternal(struct EventObjectTemplate *eventObjectTemplate, struct SpriteTemplate *spriteTemplate, u8 mapNum, u8 mapGroup, s16 cameraX, s16 cameraY)
 {
-    struct MapObject *mapObject;
-    const struct MapObjectGraphicsInfo *graphicsInfo;
+    struct EventObject *eventObject;
+    const struct EventObjectGraphicsInfo *graphicsInfo;
     struct Sprite *sprite;
-    u8 mapObjectId;
+    u8 eventObjectId;
     u8 paletteSlot;
     u8 spriteId;
 
-    mapObjectId = InitFieldObjectStateFromTemplate(mapObjectTemplate, mapNum, mapGroup);
-    if (mapObjectId == NUM_FIELD_OBJECTS)
+    eventObjectId = InitEventObjectStateFromTemplate(eventObjectTemplate, mapNum, mapGroup);
+    if (eventObjectId == NUM_EVENT_OBJECTS)
     {
-        return NUM_FIELD_OBJECTS;
+        return NUM_EVENT_OBJECTS;
     }
-    mapObject = &gMapObjects[mapObjectId];
-    graphicsInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId);
+    eventObject = &gEventObjects[eventObjectId];
+    graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId);
     paletteSlot = graphicsInfo->paletteSlot;
     if (paletteSlot == 0)
     {
@@ -1536,110 +1534,110 @@ static u8 SpawnFieldObjectInternal(struct MapObjectTemplate *mapObjectTemplate,
         paletteSlot -= 16;
         sub_808EAB0(graphicsInfo->paletteTag1, paletteSlot);
     }
-    if (mapObject->movementType == 0x4c)
+    if (eventObject->movementType == 0x4c)
     {
-        mapObject->invisible = TRUE;
+        eventObject->invisible = TRUE;
     }
     *(u16 *)&spriteTemplate->paletteTag = 0xFFFF;
     spriteId = CreateSprite(spriteTemplate, 0, 0, 0);
     if (spriteId == MAX_SPRITES)
     {
-        gMapObjects[mapObjectId].active = FALSE;
-        return NUM_FIELD_OBJECTS;
+        gEventObjects[eventObjectId].active = FALSE;
+        return NUM_EVENT_OBJECTS;
     }
     sprite = &gSprites[spriteId];
-    sub_8092FF0(mapObject->currentCoords.x + cameraX, mapObject->currentCoords.y + cameraY, &sprite->pos1.x, &sprite->pos1.y);
+    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] = mapObjectId;
-    mapObject->spriteId = spriteId;
-    mapObject->inanimate = graphicsInfo->inanimate;
-    if (!mapObject->inanimate)
+    sprite->data[0] = eventObjectId;
+    eventObject->spriteId = spriteId;
+    eventObject->inanimate = graphicsInfo->inanimate;
+    if (!eventObject->inanimate)
     {
-        StartSpriteAnim(sprite, FieldObjectDirectionToImageAnimId(mapObject->facingDirection));
+        StartSpriteAnim(sprite, EventObjectDirectionToImageAnimId(eventObject->facingDirection));
     }
-    SetObjectSubpriorityByZCoord(mapObject->previousElevation, sprite, 1);
-    sub_8096518(mapObject, sprite);
-    return mapObjectId;
+    SetObjectSubpriorityByZCoord(eventObject->previousElevation, sprite, 1);
+    sub_8096518(eventObject, sprite);
+    return eventObjectId;
 }
 
-static u8 SpawnFieldObject(struct MapObjectTemplate *mapObjectTemplate, u8 mapNum, u8 mapGroup, s16 cameraX, s16 cameraY)
+static u8 SpawnEventObject(struct EventObjectTemplate *eventObjectTemplate, u8 mapNum, u8 mapGroup, s16 cameraX, s16 cameraY)
 {
-    const struct MapObjectGraphicsInfo *graphicsInfo;
+    const struct EventObjectGraphicsInfo *graphicsInfo;
     struct SpriteTemplate spriteTemplate;
     const struct SubspriteTable *subspriteTables;
     struct SpriteFrameImage spriteFrameImage;
-    u8 mapObjectId;
+    u8 eventObjectId;
 
     subspriteTables = NULL;
-    graphicsInfo = GetFieldObjectGraphicsInfo(mapObjectTemplate->graphicsId);
-    MakeObjectTemplateFromFieldObjectTemplate(mapObjectTemplate, &spriteTemplate, &subspriteTables);
+    graphicsInfo = GetEventObjectGraphicsInfo(eventObjectTemplate->graphicsId);
+    MakeObjectTemplateFromEventObjectTemplate(eventObjectTemplate, &spriteTemplate, &subspriteTables);
     spriteFrameImage.size = graphicsInfo->size;
     spriteTemplate.images = &spriteFrameImage;
-    mapObjectId = SpawnFieldObjectInternal(mapObjectTemplate, &spriteTemplate, mapNum, mapGroup, cameraX, cameraY);
-    if (mapObjectId == NUM_FIELD_OBJECTS)
+    eventObjectId = SpawnEventObjectInternal(eventObjectTemplate, &spriteTemplate, mapNum, mapGroup, cameraX, cameraY);
+    if (eventObjectId == NUM_EVENT_OBJECTS)
     {
-        return NUM_FIELD_OBJECTS;
+        return NUM_EVENT_OBJECTS;
     }
-    gSprites[gMapObjects[mapObjectId].spriteId].images = graphicsInfo->images;
+    gSprites[gEventObjects[eventObjectId].spriteId].images = graphicsInfo->images;
     if (subspriteTables != NULL)
     {
-        SetSubspriteTables(&gSprites[gMapObjects[mapObjectId].spriteId], subspriteTables);
+        SetSubspriteTables(&gSprites[gEventObjects[eventObjectId].spriteId], subspriteTables);
     }
-    return mapObjectId;
+    return eventObjectId;
 }
 
-u8 SpawnSpecialFieldObject(struct MapObjectTemplate *mapObjectTemplate)
+u8 SpawnSpecialEventObject(struct EventObjectTemplate *eventObjectTemplate)
 {
     s16 cameraX;
     s16 cameraY;
 
-    GetFieldObjectMovingCameraOffset(&cameraX, &cameraY);
-    return SpawnFieldObject(mapObjectTemplate, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, cameraX, cameraY);
+    GetEventObjectMovingCameraOffset(&cameraX, &cameraY);
+    return SpawnEventObject(eventObjectTemplate, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, cameraX, cameraY);
 }
 
-u8 SpawnSpecialFieldObjectParametrized(u8 graphicsId, u8 movementBehavior, u8 localId, s16 x, s16 y, u8 z)
+u8 SpawnSpecialEventObjectParametrized(u8 graphicsId, u8 movementBehavior, u8 localId, s16 x, s16 y, u8 z)
 {
-    struct MapObjectTemplate mapObjectTemplate;
+    struct EventObjectTemplate eventObjectTemplate;
 
     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.movementRangeX = 0;
-    mapObjectTemplate.movementRangeY = 0;
-    mapObjectTemplate.trainerType = 0;
-    mapObjectTemplate.trainerRange_berryTreeId = 0;
-    return SpawnSpecialFieldObject(&mapObjectTemplate);
+    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 MapObjectTemplate *mapObjectTemplate;
+    struct EventObjectTemplate *eventObjectTemplate;
     s16 cameraX;
     s16 cameraY;
 
-    mapObjectTemplate = GetFieldObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup);
-    if (mapObjectTemplate == NULL)
+    eventObjectTemplate = GetEventObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup);
+    if (eventObjectTemplate == NULL)
     {
-        return NUM_FIELD_OBJECTS;
+        return NUM_EVENT_OBJECTS;
     }
-    GetFieldObjectMovingCameraOffset(&cameraX, &cameraY);
-    return SpawnFieldObject(mapObjectTemplate, mapNum, mapGroup, cameraX, cameraY);
+    GetEventObjectMovingCameraOffset(&cameraX, &cameraY);
+    return SpawnEventObject(eventObjectTemplate, mapNum, mapGroup, cameraX, cameraY);
 }
 
-static void MakeObjectTemplateFromFieldObjectGraphicsInfo(u16 graphicsId, void (*callback)(struct Sprite *), struct SpriteTemplate *sprTemplate, const struct SubspriteTable **subspriteTables)
+static void MakeObjectTemplateFromEventObjectGraphicsInfo(u16 graphicsId, void (*callback)(struct Sprite *), struct SpriteTemplate *sprTemplate, const struct SubspriteTable **subspriteTables)
 {
-    const struct MapObjectGraphicsInfo *gfxInfo = GetFieldObjectGraphicsInfo(graphicsId);
+    const struct EventObjectGraphicsInfo *gfxInfo = GetEventObjectGraphicsInfo(graphicsId);
 
     sprTemplate->tileTag = gfxInfo->tileTag;
     sprTemplate->paletteTag = gfxInfo->paletteTag1;
@@ -1651,17 +1649,17 @@ static void MakeObjectTemplateFromFieldObjectGraphicsInfo(u16 graphicsId, void (
     *subspriteTables = gfxInfo->subspriteTables;
 }
 
-static void MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex(u16 graphicsId, u16 callbackIndex, struct SpriteTemplate *sprTemplate, const struct SubspriteTable **subspriteTables)
+static void MakeObjectTemplateFromEventObjectGraphicsInfoWithCallbackIndex(u16 graphicsId, u16 callbackIndex, struct SpriteTemplate *sprTemplate, const struct SubspriteTable **subspriteTables)
 {
-    MakeObjectTemplateFromFieldObjectGraphicsInfo(graphicsId, gUnknown_08505438[callbackIndex], sprTemplate, subspriteTables);
+    MakeObjectTemplateFromEventObjectGraphicsInfo(graphicsId, gUnknown_08505438[callbackIndex], sprTemplate, subspriteTables);
 }
 
-static void MakeObjectTemplateFromFieldObjectTemplate(struct MapObjectTemplate *mapObjectTemplate, struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables)
+static void MakeObjectTemplateFromEventObjectTemplate(struct EventObjectTemplate *eventObjectTemplate, struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables)
 {
-    MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex(mapObjectTemplate->graphicsId, mapObjectTemplate->movementType, spriteTemplate, subspriteTables);
+    MakeObjectTemplateFromEventObjectGraphicsInfoWithCallbackIndex(eventObjectTemplate->graphicsId, eventObjectTemplate->movementType, spriteTemplate, subspriteTables);
 }
 
-u8 AddPseudoFieldObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority)
+u8 AddPseudoEventObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority)
 {
     struct SpriteTemplate *spriteTemplate;
     const struct SubspriteTable *subspriteTables;
@@ -1669,7 +1667,7 @@ u8 AddPseudoFieldObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 x
     u8 spriteIdx;
 
     spriteTemplate = malloc(sizeof(struct SpriteTemplate));
-    MakeObjectTemplateFromFieldObjectGraphicsInfo(graphicsId, callback, spriteTemplate, &subspriteTables);
+    MakeObjectTemplateFromEventObjectGraphicsInfo(graphicsId, callback, spriteTemplate, &subspriteTables);
     if (spriteTemplate->paletteTag != 0xffff)
     {
         sub_808E894(spriteTemplate->paletteTag);
@@ -1688,14 +1686,14 @@ u8 AddPseudoFieldObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 x
 
 u8 sprite_new(u8 graphicsId, u8 a1, s16 x, s16 y, u8 z, u8 direction)
 {
-    const struct MapObjectGraphicsInfo *graphicsInfo;
+    const struct EventObjectGraphicsInfo *graphicsInfo;
     struct SpriteTemplate spriteTemplate;
     const struct SubspriteTable *subspriteTables;
     u8 spriteId;
     struct Sprite *sprite;
 
-    graphicsInfo = GetFieldObjectGraphicsInfo(graphicsId);
-    MakeObjectTemplateFromFieldObjectGraphicsInfo(graphicsId, sub_8097AC8, &spriteTemplate, &subspriteTables);
+    graphicsInfo = GetEventObjectGraphicsInfo(graphicsId);
+    MakeObjectTemplateFromEventObjectGraphicsInfo(graphicsId, sub_8097AC8, &spriteTemplate, &subspriteTables);
     *(u16 *)&spriteTemplate.paletteTag = 0xffff;
     x += 7;
     y += 7;
@@ -1730,12 +1728,12 @@ u8 sprite_new(u8 graphicsId, u8 a1, s16 x, s16 y, u8 z, u8 direction)
         }
         InitObjectPriorityByZCoord(sprite, z);
         SetObjectSubpriorityByZCoord(z, sprite, 1);
-        StartSpriteAnim(sprite, FieldObjectDirectionToImageAnimId(direction));
+        StartSpriteAnim(sprite, EventObjectDirectionToImageAnimId(direction));
     }
     return spriteId;
 }
 
-void SpawnFieldObjectsInView(s16 cameraX, s16 cameraY)
+void SpawnEventObjectsInView(s16 cameraX, s16 cameraY)
 {
     u8 i;
     s16 left;
@@ -1763,47 +1761,47 @@ void SpawnFieldObjectsInView(s16 cameraX, s16 cameraY)
         }
         else
         {
-            objectCount = gMapHeader.events->mapObjectCount;
+            objectCount = gMapHeader.events->eventObjectCount;
         }
 
         for (i = 0; i < objectCount; i++)
         {
-            struct MapObjectTemplate *template = &gSaveBlock1Ptr->mapObjectTemplates[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))
-                SpawnFieldObject(template, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, cameraX, cameraY);
+                SpawnEventObject(template, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, cameraX, cameraY);
         }
     }
 }
 
-/*static*/ void RemoveFieldObjectsOutsideView(void)
+/*static*/ void RemoveEventObjectsOutsideView(void)
 {
     u8 i;
     u8 j;
     bool8 isActiveLinkPlayer;
-    struct MapObject *mapObject;
+    struct EventObject *eventObject;
 
-    for (i = 0; i < NUM_FIELD_OBJECTS; i ++)
+    for (i = 0; i < NUM_EVENT_OBJECTS; i ++)
     {
-        for (j = 0, isActiveLinkPlayer = FALSE; j < ARRAY_COUNT(gLinkPlayerMapObjects); j ++)
+        for (j = 0, isActiveLinkPlayer = FALSE; j < ARRAY_COUNT(gLinkPlayerEventObjects); j ++)
         {
-            if (gLinkPlayerMapObjects[j].active && i == gLinkPlayerMapObjects[j].mapObjId)
+            if (gLinkPlayerEventObjects[j].active && i == gLinkPlayerEventObjects[j].eventObjId)
                 isActiveLinkPlayer = TRUE;
         }
         if (!isActiveLinkPlayer)
         {
-            mapObject = &gMapObjects[i];
+            eventObject = &gEventObjects[i];
 
-            if (mapObject->active && !mapObject->isPlayer)
-                RemoveFieldObjectIfOutsideView(mapObject);
+            if (eventObject->active && !eventObject->isPlayer)
+                RemoveEventObjectIfOutsideView(eventObject);
         }
     }
 }
 
-static void RemoveFieldObjectIfOutsideView(struct MapObject *mapObject)
+static void RemoveEventObjectIfOutsideView(struct EventObject *eventObject)
 {
     s16 left;
     s16 right;
@@ -1815,13 +1813,13 @@ static void RemoveFieldObjectIfOutsideView(struct MapObject *mapObject)
     top = gSaveBlock1Ptr->pos.y;
     bottom = gSaveBlock1Ptr->pos.y + 16;
 
-    if (mapObject->currentCoords.x >= left && mapObject->currentCoords.x <= right
-        && mapObject->currentCoords.y >= top && mapObject->currentCoords.y <= bottom)
+    if (eventObject->currentCoords.x >= left && eventObject->currentCoords.x <= right
+        && eventObject->currentCoords.y >= top && eventObject->currentCoords.y <= bottom)
         return;
-    if (mapObject->initialCoords.x >= left && mapObject->initialCoords.x <= right
-        && mapObject->initialCoords.y >= top && mapObject->initialCoords.y <= bottom)
+    if (eventObject->initialCoords.x >= left && eventObject->initialCoords.x <= right
+        && eventObject->initialCoords.y >= top && eventObject->initialCoords.y <= bottom)
         return;
-    RemoveFieldObject(mapObject);
+    RemoveEventObject(eventObject);
 }
 
 void sub_808E16C(s16 x, s16 y)
@@ -1829,9 +1827,9 @@ void sub_808E16C(s16 x, s16 y)
     u8 i;
 
     ClearPlayerAvatarInfo();
-    for (i = 0; i < NUM_FIELD_OBJECTS; i ++)
+    for (i = 0; i < NUM_EVENT_OBJECTS; i ++)
     {
-        if (gMapObjects[i].active)
+        if (gEventObjects[i].active)
         {
             sub_808E1B8(i, x, y);
         }
@@ -1839,32 +1837,32 @@ void sub_808E16C(s16 x, s16 y)
     sub_808D450();
 }
 
-static void sub_808E1B8(u8 mapObjectId, s16 x, s16 y)
+static void sub_808E1B8(u8 eventObjectId, s16 x, s16 y)
 {
     u8 spriteId;
     u8 paletteSlot;
-    struct MapObject *mapObject;
+    struct EventObject *eventObject;
     const struct SubspriteTable *subspriteTables;
-    const struct MapObjectGraphicsInfo *graphicsInfo;
+    const struct EventObjectGraphicsInfo *graphicsInfo;
     struct SpriteFrameImage spriteFrameImage;
     struct SpriteTemplate spriteTemplate;
     struct Sprite *sprite;
 
 #define i spriteId
-    for (i = 0; i < ARRAY_COUNT(gLinkPlayerMapObjects); i ++)
+    for (i = 0; i < ARRAY_COUNT(gLinkPlayerEventObjects); i ++)
     {
-        if (gLinkPlayerMapObjects[i].active && mapObjectId == gLinkPlayerMapObjects[i].mapObjId)
+        if (gLinkPlayerEventObjects[i].active && eventObjectId == gLinkPlayerEventObjects[i].eventObjId)
         {
             return;
         }
     }
 #undef i
 
-    mapObject = &gMapObjects[mapObjectId];
+    eventObject = &gEventObjects[eventObjectId];
     subspriteTables = NULL;
-    graphicsInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId);
+    graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId);
     spriteFrameImage.size = graphicsInfo->size;
-    MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex(mapObject->graphicsId, mapObject->movementType, &spriteTemplate, &subspriteTables);
+    MakeObjectTemplateFromEventObjectGraphicsInfoWithCallbackIndex(eventObject->graphicsId, eventObject->movementType, &spriteTemplate, &subspriteTables);
     spriteTemplate.images = &spriteFrameImage;
     *(u16 *)&spriteTemplate.paletteTag = 0xffff;
     paletteSlot = graphicsInfo->paletteSlot;
@@ -1886,16 +1884,16 @@ static void sub_808E1B8(u8 mapObjectId, s16 x, s16 y)
     if (spriteId != MAX_SPRITES)
     {
         sprite = &gSprites[spriteId];
-        sub_8092FF0(x + mapObject->currentCoords.x, y + mapObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y);
+        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 (mapObject->movementType == 0x0b)
+        if (eventObject->movementType == 0x0b)
         {
-            SetPlayerAvatarFieldObjectIdAndObjectId(mapObjectId, spriteId);
-            mapObject->warpArrowSpriteId = sub_8154228();
+            SetPlayerAvatarEventObjectIdAndObjectId(eventObjectId, spriteId);
+            eventObject->warpArrowSpriteId = sub_8154228();
         }
         if (subspriteTables != NULL)
         {
@@ -1903,46 +1901,46 @@ static void sub_808E1B8(u8 mapObjectId, s16 x, s16 y)
         }
         sprite->oam.paletteNum = paletteSlot;
         sprite->coordOffsetEnabled = TRUE;
-        sprite->data[0] = mapObjectId;
-        mapObject->spriteId = spriteId;
-        if (!mapObject->inanimate && mapObject->movementType != 0x0b)
+        sprite->data[0] = eventObjectId;
+        eventObject->spriteId = spriteId;
+        if (!eventObject->inanimate && eventObject->movementType != 0x0b)
         {
-            StartSpriteAnim(sprite, FieldObjectDirectionToImageAnimId(mapObject->facingDirection));
+            StartSpriteAnim(sprite, EventObjectDirectionToImageAnimId(eventObject->facingDirection));
         }
-        sub_808E38C(mapObject);
-        SetObjectSubpriorityByZCoord(mapObject->previousElevation, sprite, 1);
+        sub_808E38C(eventObject);
+        SetObjectSubpriorityByZCoord(eventObject->previousElevation, sprite, 1);
     }
 }
 
-static void sub_808E38C(struct MapObject *mapObject)
+static void sub_808E38C(struct EventObject *eventObject)
 {
-    mapObject->singleMovementActive = FALSE;
-    mapObject->triggerGroundEffectsOnMove = TRUE;
-    mapObject->hasShadow = FALSE;
-    mapObject->hasReflection = FALSE;
-    mapObject->inShortGrass = FALSE;
-    mapObject->inShallowFlowingWater = FALSE;
-    mapObject->inSandPile = FALSE;
-    mapObject->inHotSprings = FALSE;
-    FieldObjectClearAnim(mapObject);
+    eventObject->singleMovementActive = FALSE;
+    eventObject->triggerGroundEffectsOnMove = TRUE;
+    eventObject->hasShadow = FALSE;
+    eventObject->hasReflection = FALSE;
+    eventObject->inShortGrass = FALSE;
+    eventObject->inShallowFlowingWater = FALSE;
+    eventObject->inSandPile = FALSE;
+    eventObject->inHotSprings = FALSE;
+    EventObjectClearAnim(eventObject);
 }
 
-static void SetPlayerAvatarFieldObjectIdAndObjectId(u8 mapObjectId, u8 spriteId)
+static void SetPlayerAvatarEventObjectIdAndObjectId(u8 eventObjectId, u8 spriteId)
 {
-    gPlayerAvatar.mapObjectId = mapObjectId;
+    gPlayerAvatar.eventObjectId = eventObjectId;
     gPlayerAvatar.spriteId = spriteId;
-    gPlayerAvatar.gender = GetPlayerAvatarGenderByGraphicsId(gMapObjects[mapObjectId].graphicsId);
-    SetPlayerAvatarExtraStateTransition(gMapObjects[mapObjectId].graphicsId, 0x20);
+    gPlayerAvatar.gender = GetPlayerAvatarGenderByGraphicsId(gEventObjects[eventObjectId].graphicsId);
+    SetPlayerAvatarExtraStateTransition(gEventObjects[eventObjectId].graphicsId, 0x20);
 }
 
-void FieldObjectSetGraphicsId(struct MapObject *mapObject, u8 graphicsId)
+void EventObjectSetGraphicsId(struct EventObject *eventObject, u8 graphicsId)
 {
-    const struct MapObjectGraphicsInfo *graphicsInfo;
+    const struct EventObjectGraphicsInfo *graphicsInfo;
     struct Sprite *sprite;
     u8 paletteSlot;
 
-    graphicsInfo = GetFieldObjectGraphicsInfo(graphicsId);
-    sprite = &gSprites[mapObject->spriteId];
+    graphicsInfo = GetEventObjectGraphicsInfo(graphicsId);
+    sprite = &gSprites[eventObject->spriteId];
     paletteSlot = graphicsInfo->paletteSlot;
     if (paletteSlot == 0)
     {
@@ -1963,86 +1961,86 @@ void FieldObjectSetGraphicsId(struct MapObject *mapObject, u8 graphicsId)
     sprite->anims = graphicsInfo->anims;
     sprite->subspriteTables = graphicsInfo->subspriteTables;
     sprite->oam.paletteNum = paletteSlot;
-    mapObject->inanimate = graphicsInfo->inanimate;
-    mapObject->graphicsId = graphicsId;
-    sub_8093038(mapObject->currentCoords.x, mapObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y);
+    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 (mapObject->trackedByCamera)
+    if (eventObject->trackedByCamera)
     {
         CameraObjectReset1();
     }
 }
 
-void FieldObjectSetGraphicsIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 graphicsId)
+void EventObjectSetGraphicsIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 graphicsId)
 {
-    u8 mapObjectId;
+    u8 eventObjectId;
 
-    if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId))
+    if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
     {
-        FieldObjectSetGraphicsId(&gMapObjects[mapObjectId], graphicsId);
+        EventObjectSetGraphicsId(&gEventObjects[eventObjectId], graphicsId);
     }
 }
 
-void FieldObjectTurn(struct MapObject *mapObject, u8 direction)
+void EventObjectTurn(struct EventObject *eventObject, u8 direction)
 {
-    FieldObjectSetDirection(mapObject, direction);
-    if (!mapObject->inanimate)
+    EventObjectSetDirection(eventObject, direction);
+    if (!eventObject->inanimate)
     {
-        StartSpriteAnim(&gSprites[mapObject->spriteId], FieldObjectDirectionToImageAnimId(mapObject->facingDirection));
-        SeekSpriteAnim(&gSprites[mapObject->spriteId], 0);
+        StartSpriteAnim(&gSprites[eventObject->spriteId], EventObjectDirectionToImageAnimId(eventObject->facingDirection));
+        SeekSpriteAnim(&gSprites[eventObject->spriteId], 0);
     }
 }
 
-void FieldObjectTurnByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 direction)
+void EventObjectTurnByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 direction)
 {
-    u8 mapObjectId;
+    u8 eventObjectId;
 
-    if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId))
+    if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
     {
-        FieldObjectTurn(&gMapObjects[mapObjectId], direction);
+        EventObjectTurn(&gEventObjects[eventObjectId], direction);
     }
 }
 
 void PlayerObjectTurn(struct PlayerAvatar *playerAvatar, u8 direction)
 {
-    FieldObjectTurn(&gMapObjects[playerAvatar->mapObjectId], direction);
+    EventObjectTurn(&gEventObjects[playerAvatar->eventObjectId], direction);
 }
 
-/*static*/ void get_berry_tree_graphics(struct MapObject *mapObject, struct Sprite *sprite)
+/*static*/ void get_berry_tree_graphics(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 berryStage;
     u8 berryId;
 
-    mapObject->invisible = TRUE;
+    eventObject->invisible = TRUE;
     sprite->invisible = TRUE;
-    berryStage = GetStageByBerryTreeId(mapObject->trainerRange_berryTreeId);
+    berryStage = GetStageByBerryTreeId(eventObject->trainerRange_berryTreeId);
     if (berryStage != 0)
     {
-        mapObject->invisible = FALSE;
+        eventObject->invisible = FALSE;
         sprite->invisible = FALSE;
-        berryId = GetBerryTypeByBerryTreeId(mapObject->trainerRange_berryTreeId) - 1;
+        berryId = GetBerryTypeByBerryTreeId(eventObject->trainerRange_berryTreeId) - 1;
         berryStage -= 1;
         if (berryId >= NUM_BERRIES)
         {
             berryId = 0;
         }
-        FieldObjectSetGraphicsId(mapObject, gBerryTreeFieldObjectGraphicsIdTablePointers[berryId][berryStage]);
+        EventObjectSetGraphicsId(eventObject, gBerryTreeEventObjectGraphicsIdTablePointers[berryId][berryStage]);
         sprite->images = gBerryTreePicTablePointers[berryId];
         sprite->oam.paletteNum = gBerryTreePaletteSlotTablePointers[berryId][berryStage];
         StartSpriteAnim(sprite, berryStage);
     }
 }
 
-const struct MapObjectGraphicsInfo *GetFieldObjectGraphicsInfo(u8 graphicsId)
+const struct EventObjectGraphicsInfo *GetEventObjectGraphicsInfo(u8 graphicsId)
 {
     u8 bard;
 
     if (graphicsId >= SPRITE_VAR)
     {
-        graphicsId = VarGetFieldObjectGraphicsId(graphicsId - SPRITE_VAR);
+        graphicsId = VarGetEventObjectGraphicsId(graphicsId - SPRITE_VAR);
     }
     if (graphicsId == 0x45)
     {
@@ -2053,83 +2051,83 @@ const struct MapObjectGraphicsInfo *GetFieldObjectGraphicsInfo(u8 graphicsId)
     {
         graphicsId = 0x05; // LittleBoy1
     }
-    return gFieldObjectGraphicsInfoPointers[graphicsId];
+    return gEventObjectGraphicsInfoPointers[graphicsId];
 }
 
-static void FieldObjectHandleDynamicGraphicsId(struct MapObject *mapObject)
+static void EventObjectHandleDynamicGraphicsId(struct EventObject *eventObject)
 {
-    if (mapObject->graphicsId >= SPRITE_VAR)
+    if (eventObject->graphicsId >= SPRITE_VAR)
     {
-        mapObject->graphicsId = VarGetFieldObjectGraphicsId(mapObject->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 mapObjectId;
+    u8 eventObjectId;
 
-    if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId))
+    if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
     {
-        gMapObjects[mapObjectId].invisible = state;
+        gEventObjects[eventObjectId].invisible = state;
     }
 }
 
-void FieldObjectGetLocalIdAndMap(struct MapObject *mapObject, void *localId, void *mapNum, void *mapGroup)
+void EventObjectGetLocalIdAndMap(struct EventObject *eventObject, void *localId, void *mapNum, void *mapGroup)
 {
-    *(u8*)(localId) = mapObject->localId;
-    *(u8*)(mapNum) = mapObject->mapNum;
-    *(u8*)(mapGroup) = mapObject->mapGroup;
+    *(u8*)(localId) = eventObject->localId;
+    *(u8*)(mapNum) = eventObject->mapNum;
+    *(u8*)(mapGroup) = eventObject->mapGroup;
 }
 
 void sub_808E75C(s16 x, s16 y)
 {
-    u8 mapObjectId;
-    struct MapObject *mapObject;
+    u8 eventObjectId;
+    struct EventObject *eventObject;
 
-    mapObjectId = GetFieldObjectIdByXY(x, y);
-    if (mapObjectId != NUM_FIELD_OBJECTS)
+    eventObjectId = GetEventObjectIdByXY(x, y);
+    if (eventObjectId != NUM_EVENT_OBJECTS)
     {
-        mapObject = &gMapObjects[mapObjectId];
-        mapObject->triggerGroundEffectsOnMove = TRUE;
+        eventObject = &gEventObjects[eventObjectId];
+        eventObject->triggerGroundEffectsOnMove = TRUE;
     }
 }
 
 void sub_808E78C(u8 localId, u8 mapNum, u8 mapGroup, u8 subpriority)
 {
-    u8 mapObjectId;
-    struct MapObject *mapObject;
+    u8 eventObjectId;
+    struct EventObject *eventObject;
     struct Sprite *sprite;
 
-    if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId))
+    if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
     {
-        mapObject = &gMapObjects[mapObjectId];
-        sprite = &gSprites[mapObject->spriteId];
-        mapObject->fixedPriority = TRUE;
+        eventObject = &gEventObjects[eventObjectId];
+        sprite = &gSprites[eventObject->spriteId];
+        eventObject->fixedPriority = TRUE;
         sprite->subpriority = subpriority;
     }
 }
 
 void sub_808E7E4(u8 localId, u8 mapNum, u8 mapGroup)
 {
-    u8 mapObjectId;
-    struct MapObject *mapObject;
+    u8 eventObjectId;
+    struct EventObject *eventObject;
 
-    if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId))
+    if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
     {
-        mapObject = &gMapObjects[mapObjectId];
-        mapObject->fixedPriority = FALSE;
-        mapObject->triggerGroundEffectsOnMove = TRUE;
+        eventObject = &gEventObjects[eventObjectId];
+        eventObject->fixedPriority = FALSE;
+        eventObject->triggerGroundEffectsOnMove = TRUE;
     }
 }
 
 void sub_808E82C(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y)
 {
-    u8 mapObjectId;
+    u8 eventObjectId;
     struct Sprite *sprite;
 
-    if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId))
+    if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
     {
-        sprite = &gSprites[gMapObjects[mapObjectId].spriteId];
+        sprite = &gSprites[gEventObjects[eventObjectId].spriteId];
         sprite->pos2.x = x;
         sprite->pos2.y = y;
     }
@@ -2145,7 +2143,7 @@ static void sub_808E894(u16 paletteTag)
 {
     u16 paletteSlot;
 
-    paletteSlot = FindFieldObjectPaletteIndexByTag(paletteTag);
+    paletteSlot = FindEventObjectPaletteIndexByTag(paletteTag);
     if (paletteSlot != 0x11ff) // always true
     {
         sub_808E8F4(&gUnknown_0850BBC8[paletteSlot]);
@@ -2175,7 +2173,7 @@ void pal_patch_for_npc(u16 paletteTag, u8 paletteSlot)
 {
     u16 paletteIdx;
 
-    paletteIdx = FindFieldObjectPaletteIndexByTag(paletteTag);
+    paletteIdx = FindEventObjectPaletteIndexByTag(paletteTag);
     LoadPalette(gUnknown_0850BBC8[paletteIdx].data, 16 * paletteSlot + 256, 0x20);
 }
 
@@ -2189,7 +2187,7 @@ void pal_patch_for_npc_range(const u16 *paletteTags, u8 minSlot, u8 maxSlot)
     }
 }
 
-static u8 FindFieldObjectPaletteIndexByTag(u16 tag)
+static u8 FindEventObjectPaletteIndexByTag(u16 tag)
 {
     u8 i;
 
@@ -2239,45 +2237,45 @@ 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)
+void unref_sub_808EAC4(struct EventObject *eventObject, s16 x, s16 y)
 {
-    mapObject->previousCoords.x = mapObject->currentCoords.x;
-    mapObject->previousCoords.y = mapObject->currentCoords.y;
-    mapObject->currentCoords.x += x;
-    mapObject->currentCoords.y += y;
+    eventObject->previousCoords.x = eventObject->currentCoords.x;
+    eventObject->previousCoords.y = eventObject->currentCoords.y;
+    eventObject->currentCoords.x += x;
+    eventObject->currentCoords.y += y;
 }
 
-void npc_coords_shift(struct MapObject *mapObject, s16 x, s16 y)
+void npc_coords_shift(struct EventObject *eventObject, s16 x, s16 y)
 {
-    mapObject->previousCoords.x = mapObject->currentCoords.x;
-    mapObject->previousCoords.y = mapObject->currentCoords.y;
-    mapObject->currentCoords.x = x;
-    mapObject->currentCoords.y = 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 MapObject *mapObject, s16 x, s16 y)
+/*static*/ void npc_coords_set(struct EventObject *eventObject, s16 x, s16 y)
 {
-    mapObject->previousCoords.x = x;
-    mapObject->previousCoords.y = y;
-    mapObject->currentCoords.x = x;
-    mapObject->currentCoords.y = y;
+    eventObject->previousCoords.x = x;
+    eventObject->previousCoords.y = y;
+    eventObject->currentCoords.x = x;
+    eventObject->currentCoords.y = y;
 }
 
-void sub_808EB08(struct MapObject *mapObject, s16 x, s16 y)
+void sub_808EB08(struct EventObject *eventObject, s16 x, s16 y)
 {
     struct Sprite *sprite;
-    const struct MapObjectGraphicsInfo *graphicsInfo;
+    const struct EventObjectGraphicsInfo *graphicsInfo;
 
-    sprite = &gSprites[mapObject->spriteId];
-    graphicsInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId);
-    npc_coords_set(mapObject, x, y);
-    sub_8093038(mapObject->currentCoords.x, mapObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y);
+    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(mapObject);
-    if (mapObject->trackedByCamera)
+    sub_808E38C(eventObject);
+    if (eventObject->trackedByCamera)
     {
         CameraObjectReset1();
     }
@@ -2285,22 +2283,22 @@ void sub_808EB08(struct MapObject *mapObject, s16 x, s16 y)
 
 void sub_808EBA8(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y)
 {
-    u8 mapObjectId;
+    u8 eventObjectId;
 
-    if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId))
+    if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
     {
         x += 7;
         y += 7;
-        sub_808EB08(&gMapObjects[mapObjectId], x, y);
+        sub_808EB08(&gEventObjects[eventObjectId], x, y);
     }
 }
 
-void npc_coords_shift_still(struct MapObject *mapObject)
+void npc_coords_shift_still(struct EventObject *eventObject)
 {
-    npc_coords_shift(mapObject, mapObject->currentCoords.x, mapObject->currentCoords.y);
+    npc_coords_shift(eventObject, eventObject->currentCoords.x, eventObject->currentCoords.y);
 }
 
-void UpdateFieldObjectCoordsForCameraUpdate(void)
+void UpdateEventObjectCoordsForCameraUpdate(void)
 {
     u8 i;
     s16 dx;
@@ -2310,51 +2308,51 @@ void UpdateFieldObjectCoordsForCameraUpdate(void)
     {
         dx = gCamera.x;
         dy = gCamera.y;
-        for (i = 0; i < NUM_FIELD_OBJECTS; i ++)
+        for (i = 0; i < NUM_EVENT_OBJECTS; i ++)
         {
-            if (gMapObjects[i].active)
+            if (gEventObjects[i].active)
             {
-                gMapObjects[i].initialCoords.x -= dx;
-                gMapObjects[i].initialCoords.y -= dy;
-                gMapObjects[i].currentCoords.x -= dx;
-                gMapObjects[i].currentCoords.y -= dy;
-                gMapObjects[i].previousCoords.x -= dx;
-                gMapObjects[i].previousCoords.y -= dy;
+                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 GetFieldObjectIdByXYZ(u16 x, u16 y, u8 z)
+u8 GetEventObjectIdByXYZ(u16 x, u16 y, u8 z)
 {
     u8 i;
-    for (i = 0; i < NUM_FIELD_OBJECTS; i ++)
+    for (i = 0; i < NUM_EVENT_OBJECTS; i ++)
     {
-        if (gMapObjects[i].active)
+        if (gEventObjects[i].active)
         {
-            if (gMapObjects[i].currentCoords.x == x && gMapObjects[i].currentCoords.y == y && FieldObjectDoesZCoordMatch(&gMapObjects[i], z))
+            if (gEventObjects[i].currentCoords.x == x && gEventObjects[i].currentCoords.y == y && EventObjectDoesZCoordMatch(&gEventObjects[i], z))
             {
                 return i;
             }
         }
     }
-    return NUM_FIELD_OBJECTS;
+    return NUM_EVENT_OBJECTS;
 }
 
-static bool8 FieldObjectDoesZCoordMatch(struct MapObject *mapObject, u8 z)
+static bool8 EventObjectDoesZCoordMatch(struct EventObject *eventObject, u8 z)
 {
-    if (mapObject->currentElevation != 0 && z != 0 && mapObject->currentElevation != z)
+    if (eventObject->currentElevation != 0 && z != 0 && eventObject->currentElevation != z)
     {
         return FALSE;
     }
     return TRUE;
 }
 
-void UpdateFieldObjectsForCameraUpdate(s16 x, s16 y)
+void UpdateEventObjectsForCameraUpdate(s16 x, s16 y)
 {
-    UpdateFieldObjectCoordsForCameraUpdate();
-    SpawnFieldObjectsInView(x, y);
-    RemoveFieldObjectsOutsideView();
+    UpdateEventObjectCoordsForCameraUpdate();
+    SpawnEventObjectsInView(x, y);
+    RemoveEventObjectsOutsideView();
 }
 
 u8 AddCameraObject(u8 linkedSpriteId)
@@ -2496,91 +2494,91 @@ u8 obj_unfreeze(struct Sprite *sprite, s16 x, s16 y, u8 subpriority)
     return MAX_SPRITES;
 }
 
-void FieldObjectSetDirection(struct MapObject *mapObject, u8 direction)
+void EventObjectSetDirection(struct EventObject *eventObject, u8 direction)
 {
     s8 d2;
-    mapObject->previousMovementDirection = mapObject->facingDirection;
-    if (!mapObject->facingDirectionLocked)
+    eventObject->previousMovementDirection = eventObject->facingDirection;
+    if (!eventObject->facingDirectionLocked)
     {
         d2 = direction;
-        mapObject->facingDirection = d2;
+        eventObject->facingDirection = d2;
     }
-    mapObject->movementDirection = direction;
+    eventObject->movementDirection = direction;
 }
 
-static const u8 *GetFieldObjectScriptPointerByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup)
+static const u8 *GetEventObjectScriptPointerByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup)
 {
-    return GetFieldObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->script;
+    return GetEventObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->script;
 }
 
-const u8 *GetFieldObjectScriptPointerByFieldObjectId(u8 mapObjectId)
+const u8 *GetEventObjectScriptPointerByEventObjectId(u8 eventObjectId)
 {
-    return GetFieldObjectScriptPointerByLocalIdAndMap(gMapObjects[mapObjectId].localId, gMapObjects[mapObjectId].mapNum, gMapObjects[mapObjectId].mapGroup);
+    return GetEventObjectScriptPointerByLocalIdAndMap(gEventObjects[eventObjectId].localId, gEventObjects[eventObjectId].mapNum, gEventObjects[eventObjectId].mapGroup);
 }
 
-static u16 GetFieldObjectFlagIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup)
+static u16 GetEventObjectFlagIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup)
 {
-    return GetFieldObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->flagId;
+    return GetEventObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->flagId;
 }
 
-static u16 GetFieldObjectFlagIdByFieldObjectId(u8 mapObjectId)
+static u16 GetEventObjectFlagIdByEventObjectId(u8 eventObjectId)
 {
-    return GetFieldObjectFlagIdByLocalIdAndMap(gMapObjects[mapObjectId].localId, gMapObjects[mapObjectId].mapNum, gMapObjects[mapObjectId].mapGroup);
+    return GetEventObjectFlagIdByLocalIdAndMap(gEventObjects[eventObjectId].localId, gEventObjects[eventObjectId].mapNum, gEventObjects[eventObjectId].mapGroup);
 }
 
 u8 sub_808F080(u8 localId, u8 mapNum, u8 mapGroup)
 {
-    u8 mapObjectId;
+    u8 eventObjectId;
 
-    if (TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId))
+    if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
     {
         return 0xFF;
     }
-    return gMapObjects[mapObjectId].trainerType;
+    return gEventObjects[eventObjectId].trainerType;
 }
 
-u8 sub_808F0BC(u8 mapObjectId)
+u8 sub_808F0BC(u8 eventObjectId)
 {
-    return gMapObjects[mapObjectId].trainerType;
+    return gEventObjects[eventObjectId].trainerType;
 }
 
 u8 sub_808F0D4(u8 localId, u8 mapNum, u8 mapGroup)
 {
-    u8 mapObjectId;
+    u8 eventObjectId;
 
-    if (TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId))
+    if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
     {
         return 0xFF;
     }
-    return gMapObjects[mapObjectId].trainerRange_berryTreeId;
+    return gEventObjects[eventObjectId].trainerRange_berryTreeId;
 }
 
-u8 FieldObjectGetBerryTreeId(u8 mapObjectId)
+u8 EventObjectGetBerryTreeId(u8 eventObjectId)
 {
-    return gMapObjects[mapObjectId].trainerRange_berryTreeId;
+    return gEventObjects[eventObjectId].trainerRange_berryTreeId;
 }
 
-static struct MapObjectTemplate *GetFieldObjectTemplateByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup)
+static struct EventObjectTemplate *GetEventObjectTemplateByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup)
 {
-    struct MapObjectTemplate *templates;
+    struct EventObjectTemplate *templates;
     const struct MapHeader *mapHeader;
     u8 count;
 
     if (gSaveBlock1Ptr->location.mapNum == mapNum && gSaveBlock1Ptr->location.mapGroup == mapGroup)
     {
-        templates = gSaveBlock1Ptr->mapObjectTemplates;
-        count = gMapHeader.events->mapObjectCount;
+        templates = gSaveBlock1Ptr->eventObjectTemplates;
+        count = gMapHeader.events->eventObjectCount;
     }
     else
     {
         mapHeader = Overworld_GetMapHeaderByGroupAndId(mapGroup, mapNum);
-        templates = mapHeader->events->mapObjects;
-        count = mapHeader->events->mapObjectCount;
+        templates = mapHeader->events->eventObjects;
+        count = mapHeader->events->eventObjectCount;
     }
-    return FindFieldObjectTemplateInArrayByLocalId(localId, templates, count);
+    return FindEventObjectTemplateInArrayByLocalId(localId, templates, count);
 }
 
-static struct MapObjectTemplate *FindFieldObjectTemplateInArrayByLocalId(u8 localId, struct MapObjectTemplate *templates, u8 count)
+static struct EventObjectTemplate *FindEventObjectTemplateInArrayByLocalId(u8 localId, struct EventObjectTemplate *templates, u8 count)
 {
     u8 i;
 
@@ -2594,81 +2592,81 @@ static struct MapObjectTemplate *FindFieldObjectTemplateInArrayByLocalId(u8 loca
     return NULL;
 }
 
-struct MapObjectTemplate *sub_808F1B4(const struct MapObject *mapObject)
+struct EventObjectTemplate *sub_808F1B4(const struct EventObject *eventObject)
 {
     int i;
 
-    if (mapObject->mapNum != gSaveBlock1Ptr->location.mapNum || mapObject->mapGroup != gSaveBlock1Ptr->location.mapGroup)
+    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 (mapObject->localId == gSaveBlock1Ptr->mapObjectTemplates[i].localId)
+        if (eventObject->localId == gSaveBlock1Ptr->eventObjectTemplates[i].localId)
         {
-            return &gSaveBlock1Ptr->mapObjectTemplates[i];
+            return &gSaveBlock1Ptr->eventObjectTemplates[i];
         }
     }
     return NULL;
 }
 
-void sub_808F208(const struct MapObject *mapObject)
+void sub_808F208(const struct EventObject *eventObject)
 {
-    struct MapObjectTemplate *mapObjectTemplate;
+    struct EventObjectTemplate *eventObjectTemplate;
 
-    mapObjectTemplate = sub_808F1B4(mapObject);
-    if (mapObjectTemplate != NULL)
+    eventObjectTemplate = sub_808F1B4(eventObject);
+    if (eventObjectTemplate != NULL)
     {
-        mapObjectTemplate->x = mapObject->currentCoords.x - 7;
-        mapObjectTemplate->y = mapObject->currentCoords.y - 7;
+        eventObjectTemplate->x = eventObject->currentCoords.x - 7;
+        eventObjectTemplate->y = eventObject->currentCoords.y - 7;
     }
 }
 
-void sub_808F228(const struct MapObject *mapObject, const u8 *script)
+void sub_808F228(const struct EventObject *eventObject, const u8 *script)
 {
-    struct MapObjectTemplate *mapObjectTemplate;
+    struct EventObjectTemplate *eventObjectTemplate;
 
-    mapObjectTemplate = sub_808F1B4(mapObject);
-    if (mapObjectTemplate != NULL)
+    eventObjectTemplate = sub_808F1B4(eventObject);
+    if (eventObjectTemplate != NULL)
     {
-        mapObjectTemplate->script = script;
+        eventObjectTemplate->script = script;
     }
 }
 
-void sub_808F23C(const struct MapObject *mapObject, u8 movementType)
+void sub_808F23C(const struct EventObject *eventObject, u8 movementType)
 {
-    struct MapObjectTemplate *mapObjectTemplate;
+    struct EventObjectTemplate *eventObjectTemplate;
 
-    mapObjectTemplate = sub_808F1B4(mapObject);
-    if (mapObjectTemplate != NULL)
+    eventObjectTemplate = sub_808F1B4(eventObject);
+    if (eventObjectTemplate != NULL)
     {
-        mapObjectTemplate->movementType = movementType;
+        eventObjectTemplate->movementType = movementType;
     }
 }
 
 void sub_808F254(u8 localId, u8 mapNum, u8 mapGroup)
 {
-    u8 mapObjectId;
+    u8 eventObjectId;
 
-    if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId))
+    if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
     {
-        sub_808F208(&gMapObjects[mapObjectId]);
+        sub_808F208(&gEventObjects[eventObjectId]);
     }
 }
 
 void sub_808F28C(u8 localId, u8 mapNum, u8 mapGroup, u8 decorCat)
 {
-    u8 mapObjectId;
+    u8 eventObjectId;
 
-    if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId))
+    if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
     {
         switch (decorCat)
         {
             case DECORCAT_DOLL:
-                sub_808F228(&gMapObjects[mapObjectId], EventScript_2766A2);
+                sub_808F228(&gEventObjects[eventObjectId], EventScript_2766A2);
                 break;
             case DECORCAT_CUSHION:
-                sub_808F228(&gMapObjects[mapObjectId], EventScript_2766A6);
+                sub_808F228(&gEventObjects[eventObjectId], EventScript_2766A6);
                 break;
         }
     }
@@ -2715,34 +2713,34 @@ null_object_step(NoMovement1, FALSE)
 
 field_object_step(GoRandomDirections, gUnknown_0850D6F4)
 
-bool8 sub_808F44C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_808F44C(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
+    npc_reset(eventObject, sprite);
     sprite->data[1] = 1;
     return TRUE;
 }
 
-bool8 sub_808F460(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_808F460(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection));
+    EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection));
     sprite->data[1] = 2;
     return TRUE;
 }
 
-bool8 sub_808F48C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_808F48C(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (!FieldObjectExecRegularAnim(mapObject, sprite))
+    if (!EventObjectExecRegularAnim(eventObject, sprite))
     {
         return FALSE;
     }
-    SetFieldObjectStepTimer(sprite, gMovementDelaysMedium[Random() & 0x03]);
+    SetEventObjectStepTimer(sprite, gMovementDelaysMedium[Random() & 0x03]);
     sprite->data[1] = 3;
     return TRUE;
 }
 
-bool8 sub_808F4C8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_808F4C8(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (RunFieldObjectStepTimer(sprite))
+    if (RunEventObjectStepTimer(sprite))
     {
         sprite->data[1] = 4;
         return TRUE;
@@ -2750,41 +2748,41 @@ bool8 sub_808F4C8(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_808F4E8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_808F4E8(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 directions[4];
     u8 chosenDirection;
 
     memcpy(directions, gUnknown_0850D710, sizeof directions);
     chosenDirection = directions[Random() & 0x03];
-    FieldObjectSetDirection(mapObject, chosenDirection);
+    EventObjectSetDirection(eventObject, chosenDirection);
     sprite->data[1] = 5;
-    if (npc_block_way__next_tile(mapObject, chosenDirection))
+    if (npc_block_way__next_tile(eventObject, chosenDirection))
     {
         sprite->data[1] = 1;
     }
     return TRUE;
 }
 
-bool8 sub_808F534(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_808F534(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(mapObject->movementDirection));
-    mapObject->singleMovementActive = TRUE;
+    EventObjectSetRegularAnim(eventObject, sprite, GetGoSpeed0AnimId(eventObject->movementDirection));
+    eventObject->singleMovementActive = TRUE;
     sprite->data[1] = 6;
     return TRUE;
 }
 
-bool8 sub_808F564(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_808F564(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
+    if (EventObjectExecRegularAnim(eventObject, sprite))
     {
-        mapObject->singleMovementActive = FALSE;
+        eventObject->singleMovementActive = FALSE;
         sprite->data[1] = 1;
     }
     return FALSE;
 }
 
-bool8 FieldObjectIsTrainerAndCloseToPlayer(struct MapObject *mapObject)
+bool8 EventObjectIsTrainerAndCloseToPlayer(struct EventObject *eventObject)
 {
     s16 playerX;
     s16 playerY;
@@ -2799,17 +2797,17 @@ bool8 FieldObjectIsTrainerAndCloseToPlayer(struct MapObject *mapObject)
     {
         return FALSE;
     }
-    if (mapObject->trainerType != 1 && mapObject->trainerType != 3)
+    if (eventObject->trainerType != 1 && eventObject->trainerType != 3)
     {
         return FALSE;
     }
     PlayerGetDestCoords(&playerX, &playerY);
-    objX = mapObject->currentCoords.x;
-    objY = mapObject->currentCoords.y;
-    minX = objX - mapObject->trainerRange_berryTreeId;
-    minY = objY - mapObject->trainerRange_berryTreeId;
-    maxX = objX + mapObject->trainerRange_berryTreeId;
-    maxY = objY + mapObject->trainerRange_berryTreeId;
+    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;
@@ -3008,20 +3006,20 @@ u8 GetNonNorthRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy)
     return direction;
 }
 
-u8 GetRunningPastFacingDirection(struct MapObject *mapObject, u8 movementType)
+u8 GetRunningPastFacingDirection(struct EventObject *eventObject, u8 movementType)
 {
     s16 dx;
     s16 dy;
     s16 absdx;
     s16 absdy;
 
-    if (!FieldObjectIsTrainerAndCloseToPlayer(mapObject))
+    if (!EventObjectIsTrainerAndCloseToPlayer(eventObject))
     {
         return 0;
     }
     PlayerGetDestCoords(&dx, &dy);
-    dx -= mapObject->currentCoords.x;
-    dy -= mapObject->currentCoords.y;
+    dx -= eventObject->currentCoords.x;
+    dy -= eventObject->currentCoords.y;
     absdx = dx;
     absdy = dy;
     if (absdx < 0)
@@ -3037,34 +3035,34 @@ u8 GetRunningPastFacingDirection(struct MapObject *mapObject, u8 movementType)
 
 field_object_step(LookRandomDirections, gUnknown_0850D740)
 
-bool8 sub_808F988(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_808F988(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
+    npc_reset(eventObject, sprite);
     sprite->data[1] = 1;
     return TRUE;
 }
 
-bool8 sub_808F99C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_808F99C(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection));
+    EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection));
     sprite->data[1] = 2;
     return TRUE;
 }
 
-bool8 sub_808F9C8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_808F9C8(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
+    if (EventObjectExecRegularAnim(eventObject, sprite))
     {
-        SetFieldObjectStepTimer(sprite, gMovementDelaysMedium[Random() & 0x03]);
-        mapObject->singleMovementActive = FALSE;
+        SetEventObjectStepTimer(sprite, gMovementDelaysMedium[Random() & 0x03]);
+        eventObject->singleMovementActive = FALSE;
         sprite->data[1] = 3;
     }
     return FALSE;
 }
 
-bool8 sub_808FA0C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_808FA0C(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
+    if (RunEventObjectStepTimer(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject))
     {
         sprite->data[1] = 4;
         return TRUE;
@@ -3072,52 +3070,52 @@ bool8 sub_808FA0C(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_808FA3C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_808FA3C(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 directions[4];
     u8 direction;
 
     memcpy(directions, gUnknown_0850D710, sizeof directions);
-    direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_ANY);
+    direction = GetRunningPastFacingDirection(eventObject, RUNFOLLOW_ANY);
     if (direction == 0)
     {
         direction = directions[Random() & 0x03];
     }
-    FieldObjectSetDirection(mapObject, direction);
+    EventObjectSetDirection(eventObject, direction);
     sprite->data[1] = 1;
     return TRUE;
 }
 
 field_object_step(RandomlyGoNorthOrSouth, gUnknown_0850D754)
 
-bool8 sub_808FAC8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_808FAC8(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
+    npc_reset(eventObject, sprite);
     sprite->data[1] = 1;
     return TRUE;
 }
 
-bool8 sub_808FADC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_808FADC(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection));
+    EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection));
     sprite->data[1] = 2;
     return TRUE;
 }
 
-bool8 sub_808FB08(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_808FB08(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (!FieldObjectExecRegularAnim(mapObject, sprite))
+    if (!EventObjectExecRegularAnim(eventObject, sprite))
     {
         return FALSE;
     }
-    SetFieldObjectStepTimer(sprite, gMovementDelaysMedium[Random() & 0x03]);
+    SetEventObjectStepTimer(sprite, gMovementDelaysMedium[Random() & 0x03]);
     sprite->data[1] = 3;
     return TRUE;
 }
 
-bool8 sub_808FB44(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_808FB44(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (RunFieldObjectStepTimer(sprite))
+    if (RunEventObjectStepTimer(sprite))
     {
         sprite->data[1] = 4;
         return TRUE;
@@ -3125,35 +3123,35 @@ bool8 sub_808FB44(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_808FB64(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_808FB64(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 directions[2];
     u8 direction;
 
     memcpy(directions, gUnknown_0850D770, sizeof directions);
     direction = directions[Random() & 0x01];
-    FieldObjectSetDirection(mapObject, direction);
+    EventObjectSetDirection(eventObject, direction);
     sprite->data[1] = 5;
-    if (npc_block_way__next_tile(mapObject, direction))
+    if (npc_block_way__next_tile(eventObject, direction))
     {
         sprite->data[1] = 1;
     }
     return TRUE;
 }
 
-bool8 sub_808FBB0(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_808FBB0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(mapObject->movementDirection));
-    mapObject->singleMovementActive = TRUE;
+    EventObjectSetRegularAnim(eventObject, sprite, GetGoSpeed0AnimId(eventObject->movementDirection));
+    eventObject->singleMovementActive = TRUE;
     sprite->data[1] = 6;
     return TRUE;
 }
 
-bool8 sub_808FBE0(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_808FBE0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
+    if (EventObjectExecRegularAnim(eventObject, sprite))
     {
-        mapObject->singleMovementActive = FALSE;
+        eventObject->singleMovementActive = FALSE;
         sprite->data[1] = 1;
     }
     return FALSE;
@@ -3161,34 +3159,34 @@ bool8 sub_808FBE0(struct MapObject *mapObject, struct Sprite *sprite)
 
 field_object_step(RandomlyGoEastOrWest, gUnknown_0850D774)
 
-bool8 sub_808FC4C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_808FC4C(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
+    npc_reset(eventObject, sprite);
     sprite->data[1] = 1;
     return TRUE;
 }
 
-bool8 sub_808FC60(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_808FC60(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection));
+    EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection));
     sprite->data[1] = 2;
     return TRUE;
 }
 
-bool8 sub_808FC8C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_808FC8C(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (!FieldObjectExecRegularAnim(mapObject, sprite))
+    if (!EventObjectExecRegularAnim(eventObject, sprite))
     {
         return FALSE;
     }
-    SetFieldObjectStepTimer(sprite, gMovementDelaysMedium[Random() & 0x03]);
+    SetEventObjectStepTimer(sprite, gMovementDelaysMedium[Random() & 0x03]);
     sprite->data[1] = 3;
     return TRUE;
 }
 
-bool8 sub_808FCC8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_808FCC8(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (RunFieldObjectStepTimer(sprite))
+    if (RunEventObjectStepTimer(sprite))
     {
         sprite->data[1] = 4;
         return TRUE;
@@ -3196,35 +3194,35 @@ bool8 sub_808FCC8(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_808FCE8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_808FCE8(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 directions[2];
     u8 direction;
 
     memcpy(directions, gUnknown_0850D790, sizeof directions);
     direction = directions[Random() & 0x01];
-    FieldObjectSetDirection(mapObject, direction);
+    EventObjectSetDirection(eventObject, direction);
     sprite->data[1] = 5;
-    if (npc_block_way__next_tile(mapObject, direction))
+    if (npc_block_way__next_tile(eventObject, direction))
     {
         sprite->data[1] = 1;
     }
     return TRUE;
 }
 
-bool8 sub_808FD34(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_808FD34(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(mapObject->movementDirection));
-    mapObject->singleMovementActive = TRUE;
+    EventObjectSetRegularAnim(eventObject, sprite, GetGoSpeed0AnimId(eventObject->movementDirection));
+    eventObject->singleMovementActive = TRUE;
     sprite->data[1] = 6;
     return TRUE;
 }
 
-bool8 sub_808FD64(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_808FD64(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
+    if (EventObjectExecRegularAnim(eventObject, sprite))
     {
-        mapObject->singleMovementActive = FALSE;
+        eventObject->singleMovementActive = FALSE;
         sprite->data[1] = 1;
     }
     return FALSE;
@@ -3232,17 +3230,17 @@ bool8 sub_808FD64(struct MapObject *mapObject, struct Sprite *sprite)
 
 field_object_step(FaceFixedDirection, gUnknown_0850D794)
 
-bool8 sub_808FDD0(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_808FDD0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection));
+    npc_reset(eventObject, sprite);
+    EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection));
     sprite->data[1] = 1;
     return TRUE;
 }
 
-bool8 sub_808FDFC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_808FDFC(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
+    if (EventObjectExecRegularAnim(eventObject, sprite))
     {
         sprite->data[1] = 2;
         return TRUE;
@@ -3250,45 +3248,45 @@ bool8 sub_808FDFC(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_808FE1C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_808FE1C(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    mapObject->singleMovementActive = FALSE;
+    eventObject->singleMovementActive = 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)
+static bool8 EventObjectCB2_BerryTree(struct EventObject *eventObject, struct Sprite *sprite);
+extern bool8 (*const gUnknown_0850D7A0[])(struct EventObject *eventObject, struct Sprite *sprite);
+void EventObjectCB_BerryTree(struct Sprite *sprite)
 {
-    struct MapObject *mapObject;
+    struct EventObject *eventObject;
 
-    mapObject = &gMapObjects[sprite->data[0]];
+    eventObject = &gEventObjects[sprite->data[0]];
     if (!(sprite->data[7] & 0x0001))
     {
-        get_berry_tree_graphics(mapObject, sprite);
+        get_berry_tree_graphics(eventObject, sprite);
         sprite->data[7] |= 0x0001;
     }
-    FieldObjectStep(mapObject, sprite, FieldObjectCB2_BerryTree);
+    EventObjectStep(eventObject, sprite, EventObjectCB2_BerryTree);
 }
-static bool8 FieldObjectCB2_BerryTree(struct MapObject *mapObject, struct Sprite *sprite)
+static bool8 EventObjectCB2_BerryTree(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    return gUnknown_0850D7A0[sprite->data[1]](mapObject, sprite);
+    return gUnknown_0850D7A0[sprite->data[1]](eventObject, sprite);
 }
 
-bool8 do_berry_tree_growth_sparkle_1 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 do_berry_tree_growth_sparkle_1 (struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 berryStage;
 
-    npc_reset(mapObject, sprite);
-    mapObject->invisible = TRUE;
+    npc_reset(eventObject, sprite);
+    eventObject->invisible = TRUE;
     sprite->invisible = TRUE;
-    berryStage = GetStageByBerryTreeId(mapObject->trainerRange_berryTreeId);
+    berryStage = GetStageByBerryTreeId(eventObject->trainerRange_berryTreeId);
     if (berryStage == 0)
     {
         if (!(sprite->data[7] & 0x0004) && sprite->animNum == 4)
         {
-            gFieldEffectArguments[0] = mapObject->currentCoords.x;
-            gFieldEffectArguments[1] = mapObject->currentCoords.y;
+            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);
@@ -3296,7 +3294,7 @@ bool8 do_berry_tree_growth_sparkle_1 (struct MapObject *mapObject, struct Sprite
         }
         return FALSE;
     }
-    mapObject->invisible = FALSE;
+    eventObject->invisible = FALSE;
     sprite->invisible = FALSE;
     berryStage --;
     if (sprite->animNum != berryStage)
@@ -3304,15 +3302,15 @@ bool8 do_berry_tree_growth_sparkle_1 (struct MapObject *mapObject, struct Sprite
         sprite->data[1] = 2;
         return TRUE;
     }
-    get_berry_tree_graphics(mapObject, sprite);
-    FieldObjectSetRegularAnim(mapObject, sprite, 0x39);
+    get_berry_tree_graphics(eventObject, sprite);
+    EventObjectSetRegularAnim(eventObject, sprite, 0x39);
     sprite->data[1] = 1;
     return TRUE;
 }
 
-bool8 sub_808FF48 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_808FF48 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
+    if (EventObjectExecRegularAnim(eventObject, sprite))
     {
         sprite->data[1] = 0;
         return TRUE;
@@ -3320,28 +3318,28 @@ bool8 sub_808FF48 (struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 do_berry_tree_growth_sparkle_2 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 do_berry_tree_growth_sparkle_2 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    mapObject->singleMovementActive = TRUE;
+    eventObject->singleMovementActive = TRUE;
     sprite->data[1] = 3;
     sprite->data[2] = 0;
     sprite->data[7] |= 0x0002;
-    gFieldEffectArguments[0] = mapObject->currentCoords.x;
-    gFieldEffectArguments[1] = mapObject->currentCoords.y;
+    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 sub_808FFB4 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_808FFB4 (struct EventObject *eventObject, struct Sprite *sprite)
 {
     sprite->data[2] ++;
-    mapObject->invisible = (sprite->data[2] & 0x02) >> 1;
+    eventObject->invisible = (sprite->data[2] & 0x02) >> 1;
     sprite->animPaused = TRUE;
     if (sprite->data[2] > 64)
     {
-        get_berry_tree_graphics(mapObject, sprite);
+        get_berry_tree_graphics(eventObject, sprite);
         sprite->data[1] = 4;
         sprite->data[2] = 0;
         return TRUE;
@@ -3349,10 +3347,10 @@ bool8 sub_808FFB4 (struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8090004 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090004 (struct EventObject *eventObject, struct Sprite *sprite)
 {
     sprite->data[2] ++;
-    mapObject->invisible = (sprite->data[2] & 0x02) >> 1;
+    eventObject->invisible = (sprite->data[2] & 0x02) >> 1;
     sprite->animPaused = TRUE;
     if (sprite->data[2] > 64)
     {
@@ -3365,34 +3363,34 @@ bool8 sub_8090004 (struct MapObject *mapObject, struct Sprite *sprite)
 
 field_object_step(RandomlyLookNorthOrSouth, gUnknown_0850D7B4)
 
-bool8 sub_8090094 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090094 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
+    npc_reset(eventObject, sprite);
     sprite->data[1] = 1;
     return TRUE;
 }
 
-bool8 sub_80900A8 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80900A8 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection));
+    EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection));
     sprite->data[1] = 2;
     return TRUE;
 }
 
-bool8 sub_80900D4 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80900D4 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
+    if (EventObjectExecRegularAnim(eventObject, sprite))
     {
-        SetFieldObjectStepTimer(sprite, gMovementDelaysMedium[Random() & 0x03]);
-        mapObject->singleMovementActive = FALSE;
+        SetEventObjectStepTimer(sprite, gMovementDelaysMedium[Random() & 0x03]);
+        eventObject->singleMovementActive = FALSE;
         sprite->data[1] = 3;
     }
     return FALSE;
 }
 
-bool8 sub_8090118 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090118 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
+    if (RunEventObjectStepTimer(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject))
     {
         sprite->data[1] = 4;
         return TRUE;
@@ -3400,52 +3398,52 @@ bool8 sub_8090118 (struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8090148 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090148 (struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 directions[2];
     u8 direction;
 
     memcpy(directions, gUnknown_0850D770, sizeof gUnknown_0850D770);
-    direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_NORTH_SOUTH);
+    direction = GetRunningPastFacingDirection(eventObject, RUNFOLLOW_NORTH_SOUTH);
     if (direction == 0)
     {
         direction = directions[Random() & 0x01];
     }
-    FieldObjectSetDirection(mapObject, direction);
+    EventObjectSetDirection(eventObject, direction);
     sprite->data[1] = 1;
     return TRUE;
 }
 
 field_object_step(RandomlyLookEastOrWest, gUnknown_0850D7C8)
 
-bool8 sub_80901D4 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80901D4 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
+    npc_reset(eventObject, sprite);
     sprite->data[1] = 1;
     return TRUE;
 }
 
-bool8 sub_80901E8 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80901E8 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection));
+    EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection));
     sprite->data[1] = 2;
     return TRUE;
 }
 
-bool8 sub_8090214 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090214 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
+    if (EventObjectExecRegularAnim(eventObject, sprite))
     {
-        SetFieldObjectStepTimer(sprite, gMovementDelaysMedium[Random() & 0x03]);
-        mapObject->singleMovementActive = FALSE;
+        SetEventObjectStepTimer(sprite, gMovementDelaysMedium[Random() & 0x03]);
+        eventObject->singleMovementActive = FALSE;
         sprite->data[1] = 3;
     }
     return FALSE;
 }
 
-bool8 sub_8090258 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090258 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
+    if (RunEventObjectStepTimer(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject))
     {
         sprite->data[1] = 4;
         return TRUE;
@@ -3453,52 +3451,52 @@ bool8 sub_8090258 (struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8090288 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090288 (struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 directions[2];
     u8 direction;
 
     memcpy(directions, gUnknown_0850D790, sizeof gUnknown_0850D790);
-    direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_EAST_WEST);
+    direction = GetRunningPastFacingDirection(eventObject, RUNFOLLOW_EAST_WEST);
     if (direction == 0)
     {
         direction = directions[Random() & 0x01];
     }
-    FieldObjectSetDirection(mapObject, direction);
+    EventObjectSetDirection(eventObject, direction);
     sprite->data[1] = 1;
     return TRUE;
 }
 
 field_object_step(RandomlyLookNorthOrWest, gUnknown_0850D7DC)
 
-bool8 sub_8090314 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090314 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
+    npc_reset(eventObject, sprite);
     sprite->data[1] = 1;
     return TRUE;
 }
 
-bool8 sub_8090328 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090328 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection));
+    EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection));
     sprite->data[1] = 2;
     return TRUE;
 }
 
-bool8 sub_8090354 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090354 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
+    if (EventObjectExecRegularAnim(eventObject, sprite))
     {
-        SetFieldObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]);
-        mapObject->singleMovementActive = FALSE;
+        SetEventObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]);
+        eventObject->singleMovementActive = FALSE;
         sprite->data[1] = 3;
     }
     return FALSE;
 }
 
-bool8 sub_8090398 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090398 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
+    if (RunEventObjectStepTimer(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject))
     {
         sprite->data[1] = 4;
         return TRUE;
@@ -3506,52 +3504,52 @@ bool8 sub_8090398 (struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_80903C8 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80903C8 (struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 directions[2];
     u8 direction;
 
     memcpy(directions, gUnknown_0850D7F0, sizeof gUnknown_0850D7F0);
-    direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_NORTH_WEST);
+    direction = GetRunningPastFacingDirection(eventObject, RUNFOLLOW_NORTH_WEST);
     if (direction == 0)
     {
         direction = directions[Random() & 0x01];
     }
-    FieldObjectSetDirection(mapObject, direction);
+    EventObjectSetDirection(eventObject, direction);
     sprite->data[1] = 1;
     return TRUE;
 }
 
 field_object_step(RandomlyLookNorthOrEast, gUnknown_0850D7F4)
 
-bool8 sub_8090454 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090454 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
+    npc_reset(eventObject, sprite);
     sprite->data[1] = 1;
     return TRUE;
 }
 
-bool8 sub_8090468 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090468 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection));
+    EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection));
     sprite->data[1] = 2;
     return TRUE;
 }
 
-bool8 sub_8090494 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090494 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
+    if (EventObjectExecRegularAnim(eventObject, sprite))
     {
-        SetFieldObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]);
-        mapObject->singleMovementActive = FALSE;
+        SetEventObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]);
+        eventObject->singleMovementActive = FALSE;
         sprite->data[1] = 3;
     }
     return FALSE;
 }
 
-bool8 sub_80904D8 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80904D8 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
+    if (RunEventObjectStepTimer(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject))
     {
         sprite->data[1] = 4;
         return TRUE;
@@ -3559,52 +3557,52 @@ bool8 sub_80904D8 (struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8090508 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090508 (struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 directions[2];
     u8 direction;
 
     memcpy(directions, gUnknown_0850D808, sizeof gUnknown_0850D808);
-    direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_NORTH_EAST);
+    direction = GetRunningPastFacingDirection(eventObject, RUNFOLLOW_NORTH_EAST);
     if (direction == 0)
     {
         direction = directions[Random() & 0x01];
     }
-    FieldObjectSetDirection(mapObject, direction);
+    EventObjectSetDirection(eventObject, direction);
     sprite->data[1] = 1;
     return TRUE;
 }
 
 field_object_step(RandomlyLookSouthOrWest, gUnknown_0850D80C)
 
-bool8 sub_8090594 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090594 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
+    npc_reset(eventObject, sprite);
     sprite->data[1] = 1;
     return TRUE;
 }
 
-bool8 sub_80905A8 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80905A8 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection));
+    EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection));
     sprite->data[1] = 2;
     return TRUE;
 }
 
-bool8 sub_80905D4 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80905D4 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
+    if (EventObjectExecRegularAnim(eventObject, sprite))
     {
-        SetFieldObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]);
-        mapObject->singleMovementActive = FALSE;
+        SetEventObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]);
+        eventObject->singleMovementActive = FALSE;
         sprite->data[1] = 3;
     }
     return FALSE;
 }
 
-bool8 sub_8090618 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090618 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
+    if (RunEventObjectStepTimer(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject))
     {
         sprite->data[1] = 4;
         return TRUE;
@@ -3612,52 +3610,52 @@ bool8 sub_8090618 (struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8090648 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090648 (struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 directions[2];
     u8 direction;
 
     memcpy(directions, gUnknown_0850D820, sizeof gUnknown_0850D820);
-    direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_SOUTH_WEST);
+    direction = GetRunningPastFacingDirection(eventObject, RUNFOLLOW_SOUTH_WEST);
     if (direction == 0)
     {
         direction = directions[Random() & 0x01];
     }
-    FieldObjectSetDirection(mapObject, direction);
+    EventObjectSetDirection(eventObject, direction);
     sprite->data[1] = 1;
     return TRUE;
 }
 
 field_object_step(RandomlyLookSouthOrEast, gUnknown_0850D824)
 
-bool8 sub_80906D4 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80906D4 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
+    npc_reset(eventObject, sprite);
     sprite->data[1] = 1;
     return TRUE;
 }
 
-bool8 sub_80906E8 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80906E8 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection));
+    EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection));
     sprite->data[1] = 2;
     return TRUE;
 }
 
-bool8 sub_8090714 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090714 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
+    if (EventObjectExecRegularAnim(eventObject, sprite))
     {
-        SetFieldObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]);
-        mapObject->singleMovementActive = FALSE;
+        SetEventObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]);
+        eventObject->singleMovementActive = FALSE;
         sprite->data[1] = 3;
     }
     return FALSE;
 }
 
-bool8 sub_8090758 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090758 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
+    if (RunEventObjectStepTimer(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject))
     {
         sprite->data[1] = 4;
         return TRUE;
@@ -3665,52 +3663,52 @@ bool8 sub_8090758 (struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8090788 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090788 (struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 directions[2];
     u8 direction;
 
     memcpy(directions, gUnknown_0850D838, sizeof gUnknown_0850D838);
-    direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_SOUTH_EAST);
+    direction = GetRunningPastFacingDirection(eventObject, RUNFOLLOW_SOUTH_EAST);
     if (direction == 0)
     {
         direction = directions[Random() & 0x01];
     }
-    FieldObjectSetDirection(mapObject, direction);
+    EventObjectSetDirection(eventObject, direction);
     sprite->data[1] = 1;
     return TRUE;
 }
 
 field_object_step(RandomlyLookNorthOrSouthOrWest, gUnknown_0850D83C)
 
-bool8 sub_8090814 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090814 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
+    npc_reset(eventObject, sprite);
     sprite->data[1] = 1;
     return TRUE;
 }
 
-bool8 sub_8090828 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090828 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection));
+    EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection));
     sprite->data[1] = 2;
     return TRUE;
 }
 
-bool8 sub_8090854 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090854 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
+    if (EventObjectExecRegularAnim(eventObject, sprite))
     {
-        SetFieldObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]);
-        mapObject->singleMovementActive = FALSE;
+        SetEventObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]);
+        eventObject->singleMovementActive = FALSE;
         sprite->data[1] = 3;
     }
     return FALSE;
 }
 
-bool8 sub_8090898 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090898 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
+    if (RunEventObjectStepTimer(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject))
     {
         sprite->data[1] = 4;
         return TRUE;
@@ -3718,52 +3716,52 @@ bool8 sub_8090898 (struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_80908C8 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80908C8 (struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 directions[4];
     u8 direction;
 
     memcpy(directions, gUnknown_0850D850, sizeof gUnknown_0850D850);
-    direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_NORTH_SOUTH_WEST);
+    direction = GetRunningPastFacingDirection(eventObject, RUNFOLLOW_NORTH_SOUTH_WEST);
     if (direction == 0)
     {
         direction = directions[Random() & 0x03];
     }
-    FieldObjectSetDirection(mapObject, direction);
+    EventObjectSetDirection(eventObject, direction);
     sprite->data[1] = 1;
     return TRUE;
 }
 
 field_object_step(RandomlyLookNorthOrSouthOrEast, gUnknown_0850D854)
 
-bool8 sub_8090954 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090954 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
+    npc_reset(eventObject, sprite);
     sprite->data[1] = 1;
     return TRUE;
 }
 
-bool8 sub_8090968 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090968 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection));
+    EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection));
     sprite->data[1] = 2;
     return TRUE;
 }
 
-bool8 sub_8090994 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090994 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
+    if (EventObjectExecRegularAnim(eventObject, sprite))
     {
-        SetFieldObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]);
-        mapObject->singleMovementActive = FALSE;
+        SetEventObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]);
+        eventObject->singleMovementActive = FALSE;
         sprite->data[1] = 3;
     }
     return FALSE;
 }
 
-bool8 sub_80909D8 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80909D8 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
+    if (RunEventObjectStepTimer(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject))
     {
         sprite->data[1] = 4;
         return TRUE;
@@ -3771,52 +3769,52 @@ bool8 sub_80909D8 (struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8090A08 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090A08 (struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 directions[4];
     u8 direction;
 
     memcpy(directions, gUnknown_0850D868, sizeof gUnknown_0850D868);
-    direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_NORTH_SOUTH_EAST);
+    direction = GetRunningPastFacingDirection(eventObject, RUNFOLLOW_NORTH_SOUTH_EAST);
     if (direction == 0)
     {
         direction = directions[Random() & 0x03];
     }
-    FieldObjectSetDirection(mapObject, direction);
+    EventObjectSetDirection(eventObject, direction);
     sprite->data[1] = 1;
     return TRUE;
 }
 
 field_object_step(RandomlyLookNorthOrEastOrWest, gUnknown_0850D86C)
 
-bool8 sub_8090A94 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090A94 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
+    npc_reset(eventObject, sprite);
     sprite->data[1] = 1;
     return TRUE;
 }
 
-bool8 sub_8090AA8 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090AA8 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection));
+    EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection));
     sprite->data[1] = 2;
     return TRUE;
 }
 
-bool8 sub_8090AD4 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090AD4 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
+    if (EventObjectExecRegularAnim(eventObject, sprite))
     {
-        SetFieldObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]);
-        mapObject->singleMovementActive = FALSE;
+        SetEventObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]);
+        eventObject->singleMovementActive = FALSE;
         sprite->data[1] = 3;
     }
     return FALSE;
 }
 
-bool8 sub_8090B18 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090B18 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
+    if (RunEventObjectStepTimer(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject))
     {
         sprite->data[1] = 4;
         return TRUE;
@@ -3824,52 +3822,52 @@ bool8 sub_8090B18 (struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8090B48 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090B48 (struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 directions[4];
     u8 direction;
 
     memcpy(directions, gUnknown_0850D880, sizeof gUnknown_0850D880);
-    direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_NORTH_EAST_WEST);
+    direction = GetRunningPastFacingDirection(eventObject, RUNFOLLOW_NORTH_EAST_WEST);
     if (direction == 0)
     {
         direction = directions[Random() & 0x03];
     }
-    FieldObjectSetDirection(mapObject, direction);
+    EventObjectSetDirection(eventObject, direction);
     sprite->data[1] = 1;
     return TRUE;
 }
 
 field_object_step(RandomlyLookSouthOrEastOrWest, gUnknown_0850D884)
 
-bool8 sub_8090BD4 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090BD4 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
+    npc_reset(eventObject, sprite);
     sprite->data[1] = 1;
     return TRUE;
 }
 
-bool8 sub_8090BE8 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090BE8 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection));
+    EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection));
     sprite->data[1] = 2;
     return TRUE;
 }
 
-bool8 sub_8090C14 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090C14 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
+    if (EventObjectExecRegularAnim(eventObject, sprite))
     {
-        SetFieldObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]);
-        mapObject->singleMovementActive = FALSE;
+        SetEventObjectStepTimer(sprite, gMovementDelaysShort[Random() & 0x03]);
+        eventObject->singleMovementActive = FALSE;
         sprite->data[1] = 3;
     }
     return FALSE;
 }
 
-bool8 sub_8090C58 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090C58 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
+    if (RunEventObjectStepTimer(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject))
     {
         sprite->data[1] = 4;
         return TRUE;
@@ -3877,215 +3875,215 @@ bool8 sub_8090C58 (struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8090C88 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090C88 (struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 directions[4];
     u8 direction;
 
     memcpy(directions, gUnknown_0850D898, sizeof gUnknown_0850D898);
-    direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_SOUTH_EAST_WEST);
+    direction = GetRunningPastFacingDirection(eventObject, RUNFOLLOW_SOUTH_EAST_WEST);
     if (direction == 0)
     {
         direction = directions[Random() & 0x03];
     }
-    FieldObjectSetDirection(mapObject, direction);
+    EventObjectSetDirection(eventObject, direction);
     sprite->data[1] = 1;
     return TRUE;
 }
 
 field_object_step(LookAroundCounterclockwise, gUnknown_0850D89C)
 
-bool8 sub_8090D14 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090D14 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection));
+    npc_reset(eventObject, sprite);
+    EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection));
     sprite->data[1] = 1;
     return TRUE;
 }
 
-bool8 sub_8090D40 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090D40 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
+    if (EventObjectExecRegularAnim(eventObject, sprite))
     {
-        SetFieldObjectStepTimer(sprite, 48);
+        SetEventObjectStepTimer(sprite, 48);
         sprite->data[1] = 2;
     }
     return FALSE;
 }
 
-bool8 sub_8090D64 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090D64 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
+    if (RunEventObjectStepTimer(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject))
     {
         sprite->data[1] = 3;
     }
     return FALSE;
 }
 
-bool8 sub_8090D90 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090D90 (struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 directions[5];
     u8 direction;
 
     memcpy(directions, gUnknown_0850D8AC, sizeof gUnknown_0850D8AC);
-    direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_ANY);
+    direction = GetRunningPastFacingDirection(eventObject, RUNFOLLOW_ANY);
     if (direction == 0)
     {
-        direction = directions[mapObject->facingDirection];
+        direction = directions[eventObject->facingDirection];
     }
-    FieldObjectSetDirection(mapObject, direction);
+    EventObjectSetDirection(eventObject, direction);
     sprite->data[1] = 0;
     return TRUE;
 }
 
 field_object_step(LookAroundClockwise, gUnknown_0850D8B4)
 
-bool8 sub_8090E18 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090E18 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection));
+    npc_reset(eventObject, sprite);
+    EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection));
     sprite->data[1] = 1;
     return TRUE;
 }
 
-bool8 sub_8090E44 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090E44 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
+    if (EventObjectExecRegularAnim(eventObject, sprite))
     {
-        SetFieldObjectStepTimer(sprite, 48);
+        SetEventObjectStepTimer(sprite, 48);
         sprite->data[1] = 2;
     }
     return FALSE;
 }
 
-bool8 sub_8090E68 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090E68 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
+    if (RunEventObjectStepTimer(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject))
     {
         sprite->data[1] = 3;
     }
     return FALSE;
 }
 
-bool8 sub_8090E94 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090E94 (struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 directions[5];
     u8 direction;
 
     memcpy(directions, gUnknown_0850D8C4, sizeof gUnknown_0850D8C4);
-    direction = GetRunningPastFacingDirection(mapObject, RUNFOLLOW_ANY);
+    direction = GetRunningPastFacingDirection(eventObject, RUNFOLLOW_ANY);
     if (direction == 0)
     {
-        direction = directions[mapObject->facingDirection];
+        direction = directions[eventObject->facingDirection];
     }
-    FieldObjectSetDirection(mapObject, direction);
+    EventObjectSetDirection(eventObject, direction);
     sprite->data[1] = 0;
     return TRUE;
 }
 
 field_object_step(AlternatelyGoInOppositeDirections, gUnknown_0850D8CC)
 
-bool8 sub_8090F1C (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090F1C (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
+    npc_reset(eventObject, sprite);
     sprite->data[1] = 1;
     return TRUE;
 }
 
-bool8 sub_8090F30 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090F30 (struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 direction;
 
-    direction = gInitialMovementTypeFacingDirections[mapObject->movementType];
-    if (mapObject->directionSequenceIndex)
+    direction = gInitialMovementTypeFacingDirections[eventObject->movementType];
+    if (eventObject->directionSequenceIndex)
     {
         direction = GetOppositeDirection(direction);
     }
-    FieldObjectSetDirection(mapObject, direction);
+    EventObjectSetDirection(eventObject, direction);
     sprite->data[1] = 2;
     return TRUE;
 }
 
-bool8 sub_8090F68 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8090F68 (struct EventObject *eventObject, struct Sprite *sprite)
 {
     bool8 blockingWay;
     u8 animId;
 
-    if (mapObject->directionSequenceIndex && mapObject->initialCoords.x == mapObject->currentCoords.x && mapObject->initialCoords.y == mapObject->currentCoords.y)
+    if (eventObject->directionSequenceIndex && eventObject->initialCoords.x == eventObject->currentCoords.x && eventObject->initialCoords.y == eventObject->currentCoords.y)
     {
-        mapObject->directionSequenceIndex = 0;
-        FieldObjectSetDirection(mapObject, GetOppositeDirection(mapObject->movementDirection));
+        eventObject->directionSequenceIndex = 0;
+        EventObjectSetDirection(eventObject, GetOppositeDirection(eventObject->movementDirection));
     }
-    blockingWay = npc_block_way__next_tile(mapObject, mapObject->movementDirection);
-    animId = GetGoSpeed0AnimId(mapObject->movementDirection);
+    blockingWay = npc_block_way__next_tile(eventObject, eventObject->movementDirection);
+    animId = GetGoSpeed0AnimId(eventObject->movementDirection);
     if (blockingWay == TRUE)
     {
-        mapObject->directionSequenceIndex ++;
-        FieldObjectSetDirection(mapObject, GetOppositeDirection(mapObject->movementDirection));
-        animId = GetGoSpeed0AnimId(mapObject->movementDirection);
-        blockingWay = npc_block_way__next_tile(mapObject, mapObject->movementDirection);
+        eventObject->directionSequenceIndex ++;
+        EventObjectSetDirection(eventObject, GetOppositeDirection(eventObject->movementDirection));
+        animId = GetGoSpeed0AnimId(eventObject->movementDirection);
+        blockingWay = npc_block_way__next_tile(eventObject, eventObject->movementDirection);
     }
     if (blockingWay)
     {
-        animId = GetStepInPlaceDelay16AnimId(mapObject->facingDirection);
+        animId = GetStepInPlaceDelay16AnimId(eventObject->facingDirection);
     }
-    FieldObjectSetRegularAnim(mapObject, sprite, animId);
-    mapObject->singleMovementActive = TRUE;
+    EventObjectSetRegularAnim(eventObject, sprite, animId);
+    eventObject->singleMovementActive = TRUE;
     sprite->data[1] = 3;
     return TRUE;
 }
 
-bool8 sub_8091020 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8091020 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
+    if (EventObjectExecRegularAnim(eventObject, sprite))
     {
-        mapObject->singleMovementActive = FALSE;
+        eventObject->singleMovementActive = FALSE;
         sprite->data[1] = 1;
     }
     return FALSE;
 }
 
-bool8 sub_8091048(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8091048(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
+    npc_reset(eventObject, sprite);
     sprite->data[1] = 1;
     return TRUE;
 }
 
-bool8 MoveFieldObjectInNextDirectionInSequence(struct MapObject *mapObject, struct Sprite *sprite, u8 *route)
+bool8 MoveEventObjectInNextDirectionInSequence(struct EventObject *eventObject, struct Sprite *sprite, u8 *route)
 {
     u8 blockingWay;
     u8 animId;
 
-    if (mapObject->directionSequenceIndex == 3 && mapObject->initialCoords.x == mapObject->currentCoords.x && mapObject->initialCoords.y == mapObject->currentCoords.y)
+    if (eventObject->directionSequenceIndex == 3 && eventObject->initialCoords.x == eventObject->currentCoords.x && eventObject->initialCoords.y == eventObject->currentCoords.y)
     {
-        mapObject->directionSequenceIndex = 0;
+        eventObject->directionSequenceIndex = 0;
     }
-    FieldObjectSetDirection(mapObject, route[mapObject->directionSequenceIndex]);
-    animId = GetGoSpeed0AnimId(mapObject->movementDirection);
-    blockingWay = npc_block_way__next_tile(mapObject, mapObject->movementDirection);
+    EventObjectSetDirection(eventObject, route[eventObject->directionSequenceIndex]);
+    animId = GetGoSpeed0AnimId(eventObject->movementDirection);
+    blockingWay = npc_block_way__next_tile(eventObject, eventObject->movementDirection);
     if (blockingWay == TRUE)
     {
-        mapObject->directionSequenceIndex ++;
-        FieldObjectSetDirection(mapObject, route[mapObject->directionSequenceIndex]);
-        animId = GetGoSpeed0AnimId(mapObject->movementDirection);
-        blockingWay = npc_block_way__next_tile(mapObject, mapObject->movementDirection);
+        eventObject->directionSequenceIndex ++;
+        EventObjectSetDirection(eventObject, route[eventObject->directionSequenceIndex]);
+        animId = GetGoSpeed0AnimId(eventObject->movementDirection);
+        blockingWay = npc_block_way__next_tile(eventObject, eventObject->movementDirection);
     }
     if (blockingWay)
     {
-        animId = GetStepInPlaceDelay16AnimId(mapObject->facingDirection);
+        animId = GetStepInPlaceDelay16AnimId(eventObject->facingDirection);
     }
-    FieldObjectSetRegularAnim(mapObject, sprite, animId);
-    mapObject->singleMovementActive = TRUE;
+    EventObjectSetRegularAnim(eventObject, sprite, animId);
+    eventObject->singleMovementActive = TRUE;
     sprite->data[1] = 2;
     return TRUE;
 }
 
-bool8 sub_8091110(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8091110(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
+    if (EventObjectExecRegularAnim(eventObject, sprite))
     {
-        mapObject->singleMovementActive = FALSE;
+        eventObject->singleMovementActive = FALSE;
         sprite->data[1] = 1;
     }
     return FALSE;
@@ -4118,271 +4116,271 @@ 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)
+bool8 mss_npc_reset_oampriv3_1_unk2_unk3(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
-    if (mapObject->directionSequenceIndex == 0)
+    npc_reset(eventObject, sprite);
+    if (eventObject->directionSequenceIndex == 0)
     {
-        mapObject->directionSequenceIndex = player_get_direction_lower_nybble();
+        eventObject->directionSequenceIndex = player_get_direction_lower_nybble();
     }
     sprite->data[1] = 1;
     return TRUE;
 }
 
-bool8 sub_8091EC0(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8091EC0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (gMapObjects[gPlayerAvatar.mapObjectId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == 2)
+    if (gEventObjects[gPlayerAvatar.eventObjectId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == 2)
     {
         return FALSE;
     }
-    return gUnknown_0850DA64[player_get_x22()](mapObject, sprite, player_get_direction_upper_nybble(), NULL);
+    return gUnknown_0850DA64[player_get_x22()](eventObject, sprite, player_get_direction_upper_nybble(), NULL);
 }
 
-bool8 sub_8091F20(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8091F20(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
+    if (EventObjectExecRegularAnim(eventObject, sprite))
     {
-        mapObject->singleMovementActive = FALSE;
+        eventObject->singleMovementActive = FALSE;
         sprite->data[1] = 1;
     }
     return FALSE;
 }
 
-bool8 sub_8091F48(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8))
+bool8 sub_8091F48(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8))
 {
     return FALSE;
 }
 
-bool8 sub_8091F4C(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8))
+bool8 sub_8091F4C(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8))
 {
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(state_to_direction(gInitialMovementTypeFacingDirections[mapObject->movementType], mapObject->directionSequenceIndex, playerDirection)));
-    mapObject->singleMovementActive = TRUE;
+    EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, playerDirection)));
+    eventObject->singleMovementActive = TRUE;
     sprite->data[1] = 2;
     return TRUE;
 }
 
-bool8 sub_8091F94(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8))
+bool8 sub_8091F94(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8))
 {
     u32 direction;
     s16 x;
     s16 y;
 
     direction = playerDirection;
-    if (FieldObjectIsFarawayIslandMew(mapObject))
+    if (EventObjectIsFarawayIslandMew(eventObject))
     {
         direction = sub_81D427C();
         if (direction == 0)
         {
             direction = playerDirection;
-            direction = state_to_direction(gInitialMovementTypeFacingDirections[mapObject->movementType], mapObject->directionSequenceIndex, direction);
-            FieldObjectMoveDestCoords(mapObject, direction, &x, &y);
-            FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction));
-            mapObject->singleMovementActive = TRUE;
+            direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction);
+            EventObjectMoveDestCoords(eventObject, direction, &x, &y);
+            EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(direction));
+            eventObject->singleMovementActive = TRUE;
             sprite->data[1] = 2;
             return TRUE;
         }
     }
     else
     {
-        direction = state_to_direction(gInitialMovementTypeFacingDirections[mapObject->movementType], mapObject->directionSequenceIndex, direction);
+        direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, 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))))
+    EventObjectMoveDestCoords(eventObject, direction, &x, &y);
+    EventObjectSetRegularAnim(eventObject, sprite, GetGoSpeed0AnimId(direction));
+    if (npc_block_way(eventObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y))))
     {
-        FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction));
+        EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(direction));
     }
-    mapObject->singleMovementActive = TRUE;
+    eventObject->singleMovementActive = TRUE;
     sprite->data[1] = 2;
     return TRUE;
 }
 
-bool8 sub_80920A4(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8))
+bool8 sub_80920A4(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8))
 {
     u32 direction;
     s16 x;
     s16 y;
 
     direction = playerDirection;
-    direction = state_to_direction(gInitialMovementTypeFacingDirections[mapObject->movementType], mapObject->directionSequenceIndex, 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))))
+    direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction);
+    EventObjectMoveDestCoords(eventObject, direction, &x, &y);
+    EventObjectSetRegularAnim(eventObject, sprite, GetGoSpeed1AnimId(direction));
+    if (npc_block_way(eventObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y))))
     {
-        FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction));
+        EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(direction));
     }
-    mapObject->singleMovementActive = TRUE;
+    eventObject->singleMovementActive = TRUE;
     sprite->data[1] = 2;
     return TRUE;
 }
 
-bool8 sub_809215C(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8))
+bool8 sub_809215C(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8))
 {
     u32 direction;
     s16 x;
     s16 y;
 
     direction = playerDirection;
-    direction = state_to_direction(gInitialMovementTypeFacingDirections[mapObject->movementType], mapObject->directionSequenceIndex, 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))))
+    direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction);
+    EventObjectMoveDestCoords(eventObject, direction, &x, &y);
+    EventObjectSetRegularAnim(eventObject, sprite, GetGoSpeed3AnimId(direction));
+    if (npc_block_way(eventObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y))))
     {
-        FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction));
+        EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(direction));
     }
-    mapObject->singleMovementActive = TRUE;
+    eventObject->singleMovementActive = TRUE;
     sprite->data[1] = 2;
     return TRUE;
 }
 
-bool8 sub_8092214(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8))
+bool8 sub_8092214(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8))
 {
     u32 direction;
     s16 x;
     s16 y;
 
     direction = playerDirection;
-    direction = state_to_direction(gInitialMovementTypeFacingDirections[mapObject->movementType], mapObject->directionSequenceIndex, 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))))
+    direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction);
+    EventObjectMoveDestCoords(eventObject, direction, &x, &y);
+    EventObjectSetRegularAnim(eventObject, sprite, sub_8093438(direction));
+    if (npc_block_way(eventObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y))))
     {
-        FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction));
+        EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(direction));
     }
-    mapObject->singleMovementActive = TRUE;
+    eventObject->singleMovementActive = TRUE;
     sprite->data[1] = 2;
     return TRUE;
 }
 
-bool8 cph_IM_DIFFERENT(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8))
+bool8 cph_IM_DIFFERENT(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8))
 {
     u32 direction;
 
     direction = playerDirection;
-    direction = state_to_direction(gInitialMovementTypeFacingDirections[mapObject->movementType], mapObject->directionSequenceIndex, direction);
-    FieldObjectSetRegularAnim(mapObject, sprite, sub_80934BC(direction));
-    mapObject->singleMovementActive = TRUE;
+    direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction);
+    EventObjectSetRegularAnim(eventObject, sprite, sub_80934BC(direction));
+    eventObject->singleMovementActive = TRUE;
     sprite->data[1] = 2;
     return TRUE;
 }
 
-bool8 sub_8092314(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8))
+bool8 sub_8092314(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8))
 {
     u32 direction;
     s16 x;
     s16 y;
 
     direction = playerDirection;
-    direction = state_to_direction(gInitialMovementTypeFacingDirections[mapObject->movementType], mapObject->directionSequenceIndex, 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))))
+    direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction);
+    EventObjectMoveDestCoords(eventObject, direction, &x, &y);
+    EventObjectSetRegularAnim(eventObject, sprite, sub_8093514(direction));
+    if (npc_block_way(eventObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y))))
     {
-        FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction));
+        EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(direction));
     }
-    mapObject->singleMovementActive = TRUE;
+    eventObject->singleMovementActive = TRUE;
     sprite->data[1] = 2;
     return TRUE;
 }
 
-bool8 oac_hopping(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8))
+bool8 oac_hopping(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8))
 {
     u32 direction;
     s16 x;
     s16 y;
 
     direction = playerDirection;
-    direction = state_to_direction(gInitialMovementTypeFacingDirections[mapObject->movementType], mapObject->directionSequenceIndex, direction);
-    x = mapObject->currentCoords.x;
-    y = mapObject->currentCoords.y;
+    direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction);
+    x = eventObject->currentCoords.x;
+    y = eventObject->currentCoords.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))))
+    EventObjectSetRegularAnim(eventObject, sprite, GetJumpLedgeAnimId(direction));
+    if (npc_block_way(eventObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y))))
     {
-        FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction));
+        EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(direction));
     }
-    mapObject->singleMovementActive = TRUE;
+    eventObject->singleMovementActive = TRUE;
     sprite->data[1] = 2;
     return TRUE;
 }
 
 field_object_step(CopyPlayer2, gUnknown_0850DA90)
 
-bool8 mss_08062EA4(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 mss_08062EA4(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (gMapObjects[gPlayerAvatar.mapObjectId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == 2)
+    if (gEventObjects[gPlayerAvatar.eventObjectId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == 2)
     {
         return FALSE;
     }
-    return gUnknown_0850DA64[player_get_x22()](mapObject, sprite, player_get_direction_upper_nybble(), MetatileBehavior_IsPokeGrass);
+    return gUnknown_0850DA64[player_get_x22()](eventObject, sprite, player_get_direction_upper_nybble(), MetatileBehavior_IsPokeGrass);
 }
 
-bool8 sub_80925AC(struct MapObject *, struct Sprite *);
+bool8 sub_80925AC(struct EventObject *, struct Sprite *);
 
-void FieldObjectCB_TreeDisguise(struct Sprite *sprite)
+void EventObjectCB_TreeDisguise(struct Sprite *sprite)
 {
-    struct MapObject *mapObject;
+    struct EventObject *eventObject;
 
-    mapObject = &gMapObjects[sprite->data[0]];
-    if (mapObject->directionSequenceIndex == 0 || (mapObject->directionSequenceIndex == 1 && !sprite->data[7]))
+    eventObject = &gEventObjects[sprite->data[0]];
+    if (eventObject->directionSequenceIndex == 0 || (eventObject->directionSequenceIndex == 1 && !sprite->data[7]))
     {
-        FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
-        mapObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_TREE_DISGUISE);
-        mapObject->directionSequenceIndex = 1;
+        EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
+        eventObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_TREE_DISGUISE);
+        eventObject->directionSequenceIndex = 1;
         sprite->data[7] ++;
     }
-    FieldObjectStep(&gMapObjects[sprite->data[0]], sprite, sub_80925AC);
+    EventObjectStep(&gEventObjects[sprite->data[0]], sprite, sub_80925AC);
 }
 
-bool8 sub_80925AC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80925AC(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
+    npc_reset(eventObject, sprite);
     return FALSE;
 }
 
-void FieldObjectCB_MountainDisguise(struct Sprite *sprite)
+void EventObjectCB_MountainDisguise(struct Sprite *sprite)
 {
-    struct MapObject *mapObject;
+    struct EventObject *eventObject;
 
-    mapObject = &gMapObjects[sprite->data[0]];
-    if (mapObject->directionSequenceIndex == 0 || (mapObject->directionSequenceIndex == 1 && !sprite->data[7]))
+    eventObject = &gEventObjects[sprite->data[0]];
+    if (eventObject->directionSequenceIndex == 0 || (eventObject->directionSequenceIndex == 1 && !sprite->data[7]))
     {
-        FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
-        mapObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_MOUNTAIN_DISGUISE);
-        mapObject->directionSequenceIndex = 1;
+        EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
+        eventObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_MOUNTAIN_DISGUISE);
+        eventObject->directionSequenceIndex = 1;
         sprite->data[7] ++;
     }
-    FieldObjectStep(&gMapObjects[sprite->data[0]], sprite, sub_80925AC);
+    EventObjectStep(&gEventObjects[sprite->data[0]], sprite, sub_80925AC);
 }
 
-extern bool8 (*const gUnknown_0850DA9C[])(struct MapObject *, struct Sprite *);
-bool8 sub_809268C(struct MapObject *, struct Sprite *);
+extern bool8 (*const gUnknown_0850DA9C[])(struct EventObject *, struct Sprite *);
+bool8 sub_809268C(struct EventObject *, struct Sprite *);
 
-void FieldObjectCB_Hidden1(struct Sprite *sprite)
+void EventObjectCB_Hidden1(struct Sprite *sprite)
 {
     if (!sprite->data[7])
     {
-        gMapObjects[sprite->data[0]].fixedPriority = TRUE;
+        gEventObjects[sprite->data[0]].fixedPriority = TRUE;
         sprite->subspriteMode = 2;
         sprite->oam.priority = 3;
         sprite->data[7] ++;
     }
-    FieldObjectStep(&gMapObjects[sprite->data[0]], sprite, sub_809268C);
+    EventObjectStep(&gEventObjects[sprite->data[0]], sprite, sub_809268C);
 }
 
-bool8 sub_809268C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_809268C(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    return gUnknown_0850DA9C[sprite->data[1]](mapObject, sprite);
+    return gUnknown_0850DA9C[sprite->data[1]](eventObject, sprite);
 }
 
-bool8 sub_80926AC (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80926AC (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
+    npc_reset(eventObject, sprite);
     return FALSE;
 }
-bool8 sub_80926B8 (struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80926B8 (struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
+    if (EventObjectExecRegularAnim(eventObject, sprite))
     {
         sprite->data[1] = 0;
     }
@@ -4391,57 +4389,57 @@ bool8 sub_80926B8 (struct MapObject *mapObject, struct Sprite *sprite)
 
 field_object_step(WalkInPlace1, gUnknown_0850DAA0)
 
-bool8 sub_8092718(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8092718(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
-    FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay16AnimId(mapObject->facingDirection));
+    npc_reset(eventObject, sprite);
+    EventObjectSetRegularAnim(eventObject, sprite, GetStepInPlaceDelay16AnimId(eventObject->facingDirection));
     sprite->data[1] = 1;
     return TRUE;
 }
 
 field_object_step(WalkInPlace4, gUnknown_0850DAA8)
 
-bool8 sub_8092788(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8092788(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
-    FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay32AnimId(mapObject->facingDirection));
+    npc_reset(eventObject, sprite);
+    EventObjectSetRegularAnim(eventObject, sprite, GetStepInPlaceDelay32AnimId(eventObject->facingDirection));
     sprite->data[1] = 1;
     return TRUE;
 }
 
 field_object_step(WalkInPlace2, gUnknown_0850DAB0)
 
-bool8 sub_80927F8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80927F8(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
-    FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay8AnimId(mapObject->facingDirection));
+    npc_reset(eventObject, sprite);
+    EventObjectSetRegularAnim(eventObject, sprite, GetStepInPlaceDelay8AnimId(eventObject->facingDirection));
     sprite->data[1] = 1;
     return TRUE;
 }
 
 field_object_step(WalkInPlace3, gUnknown_0850DAB8)
 
-bool8 sub_8092868(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8092868(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
-    FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay4AnimId(mapObject->facingDirection));
+    npc_reset(eventObject, sprite);
+    EventObjectSetRegularAnim(eventObject, sprite, GetStepInPlaceDelay4AnimId(eventObject->facingDirection));
     sprite->data[1] = 1;
     return TRUE;
 }
 
 field_object_step(Hidden2, gUnknown_0850DAC0)
 
-bool8 sub_80928D8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80928D8(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection));
-    mapObject->invisible = TRUE;
+    npc_reset(eventObject, sprite);
+    EventObjectSetRegularAnim(eventObject, sprite, GetFaceDirectionAnimId(eventObject->facingDirection));
+    eventObject->invisible = TRUE;
     sprite->data[1] = 1;
     return TRUE;
 }
-bool8 sub_809290C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_809290C(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
+    if (EventObjectExecRegularAnim(eventObject, sprite))
     {
         sprite->data[1] = 2;
         return TRUE;
@@ -4449,18 +4447,18 @@ bool8 sub_809290C(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_809292C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_809292C(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    mapObject->singleMovementActive = FALSE;
+    eventObject->singleMovementActive = FALSE;
     return FALSE;
 }
 
-static void npc_reset(struct MapObject *mapObject, struct Sprite *sprite)
+static void npc_reset(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    mapObject->singleMovementActive = FALSE;
-    mapObject->heldMovementActive = FALSE;
-    mapObject->heldMovementFinished = FALSE;
-    mapObject->movementActionId = 0xFF;
+    eventObject->singleMovementActive = FALSE;
+    eventObject->heldMovementActive = FALSE;
+    eventObject->heldMovementFinished = FALSE;
+    eventObject->movementActionId = 0xFF;
     sprite->data[1] = 0;
 }
 
@@ -4470,7 +4468,7 @@ u8 name(u8 direction)\
     return table[direction];\
 }
 
-dirn2anim(FieldObjectDirectionToImageAnimId, gUnknown_0850DACC)
+dirn2anim(EventObjectDirectionToImageAnimId, 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)
@@ -4500,11 +4498,11 @@ static const struct UnkStruct_085094AC *sub_8092A4C(const union AnimCmd *const *
     return NULL;
 }
 
-void npc_apply_anim_looping(struct MapObject *mapObject, struct Sprite *sprite, u8 animNum)
+void npc_apply_anim_looping(struct EventObject *eventObject, struct Sprite *sprite, u8 animNum)
 {
     const struct UnkStruct_085094AC *unk85094AC;
 
-    if (!mapObject->inanimate)
+    if (!eventObject->inanimate)
     {
         sprite->animNum = animNum;
         unk85094AC = sub_8092A4C(sprite->anims);
@@ -4523,11 +4521,11 @@ void npc_apply_anim_looping(struct MapObject *mapObject, struct Sprite *sprite,
     }
 }
 
-void obj_npc_animation_step(struct MapObject *mapObject, struct Sprite *sprite, u8 animNum)
+void obj_npc_animation_step(struct EventObject *eventObject, struct Sprite *sprite, u8 animNum)
 {
     const struct UnkStruct_085094AC *unk85094AC;
 
-    if (!mapObject->inanimate)
+    if (!eventObject->inanimate)
     {
         u8 animPos;
 
@@ -4564,100 +4562,100 @@ u8 sub_8092AF8(s16 x1, s16 y1, s16 x2, s16 y2)
     return DIR_SOUTH;
 }
 
-void npc_set_running_behaviour_etc(struct MapObject *mapObject, u8 movementType)
+void npc_set_running_behaviour_etc(struct EventObject *eventObject, u8 movementType)
 {
-    mapObject->movementType = movementType;
-    mapObject->directionSequenceIndex = 0;
-    mapObject->playerCopyableMovement = 0;
-    gSprites[mapObject->spriteId].callback = gUnknown_08505438[movementType];
-    gSprites[mapObject->spriteId].data[1] = 0;
+    eventObject->movementType = movementType;
+    eventObject->directionSequenceIndex = 0;
+    eventObject->playerCopyableMovement = 0;
+    gSprites[eventObject->spriteId].callback = gUnknown_08505438[movementType];
+    gSprites[eventObject->spriteId].data[1] = 0;
 }
 
 dirn2anim(npc_running_behaviour_by_direction, gUnknown_0850DB53)
 
-u8 npc_block_way__next_tile(struct MapObject *mapObject, u8 direction)
+u8 npc_block_way__next_tile(struct EventObject *eventObject, u8 direction)
 {
     s16 x;
     s16 y;
 
-    x = mapObject->currentCoords.x;
-    y = mapObject->currentCoords.y;
+    x = eventObject->currentCoords.x;
+    y = eventObject->currentCoords.y;
     MoveCoords(direction, &x, &y);
-    return npc_block_way(mapObject, x, y, direction);
+    return npc_block_way(eventObject, x, y, direction);
 }
 
-u8 npc_block_way(struct MapObject *mapObject, s16 x, s16 y, u32 dirn)
+u8 npc_block_way(struct EventObject *eventObject, s16 x, s16 y, u32 dirn)
 {
     u8 direction;
 
     direction = dirn;
-    if (IsCoordOutsideFieldObjectMovementRect(mapObject, x, y))
+    if (IsCoordOutsideEventObjectMovementRect(eventObject, x, y))
     {
         return 1;
     }
-    if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(mapObject, x, y, direction))
+    if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(eventObject, x, y, direction))
     {
         return 2;
     }
-    if (mapObject->trackedByCamera && !CanCameraMoveInDirection(direction))
+    if (eventObject->trackedByCamera && !CanCameraMoveInDirection(direction))
     {
         return 2;
     }
-    if (IsZCoordMismatchAt(mapObject->currentElevation, x, y))
+    if (IsZCoordMismatchAt(eventObject->currentElevation, x, y))
     {
         return 3;
     }
-    if (CheckForCollisionBetweenFieldObjects(mapObject, x, y))
+    if (CheckForCollisionBetweenEventObjects(eventObject, x, y))
     {
         return 4;
     }
     return 0;
 }
 
-u8 sub_8092C8C(struct MapObject *mapObject, s16 x, s16 y, u8 direction)
+u8 sub_8092C8C(struct EventObject *eventObject, s16 x, s16 y, u8 direction)
 {
     u8 retval;
 
     retval = 0x00;
-    if (IsCoordOutsideFieldObjectMovementRect(mapObject, x, y))
+    if (IsCoordOutsideEventObjectMovementRect(eventObject, x, y))
     {
         retval |= 1;
     }
-    if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(mapObject, x, y, direction) || (mapObject->trackedByCamera && !CanCameraMoveInDirection(direction)))
+    if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(eventObject, x, y, direction) || (eventObject->trackedByCamera && !CanCameraMoveInDirection(direction)))
     {
         retval |= 2;
     }
-    if (IsZCoordMismatchAt(mapObject->currentElevation, x, y))
+    if (IsZCoordMismatchAt(eventObject->currentElevation, x, y))
     {
         retval |= 4;
     }
-    if (CheckForCollisionBetweenFieldObjects(mapObject, x, y))
+    if (CheckForCollisionBetweenEventObjects(eventObject, x, y))
     {
         retval |= 8;
     }
     return retval;
 }
 
-static bool8 IsCoordOutsideFieldObjectMovementRect(struct MapObject *mapObject, s16 x, s16 y)
+static bool8 IsCoordOutsideEventObjectMovementRect(struct EventObject *eventObject, s16 x, s16 y)
 {
     s16 left;
     s16 right;
     s16 top;
     s16 bottom;
 
-    if (mapObject->range.as_nybbles.x != 0)
+    if (eventObject->range.as_nybbles.x != 0)
     {
-        left = mapObject->initialCoords.x - mapObject->range.as_nybbles.x;
-        right = mapObject->initialCoords.x + mapObject->range.as_nybbles.x;
+        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 (mapObject->range.as_nybbles.y != 0)
+    if (eventObject->range.as_nybbles.y != 0)
     {
-        top = mapObject->initialCoords.y - mapObject->range.as_nybbles.y;
-        bottom = mapObject->initialCoords.y + mapObject->range.as_nybbles.y;
+        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;
@@ -4666,28 +4664,28 @@ static bool8 IsCoordOutsideFieldObjectMovementRect(struct MapObject *mapObject,
     return FALSE;
 }
 
-static bool8 IsMetatileDirectionallyImpassable(struct MapObject *mapObject, s16 x, s16 y, u8 direction)
+static bool8 IsMetatileDirectionallyImpassable(struct EventObject *eventObject, s16 x, s16 y, u8 direction)
 {
-    if (gOppositeDirectionBlockedMetatileFuncs[direction - 1](mapObject->currentMetatileBehavior) || gDirectionBlockedMetatileFuncs[direction - 1](MapGridGetMetatileBehaviorAt(x, y)))
+    if (gOppositeDirectionBlockedMetatileFuncs[direction - 1](eventObject->currentMetatileBehavior) || gDirectionBlockedMetatileFuncs[direction - 1](MapGridGetMetatileBehaviorAt(x, y)))
     {
         return TRUE;
     }
     return FALSE;
 }
 
-static bool8 CheckForCollisionBetweenFieldObjects(struct MapObject *mapObject, s16 x, s16 y)
+static bool8 CheckForCollisionBetweenEventObjects(struct EventObject *eventObject, s16 x, s16 y)
 {
     u8 i;
-    struct MapObject *curObject;
+    struct EventObject *curObject;
 
-    for (i = 0; i < NUM_FIELD_OBJECTS; i ++)
+    for (i = 0; i < NUM_EVENT_OBJECTS; i ++)
     {
-        curObject = &gMapObjects[i];
-        if (curObject->active && curObject != mapObject)
+        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(mapObject->currentElevation, curObject->currentElevation))
+                if (AreZCoordsCompatible(eventObject->currentElevation, curObject->currentElevation))
                 {
                     return TRUE;
                 }
@@ -4699,9 +4697,9 @@ static bool8 CheckForCollisionBetweenFieldObjects(struct MapObject *mapObject, s
 
 bool8 sub_8092E9C(u8 localId, u8 mapNum, u8 mapGroup)
 {
-    u8 mapObjectId;
+    u8 eventObjectId;
 
-    if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId) && gSprites[gMapObjects[mapObjectId].spriteId].data[7] & 0x02)
+    if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId) && gSprites[gEventObjects[eventObjectId].spriteId].data[7] & 0x02)
     {
         return TRUE;
     }
@@ -4710,11 +4708,11 @@ bool8 sub_8092E9C(u8 localId, u8 mapNum, u8 mapGroup)
 
 void sub_8092EF0(u8 localId, u8 mapNum, u8 mapGroup)
 {
-    u8 mapObjectId;
+    u8 eventObjectId;
 
-    if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId))
+    if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
     {
-        gSprites[gMapObjects[mapObjectId].spriteId].data[7] |= 0x04;
+        gSprites[gEventObjects[eventObjectId].spriteId].data[7] |= 0x04;
     }
 }
 
@@ -4803,7 +4801,7 @@ void sub_80930E0(s16 *x, s16 *y, s16 dx, s16 dy)
     *y += dy;
 }
 
-static void GetFieldObjectMovingCameraOffset(s16 *x, s16 *y)
+static void GetEventObjectMovingCameraOffset(s16 *x, s16 *y)
 {
     *x = 0;
     *y = 0;
@@ -4825,120 +4823,120 @@ static void GetFieldObjectMovingCameraOffset(s16 *x, s16 *y)
     }
 }
 
-void FieldObjectMoveDestCoords(struct MapObject *mapObject, u32 dirn, s16 *x, s16 *y)
+void EventObjectMoveDestCoords(struct EventObject *eventObject, u32 dirn, s16 *x, s16 *y)
 {
     u8 direction;
 
     direction = dirn;
-    *x = mapObject->currentCoords.x;
-    *y = mapObject->currentCoords.y;
+    *x = eventObject->currentCoords.x;
+    *y = eventObject->currentCoords.y;
     MoveCoords(direction, x, y);
 }
 
 // file boundary?
 
-bool8 FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(struct MapObject *mapObject)
+bool8 EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(struct EventObject *eventObject)
 {
-    if (mapObject->singleMovementActive || mapObject->heldMovementActive)
+    if (eventObject->singleMovementActive || eventObject->heldMovementActive)
     {
         return TRUE;
     }
     return FALSE;
 }
 
-bool8 FieldObjectIsSpecialAnimActive(struct MapObject *mapObject)
+bool8 EventObjectIsSpecialAnimActive(struct EventObject *eventObject)
 {
-    if (mapObject->heldMovementActive && mapObject->movementActionId != 0xFF)
+    if (eventObject->heldMovementActive && eventObject->movementActionId != 0xFF)
     {
         return TRUE;
     }
     return FALSE;
 }
 
-bool8 FieldObjectSetSpecialAnim(struct MapObject *mapObject, u8 specialAnimId)
+bool8 EventObjectSetSpecialAnim(struct EventObject *eventObject, u8 specialAnimId)
 {
-    if (FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject))
+    if (EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(eventObject))
     {
         return TRUE;
     }
-    npc_sync_anim_pause_bits(mapObject);
-    mapObject->movementActionId = specialAnimId;
-    mapObject->heldMovementActive = TRUE;
-    mapObject->heldMovementFinished = FALSE;
-    gSprites[mapObject->spriteId].data[2] = 0;
+    npc_sync_anim_pause_bits(eventObject);
+    eventObject->movementActionId = specialAnimId;
+    eventObject->heldMovementActive = TRUE;
+    eventObject->heldMovementFinished = FALSE;
+    gSprites[eventObject->spriteId].data[2] = 0;
     return FALSE;
 }
 
-void FieldObjectForceSetSpecialAnim(struct MapObject *mapObject, u8 specialAnimId)
+void EventObjectForceSetSpecialAnim(struct EventObject *eventObject, u8 specialAnimId)
 {
-    FieldObjectClearAnimIfSpecialAnimActive(mapObject);
-    FieldObjectSetSpecialAnim(mapObject, specialAnimId);
+    EventObjectClearAnimIfSpecialAnimActive(eventObject);
+    EventObjectSetSpecialAnim(eventObject, specialAnimId);
 }
 
-void FieldObjectClearAnimIfSpecialAnimActive(struct MapObject *mapObject)
+void EventObjectClearAnimIfSpecialAnimActive(struct EventObject *eventObject)
 {
-    if (mapObject->heldMovementActive)
+    if (eventObject->heldMovementActive)
     {
-        FieldObjectClearAnim(mapObject);
+        EventObjectClearAnim(eventObject);
     }
 }
 
-void FieldObjectClearAnim(struct MapObject *mapObject)
+void EventObjectClearAnim(struct EventObject *eventObject)
 {
-    mapObject->movementActionId = 0xFF;
-    mapObject->heldMovementActive = FALSE;
-    mapObject->heldMovementFinished = FALSE;
-    gSprites[mapObject->spriteId].data[1] = 0;
-    gSprites[mapObject->spriteId].data[2] = 0;
+    eventObject->movementActionId = 0xFF;
+    eventObject->heldMovementActive = FALSE;
+    eventObject->heldMovementFinished = FALSE;
+    gSprites[eventObject->spriteId].data[1] = 0;
+    gSprites[eventObject->spriteId].data[2] = 0;
 }
 
-u8 FieldObjectCheckIfSpecialAnimFinishedOrInactive(struct MapObject *mapObject)
+u8 EventObjectCheckIfSpecialAnimFinishedOrInactive(struct EventObject *eventObject)
 {
-    if (mapObject->heldMovementActive)
+    if (eventObject->heldMovementActive)
     {
-        return mapObject->heldMovementFinished;
+        return eventObject->heldMovementFinished;
     }
     return 0x10;
 }
 
-u8 FieldObjectClearAnimIfSpecialAnimFinished(struct MapObject *mapObject)
+u8 EventObjectClearAnimIfSpecialAnimFinished(struct EventObject *eventObject)
 {
     u8 specialAnimState;
 
-    specialAnimState = FieldObjectCheckIfSpecialAnimFinishedOrInactive(mapObject);
+    specialAnimState = EventObjectCheckIfSpecialAnimFinishedOrInactive(eventObject);
     if (specialAnimState != 0 && specialAnimState != 16)
     {
-        FieldObjectClearAnimIfSpecialAnimActive(mapObject);
+        EventObjectClearAnimIfSpecialAnimActive(eventObject);
     }
     return specialAnimState;
 }
 
-u8 FieldObjectGetSpecialAnim(struct MapObject *mapObject)
+u8 EventObjectGetSpecialAnim(struct EventObject *eventObject)
 {
-    if (mapObject->heldMovementActive)
+    if (eventObject->heldMovementActive)
     {
-        return mapObject->movementActionId;
+        return eventObject->movementActionId;
     }
     return 0xFF;
 }
 
-void FieldObjectStep(struct MapObject *mapObject, struct Sprite *sprite, bool8 (*callback)(struct MapObject *, struct Sprite *))
+void EventObjectStep(struct EventObject *eventObject, struct Sprite *sprite, bool8 (*callback)(struct EventObject *, struct Sprite *))
 {
-    DoGroundEffects_OnSpawn(mapObject, sprite);
-    sub_80964E8(mapObject, sprite);
-    if (FieldObjectIsSpecialAnimActive(mapObject))
+    DoGroundEffects_OnSpawn(eventObject, sprite);
+    sub_80964E8(eventObject, sprite);
+    if (EventObjectIsSpecialAnimActive(eventObject))
     {
-        FieldObjectExecSpecialAnim(mapObject, sprite);
+        EventObjectExecSpecialAnim(eventObject, sprite);
     }
-    else if (!mapObject->frozen)
+    else if (!eventObject->frozen)
     {
-        while (callback(mapObject, sprite));
+        while (callback(eventObject, 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);
+    DoGroundEffects_OnBeginStep(eventObject, sprite);
+    DoGroundEffects_OnFinishStep(eventObject, sprite);
+    npc_obj_transfer_image_anim_pause_flag(eventObject, sprite);
+    sub_8096518(eventObject, sprite);
+    EventObjectUpdateSubpriority(eventObject, sprite);
 }
 
 #define dirn2anim_2(name, table) \
@@ -4973,9 +4971,9 @@ dirn2anim_2(GetStepInPlaceDelay16AnimId, gUnknown_0850DBE6);
 dirn2anim_2(GetStepInPlaceDelay8AnimId, gUnknown_0850DBEB);
 dirn2anim_2(GetStepInPlaceDelay4AnimId, gUnknown_0850DBF0);
 
-bool8 FieldObjectFaceOppositeDirection(struct MapObject *mapObject, u8 direction)
+bool8 EventObjectFaceOppositeDirection(struct EventObject *eventObject, u8 direction)
 {
-    return FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(GetOppositeDirection(direction)));
+    return EventObjectSetSpecialAnim(eventObject, GetFaceDirectionAnimId(GetOppositeDirection(direction)));
 }
 
 dirn2anim_2(sub_8093648, gUnknown_0850DBF5);
@@ -5022,141 +5020,141 @@ static u32 state_to_direction(u8 a0, u32 a1, u32 a2)
     return gUnknown_0850DC3F[a0 - 1][zffuOffset - 1];
 }
 
-static void FieldObjectExecSpecialAnim(struct MapObject *mapObject, struct Sprite *sprite)
+static void EventObjectExecSpecialAnim(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (gUnknown_0850DC50[mapObject->movementActionId][sprite->data[2]](mapObject, sprite))
+    if (gUnknown_0850DC50[eventObject->movementActionId][sprite->data[2]](eventObject, sprite))
     {
-        mapObject->heldMovementFinished = TRUE;
+        eventObject->heldMovementFinished = TRUE;
     }
 }
 
-bool8 FieldObjectExecRegularAnim(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 EventObjectExecRegularAnim(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (gUnknown_0850DC50[mapObject->movementActionId][sprite->data[2]](mapObject, sprite))
+    if (gUnknown_0850DC50[eventObject->movementActionId][sprite->data[2]](eventObject, sprite))
     {
-        mapObject->movementActionId = 0xFF;
+        eventObject->movementActionId = 0xFF;
         sprite->data[2] = 0;
         return TRUE;
     }
     return FALSE;
 }
 
-static void FieldObjectSetRegularAnim(struct MapObject *mapObject, struct Sprite *sprite, u8 animId)
+static void EventObjectSetRegularAnim(struct EventObject *eventObject, struct Sprite *sprite, u8 animId)
 {
-    mapObject->movementActionId = animId;
+    eventObject->movementActionId = animId;
     sprite->data[2] = 0;
 }
 
 // file boundary?
 
-void an_look_any(struct MapObject *mapObject, struct Sprite *sprite, u8 direction)
+void an_look_any(struct EventObject *eventObject, 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->facingDirection));
+    EventObjectSetDirection(eventObject, direction);
+    npc_coords_shift_still(eventObject);
+    obj_npc_animation_step(eventObject, sprite, get_go_image_anim_num(eventObject->facingDirection));
     sprite->animPaused = TRUE;
     sprite->data[2] = 1;
 }
 
-bool8 sub_8093950(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8093950(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    an_look_any(mapObject, sprite, DIR_SOUTH);
+    an_look_any(eventObject, sprite, DIR_SOUTH);
     return TRUE;
 }
 
-bool8 sub_8093960(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8093960(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    an_look_any(mapObject, sprite, DIR_NORTH);
+    an_look_any(eventObject, sprite, DIR_NORTH);
     return TRUE;
 }
 
-bool8 sub_8093970(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8093970(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    an_look_any(mapObject, sprite, DIR_WEST);
+    an_look_any(eventObject, sprite, DIR_WEST);
     return TRUE;
 }
 
-bool8 sub_8093980(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8093980(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    an_look_any(mapObject, sprite, DIR_EAST);
+    an_look_any(eventObject, sprite, DIR_EAST);
     return TRUE;
 }
 
-void npc_apply_direction(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 speed)
+void npc_apply_direction(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed)
 {
     s16 x;
     s16 y;
 
-    x = mapObject->currentCoords.x;
-    y = mapObject->currentCoords.y;
-    FieldObjectSetDirection(mapObject, direction);
+    x = eventObject->currentCoords.x;
+    y = eventObject->currentCoords.y;
+    EventObjectSetDirection(eventObject, direction);
     MoveCoords(direction, &x, &y);
-    npc_coords_shift(mapObject, x, y);
+    npc_coords_shift(eventObject, x, y);
     oamt_npc_ministep_reset(sprite, direction, speed);
     sprite->animPaused = FALSE;
-    if (gUnknown_020375B8 != NULL && sub_8097F78(mapObject) != 0x10)
+    if (gUnknown_020375B8 != NULL && sub_8097F78(eventObject) != 0x10)
     {
         sprite->animPaused = TRUE;
     }
-    mapObject->triggerGroundEffectsOnMove = TRUE;
+    eventObject->triggerGroundEffectsOnMove = TRUE;
     sprite->data[2] = 1;
 }
 
-void do_go_anim(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 speed)
+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(mapObject, sprite, direction, speed);
-    npc_apply_anim_looping(mapObject, sprite, functions[speed](mapObject->facingDirection));
+    npc_apply_direction(eventObject, sprite, direction, speed);
+    npc_apply_anim_looping(eventObject, sprite, functions[speed](eventObject->facingDirection));
 }
 
-void do_run_anim(struct MapObject *mapObject, struct Sprite *sprite, u8 direction)
+void do_run_anim(struct EventObject *eventObject, struct Sprite *sprite, u8 direction)
 {
-    npc_apply_direction(mapObject, sprite, direction, 1);
-    npc_apply_anim_looping(mapObject, sprite, get_run_image_anim_num(mapObject->facingDirection));
+    npc_apply_direction(eventObject, sprite, direction, 1);
+    npc_apply_anim_looping(eventObject, sprite, get_run_image_anim_num(eventObject->facingDirection));
 }
 
-bool8 npc_obj_ministep_stop_on_arrival(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 npc_obj_ministep_stop_on_arrival(struct EventObject *eventObject, struct Sprite *sprite)
 {
     if (obj_npc_ministep(sprite))
     {
-        npc_coords_shift_still(mapObject);
-        mapObject->triggerGroundEffectsOnStop = TRUE;
+        npc_coords_shift_still(eventObject);
+        eventObject->triggerGroundEffectsOnStop = TRUE;
         sprite->animPaused = TRUE;
         return TRUE;
     }
     return FALSE;
 }
 
-void sub_8093AF0(struct MapObject *mapObject, struct Sprite *sprite, u8 direction)
+void sub_8093AF0(struct EventObject *eventObject, struct Sprite *sprite, u8 direction)
 {
     s16 x;
     s16 y;
 
-    x = mapObject->currentCoords.x;
-    y = mapObject->currentCoords.y;
-    FieldObjectSetDirection(mapObject, direction);
+    x = eventObject->currentCoords.x;
+    y = eventObject->currentCoords.y;
+    EventObjectSetDirection(eventObject, direction);
     MoveCoords(direction, &x, &y);
-    npc_coords_shift(mapObject, x, y);
+    npc_coords_shift(eventObject, x, y);
     sub_80976DC(sprite, direction);
     sprite->animPaused = FALSE;
-    mapObject->triggerGroundEffectsOnMove = TRUE;
+    eventObject->triggerGroundEffectsOnMove = TRUE;
     sprite->data[2] = 1;
 }
 
-void sub_8093B60(struct MapObject *mapObject, struct Sprite *sprite, u8 direction)
+void sub_8093B60(struct EventObject *eventObject, struct Sprite *sprite, u8 direction)
 {
-    sub_8093AF0(mapObject, sprite, direction);
-    npc_apply_anim_looping(mapObject, sprite, get_go_image_anim_num(mapObject->facingDirection));
+    sub_8093AF0(eventObject, sprite, direction);
+    npc_apply_anim_looping(eventObject, sprite, get_go_image_anim_num(eventObject->facingDirection));
 }
 
-bool8 an_walk_any_2(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 an_walk_any_2(struct EventObject *eventObject, struct Sprite *sprite)
 {
     if (sub_80976EC(sprite))
     {
-        npc_coords_shift_still(mapObject);
-        mapObject->triggerGroundEffectsOnStop = TRUE;
+        npc_coords_shift_still(eventObject);
+        eventObject->triggerGroundEffectsOnStop = TRUE;
         sprite->animPaused = TRUE;
         return TRUE;
     }
@@ -5164,15 +5162,15 @@ bool8 an_walk_any_2(struct MapObject *mapObject, struct Sprite *sprite)
 }
 
 #define an_walk_any_2_macro(name, fn1, fn2, ...) \
-bool8 name##_2(struct MapObject *, struct Sprite *);\
-bool8 name(struct MapObject *mapObject, struct Sprite *sprite)\
+bool8 name##_2(struct EventObject *, struct Sprite *);\
+bool8 name(struct EventObject *eventObject, struct Sprite *sprite)\
 {\
-    fn1(mapObject, sprite, __VA_ARGS__);\
-    return name##_2(mapObject, sprite);\
+    fn1(eventObject, sprite, __VA_ARGS__);\
+    return name##_2(eventObject, sprite);\
 }\
-bool8 name##_2(struct MapObject *mapObject, struct Sprite *sprite)\
+bool8 name##_2(struct EventObject *eventObject, struct Sprite *sprite)\
 {\
-    if (fn2(mapObject, sprite))\
+    if (fn2(eventObject, sprite))\
     {\
         sprite->data[2] = 2;\
         return TRUE;\
@@ -5197,7 +5195,7 @@ an_walk_any_2_macro(sub_8093F04, do_go_anim, npc_obj_ministep_stop_on_arrival, 2
 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)
+void sub_8093FC4(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed, u8 a5)
 {
     s16 displacements[ARRAY_COUNT(gUnknown_0850DFBC)];
     s16 x;
@@ -5206,24 +5204,24 @@ void sub_8093FC4(struct MapObject *mapObject, struct Sprite *sprite, u8 directio
     memcpy(displacements, gUnknown_0850DFBC, sizeof gUnknown_0850DFBC);
     x = 0;
     y = 0;
-    FieldObjectSetDirection(mapObject, direction);
+    EventObjectSetDirection(eventObject, direction);
     sub_8092F88(direction, &x, &y, displacements[speed], displacements[speed]);
-    npc_coords_shift(mapObject, mapObject->currentCoords.x + x, mapObject->currentCoords.y + y);
+    npc_coords_shift(eventObject, eventObject->currentCoords.x + x, eventObject->currentCoords.y + y);
     sub_809783C(sprite, direction, speed, a5);
     sprite->data[2] = 1;
     sprite->animPaused = 0;
-    mapObject->triggerGroundEffectsOnMove = 1;
-    mapObject->disableCoveringGroundEffects = 1;
+    eventObject->triggerGroundEffectsOnMove = 1;
+    eventObject->disableCoveringGroundEffects = 1;
 }
 
-void maybe_shadow_1(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 speed, u8 a4)
+void maybe_shadow_1(struct EventObject *eventObject, 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->facingDirection));
-    DoShadowFieldEffect(mapObject);
+    sub_8093FC4(eventObject, sprite, direction, speed, a4);
+    npc_apply_anim_looping(eventObject, sprite, get_go_image_anim_num(eventObject->facingDirection));
+    DoShadowFieldEffect(eventObject);
 }
 
-u8 sub_80940C4(struct MapObject *mapObject, struct Sprite *sprite, u8 callback(struct Sprite *))
+u8 sub_80940C4(struct EventObject *eventObject, struct Sprite *sprite, u8 callback(struct Sprite *))
 {
     s16 displacements[ARRAY_COUNT(gUnknown_0850DFC2)];
     s16 x;
@@ -5236,75 +5234,75 @@ u8 sub_80940C4(struct MapObject *mapObject, struct Sprite *sprite, u8 callback(s
     {
         x = 0;
         y = 0;
-        sub_8092F88(mapObject->movementDirection, &x, &y, displacements[sprite->data[4]], displacements[sprite->data[4]]);
-        npc_coords_shift(mapObject, mapObject->currentCoords.x + x, mapObject->currentCoords.y + y);
-        mapObject->triggerGroundEffectsOnMove = TRUE;
-        mapObject->disableCoveringGroundEffects = TRUE;
+        sub_8092F88(eventObject->movementDirection, &x, &y, displacements[sprite->data[4]], displacements[sprite->data[4]]);
+        npc_coords_shift(eventObject, eventObject->currentCoords.x + x, eventObject->currentCoords.y + y);
+        eventObject->triggerGroundEffectsOnMove = TRUE;
+        eventObject->disableCoveringGroundEffects = TRUE;
     }
     else if (result == 0xFF)
     {
-        npc_coords_shift_still(mapObject);
-        mapObject->triggerGroundEffectsOnStop = TRUE;
-        mapObject->landingJump = TRUE;
+        npc_coords_shift_still(eventObject);
+        eventObject->triggerGroundEffectsOnStop = TRUE;
+        eventObject->landingJump = TRUE;
         sprite->animPaused = TRUE;
     }
     return result;
 }
 
-u8 sub_8094188(struct MapObject *mapObject, struct Sprite *sprite)
+u8 sub_8094188(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    return sub_80940C4(mapObject, sprite, sub_809785C);
+    return sub_80940C4(eventObject, sprite, sub_809785C);
 }
 
-u8 sub_809419C(struct MapObject *mapObject, struct Sprite *sprite)
+u8 sub_809419C(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    return sub_80940C4(mapObject, sprite, sub_80978E4);
+    return sub_80940C4(eventObject, sprite, sub_80978E4);
 }
 
-bool8 sub_80941B0(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80941B0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8094188(mapObject, sprite) == 0xFF)
+    if (sub_8094188(eventObject, sprite) == 0xFF)
     {
         return TRUE;
     }
     return FALSE;
 }
 
-bool8 sub_80941C8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80941C8(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_809419C(mapObject, sprite) == 0xFF)
+    if (sub_809419C(eventObject, sprite) == 0xFF)
     {
         return TRUE;
     }
     return FALSE;
 }
 
-bool8 sub_80941E0(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80941E0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    switch (sub_8094188(mapObject, sprite))
+    switch (sub_8094188(eventObject, sprite))
     {
         case 255:
             return TRUE;
         case   1:
-            FieldObjectSetDirection(mapObject, GetOppositeDirection(mapObject->movementDirection));
-            obj_npc_animation_step(mapObject, sprite, get_go_image_anim_num(mapObject->facingDirection));
+            EventObjectSetDirection(eventObject, GetOppositeDirection(eventObject->movementDirection));
+            obj_npc_animation_step(eventObject, sprite, get_go_image_anim_num(eventObject->facingDirection));
         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)\
+bool8 name##_2(struct EventObject *, struct Sprite *);\
+bool8 name(struct EventObject *eventObject, struct Sprite *sprite)\
 {\
-    fn1(mapObject, sprite, __VA_ARGS__);\
-    return name##_2(mapObject, sprite);\
+    fn1(eventObject, sprite, __VA_ARGS__);\
+    return name##_2(eventObject, sprite);\
 }\
-bool8 name##_2(struct MapObject *mapObject, struct Sprite *sprite)\
+bool8 name##_2(struct EventObject *eventObject, struct Sprite *sprite)\
 {\
-    if (fn2(mapObject, sprite))\
+    if (fn2(eventObject, sprite))\
     {\
-        mapObject->hasShadow = FALSE;\
+        eventObject->hasShadow = FALSE;\
         sprite->data[2] = 2;\
         return TRUE;\
     }\
@@ -5322,7 +5320,7 @@ void sub_8094390(struct Sprite *sprite, u16 duration)
     sprite->data[3] = duration;
 }
 
-bool8 sub_8094398(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8094398(struct EventObject *eventObject, struct Sprite *sprite)
 {
     if (-- sprite->data[3] == 0)
     {
@@ -5333,10 +5331,10 @@ bool8 sub_8094398(struct MapObject *mapObject, struct Sprite *sprite)
 }
 
 #define special_anim_with_timer(name, duration)\
-bool8 name(struct MapObject *mapObject, struct Sprite *sprite)\
+bool8 name(struct EventObject *eventObject, struct Sprite *sprite)\
 {\
     sub_8094390(sprite, duration);\
-    return sub_8094398(mapObject, sprite);\
+    return sub_8094398(eventObject, sprite);\
 }
 
 special_anim_with_timer(sub_80943B4,  1)
@@ -5350,16 +5348,16 @@ an_walk_any_2_macro(sub_8094494, do_go_anim, npc_obj_ministep_stop_on_arrival, 2
 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)
+void sub_8094554(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 animNum, u16 duration)
 {
-    FieldObjectSetDirection(mapObject, direction);
-    npc_apply_anim_looping(mapObject, sprite, animNum);
+    EventObjectSetDirection(eventObject, direction);
+    npc_apply_anim_looping(eventObject, sprite, animNum);
     sprite->animPaused = FALSE;
     sprite->data[2] = 1;
     sprite->data[3] = duration;
 }
 
-bool8 sub_809459C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_809459C(struct EventObject *eventObject, struct Sprite *sprite)
 {
     if (-- sprite->data[3] == 0)
     {
@@ -5370,22 +5368,22 @@ bool8 sub_809459C(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_80945C4(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80945C4(struct EventObject *eventObject, struct Sprite *sprite)
 {
     if (sprite->data[3] & 1)
     {
         sprite->animDelayCounter ++;
     }
-    return sub_809459C(mapObject, sprite);
+    return sub_809459C(eventObject, sprite);
 }
 
 #define special_anim_with_timer_2(name, direction, images, duration, timer) \
-bool8 name(struct MapObject *mapObject, struct Sprite *sprite)\
+bool8 name(struct EventObject *eventObject, struct Sprite *sprite)\
 {\
     u8 animId;\
     animId = images(DIR_##direction);\
-    sub_8094554(mapObject, sprite, DIR_##direction, animId, duration);\
-    return timer(mapObject, sprite);\
+    sub_8094554(eventObject, sprite, DIR_##direction, animId, duration);\
+    return timer(eventObject, sprite);\
 }
 
 special_anim_with_timer_2(sub_8094600, SOUTH, get_go_image_anim_num,        32, sub_80945C4)
@@ -5422,20 +5420,20 @@ an_walk_any_2_macro(sub_8094CC0, do_run_anim, npc_obj_ministep_stop_on_arrival,
 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)
+void npc_set_direction_and_anim__an_proceed(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 animNum)
 {
     obj_anim_image_set_and_seek(sprite, animNum, 0);
-    FieldObjectSetDirection(mapObject, direction);
+    EventObjectSetDirection(eventObject, direction);
     sprite->data[2] = 1;
 }
 
-bool8 sub_8094DAC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8094DAC(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_set_direction_and_anim__an_proceed(mapObject, sprite, mapObject->movementDirection, sprite->animNum);
+    npc_set_direction_and_anim__an_proceed(eventObject, sprite, eventObject->movementDirection, sprite->animNum);
     return FALSE;
 }
 
-bool8 sub_8094DC4(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8094DC4(struct EventObject *eventObject, struct Sprite *sprite)
 {
     if (sub_80979BC(sprite))
     {
@@ -5445,25 +5443,25 @@ bool8 sub_8094DC4(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-void sub_8094DE4(struct MapObject *mapObject, struct Sprite *sprite, u8 direction)
+void sub_8094DE4(struct EventObject *eventObject, struct Sprite *sprite, u8 direction)
 {
-    sub_8093FC4(mapObject, sprite, direction, 1, 0);
+    sub_8093FC4(eventObject, 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)\
+bool8 name##_2(struct EventObject *, struct Sprite *);\
+bool8 name(struct EventObject *eventObject, struct Sprite *sprite)\
 {\
-    sub_8094DE4(mapObject, sprite, direction);\
-    return name##_2(mapObject, sprite);\
+    sub_8094DE4(eventObject, sprite, direction);\
+    return name##_2(eventObject, sprite);\
 }\
-bool8 name##_2(struct MapObject *mapObject, struct Sprite *sprite)\
+bool8 name##_2(struct EventObject *eventObject, struct Sprite *sprite)\
 {\
-    if (sub_80941C8(mapObject, sprite))\
+    if (sub_80941C8(eventObject, sprite))\
     {\
         sprite->data[2] = 2;\
-        mapObject->landingJump = FALSE;\
+        eventObject->landingJump = FALSE;\
         return TRUE;\
     }\
     return FALSE;\
@@ -5474,40 +5472,40 @@ 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)
+bool8 sub_8094F38(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    u8 mapObjectId;
+    u8 eventObjectId;
 
-    if (!TryGetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0, &mapObjectId))
+    if (!TryGetEventObjectIdByLocalIdAndMap(0xFF, 0, 0, &eventObjectId))
     {
-        an_look_any(mapObject, sprite, sub_8092AF8(mapObject->currentCoords.x, mapObject->currentCoords.y, gMapObjects[mapObjectId].currentCoords.x, gMapObjects[mapObjectId].currentCoords.y));
+        an_look_any(eventObject, sprite, sub_8092AF8(eventObject->currentCoords.x, eventObject->currentCoords.y, gEventObjects[eventObjectId].currentCoords.x, gEventObjects[eventObjectId].currentCoords.y));
     }
     sprite->data[2] = 1;
     return TRUE;
 }
 
-bool8 sub_8094F94(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8094F94(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    u8 mapObjectId;
+    u8 eventObjectId;
 
-    if (!TryGetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0, &mapObjectId))
+    if (!TryGetEventObjectIdByLocalIdAndMap(0xFF, 0, 0, &eventObjectId))
     {
-        an_look_any(mapObject, sprite, GetOppositeDirection(sub_8092AF8(mapObject->currentCoords.x, mapObject->currentCoords.y, gMapObjects[mapObjectId].currentCoords.x, gMapObjects[mapObjectId].currentCoords.y)));
+        an_look_any(eventObject, sprite, GetOppositeDirection(sub_8092AF8(eventObject->currentCoords.x, eventObject->currentCoords.y, gEventObjects[eventObjectId].currentCoords.x, gEventObjects[eventObjectId].currentCoords.y)));
     }
     sprite->data[2] = 1;
     return TRUE;
 }
 
-bool8 sub_8094FF8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8094FF8(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    mapObject->facingDirectionLocked = TRUE;
+    eventObject->facingDirectionLocked = TRUE;
     sprite->data[2] = 1;
     return TRUE;
 }
 
-bool8 sub_8095008(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8095008(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    mapObject->facingDirectionLocked = FALSE;
+    eventObject->facingDirectionLocked = FALSE;
     sprite->data[2] = 1;
     return TRUE;
 }
@@ -5525,104 +5523,104 @@ 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)
+bool8 sub_8095438(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    an_look_any(mapObject, sprite, gInitialMovementTypeFacingDirections[mapObject->movementType]);
+    an_look_any(eventObject, sprite, gInitialMovementTypeFacingDirections[eventObject->movementType]);
     return TRUE;
 }
 
-bool8 sub_8095450(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8095450(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_set_direction_and_anim__an_proceed(mapObject, sprite, DIR_SOUTH, 0x14);
+    npc_set_direction_and_anim__an_proceed(eventObject, sprite, DIR_SOUTH, 0x14);
     return FALSE;
 }
 
-bool8 sub_8095460(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8095460(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    mapObject->disableJumpLandingGroundEffect = FALSE;
+    eventObject->disableJumpLandingGroundEffect = FALSE;
     sprite->data[2] = 1;
     return TRUE;
 }
 
-bool8 sub_8095470(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8095470(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    mapObject->disableJumpLandingGroundEffect = TRUE;
+    eventObject->disableJumpLandingGroundEffect = TRUE;
     sprite->data[2] = 1;
     return TRUE;
 }
 
-bool8 sub_8095480(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8095480(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    mapObject->inanimate = TRUE;
+    eventObject->inanimate = TRUE;
     sprite->data[2] = 1;
     return TRUE;
 }
 
-bool8 sub_8095490(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8095490(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    mapObject->inanimate = GetFieldObjectGraphicsInfo(mapObject->graphicsId)->inanimate;
+    eventObject->inanimate = GetEventObjectGraphicsInfo(eventObject->graphicsId)->inanimate;
     sprite->data[2] = 1;
     return TRUE;
 }
 
-bool8 sub_80954BC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80954BC(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    mapObject->invisible = TRUE;
+    eventObject->invisible = TRUE;
     sprite->data[2] = 1;
     return TRUE;
 }
 
-bool8 sub_80954CC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80954CC(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    mapObject->invisible = FALSE;
+    eventObject->invisible = FALSE;
     sprite->data[2] = 1;
     return TRUE;
 }
 
-bool8 do_exclamation_mark_bubble_1(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 do_exclamation_mark_bubble_1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
+    EventObjectGetLocalIdAndMap(eventObject, &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)
+bool8 do_exclamation_mark_bubble_2(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
+    EventObjectGetLocalIdAndMap(eventObject, &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)
+bool8 do_heart_bubble(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
+    EventObjectGetLocalIdAndMap(eventObject, &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)
+bool8 sub_8095548(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (mapObject->movementType == 0x3F)
+    if (eventObject->movementType == 0x3F)
     {
-        sub_80B4578(mapObject);
+        sub_80B4578(eventObject);
         return FALSE;
     }
-    if (mapObject->movementType != 0x39 && mapObject->movementType != 0x3A)
+    if (eventObject->movementType != 0x39 && eventObject->movementType != 0x3A)
     {
         sprite->data[2] = 2;
         return TRUE;
     }
-    sub_8155D78(mapObject);
+    sub_8155D78(eventObject);
     sprite->data[2] = 1;
-    return sub_809558C(mapObject, sprite);
+    return sub_809558C(eventObject, sprite);
 }
 
-bool8 sub_809558C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_809558C(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8155DA0(mapObject))
+    if (sub_8155DA0(eventObject))
     {
         sprite->data[2] = 2;
         return TRUE;
@@ -5630,77 +5628,77 @@ bool8 sub_809558C(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_80955AC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80955AC(struct EventObject *eventObject, 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)
+bool8 sub_80955C8(struct EventObject *eventObject, struct Sprite *sprite)
 {
     if (sub_80979BC(sprite))
     {
-        SetFieldObjectStepTimer(sprite, 32);
+        SetEventObjectStepTimer(sprite, 32);
         sprite->data[2] = 2;
     }
     return FALSE;
 }
 
-bool8 sub_80955EC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80955EC(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    mapObject->invisible ^= TRUE;
-    if (RunFieldObjectStepTimer(sprite))
+    eventObject->invisible ^= TRUE;
+    if (RunEventObjectStepTimer(sprite))
     {
-        mapObject->invisible = TRUE;
+        eventObject->invisible = TRUE;
         sprite->data[2] = 3;
     }
     return FALSE;
 }
 
-bool8 sub_8095628(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8095628(struct EventObject *eventObject, 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)
+bool8 sub_8095644(struct EventObject *eventObject, struct Sprite *sprite)
 {
     if (sub_80979BC(sprite))
     {
-        SetFieldObjectStepTimer(sprite, 32);
+        SetEventObjectStepTimer(sprite, 32);
         sprite->data[2] = 2;
     }
     return FALSE;
 }
 
-bool8 sub_8095668(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8095668(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    mapObject->invisible ^= TRUE;
-    if (RunFieldObjectStepTimer(sprite))
+    eventObject->invisible ^= TRUE;
+    if (RunEventObjectStepTimer(sprite))
     {
-        mapObject->invisible = TRUE;
+        eventObject->invisible = TRUE;
         sprite->data[2] = 3;
     }
     return FALSE;
 }
 
-bool8 sub_80956A4(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80956A4(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    mapObject->fixedPriority = TRUE;
+    eventObject->fixedPriority = TRUE;
     sprite->data[2] = 1;
     return TRUE;
 }
 
-bool8 sub_80956B4(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80956B4(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    mapObject->fixedPriority = FALSE;
+    eventObject->fixedPriority = FALSE;
     sprite->data[2] = 1;
     return TRUE;
 }
 
-bool8 sub_80956C4(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80956C4(struct EventObject *eventObject, struct Sprite *sprite)
 {
     sprite->oam.affineMode = 3;
     InitSpriteAffineAnim(sprite);
@@ -5709,7 +5707,7 @@ bool8 sub_80956C4(struct MapObject *mapObject, struct Sprite *sprite)
     return TRUE;
 }
 
-bool8 sub_80956F4(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80956F4(struct EventObject *eventObject, struct Sprite *sprite)
 {
     FreeOamMatrix(sprite->oam.matrixNum);
     sprite->oam.affineMode = 0;
@@ -5717,30 +5715,30 @@ bool8 sub_80956F4(struct MapObject *mapObject, struct Sprite *sprite)
     return TRUE;
 }
 
-bool8 sub_8095724(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8095724(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    mapObject->unk3_3 = TRUE;
+    eventObject->unk3_3 = TRUE;
     return TRUE;
 }
 
-bool8 sub_8095730(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8095730(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    mapObject->unk3_3 = FALSE;
+    eventObject->unk3_3 = 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)\
+bool8 name##_2(struct EventObject *, struct Sprite *);\
+bool8 name(struct EventObject *eventObject, struct Sprite *sprite)\
 {\
-    fn(mapObject, sprite, __VA_ARGS__);\
+    fn(eventObject, sprite, __VA_ARGS__);\
     sprite->affineAnimPaused = FALSE;\
     action(sprite, anim);\
-    return name##_2(mapObject, sprite);\
+    return name##_2(eventObject, sprite);\
 }\
-bool8 name##_2(struct MapObject *mapObject, struct Sprite *sprite)\
+bool8 name##_2(struct EventObject *eventObject, struct Sprite *sprite)\
 {\
-    if (fn2(mapObject, sprite))\
+    if (fn2(eventObject, sprite))\
     {\
         sprite->affineAnimPaused = TRUE;\
         sprite->data[2] = 2;\
@@ -5754,43 +5752,43 @@ affine_an_walk_any_2_macro(sub_80957A0, sub_8093B60, an_walk_any_2, ChangeSprite
 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)
+static void sub_80958C0(struct EventObject *eventObject, struct Sprite *sprite, u8 direction)
 {
-    FieldObjectSetDirection(mapObject, direction);
-    npc_coords_shift_still(mapObject);
-    obj_npc_animation_step(mapObject, sprite, sub_80929FC(direction));
+    EventObjectSetDirection(eventObject, direction);
+    npc_coords_shift_still(eventObject);
+    obj_npc_animation_step(eventObject, sprite, sub_80929FC(direction));
     sprite->animPaused = TRUE;
     sprite->data[2] = 1;
 }
 
-bool8 sub_8095900(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8095900(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_80958C0(mapObject, sprite, DIR_SOUTH);
+    sub_80958C0(eventObject, sprite, DIR_SOUTH);
     return TRUE;
 }
 
-bool8 sub_8095910(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8095910(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_80958C0(mapObject, sprite, DIR_NORTH);
+    sub_80958C0(eventObject, sprite, DIR_NORTH);
     return TRUE;
 }
 
-bool8 sub_8095920(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8095920(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_80958C0(mapObject, sprite, DIR_WEST);
+    sub_80958C0(eventObject, sprite, DIR_WEST);
     return TRUE;
 }
 
-bool8 sub_8095930(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8095930(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_80958C0(mapObject, sprite, DIR_EAST);
+    sub_80958C0(eventObject, sprite, DIR_EAST);
     return TRUE;
 }
 
 #define set_dirn_and_anim__an_proceed(name, direction, anims)\
-bool8 name(struct MapObject *mapObject, struct Sprite *sprite)\
+bool8 name(struct EventObject *eventObject, struct Sprite *sprite)\
 {\
-    npc_set_direction_and_anim__an_proceed(mapObject, sprite, direction, anims(direction));\
+    npc_set_direction_and_anim__an_proceed(eventObject, sprite, direction, anims(direction));\
     return FALSE;\
 }
 
@@ -5807,34 +5805,34 @@ 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)
+void sub_8095AF0(struct EventObject *eventObject, struct Sprite *sprite)
 {
     sub_8097750(sprite);
     sprite->animPaused = FALSE;
 }
 
-bool8 sub_8095B0C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8095B0C(struct EventObject *eventObject, struct Sprite *sprite)
 {
     if (sub_8097758(sprite))
     {
-        npc_coords_shift_still(mapObject);
-        mapObject->triggerGroundEffectsOnStop = TRUE;
+        npc_coords_shift_still(eventObject);
+        eventObject->triggerGroundEffectsOnStop = TRUE;
         sprite->animPaused = TRUE;
         return TRUE;
     }
     return FALSE;
 }
 
-bool8 sub_8095B44(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8095B44(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_8095AF0(mapObject, sprite);
+    sub_8095AF0(eventObject, sprite);
     sprite->data[2] = 1;
-    return sub_8095B64(mapObject, sprite);
+    return sub_8095B64(eventObject, sprite);
 }
 
-bool8 sub_8095B64(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8095B64(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8095B0C(mapObject, sprite))
+    if (sub_8095B0C(eventObject, sprite))
     {
         sprite->data[2] = 2;
         return TRUE;
@@ -5842,11 +5840,11 @@ bool8 sub_8095B64(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-void sub_8095B84(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 speed, u8 a4)
+void sub_8095B84(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed, u8 a4)
 {
-    sub_8093FC4(mapObject, sprite, direction, speed, a4);
+    sub_8093FC4(eventObject, sprite, direction, speed, a4);
     StartSpriteAnimIfDifferent(sprite, sub_80929BC(direction));
-    DoShadowFieldEffect(mapObject);
+    DoShadowFieldEffect(eventObject);
 }
 
 maybe_shadow_1_macro(sub_8095BC8, sub_8095B84, sub_80941B0, DIR_SOUTH, 0, 1)
@@ -5867,10 +5865,10 @@ 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)
+void sub_80960C8(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed)
 {
-    npc_apply_direction(mapObject, sprite, direction, speed);
-    StartSpriteAnim(sprite, sub_80929BC(mapObject->facingDirection));
+    npc_apply_direction(eventObject, sprite, direction, speed);
+    StartSpriteAnim(sprite, sub_80929BC(eventObject->facingDirection));
     SeekSpriteAnim(sprite, 0);
 }
 
@@ -5879,10 +5877,10 @@ an_walk_any_2_macro(sub_8096140, sub_80960C8, npc_obj_ministep_stop_on_arrival,
 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)
+void sub_8096200(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed)
 {
-    npc_apply_direction(mapObject, sprite, direction, speed);
-    npc_apply_anim_looping(mapObject, sprite, sub_80929FC(mapObject->facingDirection));
+    npc_apply_direction(eventObject, sprite, direction, speed);
+    npc_apply_anim_looping(eventObject, sprite, sub_80929FC(eventObject->facingDirection));
 }
 
 an_walk_any_2_macro(sub_8096230, sub_8096200, npc_obj_ministep_stop_on_arrival, DIR_SOUTH, 1)
@@ -5890,10 +5888,10 @@ an_walk_any_2_macro(sub_8096270, sub_8096200, npc_obj_ministep_stop_on_arrival,
 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)
+void sub_8096330(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed)
 {
-    npc_apply_direction(mapObject, sprite, direction, speed);
-    StartSpriteAnim(sprite, sub_80929DC(mapObject->facingDirection));
+    npc_apply_direction(eventObject, sprite, direction, speed);
+    StartSpriteAnim(sprite, sub_80929DC(eventObject->facingDirection));
     SeekSpriteAnim(sprite, 0);
 }
 an_walk_any_2_macro(sub_8096368, sub_8096330, npc_obj_ministep_stop_on_arrival, DIR_SOUTH, 1)
@@ -5901,77 +5899,77 @@ an_walk_any_2_macro(sub_80963A8, sub_8096330, npc_obj_ministep_stop_on_arrival,
 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)
+bool8 sub_8096468(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_8097FA4(mapObject);
+    sub_8097FA4(eventObject);
     sprite->data[2] = 1;
     return TRUE;
 }
 
-bool8 sub_809647C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_809647C(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_8098044(mapObject->warpArrowSpriteId);
+    sub_8098044(eventObject->warpArrowSpriteId);
     sprite->pos2.y = 0;
     sprite->data[2] = 1;
     return TRUE;
 }
 
-bool8 sub_8096494(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8096494(struct EventObject *eventObject, struct Sprite *sprite)
 {
     if (sprite->pos2.y == 0)
     {
-        sub_8098044(mapObject->warpArrowSpriteId);
+        sub_8098044(eventObject->warpArrowSpriteId);
         sprite->data[2] = 1;
         return TRUE;
     }
     return FALSE;
 }
 
-u8 sub_80964B8(struct MapObject *mapObject, struct Sprite *sprite)
+u8 sub_80964B8(struct EventObject *eventObject, struct Sprite *sprite)
 {
     return TRUE;
 }
 
-bool8 sub_80964BC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80964BC(struct EventObject *eventObject, struct Sprite *sprite)
 {
     sprite->animPaused = TRUE;
     return TRUE;
 }
 
-void npc_obj_transfer_image_anim_pause_flag(struct MapObject *mapObject, struct Sprite *sprite)
+void npc_obj_transfer_image_anim_pause_flag(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (mapObject->disableAnim)
+    if (eventObject->disableAnim)
     {
         sprite->animPaused = TRUE;
     }
 }
 
-void sub_80964E8(struct MapObject *mapObject, struct Sprite *sprite)
+void sub_80964E8(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (mapObject->enableAnim)
+    if (eventObject->enableAnim)
     {
         sprite->animPaused = FALSE;
-        mapObject->disableAnim = FALSE;
-        mapObject->enableAnim = FALSE;
+        eventObject->disableAnim = FALSE;
+        eventObject->enableAnim = FALSE;
     }
 }
 
-static void sub_8096518(struct MapObject *mapObject, struct Sprite *sprite)
+static void sub_8096518(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_8096530(mapObject, sprite);
-    npc_update_obj_anim_flag(mapObject, sprite);
+    sub_8096530(eventObject, sprite);
+    npc_update_obj_anim_flag(eventObject, sprite);
 }
 
-static void sub_8096530(struct MapObject *mapObject, struct Sprite *sprite)
+static void sub_8096530(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u16 x;
     u16 y;
     u16 x2;
     u16 y2;
-    const struct MapObjectGraphicsInfo *graphicsInfo;
+    const struct EventObjectGraphicsInfo *graphicsInfo;
 
-    mapObject->offScreen = FALSE;
-    graphicsInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId);
+    eventObject->offScreen = FALSE;
+    graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId);
     if (sprite->coordOffsetEnabled)
     {
         x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX + gSpriteCoordOffsetX;
@@ -5988,26 +5986,26 @@ static void sub_8096530(struct MapObject *mapObject, struct Sprite *sprite)
     y2 += graphicsInfo->height;
     if ((s16)x >= 0x100 || (s16)x2 < -0x10)
     {
-        mapObject->offScreen = TRUE;
+        eventObject->offScreen = TRUE;
     }
     if ((s16)y >= 0xB0 || (s16)y2 < -0x10)
     {
-        mapObject->offScreen = TRUE;
+        eventObject->offScreen = TRUE;
     }
 }
 
-static void npc_update_obj_anim_flag(struct MapObject *mapObject, struct Sprite *sprite)
+static void npc_update_obj_anim_flag(struct EventObject *eventObject, struct Sprite *sprite)
 {
     sprite->invisible = FALSE;
-    if (mapObject->invisible || mapObject->offScreen)
+    if (eventObject->invisible || eventObject->offScreen)
     {
         sprite->invisible = TRUE;
     }
 }
 
-/*static*/ void GetAllGroundEffectFlags_OnSpawn(struct MapObject *eventObj, u32 *flags)
+/*static*/ void GetAllGroundEffectFlags_OnSpawn(struct EventObject *eventObj, u32 *flags)
 {
-    FieldObjectUpdateMetatileBehaviors(eventObj);
+    EventObjectUpdateMetatileBehaviors(eventObj);
     GetGroundEffectFlags_Reflection(eventObj, flags);
     GetGroundEffectFlags_TallGrassOnSpawn(eventObj, flags);
     GetGroundEffectFlags_LongGrassOnSpawn(eventObj, flags);
@@ -6017,9 +6015,9 @@ static void npc_update_obj_anim_flag(struct MapObject *mapObject, struct Sprite
     GetGroundEffectFlags_HotSprings(eventObj, flags);
 }
 
-static void GetAllGroundEffectFlags_OnBeginStep(struct MapObject *eventObj, u32 *flags)
+static void GetAllGroundEffectFlags_OnBeginStep(struct EventObject *eventObj, u32 *flags)
 {
-    FieldObjectUpdateMetatileBehaviors(eventObj);
+    EventObjectUpdateMetatileBehaviors(eventObj);
     GetGroundEffectFlags_Reflection(eventObj, flags);
     GetGroundEffectFlags_TallGrassOnBeginStep(eventObj, flags);
     GetGroundEffectFlags_LongGrassOnBeginStep(eventObj, flags);
@@ -6031,9 +6029,9 @@ static void GetAllGroundEffectFlags_OnBeginStep(struct MapObject *eventObj, u32
     GetGroundEffectFlags_HotSprings(eventObj, flags);
 }
 
-/*static*/ void GetAllGroundEffectFlags_OnFinishStep(struct MapObject *eventObj, u32 *flags)
+/*static*/ void GetAllGroundEffectFlags_OnFinishStep(struct EventObject *eventObj, u32 *flags)
 {
-    FieldObjectUpdateMetatileBehaviors(eventObj);
+    EventObjectUpdateMetatileBehaviors(eventObj);
     GetGroundEffectFlags_ShallowFlowingWater(eventObj, flags);
     GetGroundEffectFlags_SandHeap(eventObj, flags);
     GetGroundEffectFlags_Puddle(eventObj, flags);
@@ -6044,16 +6042,16 @@ static void GetAllGroundEffectFlags_OnBeginStep(struct MapObject *eventObj, u32
     GetGroundEffectFlags_JumpLanding(eventObj, flags);
 }
 
-static void FieldObjectUpdateMetatileBehaviors(struct MapObject *eventObj)
+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 MapObject *eventObj, u32 *flags)
+static void GetGroundEffectFlags_Reflection(struct EventObject *eventObj, u32 *flags)
 {
     u32 reflectionFlags[2] = { GROUND_EFFECT_FLAG_REFLECTION, GROUND_EFFECT_FLAG_ICE_REFLECTION };
-    u8 type = FieldObjectCheckForReflectiveSurface(eventObj);
+    u8 type = EventObjectCheckForReflectiveSurface(eventObj);
 
     if (type)
     {
@@ -6070,31 +6068,31 @@ static void GetGroundEffectFlags_Reflection(struct MapObject *eventObj, u32 *fla
     }
 }
 
-static void GetGroundEffectFlags_TallGrassOnSpawn(struct MapObject *eventObj, u32 *flags)
+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 MapObject *eventObj, u32 *flags)
+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 MapObject *eventObj, u32 *flags)
+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 MapObject *eventObj, u32 *flags)
+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 MapObject *eventObj, u32 *flags)
+static void GetGroundEffectFlags_Tracks(struct EventObject *eventObj, u32 *flags)
 {
     if (MetatileBehavior_IsDeepSand(eventObj->previousMetatileBehavior))
     {
@@ -6107,7 +6105,7 @@ static void GetGroundEffectFlags_Tracks(struct MapObject *eventObj, u32 *flags)
     }
 }
 
-static void GetGroundEffectFlags_SandHeap(struct MapObject *eventObj, u32 *flags)
+static void GetGroundEffectFlags_SandHeap(struct EventObject *eventObj, u32 *flags)
 {
     if (MetatileBehavior_IsDeepSand(eventObj->currentMetatileBehavior)
         && MetatileBehavior_IsDeepSand(eventObj->previousMetatileBehavior))
@@ -6125,7 +6123,7 @@ static void GetGroundEffectFlags_SandHeap(struct MapObject *eventObj, u32 *flags
     }
 }
 
-static void GetGroundEffectFlags_ShallowFlowingWater(struct MapObject *eventObj, u32 *flags)
+static void GetGroundEffectFlags_ShallowFlowingWater(struct EventObject *eventObj, u32 *flags)
 {
     if ((MetatileBehavior_IsShallowFlowingWater(eventObj->currentMetatileBehavior)
          && MetatileBehavior_IsShallowFlowingWater(eventObj->previousMetatileBehavior))
@@ -6145,7 +6143,7 @@ static void GetGroundEffectFlags_ShallowFlowingWater(struct MapObject *eventObj,
     }
 }
 
-static void GetGroundEffectFlags_Puddle(struct MapObject *eventObj, u32 *flags)
+static void GetGroundEffectFlags_Puddle(struct EventObject *eventObj, u32 *flags)
 {
     if (MetatileBehavior_IsPuddle(eventObj->currentMetatileBehavior)
         && MetatileBehavior_IsPuddle(eventObj->previousMetatileBehavior))
@@ -6154,13 +6152,13 @@ static void GetGroundEffectFlags_Puddle(struct MapObject *eventObj, u32 *flags)
     }
 }
 
-static void GetGroundEffectFlags_Ripple(struct MapObject *eventObj, u32 *flags)
+static void GetGroundEffectFlags_Ripple(struct EventObject *eventObj, u32 *flags)
 {
     if (MetatileBehavior_HasRipples(eventObj->currentMetatileBehavior))
         *flags |= GROUND_EFFECT_FLAG_RIPPLES;
 }
 
-static void GetGroundEffectFlags_ShortGrass(struct MapObject *eventObj, u32 *flags)
+static void GetGroundEffectFlags_ShortGrass(struct EventObject *eventObj, u32 *flags)
 {
     if (MetatileBehavior_IsShortGrass(eventObj->currentMetatileBehavior)
         && MetatileBehavior_IsShortGrass(eventObj->previousMetatileBehavior))
@@ -6178,7 +6176,7 @@ static void GetGroundEffectFlags_ShortGrass(struct MapObject *eventObj, u32 *fla
     }
 }
 
-static void GetGroundEffectFlags_HotSprings(struct MapObject *eventObj, u32 *flags)
+static void GetGroundEffectFlags_HotSprings(struct EventObject *eventObj, u32 *flags)
 {
     if (MetatileBehavior_IsHotSprings(eventObj->currentMetatileBehavior)
         && MetatileBehavior_IsHotSprings(eventObj->previousMetatileBehavior))
@@ -6196,13 +6194,13 @@ static void GetGroundEffectFlags_HotSprings(struct MapObject *eventObj, u32 *fla
     }
 }
 
-static void GetGroundEffectFlags_Seaweed(struct MapObject *eventObj, u32 *flags)
+static void GetGroundEffectFlags_Seaweed(struct EventObject *eventObj, u32 *flags)
 {
     if (MetatileBehavior_IsSeaweed(eventObj->currentMetatileBehavior))
         *flags |= GROUND_EFFECT_FLAG_SEAWEED;
 }
 
-static void GetGroundEffectFlags_JumpLanding(struct MapObject *eventObj, u32 *flags)
+static void GetGroundEffectFlags_JumpLanding(struct EventObject *eventObj, u32 *flags)
 {
     typedef bool8 (*MetatileFunc)(u8);
 
@@ -6239,9 +6237,9 @@ static void GetGroundEffectFlags_JumpLanding(struct MapObject *eventObj, u32 *fl
     }
 }
 
-static u8 FieldObjectCheckForReflectiveSurface(struct MapObject *eventObj)
+static u8 EventObjectCheckForReflectiveSurface(struct EventObject *eventObj)
 {
-    const struct MapObjectGraphicsInfo *info = GetFieldObjectGraphicsInfo(eventObj->graphicsId);
+    const struct EventObjectGraphicsInfo *info = GetEventObjectGraphicsInfo(eventObj->graphicsId);
 
     // ceil div by tile width?
     s16 width = (info->width + 8) >> 4;
@@ -6311,7 +6309,7 @@ u8 GetLedgeJumpDirection(s16 x, s16 y, u8 z)
     return 0;
 }
 
-void FieldObjectSetSpriteOamTableForLongGrass(struct MapObject *eventObj, struct Sprite *sprite)
+void EventObjectSetSpriteOamTableForLongGrass(struct EventObject *eventObj, struct Sprite *sprite)
 {
     if (eventObj->disableCoveringGroundEffects)
         return;
@@ -6364,12 +6362,12 @@ static const u8 sEventObjectPriorities_08376070[] = {
     1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 0, 0, 1,
 };
 
-void FieldObjectUpdateZCoordAndPriority(struct MapObject *eventObj, struct Sprite *sprite)
+void EventObjectUpdateZCoordAndPriority(struct EventObject *eventObj, struct Sprite *sprite)
 {
     if (eventObj->fixedPriority)
         return;
 
-    FieldObjectUpdateZCoord(eventObj);
+    EventObjectUpdateZCoord(eventObj);
 
     sprite->subspriteTableNum = sEventObjectPriorities_08376070[eventObj->previousElevation];
     sprite->oam.priority = sEventObjectPriorities_08376060[eventObj->previousElevation];
@@ -6386,7 +6384,7 @@ u8 ZCoordToPriority(u8 z)
     return sEventObjectPriorities_08376060[z];
 }
 
-void FieldObjectUpdateZCoord(struct MapObject *eventObj)
+void EventObjectUpdateZCoord(struct EventObject *eventObj)
 {
     u8 z = MapGridGetZCoordAt(eventObj->currentCoords.x, eventObj->currentCoords.y);
     u8 z2 = MapGridGetZCoordAt(eventObj->previousCoords.x, eventObj->previousCoords.y);
@@ -6410,7 +6408,7 @@ void SetObjectSubpriorityByZCoord(u8 a, struct Sprite *sprite, u8 b)
     sprite->subpriority = tmp3 + sUnknown_08376050[a] + b;
 }
 
-static void FieldObjectUpdateSubpriority(struct MapObject *eventObj, struct Sprite *sprite)
+static void EventObjectUpdateSubpriority(struct EventObject *eventObj, struct Sprite *sprite)
 {
     if (eventObj->fixedPriority)
         return;
@@ -6429,7 +6427,7 @@ bool8 AreZCoordsCompatible(u8 a, u8 b)
     return TRUE;
 }
 
-void GroundEffect_SpawnOnTallGrass(struct MapObject *eventObj, struct Sprite *sprite)
+void GroundEffect_SpawnOnTallGrass(struct EventObject *eventObj, struct Sprite *sprite)
 {
     gFieldEffectArguments[0] = eventObj->currentCoords.x;
     gFieldEffectArguments[1] = eventObj->currentCoords.y;
@@ -6442,7 +6440,7 @@ void GroundEffect_SpawnOnTallGrass(struct MapObject *eventObj, struct Sprite *sp
     FieldEffectStart(FLDEFF_TALL_GRASS);
 }
 
-void GroundEffect_StepOnTallGrass(struct MapObject *eventObj, struct Sprite *sprite)
+void GroundEffect_StepOnTallGrass(struct EventObject *eventObj, struct Sprite *sprite)
 {
     gFieldEffectArguments[0] = eventObj->currentCoords.x;
     gFieldEffectArguments[1] = eventObj->currentCoords.y;
@@ -6455,7 +6453,7 @@ void GroundEffect_StepOnTallGrass(struct MapObject *eventObj, struct Sprite *spr
     FieldEffectStart(FLDEFF_TALL_GRASS);
 }
 
-void GroundEffect_SpawnOnLongGrass(struct MapObject *eventObj, struct Sprite *sprite)
+void GroundEffect_SpawnOnLongGrass(struct EventObject *eventObj, struct Sprite *sprite)
 {
     gFieldEffectArguments[0] = eventObj->currentCoords.x;
     gFieldEffectArguments[1] = eventObj->currentCoords.y;
@@ -6468,7 +6466,7 @@ void GroundEffect_SpawnOnLongGrass(struct MapObject *eventObj, struct Sprite *sp
     FieldEffectStart(FLDEFF_LONG_GRASS);
 }
 
-void GroundEffect_StepOnLongGrass(struct MapObject *eventObj, struct Sprite *sprite)
+void GroundEffect_StepOnLongGrass(struct EventObject *eventObj, struct Sprite *sprite)
 {
     gFieldEffectArguments[0] = eventObj->currentCoords.x;
     gFieldEffectArguments[1] = eventObj->currentCoords.y;
@@ -6481,44 +6479,44 @@ void GroundEffect_StepOnLongGrass(struct MapObject *eventObj, struct Sprite *spr
     FieldEffectStart(FLDEFF_LONG_GRASS);
 }
 
-void GroundEffect_WaterReflection(struct MapObject *eventObj, struct Sprite *sprite)
+void GroundEffect_WaterReflection(struct EventObject *eventObj, struct Sprite *sprite)
 {
     SetUpReflection(eventObj, sprite, 0);
 }
 
-void GroundEffect_IceReflection(struct MapObject *eventObj, struct Sprite *sprite)
+void GroundEffect_IceReflection(struct EventObject *eventObj, struct Sprite *sprite)
 {
     SetUpReflection(eventObj, sprite, 1);
 }
 
-void GroundEffect_FlowingWater(struct MapObject *eventObj, struct Sprite *sprite)
+void GroundEffect_FlowingWater(struct EventObject *eventObj, struct Sprite *sprite)
 {
     StartFieldEffectForEventObject(FLDEFF_FEET_IN_FLOWING_WATER, eventObj);
 }
 
-static void (*const sGroundEffectTracksFuncs[])(struct MapObject *eventObj, struct Sprite *sprite, u8 a) = {
+static void (*const sGroundEffectTracksFuncs[])(struct EventObject *eventObj, struct Sprite *sprite, u8 a) = {
     DoTracksGroundEffect_None,
     DoTracksGroundEffect_Footprints,
     DoTracksGroundEffect_BikeTireTracks,
 };
 
-void GroundEffect_SandTracks(struct MapObject *eventObj, struct Sprite *sprite)
+void GroundEffect_SandTracks(struct EventObject *eventObj, struct Sprite *sprite)
 {
-    const struct MapObjectGraphicsInfo *info = GetFieldObjectGraphicsInfo(eventObj->graphicsId);
+    const struct EventObjectGraphicsInfo *info = GetEventObjectGraphicsInfo(eventObj->graphicsId);
     sGroundEffectTracksFuncs[info->tracks](eventObj, sprite, 0);
 }
 
-void GroundEffect_DeepSandTracks(struct MapObject *eventObj, struct Sprite *sprite)
+void GroundEffect_DeepSandTracks(struct EventObject *eventObj, struct Sprite *sprite)
 {
-    const struct MapObjectGraphicsInfo *info = GetFieldObjectGraphicsInfo(eventObj->graphicsId);
+    const struct EventObjectGraphicsInfo *info = GetEventObjectGraphicsInfo(eventObj->graphicsId);
     sGroundEffectTracksFuncs[info->tracks](eventObj, sprite, 1);
 }
 
-static void DoTracksGroundEffect_None(struct MapObject *eventObj, struct Sprite *sprite, u8 a)
+static void DoTracksGroundEffect_None(struct EventObject *eventObj, struct Sprite *sprite, u8 a)
 {
 }
 
-static void DoTracksGroundEffect_Footprints(struct MapObject *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] = {
@@ -6534,7 +6532,7 @@ static void DoTracksGroundEffect_Footprints(struct MapObject *eventObj, struct S
     FieldEffectStart(sandFootprints_FieldEffectData[a]);
 }
 
-static void DoTracksGroundEffect_BikeTireTracks(struct MapObject *eventObj, struct Sprite *sprite, u8 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
@@ -6561,22 +6559,22 @@ static void DoTracksGroundEffect_BikeTireTracks(struct MapObject *eventObj, stru
     }
 }
 
-void GroundEffect_Ripple(struct MapObject *eventObj, struct Sprite *sprite)
+void GroundEffect_Ripple(struct EventObject *eventObj, struct Sprite *sprite)
 {
     DoRippleFieldEffect(eventObj, sprite);
 }
 
-void GroundEffect_StepOnPuddle(struct MapObject *eventObj, struct Sprite *sprite)
+void GroundEffect_StepOnPuddle(struct EventObject *eventObj, struct Sprite *sprite)
 {
     StartFieldEffectForEventObject(FLDEFF_SPLASH, eventObj);
 }
 
-void GroundEffect_SandHeap(struct MapObject *eventObj, struct Sprite *sprite)
+void GroundEffect_SandHeap(struct EventObject *eventObj, struct Sprite *sprite)
 {
     StartFieldEffectForEventObject(FLDEFF_SAND_PILE, eventObj);
 }
 
-void GroundEffect_JumpOnTallGrass(struct MapObject *eventObj, struct Sprite *sprite)
+void GroundEffect_JumpOnTallGrass(struct EventObject *eventObj, struct Sprite *sprite)
 {
     u8 spriteId;
 
@@ -6593,7 +6591,7 @@ void GroundEffect_JumpOnTallGrass(struct MapObject *eventObj, struct Sprite *spr
         GroundEffect_SpawnOnTallGrass(eventObj, sprite);
 }
 
-void GroundEffect_JumpOnLongGrass(struct MapObject *eventObj, struct Sprite *sprite)
+void GroundEffect_JumpOnLongGrass(struct EventObject *eventObj, struct Sprite *sprite)
 {
     gFieldEffectArguments[0] = eventObj->currentCoords.x;
     gFieldEffectArguments[1] = eventObj->currentCoords.y;
@@ -6602,7 +6600,7 @@ void GroundEffect_JumpOnLongGrass(struct MapObject *eventObj, struct Sprite *spr
     FieldEffectStart(FLDEFF_JUMP_LONG_GRASS);
 }
 
-void GroundEffect_JumpOnShallowWater(struct MapObject *eventObj, struct Sprite *sprite)
+void GroundEffect_JumpOnShallowWater(struct EventObject *eventObj, struct Sprite *sprite)
 {
     gFieldEffectArguments[0] = eventObj->currentCoords.x;
     gFieldEffectArguments[1] = eventObj->currentCoords.y;
@@ -6611,7 +6609,7 @@ void GroundEffect_JumpOnShallowWater(struct MapObject *eventObj, struct Sprite *
     FieldEffectStart(FLDEFF_JUMP_SMALL_SPLASH);
 }
 
-void GroundEffect_JumpOnWater(struct MapObject *eventObj, struct Sprite *sprite)
+void GroundEffect_JumpOnWater(struct EventObject *eventObj, struct Sprite *sprite)
 {
     gFieldEffectArguments[0] = eventObj->currentCoords.x;
     gFieldEffectArguments[1] = eventObj->currentCoords.y;
@@ -6620,7 +6618,7 @@ void GroundEffect_JumpOnWater(struct MapObject *eventObj, struct Sprite *sprite)
     FieldEffectStart(FLDEFF_JUMP_BIG_SPLASH);
 }
 
-void GroundEffect_JumpLandingDust(struct MapObject *eventObj, struct Sprite *sprite)
+void GroundEffect_JumpLandingDust(struct EventObject *eventObj, struct Sprite *sprite)
 {
     gFieldEffectArguments[0] = eventObj->currentCoords.x;
     gFieldEffectArguments[1] = eventObj->currentCoords.y;
@@ -6629,24 +6627,24 @@ void GroundEffect_JumpLandingDust(struct MapObject *eventObj, struct Sprite *spr
     FieldEffectStart(FLDEFF_DUST);
 }
 
-void GroundEffect_ShortGrass(struct MapObject *eventObj, struct Sprite *sprite)
+void GroundEffect_ShortGrass(struct EventObject *eventObj, struct Sprite *sprite)
 {
     StartFieldEffectForEventObject(FLDEFF_SHORT_GRASS, eventObj);
 }
 
-void GroundEffect_HotSprings(struct MapObject *eventObj, struct Sprite *sprite)
+void GroundEffect_HotSprings(struct EventObject *eventObj, struct Sprite *sprite)
 {
     StartFieldEffectForEventObject(FLDEFF_HOT_SPRINGS_WATER, eventObj);
 }
 
-void GroundEffect_Seaweed(struct MapObject *eventObj, struct Sprite *sprite)
+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 MapObject *eventObj, struct Sprite *sprite) = {
+static void (*const sGroundEffectFuncs[])(struct EventObject *eventObj, struct Sprite *sprite) = {
     GroundEffect_SpawnOnTallGrass,
     GroundEffect_StepOnTallGrass,
     GroundEffect_SpawnOnLongGrass,
@@ -6669,11 +6667,11 @@ static void (*const sGroundEffectFuncs[])(struct MapObject *eventObj, struct Spr
     GroundEffect_Seaweed
 };
 
-/*static*/ void DoFlaggedGroundEffects(struct MapObject *eventObj, struct Sprite *sprite, u32 flags)
+/*static*/ void DoFlaggedGroundEffects(struct EventObject *eventObj, struct Sprite *sprite, u32 flags)
 {
     u8 i;
 
-    if (FieldObjectIsFarawayIslandMew(eventObj) == TRUE && !sub_81D4A58(eventObj))
+    if (EventObjectIsFarawayIslandMew(eventObj) == TRUE && !sub_81D4A58(eventObj))
         return;
 
     for (i = 0; i < ARRAY_COUNT(sGroundEffectFuncs); i++, flags >>= 1)
@@ -6681,7 +6679,7 @@ static void (*const sGroundEffectFuncs[])(struct MapObject *eventObj, struct Spr
             sGroundEffectFuncs[i](eventObj, sprite);
 }
 
-void filters_out_some_ground_effects(struct MapObject *eventObj, u32 *flags)
+void filters_out_some_ground_effects(struct EventObject *eventObj, u32 *flags)
 {
     if (eventObj->disableCoveringGroundEffects)
     {
@@ -6697,38 +6695,38 @@ void filters_out_some_ground_effects(struct MapObject *eventObj, u32 *flags)
     }
 }
 
-void FilterOutStepOnPuddleGroundEffectIfJumping(struct MapObject *eventObj, u32 *flags)
+void FilterOutStepOnPuddleGroundEffectIfJumping(struct EventObject *eventObj, u32 *flags)
 {
     if (eventObj->landingJump)
         *flags &= ~GROUND_EFFECT_FLAG_PUDDLE;
 }
 
-static void DoGroundEffects_OnSpawn(struct MapObject *eventObj, struct Sprite *sprite)
+static void DoGroundEffects_OnSpawn(struct EventObject *eventObj, struct Sprite *sprite)
 {
     u32 flags;
 
     if (eventObj->triggerGroundEffectsOnMove)
     {
         flags = 0;
-        FieldObjectUpdateZCoordAndPriority(eventObj, sprite);
+        EventObjectUpdateZCoordAndPriority(eventObj, sprite);
         GetAllGroundEffectFlags_OnSpawn(eventObj, &flags);
-        FieldObjectSetSpriteOamTableForLongGrass(eventObj, sprite);
+        EventObjectSetSpriteOamTableForLongGrass(eventObj, sprite);
         DoFlaggedGroundEffects(eventObj, sprite, flags);
         eventObj->triggerGroundEffectsOnMove = 0;
         eventObj->disableCoveringGroundEffects = 0;
     }
 }
 
-static void DoGroundEffects_OnBeginStep(struct MapObject *eventObj, struct Sprite *sprite)
+static void DoGroundEffects_OnBeginStep(struct EventObject *eventObj, struct Sprite *sprite)
 {
     u32 flags;
 
     if (eventObj->triggerGroundEffectsOnMove)
     {
         flags = 0;
-        FieldObjectUpdateZCoordAndPriority(eventObj, sprite);
+        EventObjectUpdateZCoordAndPriority(eventObj, sprite);
         GetAllGroundEffectFlags_OnBeginStep(eventObj, &flags);
-        FieldObjectSetSpriteOamTableForLongGrass(eventObj, sprite);
+        EventObjectSetSpriteOamTableForLongGrass(eventObj, sprite);
         filters_out_some_ground_effects(eventObj, &flags);
         DoFlaggedGroundEffects(eventObj, sprite, flags);
         eventObj->triggerGroundEffectsOnMove = 0;
@@ -6736,16 +6734,16 @@ static void DoGroundEffects_OnBeginStep(struct MapObject *eventObj, struct Sprit
     }
 }
 
-static void DoGroundEffects_OnFinishStep(struct MapObject *eventObj, struct Sprite *sprite)
+static void DoGroundEffects_OnFinishStep(struct EventObject *eventObj, struct Sprite *sprite)
 {
     u32 flags;
 
     if (eventObj->triggerGroundEffectsOnStop)
     {
         flags = 0;
-        FieldObjectUpdateZCoordAndPriority(eventObj, sprite);
+        EventObjectUpdateZCoordAndPriority(eventObj, sprite);
         GetAllGroundEffectFlags_OnFinishStep(eventObj, &flags);
-        FieldObjectSetSpriteOamTableForLongGrass(eventObj, sprite);
+        EventObjectSetSpriteOamTableForLongGrass(eventObj, sprite);
         FilterOutStepOnPuddleGroundEffectIfJumping(eventObj, &flags);
         DoFlaggedGroundEffects(eventObj, sprite, flags);
         eventObj->triggerGroundEffectsOnStop = 0;
@@ -6753,55 +6751,55 @@ static void DoGroundEffects_OnFinishStep(struct MapObject *eventObj, struct Spri
     }
 }
 
-bool8 FreezeMapObject(struct MapObject *mapObject)
+bool8 FreezeEventObject(struct EventObject *eventObject)
 {
-    if (mapObject->heldMovementActive || mapObject->frozen)
+    if (eventObject->heldMovementActive || eventObject->frozen)
     {
         return TRUE;
     }
     else
     {
-        mapObject->frozen = 1;
-        mapObject->spriteAnimPausedBackup = gSprites[mapObject->spriteId].animPaused;
-        mapObject->spriteAffineAnimPausedBackup = gSprites[mapObject->spriteId].affineAnimPaused;
-        gSprites[mapObject->spriteId].animPaused = 1;
-        gSprites[mapObject->spriteId].affineAnimPaused = 1;
+        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 FreezeMapObjects(void)
+void FreezeEventObjects(void)
 {
     u8 i;
-    for (i = 0; i < MAP_OBJECTS_COUNT; i++)
-        if (gMapObjects[i].active && i != gPlayerAvatar.mapObjectId)
-            FreezeMapObject(&gMapObjects[i]);
+    for (i = 0; i < EVENT_OBJECTS_COUNT; i++)
+        if (gEventObjects[i].active && i != gPlayerAvatar.eventObjectId)
+            FreezeEventObject(&gEventObjects[i]);
 }
 
-void FreezeMapObjectsExceptOne(u8 a1)
+void FreezeEventObjectsExceptOne(u8 a1)
 {
     u8 i;
-    for (i = 0; i < MAP_OBJECTS_COUNT; i++)
-        if (i != a1 && gMapObjects[i].active && i != gPlayerAvatar.mapObjectId)
-            FreezeMapObject(&gMapObjects[i]);
+    for (i = 0; i < EVENT_OBJECTS_COUNT; i++)
+        if (i != a1 && gEventObjects[i].active && i != gPlayerAvatar.eventObjectId)
+            FreezeEventObject(&gEventObjects[i]);
 }
 
-void npc_sync_anim_pause_bits(struct MapObject *mapObject)
+void npc_sync_anim_pause_bits(struct EventObject *eventObject)
 {
-    if (mapObject->active && mapObject->frozen)
+    if (eventObject->active && eventObject->frozen)
     {
-        mapObject->frozen = 0;
-        gSprites[mapObject->spriteId].animPaused = mapObject->spriteAnimPausedBackup;
-        gSprites[mapObject->spriteId].affineAnimPaused = mapObject->spriteAffineAnimPausedBackup;
+        eventObject->frozen = 0;
+        gSprites[eventObject->spriteId].animPaused = eventObject->spriteAnimPausedBackup;
+        gSprites[eventObject->spriteId].affineAnimPaused = eventObject->spriteAffineAnimPausedBackup;
     }
 }
 
-void UnfreezeMapObjects(void)
+void UnfreezeEventObjects(void)
 {
     u8 i;
-    for (i = 0; i < MAP_OBJECTS_COUNT; i++)
-        if (gMapObjects[i].active)
-            npc_sync_anim_pause_bits(&gMapObjects[i]);
+    for (i = 0; i < EVENT_OBJECTS_COUNT; i++)
+        if (gEventObjects[i].active)
+            npc_sync_anim_pause_bits(&gEventObjects[i]);
 }
 
 void little_step(struct Sprite *sprite, u8 dir)
@@ -7126,12 +7124,12 @@ u8 sub_80978E4(struct Sprite *sprite)
     return v2;
 }
 
-void SetFieldObjectStepTimer(struct Sprite *sprite, s16 timer)
+void SetEventObjectStepTimer(struct Sprite *sprite, s16 timer)
 {
     sprite->data[3] = timer;
 }
 
-bool8 RunFieldObjectStepTimer(struct Sprite *sprite)
+bool8 RunEventObjectStepTimer(struct Sprite *sprite)
 {
     sprite->data[3]--;
 
@@ -7220,7 +7218,7 @@ void sub_8097B78(u8 var1, u8 var2)
     u8 spriteId = sub_8097B2C(var1);
 
     if(spriteId != MAX_SPRITES)
-        StartSpriteAnim(&gSprites[spriteId], FieldObjectDirectionToImageAnimId(var2));
+        StartSpriteAnim(&gSprites[spriteId], EventObjectDirectionToImageAnimId(var2));
 }
 
 void sub_8097BB4(u8 var1, u8 var2)
@@ -7230,7 +7228,7 @@ void sub_8097BB4(u8 var1, u8 var2)
     if(spriteId != MAX_SPRITES)
     {
         struct Sprite *sprite = &gSprites[spriteId];
-        const struct MapObjectGraphicsInfo *gfxInfo = GetFieldObjectGraphicsInfo(var2);
+        const struct EventObjectGraphicsInfo *gfxInfo = GetEventObjectGraphicsInfo(var2);
         u16 tileNum = sprite->oam.tileNum;
 
         sprite->oam = *gfxInfo->oam;
@@ -7354,24 +7352,24 @@ bool32 sub_8097D9C(u8 var)
     return FALSE;
 }
 
-u32 StartFieldEffectForEventObject(u8 fieldEffectId, struct MapObject *mapObject)
+u32 StartFieldEffectForEventObject(u8 fieldEffectId, struct EventObject *eventObject)
 {
-    FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
+    EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
     return FieldEffectStart(fieldEffectId);
 }
 
-void DoShadowFieldEffect(struct MapObject *mapObject)
+void DoShadowFieldEffect(struct EventObject *eventObject)
 {
-    if (!mapObject->hasShadow)
+    if (!eventObject->hasShadow)
     {
-        mapObject->hasShadow = 1;
-        StartFieldEffectForEventObject(FLDEFF_SHADOW, mapObject);
+        eventObject->hasShadow = 1;
+        StartFieldEffectForEventObject(FLDEFF_SHADOW, eventObject);
     }
 }
 
-static void DoRippleFieldEffect(struct MapObject *mapObject, struct Sprite *sprite)
+static void DoRippleFieldEffect(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    const struct MapObjectGraphicsInfo *gfxInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId);
+    const struct EventObjectGraphicsInfo *gfxInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId);
     gFieldEffectArguments[0] = sprite->pos1.x;
     gFieldEffectArguments[1] = sprite->pos1.y + (gfxInfo->height >> 1) - 2;
     gFieldEffectArguments[2] = 151;
@@ -7379,36 +7377,36 @@ static void DoRippleFieldEffect(struct MapObject *mapObject, struct Sprite *spri
     FieldEffectStart(FLDEFF_RIPPLE);
 }
 
-u8 (*const gUnknown_0850E854[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E854[])(struct EventObject *, struct Sprite *) = {
     sub_8097E50,
     sub_80964B8,
 };
 
-u8 (*const gUnknown_0850E85C[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E85C[])(struct EventObject *, struct Sprite *) = {
     sub_8097EF0,
     sub_80964B8,
 };
 
-u8 (*const gUnknown_0850E864[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E864[])(struct EventObject *, struct Sprite *) = {
     sub_80980C0,
     sub_80980D0,
     sub_8098124,
 };
 
-u8 (*const gUnknown_0850E870[])(struct MapObject *, struct Sprite *) = {
+u8 (*const gUnknown_0850E870[])(struct EventObject *, struct Sprite *) = {
     sub_80980F4,
     sub_8098108,
     sub_8098124,
 };
 
-u8 sub_8097E50(struct MapObject *mapObject, struct Sprite *sprite)
+u8 sub_8097E50(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u32 one;
     bool32 ableToStore = FALSE;
     if (gUnknown_020375B8 == NULL)
     {
         gUnknown_020375B8 = AllocZeroed(0x14);
-        gUnknown_020375B8[0] = mapObject->localId;
+        gUnknown_020375B8[0] = eventObject->localId;
         // needed to match
         gUnknown_020375B8[16] = (one = 1);
         ableToStore = one;
@@ -7423,7 +7421,7 @@ u8 sub_8097E50(struct MapObject *mapObject, struct Sprite *sprite)
             if (firstFreeSlot == 16 && gUnknown_020375B8[i] == 0)
                 firstFreeSlot = i;
 
-            if (gUnknown_020375B8[i] == mapObject->localId)
+            if (gUnknown_020375B8[i] == eventObject->localId)
             {
                 found = TRUE;
                 break;
@@ -7432,7 +7430,7 @@ u8 sub_8097E50(struct MapObject *mapObject, struct Sprite *sprite)
 
         if (!found && firstFreeSlot != 16)
         {
-            gUnknown_020375B8[firstFreeSlot] = mapObject->localId;
+            gUnknown_020375B8[firstFreeSlot] = eventObject->localId;
             gUnknown_020375B8[16]++;
             ableToStore = TRUE;
         }
@@ -7440,15 +7438,15 @@ u8 sub_8097E50(struct MapObject *mapObject, struct Sprite *sprite)
 
     if (ableToStore == TRUE)
     {
-        mapObject->inanimate = TRUE;
-        mapObject->facingDirectionLocked = TRUE;
+        eventObject->inanimate = TRUE;
+        eventObject->facingDirectionLocked = TRUE;
     }
 
     sprite->data[2] = 1;
     return TRUE;
 }
 
-u8 sub_8097EF0(struct MapObject *mapObject, struct Sprite *sprite)
+u8 sub_8097EF0(struct EventObject *eventObject, struct Sprite *sprite)
 {
     bool32 ableToStore;
     u8 id;
@@ -7457,7 +7455,7 @@ u8 sub_8097EF0(struct MapObject *mapObject, struct Sprite *sprite)
     if (gUnknown_020375B8 != NULL)
     {
         ableToStore = FALSE;
-        id = sub_8097F78(mapObject);
+        id = sub_8097F78(eventObject);
         if (id != 16)
         {
             gUnknown_020375B8[id] = 0;
@@ -7468,8 +7466,8 @@ u8 sub_8097EF0(struct MapObject *mapObject, struct Sprite *sprite)
             FREE_AND_SET_NULL(gUnknown_020375B8);
         if (ableToStore == TRUE)
         {
-            mapObject->inanimate = GetFieldObjectGraphicsInfo(mapObject->graphicsId)->inanimate;
-            mapObject->facingDirectionLocked = 0;
+            eventObject->inanimate = GetEventObjectGraphicsInfo(eventObject->graphicsId)->inanimate;
+            eventObject->facingDirectionLocked = 0;
             sprite->animPaused = 0;
         }
     }
@@ -7477,36 +7475,36 @@ u8 sub_8097EF0(struct MapObject *mapObject, struct Sprite *sprite)
     return TRUE;
 }
 
-u8 sub_8097F78(struct MapObject *mapObject)
+u8 sub_8097F78(struct EventObject *eventObject)
 {
     u8 i;
 
-    for(i = 0; i < MAP_OBJECTS_COUNT; i++)
+    for(i = 0; i < EVENT_OBJECTS_COUNT; i++)
     {
-        if(gUnknown_020375B8[i] == mapObject->localId)
+        if(gUnknown_020375B8[i] == eventObject->localId)
             return i;
     }
-    return MAP_OBJECTS_COUNT;
+    return EVENT_OBJECTS_COUNT;
 }
 
-void sub_8097FA4(struct MapObject *mapObject)
+void sub_8097FA4(struct EventObject *eventObject)
 {
     u8 taskId = CreateTask(sub_8097FE4, 0xFF);
     struct Task *task = &gTasks[taskId];
 
-    StoreWordInTwoHalfwords(&task->data[0], (u32)mapObject);
-    mapObject->warpArrowSpriteId = taskId;
+    StoreWordInTwoHalfwords(&task->data[0], (u32)eventObject);
+    eventObject->warpArrowSpriteId = taskId;
     task->data[3] = 0xFFFF;
 }
 
 static void sub_8097FE4(u8 taskId)
 {
-    struct MapObject *mapObject;
+    struct EventObject *eventObject;
     struct Sprite *sprite;
     struct Task *task = &gTasks[taskId];
 
-    LoadWordFromTwoHalfwords(&task->data[0], (u32 *)&mapObject); // load the map object pointer.
-    sprite = &gSprites[mapObject->spriteId];
+    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];
@@ -7530,22 +7528,22 @@ void sub_8098074(u8 var1, u8 var2)
 {
     u8 i;
 
-    for(i = 0; i < MAP_OBJECTS_COUNT; i++)
+    for(i = 0; i < EVENT_OBJECTS_COUNT; i++)
     {
         if(i != var1 && i != var2 &&
-            gMapObjects[i].active && i != gPlayerAvatar.mapObjectId)
-                FreezeMapObject(&gMapObjects[i]);
+            gEventObjects[i].active && i != gPlayerAvatar.eventObjectId)
+                FreezeEventObject(&gEventObjects[i]);
     }
 }
 
-u8 sub_80980C0(struct MapObject *mapObject, struct Sprite *sprite)
+u8 sub_80980C0(struct EventObject *eventObject, struct Sprite *sprite)
 {
     sprite->pos2.y = 0;
     sprite->data[2]++;
     return FALSE;
 }
 
-u8 sub_80980D0(struct MapObject *mapObject, struct Sprite *sprite)
+u8 sub_80980D0(struct EventObject *eventObject, struct Sprite *sprite)
 {
     sprite->pos2.y -= 8;
 
@@ -7554,14 +7552,14 @@ u8 sub_80980D0(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-u8 sub_80980F4(struct MapObject *mapObject, struct Sprite *sprite)
+u8 sub_80980F4(struct EventObject *eventObject, struct Sprite *sprite)
 {
     sprite->pos2.y = -160;
     sprite->data[2]++;
     return FALSE;
 }
 
-u8 sub_8098108(struct MapObject *mapObject, struct Sprite *sprite)
+u8 sub_8098108(struct EventObject *eventObject, struct Sprite *sprite)
 {
     sprite->pos2.y += 8;
 
@@ -7571,7 +7569,7 @@ u8 sub_8098108(struct MapObject *mapObject, struct Sprite *sprite)
 }
 
 // though this function returns TRUE without doing anything, this header is required due to being in an array of functions which needs it.
-u8 sub_8098124(struct MapObject *mapObject, struct Sprite *sprite)
+u8 sub_8098124(struct EventObject *eventObject, struct Sprite *sprite)
 {
     return TRUE;
 }
diff --git a/src/field_camera.c b/src/field_camera.c
index b937f704b..f4d9550a3 100644
--- a/src/field_camera.c
+++ b/src/field_camera.c
@@ -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;
diff --git a/src/field_effect.c b/src/field_effect.c
index 71bce8f41..4ad3bd916 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -48,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");
@@ -286,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,
@@ -300,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,
@@ -309,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,
@@ -1147,7 +1147,7 @@ void mapldr_080842E8(void)
     pal_fill_black();
     CreateTask(task00_8084310, 0);
     ScriptContext2_Enable();
-    FreezeMapObjects();
+    FreezeEventObjects();
     gFieldCallback = NULL;
 }
 
@@ -1184,13 +1184,13 @@ void mapldr_08084390(void)
     Overworld_PlaySpecialMapMusic();
     pal_fill_black();
     CreateTask(c3_080843F8, 0);
-    gMapObjects[gPlayerAvatar.mapObjectId].invisible = 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;
 }
 
@@ -1210,7 +1210,7 @@ void c3_080843F8(u8 taskId)
     if (!FieldEffectActiveListContains(FLDEFF_FLY_IN))
     {
         ScriptContext2_Disable();
-        UnfreezeMapObjects();
+        UnfreezeEventObjects();
         DestroyTask(taskId);
     }
 }
@@ -1225,7 +1225,7 @@ void sub_80B6B68(void)
     Overworld_PlaySpecialMapMusic();
     pal_fill_for_maplights();
     ScriptContext2_Enable();
-    FreezeMapObjects();
+    FreezeEventObjects();
     CreateTask(sub_80B6B94, 0);
     gFieldCallback = NULL;
 }
@@ -1239,14 +1239,14 @@ 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].invisible = 1;
+    gEventObjects[gPlayerAvatar.eventObjectId].invisible = 1;
     gPlayerAvatar.preventStep = TRUE;
-    FieldObjectSetSpecialAnim(playerObject, GetFaceDirectionAnimId(player_get_direction_lower_nybble()));
+    EventObjectSetSpecialAnim(playerObject, GetFaceDirectionAnimId(player_get_direction_lower_nybble()));
     task->data[4] = playerSprite->subspriteMode;
     playerObject->fixedPriority = 1;
     playerSprite->oam.priority = 1;
@@ -1273,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].invisible = 0;
+    gEventObjects[gPlayerAvatar.eventObjectId].invisible = 0;
     PlaySE(SE_RU_HYUU);
     task->data[0]++;
     return FALSE;
@@ -1281,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)
@@ -1298,15 +1298,15 @@ bool8 sub_80B6D04(struct Task *task)
     if (task->data[3] == 0 && sprite->pos2.y >= -16)
     {
         task->data[3]++;
-        mapObject->fixedPriority = 0;
+        eventObject->fixedPriority = 0;
         sprite->subspriteMode = task->data[4];
-        mapObject->triggerGroundEffectsOnMove = 1;
+        eventObject->triggerGroundEffectsOnMove = 1;
     }
     if (sprite->pos2.y >= 0)
     {
         PlaySE(SE_W070);
-        mapObject->triggerGroundEffectsOnStop = 1;
-        mapObject->landingJump = 1;
+        eventObject->triggerGroundEffectsOnStop = 1;
+        eventObject->landingJump = 1;
         sprite->pos2.y = 0;
         task->data[0]++;
     }
@@ -1343,7 +1343,7 @@ bool8 sub_80B6E18(struct Task *task)
     gPlayerAvatar.preventStep = FALSE;
     ScriptContext2_Disable();
     CameraObjectReset1();
-    UnfreezeMapObjects();
+    UnfreezeEventObjects();
     InstallCameraPanAheadCallback();
     DestroyTask(FindTaskIdByFunc(sub_80B6B94));
     return FALSE;
@@ -1382,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]++;
@@ -1391,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 (!EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(eventObject) || EventObjectClearAnimIfSpecialAnimFinished(eventObject))
     {
-        FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(player_get_direction_lower_nybble()));
+        EventObjectSetSpecialAnim(eventObject, GetFaceDirectionAnimId(player_get_direction_lower_nybble()));
         task->data[0]++;
         task->data[2] = 0;
         task->data[3] = 0;
@@ -1506,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];
+    EventObjectSetSpecialAnim(eventObject, GetFaceDirectionAnimId(DIR_EAST));
     PlayerGetDestCoords(&x, &y);
     behavior = MapGridGetMetatileBehaviorAt(x, y);
     task->data[0]++;
@@ -1604,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 (EventObjectClearAnimIfSpecialAnimFinished(eventObject))
     {
         CameraObjectReset1();
         ScriptContext2_Disable();
-        FieldObjectSetSpecialAnim(mapObject, GetGoSpeed0AnimId(DIR_EAST));
+        EventObjectSetSpecialAnim(eventObject, GetGoSpeed0AnimId(DIR_EAST));
         DestroyTask(FindTaskIdByFunc(sub_80B70DC));
     }
     return FALSE;
@@ -1629,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;
@@ -1640,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 (!EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(eventObject))
     {
-        FieldObjectClearAnimIfSpecialAnimFinished(mapObject);
+        EventObjectClearAnimIfSpecialAnimFinished(eventObject);
         gFieldEffectArguments[0] = task->data[1];
         FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
         task->data[0]++;
@@ -1653,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))
     {
@@ -1663,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));
+    EventObjectSetSpecialAnim(eventObject, GetSimpleGoAnimId(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 (!EventObjectClearAnimIfSpecialAnimFinished(eventObject))
     {
         return FALSE;
     }
-    if (MetatileBehavior_IsWaterfall(mapObject->currentMetatileBehavior))
+    if (MetatileBehavior_IsWaterfall(eventObject->currentMetatileBehavior))
     {
         task->data[0] = 3;
         return TRUE;
@@ -1728,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].currentMetatileBehavior);
+        dive_warp(&mapPosition, gEventObjects[gPlayerAvatar.eventObjectId].currentMetatileBehavior);
         DestroyTask(FindTaskIdByFunc(Task_Dive));
         FieldEffectActiveListRemove(FLDEFF_USE_DIVE);
     }
@@ -1745,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->fixedPriority = 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];
@@ -1773,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->currentCoords.x;
-    gFieldEffectArguments[1] = mapObject->currentCoords.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);
@@ -1787,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]);
@@ -1819,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->fixedPriority = 1;
+        eventObject->fixedPriority = 1;
         sprite->oam.priority = 1;
         sprite->subspriteMode = 2;
     }
@@ -1830,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();
@@ -1838,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)
     {
@@ -1863,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->invisible = 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->currentCoords.x;
-        gFieldEffectArguments[1] = mapObject->currentCoords.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);
@@ -1890,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->invisible = 0;
+        eventObject->invisible = 0;
         CameraObjectReset1();
         PlaySE(SE_W091);
-        FieldObjectSetSpecialAnim(mapObject, sub_8093514(DIR_EAST));
+        EventObjectSetSpecialAnim(eventObject, sub_8093514(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 (EventObjectClearAnimIfSpecialAnimFinished(eventObject))
     {
         gPlayerAvatar.preventStep = FALSE;
         ScriptContext2_Disable();
-        UnfreezeMapObjects();
+        UnfreezeEventObjects();
         DestroyTask(FindTaskIdByFunc(sub_80B7890));
     }
     return FALSE;
@@ -1945,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->fixedPriority = 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 (EventObjectClearAnimIfSpecialAnimFinished(eventObject))
     {
         if (task->data[1] > 3)
         {
-            gFieldEffectArguments[0] = mapObject->currentCoords.x;
-            gFieldEffectArguments[1] = mapObject->currentCoords.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);
@@ -1973,24 +1973,24 @@ bool8 sub_80B7B18(struct Task *task, struct MapObject *mapObject, struct Sprite
         } else
         {
             task->data[1]++;
-            FieldObjectSetSpecialAnim(mapObject, GetStepInPlaceDelay4AnimId(mapObject->facingDirection));
+            EventObjectSetSpecialAnim(eventObject, GetStepInPlaceDelay4AnimId(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->invisible = 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))
     {
@@ -2004,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)
     {
@@ -2037,7 +2037,7 @@ void sub_80B7CAC(struct Sprite *sprite)
 void sub_80B7CC8(void)
 {
     ScriptContext2_Enable();
-    FreezeMapObjects();
+    FreezeEventObjects();
     CreateTask(sub_80B7CE4, 0x50);
 }
 
@@ -2055,19 +2055,19 @@ void sub_80B7D14(struct Task *task)
 
 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 (!EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(eventObject) || EventObjectClearAnimIfSpecialAnimFinished(eventObject))
     {
         if (task->data[14] == 0 && !gPaletteFade.active && sub_80859A0() == TRUE)
         {
-            FieldObjectSetDirection(mapObject, task->data[15]);
+            EventObjectSetDirection(eventObject, task->data[15]);
             sub_8084E14();
             warp_in();
             gFieldCallback = mapldr_080859D4;
@@ -2075,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->facingDirection]));
+            EventObjectSetSpecialAnim(eventObject, GetFaceDirectionAnimId(spinDirections[eventObject->facingDirection]));
             if (task->data[2] < 12)
             {
                 task->data[2]++;
@@ -2097,9 +2097,9 @@ void mapldr_080859D4(void)
     Overworld_PlaySpecialMapMusic();
     pal_fill_for_maplights();
     ScriptContext2_Enable();
-    FreezeMapObjects();
+    FreezeEventObjects();
     gFieldCallback = NULL;
-    gMapObjects[gPlayerAvatar.mapObjectId].invisible = 1;
+    gEventObjects[gPlayerAvatar.eventObjectId].invisible = 1;
     CreateTask(sub_80B7E94, 0);
 }
 
@@ -2120,29 +2120,29 @@ void sub_80B7EC4(struct Task *task)
 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 (EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(eventObject) && !EventObjectClearAnimIfSpecialAnimFinished(eventObject))
         {
             return;
         }
         if (task->data[2] >= 32 && task->data[15] == player_get_direction_lower_nybble())
         {
-            mapObject->invisible = 0;
+            eventObject->invisible = 0;
             ScriptContext2_Disable();
-            UnfreezeMapObjects();
+            UnfreezeEventObjects();
             DestroyTask(FindTaskIdByFunc(sub_80B7E94));
             return;
         }
-        FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(spinDirections[mapObject->facingDirection]));
+        EventObjectSetSpecialAnim(eventObject, GetFaceDirectionAnimId(spinDirections[eventObject->facingDirection]));
         if (task->data[2] < 32)
         {
             task->data[2]++;
         }
         task->data[1] = task->data[2] >> 2;
     }
-    mapObject->invisible ^= 1;
+    eventObject->invisible ^= 1;
 }
 
 static void ExecuteTeleportFieldEffectTask(u8);
@@ -2172,7 +2172,7 @@ 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[0]++;
@@ -2181,14 +2181,14 @@ static void TeleportFieldEffectTask1(struct Task *task)
 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->facingDirection]);
+        EventObjectTurn(eventObject, spinDirections[eventObject->facingDirection]);
         task->data[1] = 8;
         task->data[2]++;
     }
-    if (task->data[2] > 7 && task->data[15] == mapObject->facingDirection)
+    if (task->data[2] > 7 && task->data[15] == eventObject->facingDirection)
     {
         task->data[0]++;
         task->data[1] = 4;
@@ -2201,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->facingDirection]);
+        EventObjectTurn(eventObject, spinDirections[eventObject->facingDirection]);
     }
     sprite->pos1.y -= task->data[3];
     task->data[4] += task->data[3];
@@ -2254,9 +2254,9 @@ static void mapldr_08085D88(void)
     Overworld_PlaySpecialMapMusic();
     pal_fill_for_maplights();
     ScriptContext2_Enable();
-    FreezeMapObjects();
+    FreezeEventObjects();
     gFieldCallback = NULL;
-    gMapObjects[gPlayerAvatar.mapObjectId].invisible = 1;
+    gEventObjects[gPlayerAvatar.eventObjectId].invisible = 1;
     CameraObjectReset2();
     CreateTask(sub_80B8250, 0);
 }
@@ -2281,7 +2281,7 @@ 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].invisible = 0;
+        gEventObjects[gPlayerAvatar.eventObjectId].invisible = 0;
         task->data[0]++;
         task->data[1] = 8;
         task->data[2] = 1;
@@ -2294,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->triggerGroundEffectsOnMove = 1;
+            eventObject->triggerGroundEffectsOnMove = 1;
             sprite->subspriteMode = task->data[14];
         }
     } else
@@ -2319,7 +2319,7 @@ void sub_80B830C(struct Task *task)
     if ((--task->data[2]) == 0)
     {
         task->data[2] = 4;
-        FieldObjectTurn(mapObject, spinDirections[mapObject->facingDirection]);
+        EventObjectTurn(eventObject, spinDirections[eventObject->facingDirection]);
     }
     if (sprite->pos2.y >= 0)
     {
@@ -2333,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->facingDirection]);
+        EventObjectTurn(eventObject, spinDirections[eventObject->facingDirection]);
         task->data[1] = 8;
-        if ((++task->data[2]) > 4 && task->data[14] == mapObject->facingDirection)
+        if ((++task->data[2]) > 4 && task->data[14] == eventObject->facingDirection)
         {
             ScriptContext2_Disable();
             CameraObjectReset1();
-            UnfreezeMapObjects();
+            UnfreezeEventObjects();
             DestroyTask(FindTaskIdByFunc(sub_80B8250));
         }
     }
@@ -2892,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].movementDirection, &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 (!EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(eventObject) || EventObjectClearAnimIfSpecialAnimFinished(eventObject))
     {
         sub_808C114();
-        FieldObjectSetSpecialAnim(mapObject, 0x39);
+        EventObjectSetSpecialAnim(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 (EventObjectCheckIfSpecialAnimFinishedOrInactive(eventObject))
     {
         gFieldEffectArguments[0] = task->data[15] | 0x80000000;
         FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
@@ -2926,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->movementDirection));
+        eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
+        EventObjectSetGraphicsId(eventObject, GetPlayerAvatarGraphicsIdByStateId(3));
+        EventObjectClearAnimIfSpecialAnimFinished(eventObject);
+        EventObjectSetSpecialAnim(eventObject, sub_8093540(eventObject->movementDirection));
         gFieldEffectArguments[0] = task->data[1];
         gFieldEffectArguments[1] = task->data[2];
-        gFieldEffectArguments[2] = gPlayerAvatar.mapObjectId;
-        mapObject->fieldEffectSpriteId = 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 (EventObjectClearAnimIfSpecialAnimFinished(eventObject))
     {
         gPlayerAvatar.preventStep = FALSE;
         gPlayerAvatar.flags &= 0xdf;
-        FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(mapObject->movementDirection));
-        sub_81555AC(mapObject->fieldEffectSpriteId, 1);
-        UnfreezeMapObjects();
+        EventObjectSetSpecialAnim(eventObject, GetFaceDirectionAnimId(eventObject->movementDirection));
+        sub_81555AC(eventObject->fieldEffectSpriteId, 1);
+        UnfreezeEventObjects();
         ScriptContext2_Disable();
         FieldEffectActiveListRemove(FLDEFF_USE_SURF);
         DestroyTask(FindTaskIdByFunc(sub_80B8D84));
@@ -3204,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 (!EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(eventObject) || EventObjectClearAnimIfSpecialAnimFinished(eventObject))
     {
         task->data[15] = gPlayerAvatar.flags;
         gPlayerAvatar.preventStep = TRUE;
         SetPlayerAvatarStateMask(1);
         sub_808C114();
-        FieldObjectSetSpecialAnim(mapObject, 0x39);
+        EventObjectSetSpecialAnim(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 (EventObjectClearAnimIfSpecialAnimFinished(eventObject))
     {
         task->data[0]++;
         gFieldEffectArguments[0] = task->data[1];
@@ -3231,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->fieldEffectSpriteId, 2);
-            sub_81555D8(mapObject->fieldEffectSpriteId, 0);
+            sub_81555AC(eventObject->fieldEffectSpriteId, 2);
+            sub_81555D8(eventObject->fieldEffectSpriteId, 0);
         }
         task->data[1] = sub_80B94C4();
         task->data[0]++;
@@ -3252,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);
+        EventObjectSetSpecialAnim(&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) && EventObjectClearAnimIfSpecialAnimFinished(eventObject))
     {
         task->data[0]++;
         PlaySE(SE_W019);
@@ -3270,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->inanimate = 1;
-        FieldObjectSetSpecialAnim(mapObject, 0x48);
+        eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
+        EventObjectSetGraphicsId(eventObject, GetPlayerAvatarGraphicsIdByStateId(0x03));
+        StartSpriteAnim(&gSprites[eventObject->spriteId], 0x16);
+        eventObject->inanimate = 1;
+        EventObjectSetSpecialAnim(eventObject, 0x48);
         if (task->data[15] & 0x08)
         {
-            DestroySprite(&gSprites[mapObject->fieldEffectSpriteId]);
+            DestroySprite(&gSprites[eventObject->fieldEffectSpriteId]);
         }
         task->data[0]++;
         task->data[2] = 0;
@@ -3289,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->inanimate = 0;
-        mapObject->hasShadow = 0;
-        sub_80B9560(task->data[1], mapObject->spriteId);
+        eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
+        EventObjectClearAnimIfSpecialAnimActive(eventObject);
+        eventObject->inanimate = 0;
+        eventObject->hasShadow = 0;
+        sub_80B9560(task->data[1], eventObject->spriteId);
         CameraObjectReset2();
         task->data[0]++;
     }
@@ -3501,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 (!EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(eventObject) || EventObjectClearAnimIfSpecialAnimFinished(eventObject))
     {
         task->data[0]++;
         task->data[2] = 17;
@@ -3512,27 +3512,27 @@ void sub_80B9804(struct Task *task)
         SetPlayerAvatarStateMask(0x01);
         if (task->data[15] & 0x08)
         {
-            sub_81555AC(mapObject->fieldEffectSpriteId, 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->invisible = 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;
@@ -3575,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->inanimate = 0;
-        sub_808EB08(mapObject, mapObject->currentCoords.x, mapObject->currentCoords.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);
+        EventObjectSetSpecialAnim(eventObject, 0x39);
         task->data[0]++;
     }
 }
 
 void sub_80B99F0(struct Task *task)
 {
-    if (FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[gPlayerAvatar.mapObjectId]))
+    if (EventObjectClearAnimIfSpecialAnimFinished(&gEventObjects[gPlayerAvatar.eventObjectId]))
     {
         task->data[0]++;
         sub_80B9794(task->data[1]);
@@ -3614,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->fieldEffectSpriteId, 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);
@@ -3638,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];
@@ -3721,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]].invisible = 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);
@@ -3738,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);
     }
@@ -3837,13 +3837,13 @@ 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];
+        object = &gEventObjects[eventObjectIdBuffer];
         xPos = object->currentCoords.x - 7;
         yPos = object->currentCoords.y - 7;
         xPos = (gFieldEffectArguments[3] - xPos) * 16;
@@ -3854,7 +3854,7 @@ bool8 sub_80B9E28(struct Sprite* sprite)
         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;
 }
@@ -3883,7 +3883,7 @@ 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);
diff --git a/src/field_special_scene.c b/src/field_special_scene.c
index 8a4fb7c69..a5058b363 100644
--- a/src/field_special_scene.c
+++ b/src/field_special_scene.c
@@ -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], EventObjectDirectionToImageAnimId(4));
     }
     else
     {
-        StartSpriteAnim(&gSprites[spriteId], FieldObjectDirectionToImageAnimId(3));
+        StartSpriteAnim(&gSprites[spriteId], EventObjectDirectionToImageAnimId(3));
     }
 }
 
 void sub_80FB768(void)
 {
     sub_80FB6EC();
-    gMapObjects[gPlayerAvatar.mapObjectId].invisible = 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 6da529d00..60b078982 100644
--- a/src/fldeff_groundshake.c
+++ b/src/fldeff_groundshake.c
@@ -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/item_menu.c b/src/item_menu.c
index 132f39c34..0642c771e 100755
--- a/src/item_menu.c
+++ b/src/item_menu.c
@@ -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 82d96606a..2044a8c87 100755
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -579,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)]);
+    EventObjectClearAnimIfSpecialAnimFinished(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]);
+    EventObjectClearAnim(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]);
+    npc_sync_anim_pause_bits(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]);
     PlayerTurnInPlace(direction);
 }
 
 void sub_80FDA94(u8 taskId)
 {
-    if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE)
+    if (EventObjectCheckIfSpecialAnimFinishedOrInactive(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE)
         DisplayItemMessageOnField(taskId, gText_ItemFinderNearby, sub_80FD5CC);
 }
 
@@ -595,7 +595,7 @@ void sub_80FDADC(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
 
-    if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE
+    if (EventObjectCheckIfSpecialAnimFinishedOrInactive(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE
     || data[2] == FALSE)
     {
         sub_80FDA24(gUnknown_085920E4[data[5]]);
@@ -727,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/naming_screen.c b/src/naming_screen.c
index 9ad1a9742..f99d23bc3 100644
--- a/src/naming_screen.c
+++ b/src/naming_screen.c
@@ -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 85bdbc5ea..5b92b8023 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -204,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);
@@ -212,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);
@@ -267,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 =
@@ -352,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,
@@ -382,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,
@@ -501,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;
         }
     }
@@ -824,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();
@@ -867,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);
@@ -1734,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)
@@ -2170,7 +2170,7 @@ static void sub_80869DC(void)
     gUnknown_03005DEC = 0;
     gUnknown_03005DE8 = 0;
     sub_808D438();
-    SpawnFieldObjectsInView(0, 0);
+    SpawnEventObjectsInView(0, 0);
     mapheader_run_first_tag4_script_list_match();
 }
 
@@ -2187,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);
+    SpawnEventObjectsInView(0, 0);
     mapheader_run_first_tag4_script_list_match();
 }
 
@@ -2200,7 +2200,7 @@ static void sub_8086A68(void)
 
 static void sub_8086A80(void)
 {
-    gMapObjects[gPlayerAvatar.mapObjectId].trackedByCamera = 1;
+    gEventObjects[gPlayerAvatar.eventObjectId].trackedByCamera = 1;
     InitCameraUpdateCallback(gPlayerAvatar.spriteId);
 }
 
@@ -2231,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);
     }
 
@@ -2676,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;
@@ -2889,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 ZeroAllLinkPlayerEventObjects(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 = sub_808D4F4();
+    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->singleMovementActive = 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->currentCoords.x = x;
-    mapObj->currentCoords.y = y;
-    mapObj->previousCoords.x = x;
-    mapObj->previousCoords.y = y;
-    sub_8093038(x, y, &mapObj->initialCoords.x, &mapObj->initialCoords.y);
-    mapObj->initialCoords.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->currentCoords.x;
-    *y = mapObj->currentCoords.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->currentElevation;
+    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->directionSequenceIndex;
+    u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId;
+    struct EventObject *eventObj = &gEventObjects[eventObjId];
+    return 16 - (s8)eventObj->directionSequenceIndex;
 }
 
 static u8 GetLinkPlayerIdAt(s16 x, s16 y)
@@ -2999,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->currentCoords.x == x && mapObj->currentCoords.y == y)
+            struct EventObject *eventObj = &gEventObjects[gLinkPlayerEventObjects[i].eventObjId];
+            if (eventObj->currentCoords.x == x && eventObj->currentCoords.y == y)
                 return i;
         }
     }
@@ -3012,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->triggerGroundEffectsOnMove = 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->directionSequenceIndex = 16;
-        npc_coords_shift(mapObj, x, y);
-        FieldObjectUpdateZCoord(mapObj);
+        eventObj->directionSequenceIndex = 16;
+        npc_coords_shift(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->directionSequenceIndex--;
-    linkPlayerMapObj->mode = 1;
-    MoveCoords(mapObj->range.as_byte, &mapObj->initialCoords.x, &mapObj->initialCoords.y);
-    if (!mapObj->directionSequenceIndex)
+    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;
+        npc_coords_shift_still(eventObj);
+        linkPlayerEventObj->mode = 2;
     }
 }
 
@@ -3108,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].currentCoords.x == x && gMapObjects[i].currentCoords.y == y)
-             || (gMapObjects[i].previousCoords.x == x && gMapObjects[i].previousCoords.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;
             }
@@ -3127,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->singleMovementActive), 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->singleMovementActive), 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->singleMovementActive), 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->triggerGroundEffectsOnMove = 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->initialCoords.x;
-    sprite->pos1.y = mapObj->initialCoords.y;
-    SetObjectSubpriorityByZCoord(mapObj->previousElevation, sprite, 1);
-    sprite->oam.priority = ZCoordToPriority(mapObj->previousElevation);
+    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, EventObjectDirectionToImageAnimId(eventObj->range.as_byte));
     else
-        StartSpriteAnimIfDifferent(sprite, get_go_image_anim_num(mapObj->range.as_byte));
+        StartSpriteAnimIfDifferent(sprite, get_go_image_anim_num(eventObj->range.as_byte));
 
 	sub_80979D4(sprite, 0);
-    if (mapObj->triggerGroundEffectsOnMove)
+    if (eventObj->triggerGroundEffectsOnMove)
     {
         sprite->invisible = ((sprite->data[7] & 4) >> 2);
         sprite->data[7]++;
diff --git a/src/rom6.c b/src/rom6.c
index 9b505a205..60447f641 100644
--- a/src/rom6.c
+++ b/src/rom6.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "constants/map_objects.h"
+#include "constants/event_objects.h"
 #include "constants/songs.h"
 #include "rom6.h"
 #include "braille_puzzles.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 (!EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(&gEventObjects[eventObjId])
+     || EventObjectClearAnimIfSpecialAnimFinished(&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);
+            EventObjectSetSpecialAnim(&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 (EventObjectCheckIfSpecialAnimFinishedOrInactive(&gEventObjects[gPlayerAvatar.eventObjectId]) == TRUE)
     {
         FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
         gTasks[taskId].func = sub_8135578;
@@ -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/scrcmd.c b/src/scrcmd.c
index e36b60718..e3edb5abf 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -24,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"
@@ -1051,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;
 }
 
@@ -1061,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;
 }
 
@@ -1099,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;
 }
 
@@ -1154,9 +1154,9 @@ bool8 ScrCmd_resetobjectpriority(struct ScriptContext *ctx)
 
 bool8 ScrCmd_faceplayer(struct ScriptContext *ctx)
 {
-    if (gMapObjects[gSelectedMapObject].active)
+    if (gEventObjects[gSelectedEventObject].active)
     {
-        FieldObjectFaceOppositeDirection(&gMapObjects[gSelectedMapObject],
+        EventObjectFaceOppositeDirection(&gEventObjects[gSelectedEventObject],
           player_get_direction_lower_nybble());
     }
     return FALSE;
@@ -1167,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;
 }
 
@@ -1176,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;
 }
 
@@ -1210,7 +1210,7 @@ bool8 ScrCmd_lockall(struct ScriptContext *ctx)
     }
     else
     {
-        ScriptFreezeMapObjects();
+        ScriptFreezeEventObjects();
         SetupNativeScript(ctx, sub_80983C4);
         return TRUE;
     }
@@ -1224,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;
@@ -1243,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);
+    EventObjectClearAnimIfSpecialAnimFinished(&gEventObjects[objectId]);
     sub_80D338C();
-    UnfreezeMapObjects();
+    UnfreezeEventObjects();
     return FALSE;
 }
 
@@ -1255,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)
+        EventObjectClearAnimIfSpecialAnimFinished(&gEventObjects[gSelectedEventObject]);
+    objectId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0);
+    EventObjectClearAnimIfSpecialAnimFinished(&gEventObjects[objectId]);
     sub_80D338C();
-    UnfreezeMapObjects();
+    UnfreezeEventObjects();
     return FALSE;
 }
 
@@ -2178,7 +2178,7 @@ bool8 ScrCmd_mossdeepgym4(struct ScriptContext *ctx)
 
 bool8 ScrCmd_cmdD8(struct ScriptContext *ctx)
 {
-    gSelectedMapObject = GetCurrentApproachingTrainerMapObjectId();
+    gSelectedEventObject = GetCurrentApproachingTrainerEventObjectId();
     return FALSE;
 }
 
@@ -2190,7 +2190,7 @@ bool8 ScrCmd_cmdD9(struct ScriptContext *ctx)
     }
     else
     {
-        if (gMapObjects[gSelectedMapObject].active)
+        if (gEventObjects[gSelectedEventObject].active)
         {
             sub_8098630();
             SetupNativeScript(ctx, sub_8098734);
diff --git a/src/script_movement.c b/src/script_movement.c
index 02ab55223..27280addf 100644
--- a/src/script_movement.c
+++ b/src/script_movement.c
@@ -21,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);
@@ -73,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)
@@ -86,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;
         }
     }
@@ -97,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;
     }
 }
@@ -173,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)
+            npc_sync_anim_pause_bits(&gEventObjects[*pEventObjId]);
     }
 }
 
@@ -206,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 (EventObjectIsSpecialAnimActive(&gEventObjects[eventObjId])
+     && !EventObjectClearAnimIfSpecialAnimFinished(&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 (!EventObjectSetSpecialAnim(&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 71cf3f1a6..d6f4e24a5 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -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 9ab8a69ba..7080ae6a8 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -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 db8cff8a1..cf47bbe2a 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -15,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);
 
@@ -63,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,
@@ -71,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,
@@ -87,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,
@@ -171,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);
@@ -196,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;
@@ -206,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();
@@ -221,7 +221,7 @@ bool8 CheckForTrainersWantingBattle(void)
     }
 }
 
-static u8 CheckTrainer(u8 mapObjectId)
+static u8 CheckTrainer(u8 eventObjectId)
 {
     const u8 *scriptPtr;
     u8 ret = 1;
@@ -230,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
@@ -248,7 +248,7 @@ static u8 CheckTrainer(u8 mapObjectId)
             return 0;
     }
 
-    approachDistance = GetTrainerApproachDistance(&gMapObjects[mapObjectId]);
+    approachDistance = GetTrainerApproachDistance(&gEventObjects[eventObjectId]);
 
     if (approachDistance != 0)
     {
@@ -262,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;
@@ -274,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;
@@ -300,7 +300,7 @@ 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->currentCoords.x == x
      && y > trainerObj->currentCoords.y
@@ -311,7 +311,7 @@ static u8 GetTrainerApproachDistanceSouth(struct MapObject *trainerObj, s16 rang
 }
 
 // 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->currentCoords.x == x
      && y < trainerObj->currentCoords.y
@@ -322,7 +322,7 @@ static u8 GetTrainerApproachDistanceNorth(struct MapObject *trainerObj, s16 rang
 }
 
 // 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->currentCoords.y == y
      && x < trainerObj->currentCoords.x
@@ -333,7 +333,7 @@ static u8 GetTrainerApproachDistanceWest(struct MapObject *trainerObj, s16 range
 }
 
 // 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->currentCoords.y == y
      && x > trainerObj->currentCoords.x
@@ -345,7 +345,7 @@ static u8 GetTrainerApproachDistanceEast(struct MapObject *trainerObj, s16 range
 
 #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;
@@ -386,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)
@@ -417,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)
     {
@@ -429,24 +429,24 @@ 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]);
+    EventObjectGetLocalIdAndMap(trainerObj, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
     FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_1);
     direction = GetFaceDirectionAnimId(trainerObj->facingDirection);
-    FieldObjectSetSpecialAnim(trainerObj, direction);
+    EventObjectSetSpecialAnim(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))
     {
@@ -463,88 +463,88 @@ static bool8 sub_80B41C0(u8 taskId, struct Task *task, struct MapObject *trainer
     }
 }
 
-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 (!(EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj)) || EventObjectClearAnimIfSpecialAnimFinished(trainerObj))
     {
         if (task->tTrainerRange)
         {
-            FieldObjectSetSpecialAnim(trainerObj, GetGoSpeed0AnimId(trainerObj->facingDirection));
+            EventObjectSetSpecialAnim(trainerObj, GetGoSpeed0AnimId(trainerObj->facingDirection));
             task->tTrainerRange--;
         }
         else
         {
-            FieldObjectSetSpecialAnim(trainerObj, 0x3E);
+            EventObjectSetSpecialAnim(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 (EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj) && !EventObjectClearAnimIfSpecialAnimFinished(trainerObj))
         return FALSE;
 
     npc_set_running_behaviour_etc(trainerObj, npc_running_behaviour_by_direction(trainerObj->facingDirection));
     sub_808F23C(trainerObj, npc_running_behaviour_by_direction(trainerObj->facingDirection));
     sub_808F208(trainerObj);
 
-    playerObj = &gMapObjects[gPlayerAvatar.mapObjectId];
-    if (FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(playerObj) && !FieldObjectClearAnimIfSpecialAnimFinished(playerObj))
+    playerObj = &gEventObjects[gPlayerAvatar.eventObjectId];
+    if (EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(playerObj) && !EventObjectClearAnimIfSpecialAnimFinished(playerObj))
         return FALSE;
 
     sub_808BCE8();
-    FieldObjectSetSpecialAnim(&gMapObjects[gPlayerAvatar.mapObjectId], GetFaceDirectionAnimId(GetOppositeDirection(trainerObj->facingDirection)));
+    EventObjectSetSpecialAnim(&gEventObjects[gPlayerAvatar.eventObjectId], GetFaceDirectionAnimId(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 (!EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(playerObj)
+     || EventObjectClearAnimIfSpecialAnimFinished(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 (!EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj)
+     || EventObjectClearAnimIfSpecialAnimFinished(trainerObj))
     {
-        FieldObjectSetSpecialAnim(trainerObj, 0x59);
+        EventObjectSetSpecialAnim(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 (EventObjectClearAnimIfSpecialAnimFinished(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 (!EventObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj)
+     || EventObjectClearAnimIfSpecialAnimFinished(trainerObj))
     {
-        FieldObjectSetSpecialAnim(trainerObj, 0x3E);
+        EventObjectSetSpecialAnim(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 (EventObjectCheckIfSpecialAnimFinishedOrInactive(trainerObj))
     {
         gFieldEffectArguments[0] = trainerObj->currentCoords.x;
         gFieldEffectArguments[1] = trainerObj->currentCoords.y;
@@ -556,7 +556,7 @@ 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;
 
@@ -567,15 +567,15 @@ static bool8 sub_80B4438(u8 taskId, struct Task *task, struct MapObject *trainer
 
         sprite = &gSprites[trainerObj->spriteId];
         sprite->oam.priority = 2;
-        FieldObjectClearAnimIfSpecialAnimFinished(trainerObj);
-        FieldObjectSetSpecialAnim(trainerObj, sub_80934BC(trainerObj->facingDirection));
+        EventObjectClearAnimIfSpecialAnimFinished(trainerObj);
+        EventObjectSetSpecialAnim(trainerObj, sub_80934BC(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;
@@ -586,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);
+        EventObjectClearAnim(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->facingDirection));
-        sub_808F23C(mapObj, npc_running_behaviour_by_direction(mapObj->facingDirection));
+        npc_set_running_behaviour_etc(eventObj, npc_running_behaviour_by_direction(eventObj->facingDirection));
+        sub_808F23C(eventObj, npc_running_behaviour_by_direction(eventObj->facingDirection));
         DestroyTask(taskId);
     }
     else
     {
-        mapObj->heldMovementFinished = 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);
 }
@@ -637,8 +637,8 @@ void sub_80B45D0(void)
         {
             gApproachingTrainerId++;
             gSpecialVar_Result = 1;
-            UnfreezeMapObjects();
-            FreezeMapObjectsExceptOne(gApproachingTrainers[1].mapObjectId);
+            UnfreezeEventObjects();
+            FreezeEventObjectsExceptOne(gApproachingTrainers[1].eventObjectId);
         }
         else
         {
@@ -710,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
@@ -739,38 +739,38 @@ 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];
+        trainerObj = &gEventObjects[gApproachingTrainers[gUnknown_03006080].eventObjectId];
         gUnknown_03006084[0] = GetFaceDirectionAnimId(GetOppositeDirection(trainerObj->facingDirection));
         gUnknown_03006084[1] = 0xFE;
         ScriptMovement_StartObjectMovementScript(0xFF, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gUnknown_03006084);
     }
     else
     {
-        trainerObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+        trainerObj = &gEventObjects[gPlayerAvatar.eventObjectId];
         gUnknown_03006084[0] = GetFaceDirectionAnimId(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 5c1037293..2219a720b 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -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..17fe48f70 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