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

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

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 r2, =gEventObjects
-	ldr r0, =gSelectedMapObject
+	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 r2, =gEventObjects
-	ldr r0, =gSelectedMapObject
+	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
+	bl GetChosenApproachingTrainerEventObjectId
-	ldr r1, =gSelectedMapObject
+	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

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

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

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
+	thumb_func_start TryGetEventObjectScript
-TryGetMapObjectScript: @ 809C384
+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
+	thumb_func_start TryGetInvisibleEventObjectScript
-@ signed int TryGetInvisibleMapObjectScript(int a1, int a2, u8 playerFacingDirection)
+@ signed int TryGetInvisibleEventObjectScript(int a1, int a2, u8 playerFacingDirection)
-TryGetInvisibleMapObjectScript: @ 809C458
+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
+	thumb_func_start FindInvisibleEventObjectByPosition
-@ int FindInvisibleMapObjectByPosition(struct mapheader *mapHeader, u16 x, u16 y, u8 elevation)
+@ int FindInvisibleEventObjectByPosition(struct mapheader *mapHeader, u16 x, u16 y, u8 elevation)
-FindInvisibleMapObjectByPosition: @ 809D11C
+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
+	thumb_func_start GetEventObjectScriptPointerForComparison
-@ u8 *GetFieldObjectScriptPointerForComparison()
+@ u8 *GetEventObjectScriptPointerForComparison()
-GetFieldObjectScriptPointerForComparison: @ 809D280
+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

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

asm/field_player_avatar.s

@@ -5,9 +5,9 @@
 
 	.text
 
-	thumb_func_start FieldObjectCB_NoMovement2
+	thumb_func_start EventObjectCB_NoMovement2
-@ void FieldObjectCB_NoMovement2(struct obj *object)
+@ void EventObjectCB_NoMovement2(struct obj *object)
-FieldObjectCB_NoMovement2: @ 808A998
+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
+	ldr r2, =EventObjectCB2_NoMovement2
-	bl FieldObjectStep
+	bl EventObjectStep
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end FieldObjectCB_NoMovement2
+	thumb_func_end EventObjectCB_NoMovement2
 
-	thumb_func_start FieldObjectCB2_NoMovement2
+	thumb_func_start EventObjectCB2_NoMovement2
-FieldObjectCB2_NoMovement2: @ 808A9BC
+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
+	thumb_func_start TryInterruptEventObjectSpecialAnim
-@ bool8 TryInterruptFieldObjectSpecialAnim(struct npc_state *fieldObject, u8 direction)
+@ bool8 TryInterruptEventObjectSpecialAnim(struct npc_state *eventObject, u8 direction)
-TryInterruptFieldObjectSpecialAnim: @ 808AA38
+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
+	thumb_func_start CheckForEventObjectCollision
-@ u8 CheckForFieldObjectCollision(struct npc_state *fieldObject, u16 x, u16 y, u8 direction, u8 metatileBehavior)
+@ u8 CheckForEventObjectCollision(struct npc_state *eventObject, u16 x, u16 y, u8 direction, u8 metatileBehavior)
-CheckForFieldObjectCollision: @ 808B094
+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]

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

asm/field_specials.s

@@ -741,8 +741,8 @@ _0813828A:
 	.pool
 	thumb_func_end GetLinkPartnerNames
 
-	thumb_func_start SpawnLinkPartnerFieldObject
+	thumb_func_start SpawnLinkPartnerEventObject
-SpawnLinkPartnerFieldObject: @ 81382A0
+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
+	thumb_func_start SpawnScriptEventObject
-SpawnScriptFieldObject: @ 8139158
+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
+	thumb_func_start RemoveScriptEventObject
-RemoveScriptFieldObject: @ 81391AC
+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}

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:

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
+	thumb_func_start EventObjectIsFarawayIslandMew
-@ bool8 FieldObjectIsFarawayIslandMew(struct npc_state *fieldObject)
+@ bool8 EventObjectIsFarawayIslandMew(struct npc_state *eventObject)
-FieldObjectIsFarawayIslandMew: @ 81D49E8
+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

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:

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:

asm/shop.s

@@ -1277,8 +1277,8 @@ BuyMenuDrawGraphics: @ 80E0524
 @ void BuyMenuDrawMapGraphics()
 BuyMenuDrawMapGraphics: @ 80E0570
 	push {lr}
-	bl BuyMenuCollectFieldObjectData
+	bl BuyMenuCollectEventObjectData
-	bl BuyMenuDrawFieldObjects
+	bl BuyMenuDrawEventObjects
 	bl BuyMenuDrawMapBg
 	pop {r0}
 	bx r0
@@ -1525,9 +1525,9 @@ BuyMenuDrawMapMetatileLayer: @ 80E0734
 	bx lr
 	thumb_func_end BuyMenuDrawMapMetatileLayer
 
-	thumb_func_start BuyMenuCollectFieldObjectData
+	thumb_func_start BuyMenuCollectEventObjectData
-@ void BuyMenuCollectFieldObjectData()
+@ void BuyMenuCollectEventObjectData()
-BuyMenuCollectFieldObjectData: @ 80E075C
+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
+	thumb_func_start BuyMenuDrawEventObjects
-@ void BuyMenuDrawFieldObjects()
+@ void BuyMenuDrawEventObjects()
-BuyMenuDrawFieldObjects: @ 80E08F0
+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
+	thumb_func_start BuyMenuCheckIfEventObjectOverlapsMenuBg
-BuyMenuCheckIfFieldObjectOverlapsMenuBg: @ 80E0A14
+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()

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 EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
-	.byte MAP_OBJ_GFX_RIVAL_MAY_NORMAL
+	.byte EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
 
 gMtChimneyHikerGraphicsIDs:: @ 85CDBE6
-	.byte MAP_OBJ_GFX_HIKER
+	.byte EVENT_OBJ_GFX_HIKER
-	.byte MAP_OBJ_GFX_CAMPER
+	.byte EVENT_OBJ_GFX_CAMPER
-	.byte MAP_OBJ_GFX_PICNICKER
+	.byte EVENT_OBJ_GFX_PICNICKER
-	.byte MAP_OBJ_GFX_ZIGZAGOON_1 @ not used
+	.byte EVENT_OBJ_GFX_ZIGZAGOON_1 @ not used
 
 	.align 1
 gMtChimneyHikerCoords:: @ 85CDBEA

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
 

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"

data/maps/events/AbandonedShip_CaptainsOffice.inc

@@ -1,11 +1,11 @@
-AbandonedShip_CaptainsOffice_MapObjects: @ 8536A5C
+AbandonedShip_CaptainsOffice_EventObjects: @ 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 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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 6, 3, 1, 17, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_29126E, 1100, 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
 

data/maps/events/AbandonedShip_Corridors_1F.inc

@@ -1,6 +1,6 @@
-AbandonedShip_Corridors_1F_MapObjects: @ 85366C0
+AbandonedShip_Corridors_1F_EventObjects: @ 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 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, MAP_OBJ_GFX_TUBER_M, 0, 0, 5, 10, 3, 45, 116, 0, 1, 3, AbandonedShip_Corridors_1F_EventScript_2379AE, 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
 

data/maps/events/AbandonedShip_Corridors_B1F.inc

@@ -1,6 +1,6 @@
-AbandonedShip_Corridors_B1F_MapObjects: @ 8536808
+AbandonedShip_Corridors_B1F_EventObjects: @ 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 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, MAP_OBJ_GFX_SAILOR, 0, 0, 9, 6, 3, 14, 0, 0, 1, 4, AbandonedShip_Corridors_B1F_EventScript_237E13, 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
 

data/maps/events/AbandonedShip_HiddenFloorRooms.inc

@@ -1,8 +1,8 @@
-AbandonedShip_HiddenFloorRooms_MapObjects: @ 8536B40
+AbandonedShip_HiddenFloorRooms_EventObjects: @ 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 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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 16, 10, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291288, 1078, 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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 11, 3, 1, 17, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_2912A2, 1102, 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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 31, 11, 3, 1, 17, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291295, 1101, 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
 

data/maps/events/AbandonedShip_Room_B1F.inc

@@ -1,10 +1,10 @@
-AbandonedShip_Room_B1F_MapObjects: @ 853697C
+AbandonedShip_Room_B1F_EventObjects: @ 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
+	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
 

data/maps/events/AbandonedShip_Rooms2_1F.inc

@@ -1,9 +1,9 @@
-AbandonedShip_Rooms2_1F_MapObjects: @ 85369B8
+AbandonedShip_Rooms2_1F_EventObjects: @ 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 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, 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 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, 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 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, MAP_OBJ_GFX_HIKER, 0, 0, 3, 2, 3, 10, 17, 0, 1, 3, AbandonedShip_Rooms2_1F_EventScript_238186, 0, 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, MAP_OBJ_GFX_TUBER_F, 0, 0, 7, 2, 3, 9, 17, 0, 1, 3, AbandonedShip_Rooms2_1F_EventScript_23816F, 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
 

data/maps/events/AbandonedShip_Rooms2_B1F.inc

@@ -1,6 +1,6 @@
-AbandonedShip_Rooms2_B1F_MapObjects: @ 85368F4
+AbandonedShip_Rooms2_B1F_EventObjects: @ 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 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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 13, 3, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_291247, 1097, 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
 

data/maps/events/AbandonedShip_Rooms_1F.inc

@@ -1,8 +1,8 @@
-AbandonedShip_Rooms_1F_MapObjects: @ 8536764
+AbandonedShip_Rooms_1F_EventObjects: @ 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 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, 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 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, MAP_OBJ_GFX_BEAUTY, 0, 0, 10, 11, 3, 8, 17, 0, 1, 4, AbandonedShip_Rooms_1F_EventScript_237AB3, 0, 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, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 10, 16, 3, 16, 17, 0, 1, 4, AbandonedShip_Rooms_1F_EventScript_237A9C, 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
 

data/maps/events/AbandonedShip_Rooms_B1F.inc

@@ -1,6 +1,6 @@
-AbandonedShip_Rooms_B1F_MapObjects: @ 8536898
+AbandonedShip_Rooms_B1F_EventObjects: @ 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 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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 7, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_29123A, 1096, 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
 

data/maps/events/AncientTomb.inc

@@ -1,5 +1,5 @@
-AncientTomb_MapObjects: @ 8536CDC
+AncientTomb_EventObjects: @ 8536CDC
-	object_event 1, MAP_OBJ_GFX_REGISTEEL, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, AncientTomb_EventScript_23905A, 937, 0, 0
+	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
 

data/maps/events/AquaHideout_1F.inc

@@ -1,7 +1,7 @@
-AquaHideout_1F_MapObjects: @ 8535304
+AquaHideout_1F_EventObjects: @ 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 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, 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 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, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 20, 4, 3, 50, 93, 0, 1, 3, AquaHideout_1F_EventScript_2334F8, 924, 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
 

data/maps/events/AquaHideout_B1F.inc

@@ -1,13 +1,13 @@
-AquaHideout_B1F_MapObjects: @ 8535378
+AquaHideout_B1F_EventObjects: @ 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 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, 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 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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 29, 12, 3, 1, 0, 0, 0, 0, AquaHideout_B1F_EventScript_291372, 1071, 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, 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 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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 15, 9, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_291358, 1124, 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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 16, 9, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_2339EB, 977, 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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 15, 10, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_291365, 1132, 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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 16, 10, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_233A38, 978, 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, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 28, 21, 3, 7, 17, 0, 1, 4, AquaHideout_B1F_EventScript_233AEC, 924, 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
 

data/maps/events/AquaHideout_B2F.inc

@@ -1,10 +1,10 @@
-AquaHideout_B2F_MapObjects: @ 853552C
+AquaHideout_B2F_EventObjects: @ 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 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, 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 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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 13, 3, 1, 0, 0, 0, 0, AquaHideout_B2F_EventScript_29137F, 1072, 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, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 0, 19, 20, 1, 9, 0, 0, 0, 0, 0x0, 943, 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, 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 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, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 5, 3, 9, 17, 0, 1, 5, AquaHideout_B2F_EventScript_233EC6, 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
 

data/maps/events/ArtisanCave_1F.inc

@@ -1,10 +1,10 @@
-ArtisanCave_1F_MapObjects: @ 8537774
+ArtisanCave_1F_EventObjects: @ 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
+	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
 

data/maps/events/ArtisanCave_B1F.inc

@@ -1,5 +1,5 @@
-ArtisanCave_B1F_MapObjects: @ 8537708
+ArtisanCave_B1F_EventObjects: @ 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
+	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
 

data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc

@@ -1,14 +1,14 @@
-BattleFrontier_BattleArenaBattleRoom_MapObjects: @ 853C8EC
+BattleFrontier_BattleArenaBattleRoom_EventObjects: @ 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 1, EVENT_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 2, EVENT_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 3, EVENT_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 4, EVENT_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 5, EVENT_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 6, EVENT_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 7, EVENT_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 8, EVENT_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
+	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
 

data/maps/events/BattleFrontier_BattleArenaCorridor.inc

@@ -1,6 +1,6 @@
-BattleFrontier_BattleArenaCorridor_MapObjects: @ 853C8C0
+BattleFrontier_BattleArenaCorridor_EventObjects: @ 853C8C0
-	object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 9, 12, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+	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
 

data/maps/events/BattleFrontier_BattleArenaLobby.inc

@@ -1,9 +1,9 @@
-BattleFrontier_BattleArenaLobby_MapObjects: @ 853C814
+BattleFrontier_BattleArenaLobby_EventObjects: @ 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 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, MAP_OBJ_GFX_WOMAN_7, 0, 0, 2, 10, 3, 2, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560C1, 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, MAP_OBJ_GFX_MAN_6, 0, 0, 14, 11, 3, 9, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560AF, 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, MAP_OBJ_GFX_CAMPER, 0, 0, 14, 12, 3, 9, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560B8, 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, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 14, 10, 3, 9, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560A6, 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
 

data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc

@@ -1,20 +1,20 @@
-BattleFrontier_BattleDomeBattleRoom_MapObjects: @ 853C1C4
+BattleFrontier_BattleDomeBattleRoom_EventObjects: @ 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 1, EVENT_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 2, EVENT_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 3, EVENT_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 4, EVENT_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 5, EVENT_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 6, EVENT_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 7, EVENT_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 8, EVENT_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 9, EVENT_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 10, EVENT_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 11, EVENT_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 12, EVENT_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 13, EVENT_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 14, EVENT_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
+	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
 

data/maps/events/BattleFrontier_BattleDomeCorridor.inc

@@ -1,10 +1,10 @@
-BattleFrontier_BattleDomeCorridor_MapObjects: @ 853C14C
+BattleFrontier_BattleDomeCorridor_EventObjects: @ 853C14C
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 23, 5, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+	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
 

data/maps/events/BattleFrontier_BattleDomeLobby.inc

@@ -1,10 +1,10 @@
-BattleFrontier_BattleDomeLobby_MapObjects: @ 853C068
+BattleFrontier_BattleDomeLobby_EventObjects: @ 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 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, MAP_OBJ_GFX_MAN_4, 0, 0, 1, 11, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E10, 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, MAP_OBJ_GFX_LASS, 0, 0, 14, 14, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DFE, 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, MAP_OBJ_GFX_FAT_MAN, 0, 0, 18, 14, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E07, 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, MAP_OBJ_GFX_MANIAC, 0, 0, 8, 14, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DED, 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, MAP_OBJ_GFX_TEALA, 0, 0, 17, 10, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A47, 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
 

data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc

@@ -1,10 +1,10 @@
-BattleFrontier_BattleDomePreBattleRoom_MapObjects: @ 853C188
+BattleFrontier_BattleDomePreBattleRoom_EventObjects: @ 853C188
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 5, 2, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+	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
 

data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc

@@ -1,13 +1,13 @@
-BattleFrontier_BattleFactoryBattleRoom_MapObjects: @ 853CADC
+BattleFrontier_BattleFactoryBattleRoom_EventObjects: @ 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 1, EVENT_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 2, EVENT_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 3, EVENT_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 4, EVENT_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 5, EVENT_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 6, EVENT_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
+	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
 

data/maps/events/BattleFrontier_BattleFactoryLobby.inc

@@ -1,10 +1,10 @@
-BattleFrontier_BattleFactoryLobby_MapObjects: @ 853C9D8
+BattleFrontier_BattleFactoryLobby_EventObjects: @ 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 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, MAP_OBJ_GFX_WOMAN_1, 0, 0, 3, 11, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258813, 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, MAP_OBJ_GFX_CAMPER, 0, 0, 14, 11, 0, 8, 0, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_25881C, 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, MAP_OBJ_GFX_PICNICKER, 0, 0, 13, 11, 0, 10, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258825, 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, MAP_OBJ_GFX_FAT_MAN, 0, 0, 6, 10, 0, 1, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258830, 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, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 14, 7, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585DD, 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
 

data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc

@@ -1,6 +1,6 @@
-BattleFrontier_BattleFactoryPreBattleRoom_MapObjects: @ 853CAB0
+BattleFrontier_BattleFactoryPreBattleRoom_EventObjects: @ 853CAB0
-	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 8, 12, 0, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
+	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
 

data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc

@@ -1,14 +1,14 @@
-BattleFrontier_BattlePalaceBattleRoom_MapObjects: @ 853C4FC
+BattleFrontier_BattlePalaceBattleRoom_EventObjects: @ 853C4FC
-	object_event 1, MAP_OBJ_GFX_TRADER, 0, 0, 1, 9, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 1, EVENT_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 2, EVENT_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 3, EVENT_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 4, EVENT_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
+	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
 

data/maps/events/BattleFrontier_BattlePalaceCorridor.inc

@@ -1,11 +1,11 @@
-BattleFrontier_BattlePalaceCorridor_MapObjects: @ 853C420
+BattleFrontier_BattlePalaceCorridor_EventObjects: @ 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 1, EVENT_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 2, EVENT_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 3, EVENT_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 4, EVENT_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 5, EVENT_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 6, EVENT_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
+	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
 

data/maps/events/BattleFrontier_BattlePalaceLobby.inc

@@ -1,10 +1,10 @@
-BattleFrontier_BattlePalaceLobby_MapObjects: @ 853C340
+BattleFrontier_BattlePalaceLobby_EventObjects: @ 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 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, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 11, 8, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC82, 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, MAP_OBJ_GFX_MANIAC, 0, 0, 24, 5, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC9D, 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, MAP_OBJ_GFX_MAN_4, 0, 0, 18, 10, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC8B, 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, MAP_OBJ_GFX_BEAUTY, 0, 0, 2, 10, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC94, 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, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 19, 6, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D956, 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
 

data/maps/events/BattleFrontier_BattlePikeCorridor.inc

@@ -1,6 +1,6 @@
-BattleFrontier_BattlePikeCorridor_MapObjects: @ 853CC54
+BattleFrontier_BattlePikeCorridor_EventObjects: @ 853CC54
-	object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 0, 6, 6, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+	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
 

data/maps/events/BattleFrontier_BattlePikeLobby.inc

@@ -1,8 +1,8 @@
-BattleFrontier_BattlePikeLobby_MapObjects: @ 853CBB0
+BattleFrontier_BattlePikeLobby_EventObjects: @ 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 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, MAP_OBJ_GFX_HIKER, 0, 0, 10, 9, 3, 7, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAAB, 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, 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 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, MAP_OBJ_GFX_BEAUTY, 0, 0, 8, 9, 3, 2, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BABD, 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
 

data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc

@@ -1,6 +1,6 @@
-BattleFrontier_BattlePikeRandomRoom1_MapObjects: @ 853CD54
+BattleFrontier_BattlePikeRandomRoom1_EventObjects: @ 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 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, MAP_OBJ_GFX_TRADER, 0, 0, 3, 4, 3, 8, 17, 0, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 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
 

data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc

@@ -1,6 +1,6 @@
-BattleFrontier_BattlePikeRandomRoom2_MapObjects: @ 853CE08
+BattleFrontier_BattlePikeRandomRoom2_EventObjects: @ 853CE08
-	object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 0, 2, 4, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+	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
 

data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc

@@ -1,6 +1,6 @@
-BattleFrontier_BattlePikeThreePathRoom_MapObjects: @ 853CC80
+BattleFrontier_BattlePikeThreePathRoom_EventObjects: @ 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 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, MAP_OBJ_GFX_WOMAN_6, 0, 0, 8, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB, 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
 

data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc

@@ -1,13 +1,13 @@
-BattleFrontier_BattlePointExchangeServiceCorner_MapObjects: @ 853D018
+BattleFrontier_BattlePointExchangeServiceCorner_EventObjects: @ 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 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, MAP_OBJ_GFX_BOY_4, 0, 0, 0, 5, 0, 10, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8, 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, MAP_OBJ_GFX_WOMAN_2, 0, 0, 0, 4, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD, 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, MAP_OBJ_GFX_SAILOR, 0, 0, 14, 6, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4, 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, MAP_OBJ_GFX_MAN_6, 0, 0, 1, 9, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB, 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, MAP_OBJ_GFX_TEALA, 0, 0, 5, 5, 0, 8, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C, 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, MAP_OBJ_GFX_TEALA, 0, 0, 9, 5, 0, 8, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F, 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, MAP_OBJ_GFX_TEALA, 0, 0, 10, 4, 0, 10, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0, 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, MAP_OBJ_GFX_GIRL_1, 0, 0, 12, 10, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1, 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
 

data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc

@@ -1,21 +1,21 @@
-BattleFrontier_BattlePyramidEmptySquare_MapObjects: @ 853C62C
+BattleFrontier_BattlePyramidEmptySquare_EventObjects: @ 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 1, EVENT_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 2, EVENT_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 3, EVENT_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 4, EVENT_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 5, EVENT_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 6, EVENT_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 7, EVENT_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 8, EVENT_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 9, EVENT_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 10, EVENT_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 11, EVENT_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 12, EVENT_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 13, EVENT_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 14, EVENT_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 15, EVENT_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
+	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
 

data/maps/events/BattleFrontier_BattlePyramidLobby.inc

@@ -1,8 +1,8 @@
-BattleFrontier_BattlePyramidLobby_MapObjects: @ 853C598
+BattleFrontier_BattlePyramidLobby_EventObjects: @ 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 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, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 14, 13, 4, 9, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250ACE, 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, MAP_OBJ_GFX_WOMAN_4, 0, 0, 2, 15, 4, 2, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E83, 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, MAP_OBJ_GFX_FAT_MAN, 0, 0, 12, 16, 4, 2, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E8C, 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
 

data/maps/events/BattleFrontier_BattlePyramidTop.inc

@@ -1,10 +1,10 @@
-BattleFrontier_BattlePyramidTop_MapObjects: @ 853C7C0
+BattleFrontier_BattlePyramidTop_EventObjects: @ 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 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, MAP_OBJ_GFX_BRANDON, 0, 0, 17, 7, 0, 7, 17, 0, 0, 0, 0x0, 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
 

data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc

@@ -1,12 +1,12 @@
-BattleFrontier_BattleTowerBattleRoom_MapObjects: @ 853B7D0
+BattleFrontier_BattleTowerBattleRoom_EventObjects: @ 853B7D0
-	object_event 1, MAP_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, 0x0, 888, 0, 0
+	object_event 1, EVENT_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 2, EVENT_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
+	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
 

data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc

@@ -1,11 +1,11 @@
-BattleFrontier_BattleTowerBattleRoom2_MapObjects: @ 853BFC4
+BattleFrontier_BattleTowerBattleRoom2_EventObjects: @ 853BFC4
-	object_event 1, MAP_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, 0x0, 888, 0, 0
+	object_event 1, EVENT_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 2, EVENT_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 3, EVENT_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
+	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
 

data/maps/events/BattleFrontier_BattleTowerCorridor.inc

@@ -1,6 +1,6 @@
-BattleFrontier_BattleTowerCorridor_MapObjects: @ 853B7A4
+BattleFrontier_BattleTowerCorridor_EventObjects: @ 853B7A4
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 9, 2, 3, 9, 0, 0, 0, 0, 0x0, 0, 0, 0
+	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
 

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 2, EVENT_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 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
 

data/maps/events/BattleFrontier_BattleTowerElevator.inc

@@ -1,6 +1,6 @@
-BattleFrontier_BattleTowerElevator_MapObjects: @ 853B778
+BattleFrontier_BattleTowerElevator_EventObjects: @ 853B778
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 1, 5, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
+	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
 

data/maps/events/BattleFrontier_BattleTowerLobby.inc

@@ -1,13 +1,13 @@
-BattleFrontier_BattleTowerLobby_MapObjects: @ 853B638
+BattleFrontier_BattleTowerLobby_EventObjects: @ 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 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, MAP_OBJ_GFX_MAN_5, 0, 0, 23, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EEE7, 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, MAP_OBJ_GFX_WOMAN_7, 0, 0, 17, 8, 3, 2, 17, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFB5, 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, MAP_OBJ_GFX_BOY_1, 0, 0, 15, 9, 3, 2, 17, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFBE, 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, MAP_OBJ_GFX_REPORTER_F, 0, 0, 11, 9, 3, 10, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_28CB96, 918, 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, MAP_OBJ_GFX_HIPSTER, 0, 0, 1, 5, 3, 8, 17, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_2B688D, 701, 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, MAP_OBJ_GFX_TEALA, 0, 0, 10, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EA9F, 0, 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, MAP_OBJ_GFX_TEALA, 0, 0, 14, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EC08, 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, MAP_OBJ_GFX_TEALA, 0, 0, 18, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23ED74, 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
 

data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc

@@ -1,14 +1,14 @@
-BattleFrontier_BattleTowerMultiBattleRoom_MapObjects: @ 853BE64
+BattleFrontier_BattleTowerMultiBattleRoom_EventObjects: @ 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 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, MAP_OBJ_GFX_HIPSTER, 0, 0, 2, 10, 3, 1, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29, 711, 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, MAP_OBJ_GFX_TRADER, 0, 0, 17, 11, 3, 14, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB, 712, 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, MAP_OBJ_GFX_STORYTELLER, 0, 0, 6, 9, 3, 1, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008, 713, 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, MAP_OBJ_GFX_GIDDY, 0, 0, 8, 13, 3, 1, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015, 714, 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, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 10, 11, 3, 7, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022, 715, 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, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 13, 10, 3, 10, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F, 716, 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
 

data/maps/events/BattleFrontier_Lounge1.inc

@@ -1,11 +1,11 @@
-BattleFrontier_Lounge1_MapObjects: @ 853CFB4
+BattleFrontier_Lounge1_EventObjects: @ 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 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, MAP_OBJ_GFX_BOY_3, 0, 0, 7, 6, 0, 2, 33, 0, 0, 0, BattleFrontier_Lounge1_EventScript_25E94D, 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, MAP_OBJ_GFX_BOY_2, 0, 0, 5, 4, 0, 2, 18, 0, 0, 0, BattleFrontier_Lounge1_EventScript_25E956, 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
 

data/maps/events/BattleFrontier_Lounge2.inc

@@ -1,14 +1,14 @@
-BattleFrontier_Lounge2_MapObjects: @ 853D11C
+BattleFrontier_Lounge2_EventObjects: @ 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 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, MAP_OBJ_GFX_MANIAC, 0, 0, 10, 4, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_26073C, 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, MAP_OBJ_GFX_MANIAC, 0, 0, 10, 3, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_260747, 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, 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 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, MAP_OBJ_GFX_MANIAC, 0, 0, 10, 5, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_260752, 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
 

data/maps/events/BattleFrontier_Lounge3.inc

@@ -1,13 +1,13 @@
-BattleFrontier_Lounge3_MapObjects: @ 853D1B8
+BattleFrontier_Lounge3_EventObjects: @ 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 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, MAP_OBJ_GFX_FAT_MAN, 0, 0, 4, 4, 0, 8, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FE1, 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, MAP_OBJ_GFX_WOMAN_3, 0, 0, 3, 5, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FC1, 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, MAP_OBJ_GFX_WOMAN_2, 0, 0, 5, 5, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FD1, 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, MAP_OBJ_GFX_MAN_4, 0, 0, 0, 6, 0, 2, 48, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FB8, 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
 

data/maps/events/BattleFrontier_Lounge4.inc

@@ -1,11 +1,11 @@
-BattleFrontier_Lounge4_MapObjects: @ 853D24C
+BattleFrontier_Lounge4_EventObjects: @ 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 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, MAP_OBJ_GFX_COOK, 0, 0, 6, 6, 0, 2, 17, 0, 0, 0, BattleFrontier_Lounge4_EventScript_263596, 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, MAP_OBJ_GFX_MAN_4, 0, 0, 0, 5, 0, 10, 18, 0, 0, 0, BattleFrontier_Lounge4_EventScript_26359F, 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
 

data/maps/events/BattleFrontier_Lounge5.inc

@@ -1,13 +1,13 @@
-BattleFrontier_Lounge5_MapObjects: @ 853D2EC
+BattleFrontier_Lounge5_EventObjects: @ 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 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, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 0, 4, 3, 10, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_264617, 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, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 6, 5, 0, 2, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_264620, 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, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 11, 7, 0, 1, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_264629, 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
 

data/maps/events/BattleFrontier_Lounge6.inc

@@ -1,9 +1,9 @@
-BattleFrontier_Lounge6_MapObjects: @ 853D370
+BattleFrontier_Lounge6_EventObjects: @ 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
+	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
 

data/maps/events/BattleFrontier_Lounge7.inc

@@ -1,12 +1,12 @@
-BattleFrontier_Lounge7_MapObjects: @ 853D3A4
+BattleFrontier_Lounge7_EventObjects: @ 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 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, 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 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, 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 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, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 8, 3, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_2656E4, 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
 

data/maps/events/BattleFrontier_Lounge8.inc

@@ -1,11 +1,11 @@
-BattleFrontier_Lounge8_MapObjects: @ 853D4BC
+BattleFrontier_Lounge8_EventObjects: @ 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 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, MAP_OBJ_GFX_MAN_4, 0, 0, 8, 7, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge8_EventScript_2676CA, 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, MAP_OBJ_GFX_WOMAN_7, 0, 0, 8, 4, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge8_EventScript_2676D3, 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
 

data/maps/events/BattleFrontier_Lounge9.inc

@@ -1,10 +1,10 @@
-BattleFrontier_Lounge9_MapObjects: @ 853D520
+BattleFrontier_Lounge9_EventObjects: @ 853D520
-	object_event 1, MAP_OBJ_GFX_GIRL_2, 0, 0, 6, 3, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+	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
 

data/maps/events/BattleFrontier_Mart.inc

@@ -1,13 +1,13 @@
-BattleFrontier_Mart_MapObjects: @ 853D68C
+BattleFrontier_Mart_EventObjects: @ 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 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, 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 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, 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 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, MAP_OBJ_GFX_BOY_2, 0, 0, 8, 4, 3, 9, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B20, 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
 

data/maps/events/BattleFrontier_OutsideEast.inc

@@ -1,30 +1,30 @@
-BattleFrontier_OutsideEast_MapObjects: @ 853BB10
+BattleFrontier_OutsideEast_EventObjects: @ 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 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, MAP_OBJ_GFX_MAN_4, 0, 0, 42, 15, 0, 2, 49, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C70, 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, MAP_OBJ_GFX_HIKER, 0, 0, 53, 6, 0, 8, 2, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C79, 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, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 54, 16, 0, 2, 18, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C82, 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, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 37, 32, 0, 7, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C8B, 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, MAP_OBJ_GFX_COOK, 0, 0, 41, 56, 3, 9, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C94, 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, 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 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, 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 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, MAP_OBJ_GFX_BOY_4, 0, 0, 45, 47, 3, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CB2, 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, 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 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, 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 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, MAP_OBJ_GFX_MAN_1, 0, 0, 17, 40, 0, 10, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CD6, 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, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 40, 56, 3, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C9F, 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, MAP_OBJ_GFX_SUDOWOODO, 0, 0, 54, 62, 3, 8, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CEA, 842, 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, MAP_OBJ_GFX_MANIAC, 0, 0, 42, 34, 3, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D79, 0, 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, MAP_OBJ_GFX_GIRL_3, 0, 0, 51, 53, 3, 2, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D82, 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, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 62, 18, 0, 46, 98, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D8B, 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, MAP_OBJ_GFX_MAN_4, 0, 0, 11, 21, 0, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D94, 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, MAP_OBJ_GFX_WOMAN_7, 0, 0, 10, 21, 0, 10, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D9D, 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, MAP_OBJ_GFX_WOMAN_7, 0, 0, 16, 30, 0, 2, 35, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DA6, 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, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 33, 14, 0, 7, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DAF, 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, MAP_OBJ_GFX_MANIAC, 0, 0, 54, 31, 0, 9, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DB8, 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, MAP_OBJ_GFX_WOMAN_5, 0, 0, 54, 32, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DC3, 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, 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 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, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 48, 41, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE0, 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, MAP_OBJ_GFX_CAMPER, 0, 0, 29, 14, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242E08, 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
 

data/maps/events/BattleFrontier_OutsideWest.inc

@@ -1,28 +1,28 @@
-BattleFrontier_OutsideWest_MapObjects: @ 853B350
+BattleFrontier_OutsideWest_EventObjects: @ 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 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, MAP_OBJ_GFX_SS_TIDAL, 0, 0, 20, 70, 0, 10, 17, 0, 0, 0, 0x0, 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, MAP_OBJ_GFX_BEAUTY, 0, 0, 19, 68, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D3F0, 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, 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 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, MAP_OBJ_GFX_MAN_4, 0, 0, 27, 30, 0, 2, 49, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D52D, 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, MAP_OBJ_GFX_WOMAN_7, 0, 0, 33, 41, 0, 2, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D69D, 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, MAP_OBJ_GFX_FAT_MAN, 0, 0, 28, 43, 0, 3, 48, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6A6, 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, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 17, 20, 0, 2, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D679, 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, MAP_OBJ_GFX_MANIAC, 0, 0, 13, 44, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D536, 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, MAP_OBJ_GFX_MANIAC, 0, 0, 14, 44, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D53D, 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, MAP_OBJ_GFX_MAN_6, 0, 0, 23, 47, 0, 15, 34, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D694, 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, MAP_OBJ_GFX_GIRL_1, 0, 0, 38, 27, 0, 2, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D5C6, 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, MAP_OBJ_GFX_WOMAN_4, 0, 0, 45, 18, 0, 3, 49, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D635, 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, MAP_OBJ_GFX_CAMPER, 0, 0, 9, 47, 0, 15, 33, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D57F, 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, MAP_OBJ_GFX_LASS, 0, 0, 35, 5, 0, 2, 18, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D682, 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, MAP_OBJ_GFX_MAN_2, 0, 0, 11, 66, 0, 9, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_249E19, 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, MAP_OBJ_GFX_FISHERMAN, 0, 0, 31, 31, 0, 8, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D667, 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, MAP_OBJ_GFX_FISHERMAN, 0, 0, 42, 48, 0, 18, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D518, 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, MAP_OBJ_GFX_FAT_MAN, 0, 0, 38, 22, 0, 3, 48, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6AF, 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, MAP_OBJ_GFX_WOMAN_3, 0, 0, 12, 9, 0, 8, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6B8, 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, MAP_OBJ_GFX_BOY_1, 0, 0, 12, 10, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6C3, 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, 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 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, MAP_OBJ_GFX_MAN_5, 0, 0, 8, 5, 0, 8, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6D7, 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, MAP_OBJ_GFX_WOMAN_2, 0, 0, 4, 26, 0, 24, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6EE, 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
 

data/maps/events/BattleFrontier_PokemonCenter_1F.inc

@@ -1,9 +1,9 @@
-BattleFrontier_PokemonCenter_1F_MapObjects: @ 853D55C
+BattleFrontier_PokemonCenter_1F_EventObjects: @ 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 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, 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 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, 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 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, MAP_OBJ_GFX_PICNICKER, 0, 0, 2, 3, 3, 9, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267928, 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, MAP_OBJ_GFX_SKITTY, 0, 0, 1, 3, 3, 10, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267931, 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
 

data/maps/events/BattleFrontier_PokemonCenter_2F.inc

@@ -1,8 +1,8 @@
-BattleFrontier_PokemonCenter_2F_MapObjects: @ 853D600
+BattleFrontier_PokemonCenter_2F_EventObjects: @ 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 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, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273761, 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, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273767, 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, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_276B03, 702, 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
 

data/maps/events/BattleFrontier_RankingHall.inc

@@ -1,7 +1,7 @@
-BattleFrontier_RankingHall_MapObjects: @ 853CEB8
+BattleFrontier_RankingHall_EventObjects: @ 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 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, 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 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, MAP_OBJ_GFX_BOY_3, 0, 0, 44, 11, 3, 2, 17, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E573, 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
 

data/maps/events/BattleFrontier_ReceptionGate.inc

@@ -1,14 +1,14 @@
-BattleFrontier_ReceptionGate_MapObjects: @ 853D420
+BattleFrontier_ReceptionGate_EventObjects: @ 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 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, MAP_OBJ_GFX_TEALA, 0, 0, 8, 11, 0, 9, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_266310, 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, MAP_OBJ_GFX_MAN_2, 0, 0, 8, 4, 0, 9, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_266436, 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, MAP_OBJ_GFX_SCOTT, 0, 0, 4, 5, 3, 8, 17, 0, 0, 0, 0x0, 836, 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, MAP_OBJ_GFX_MAN_2, 0, 0, 0, 4, 0, 10, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_2664F4, 0, 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
 

data/maps/events/BattleFrontier_ScottsHouse.inc

@@ -1,10 +1,10 @@
-BattleFrontier_ScottsHouse_MapObjects: @ 853D2B0
+BattleFrontier_ScottsHouse_EventObjects: @ 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
+	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
 

data/maps/events/BattlePyramidSquare01.inc

@@ -1,12 +1,12 @@
-BattlePyramidSquare01_MapObjects: @ 853A460
+BattlePyramidSquare01_EventObjects: @ 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 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, MAP_OBJ_GFX_GIRL_3, 0, 0, 5, 3, 4, 17, 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, MAP_OBJ_GFX_BOY_4, 0, 0, 2, 6, 4, 16, 17, 0, 1, 5, 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, MAP_OBJ_GFX_BOY_2, 0, 0, 6, 6, 4, 9, 17, 0, 1, 4, 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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 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, 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, 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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 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
 

data/maps/events/BattlePyramidSquare02.inc

@@ -1,12 +1,12 @@
-BattlePyramidSquare02_MapObjects: @ 853A51C
+BattlePyramidSquare02_EventObjects: @ 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 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, MAP_OBJ_GFX_WOMAN_2, 0, 0, 5, 6, 4, 15, 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, MAP_OBJ_GFX_FAT_MAN, 0, 0, 2, 6, 4, 16, 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, 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 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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 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, 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, 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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 2, 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
 

data/maps/events/BattlePyramidSquare03.inc

@@ -1,12 +1,12 @@
-BattlePyramidSquare03_MapObjects: @ 853A5D8
+BattlePyramidSquare03_EventObjects: @ 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 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, 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 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, MAP_OBJ_GFX_FISHERMAN, 0, 0, 6, 4, 4, 15, 17, 0, 1, 3, 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, MAP_OBJ_GFX_MAN_4, 0, 0, 3, 4, 4, 18, 17, 0, 1, 4, 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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 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, 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, 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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 2, 7, 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
 

data/maps/events/BattlePyramidSquare04.inc

@@ -1,12 +1,12 @@
-BattlePyramidSquare04_MapObjects: @ 853A694
+BattlePyramidSquare04_EventObjects: @ 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 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, MAP_OBJ_GFX_GIRL_1, 0, 0, 7, 7, 4, 15, 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, MAP_OBJ_GFX_BOY_4, 0, 0, 1, 4, 4, 18, 17, 0, 1, 6, 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, MAP_OBJ_GFX_GIRL_3, 0, 0, 6, 4, 4, 15, 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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 2, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 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, 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, 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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 0, 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
 

data/maps/events/BattlePyramidSquare05.inc

@@ -1,12 +1,12 @@
-BattlePyramidSquare05_MapObjects: @ 853A750
+BattlePyramidSquare05_EventObjects: @ 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 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, MAP_OBJ_GFX_BOY_2, 0, 0, 3, 7, 4, 16, 17, 0, 1, 5, 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, MAP_OBJ_GFX_BOY_2, 0, 0, 3, 1, 4, 8, 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, MAP_OBJ_GFX_BOY_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 3, 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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 6, 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, 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, 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
 

data/maps/events/BattlePyramidSquare06.inc

@@ -1,12 +1,12 @@
-BattlePyramidSquare06_MapObjects: @ 853A80C
+BattlePyramidSquare06_EventObjects: @ 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 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, MAP_OBJ_GFX_GIRL_2, 0, 0, 2, 5, 4, 16, 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, MAP_OBJ_GFX_GIRL_2, 0, 0, 5, 5, 4, 15, 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, MAP_OBJ_GFX_GIRL_2, 0, 0, 2, 2, 4, 18, 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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 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, 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, 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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 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, 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
 

data/maps/events/BattlePyramidSquare07.inc

@@ -1,12 +1,12 @@
-BattlePyramidSquare07_MapObjects: @ 853A8C8
+BattlePyramidSquare07_EventObjects: @ 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 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, 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 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, 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 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, 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 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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 1, 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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 7, 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
 

data/maps/events/BattlePyramidSquare08.inc

@@ -1,12 +1,12 @@
-BattlePyramidSquare08_MapObjects: @ 853A984
+BattlePyramidSquare08_EventObjects: @ 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 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, 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 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, 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 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, 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 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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 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, 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, 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, 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, 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
 

data/maps/events/BattlePyramidSquare09.inc

@@ -1,12 +1,12 @@
-BattlePyramidSquare09_MapObjects: @ 853AA40
+BattlePyramidSquare09_EventObjects: @ 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 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, 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 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, 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 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, 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 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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 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, 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
 

data/maps/events/BattlePyramidSquare10.inc

@@ -1,12 +1,12 @@
-BattlePyramidSquare10_MapObjects: @ 853AAFC
+BattlePyramidSquare10_EventObjects: @ 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 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, MAP_OBJ_GFX_GIRL_3, 0, 0, 0, 3, 4, 10, 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, MAP_OBJ_GFX_GIRL_3, 0, 0, 6, 5, 4, 9, 17, 0, 1, 6, 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, MAP_OBJ_GFX_GIRL_3, 0, 0, 0, 5, 4, 10, 17, 0, 1, 7, 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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 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, 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, 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, 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, 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
 

data/maps/events/BattlePyramidSquare11.inc

@@ -1,12 +1,12 @@
-BattlePyramidSquare11_MapObjects: @ 853ABB8
+BattlePyramidSquare11_EventObjects: @ 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 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, MAP_OBJ_GFX_BOY_4, 0, 0, 3, 6, 4, 14, 17, 0, 1, 4, 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, MAP_OBJ_GFX_BOY_4, 0, 0, 6, 4, 4, 8, 17, 0, 1, 3, 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, MAP_OBJ_GFX_BOY_4, 0, 0, 6, 7, 4, 7, 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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 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, 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
 

data/maps/events/BattlePyramidSquare12.inc

@@ -1,12 +1,12 @@
-BattlePyramidSquare12_MapObjects: @ 853AC74
+BattlePyramidSquare12_EventObjects: @ 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 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, MAP_OBJ_GFX_WOMAN_1, 0, 0, 0, 5, 4, 10, 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, MAP_OBJ_GFX_WOMAN_1, 0, 0, 3, 0, 4, 8, 17, 0, 1, 6, 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, MAP_OBJ_GFX_WOMAN_1, 0, 0, 3, 3, 4, 7, 17, 0, 1, 3, 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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 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, 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, 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, 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, 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
 

data/maps/events/BattlePyramidSquare13.inc

@@ -1,12 +1,12 @@
-BattlePyramidSquare13_MapObjects: @ 853AD30
+BattlePyramidSquare13_EventObjects: @ 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 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, MAP_OBJ_GFX_FAT_MAN, 0, 0, 5, 6, 4, 7, 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, MAP_OBJ_GFX_FAT_MAN, 0, 0, 1, 1, 4, 8, 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, MAP_OBJ_GFX_FAT_MAN, 0, 0, 1, 6, 4, 7, 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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 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, 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, 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, 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, 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
 

data/maps/events/BattlePyramidSquare14.inc

@@ -1,12 +1,12 @@
-BattlePyramidSquare14_MapObjects: @ 853ADEC
+BattlePyramidSquare14_EventObjects: @ 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 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, MAP_OBJ_GFX_WOMAN_2, 0, 0, 1, 1, 4, 18, 17, 0, 1, 6, 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, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 5, 4, 15, 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, MAP_OBJ_GFX_WOMAN_2, 0, 0, 0, 5, 4, 16, 17, 0, 1, 7, 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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 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, 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, 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, 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, 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
 

data/maps/events/BattlePyramidSquare15.inc

@@ -1,12 +1,12 @@
-BattlePyramidSquare15_MapObjects: @ 853AEA8
+BattlePyramidSquare15_EventObjects: @ 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 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, MAP_OBJ_GFX_WOMAN_2, 0, 0, 2, 1, 4, 18, 17, 0, 1, 6, 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, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 4, 4, 15, 17, 0, 1, 4, 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, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 0, 4, 17, 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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 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, 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
+	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
 

data/maps/events/BattlePyramidSquare16.inc

@@ -1,12 +1,12 @@
-BattlePyramidSquare16_MapObjects: @ 853AF64
+BattlePyramidSquare16_EventObjects: @ 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 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, MAP_OBJ_GFX_WOMAN_2, 0, 0, 1, 0, 0, 18, 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, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 7, 4, 15, 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, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 0, 4, 17, 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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 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, 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, 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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 2, 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
 

data/maps/events/BirthIsland_Exterior.inc

@@ -1,10 +1,10 @@
-BirthIsland_Exterior_MapObjects: @ 853D7DC
+BirthIsland_Exterior_EventObjects: @ 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 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, MAP_OBJ_GFX_DEOXYS, 0, 0, 15, 3, 0, 8, 17, 0, 0, 0, 0x0, 763, 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
 

data/maps/events/BirthIsland_Harbor.inc

@@ -1,10 +1,10 @@
-BirthIsland_Harbor_MapObjects: @ 853D828
+BirthIsland_Harbor_EventObjects: @ 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 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, MAP_OBJ_GFX_SS_TIDAL, 0, 0, 8, 7, 1, 10, 17, 0, 0, 0, 0x0, 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
 

data/maps/events/CaveOfOrigin_B1F.inc

@@ -1,9 +1,9 @@
-CaveOfOrigin_B1F_MapObjects: @ 8535DD0
+CaveOfOrigin_B1F_EventObjects: @ 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
+	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
 

data/maps/events/DesertRuins.inc

@@ -1,5 +1,5 @@
-DesertRuins_MapObjects: @ 8534354
+DesertRuins_EventObjects: @ 8534354
-	object_event 1, MAP_OBJ_GFX_REGIROCK, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, DesertRuins_EventScript_22DA02, 935, 0, 0
+	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
 

data/maps/events/DesertUnderpass.inc

@@ -1,9 +1,9 @@
-DesertUnderpass_MapObjects: @ 85376D4
+DesertUnderpass_EventObjects: @ 85376D4
-	object_event 1, MAP_OBJ_GFX_FOSSIL, 0, 0, 132, 10, 0, 8, 17, 0, 0, 0, DesertUnderpass_EventScript_23AF41, 874, 0, 0
+	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
 

data/maps/events/DewfordTown.inc

@@ -1,9 +1,9 @@
-DewfordTown_MapObjects: @ 8527964
+DewfordTown_EventObjects: @ 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 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, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 9, 3, 9, 16, 0, 0, 3, DewfordTown_EventScript_1E9511, 740, 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, MAP_OBJ_GFX_FISHERMAN, 0, 0, 12, 14, 3, 5, 1, 0, 0, 0, DewfordTown_EventScript_1E95D5, 0, 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, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 0, 12, 8, 1, 8, 0, 0, 0, 0, 0x0, 743, 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, MAP_OBJ_GFX_BOY_1, 0, 0, 1, 6, 3, 1, 0, 0, 0, 0, DewfordTown_EventScript_1E9922, 0, 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