Merge pull request #174 from garakmon/object_event

Dissassemble Event Object Data

asm/bike.s

@@ -77,7 +77,7 @@ sub_80BD100: @ 80BD100
 	lsls r4, r0, 3
 	adds r4, r0
 	lsls r4, 2
-	ldr r0, _080BD160 @ =gMapObjects
+	ldr r0, _080BD160 @ =gObjectEvents
 	adds r4, r0
 	bl player_get_direction_upper_nybble
 	lsls r0, 24
@@ -106,7 +106,7 @@ sub_80BD100: @ 80BD100
 	b _080BD1B6
 	.align 2, 0
 _080BD15C: .4byte gPlayerAvatar
-_080BD160: .4byte gMapObjects
+_080BD160: .4byte gObjectEvents
 _080BD164: .4byte gMain
 _080BD168:
 	ldrb r0, [r6]
@@ -204,7 +204,7 @@ sub_80BD1E8: @ 80BD1E8
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _080BD244 @ =gMapObjects
+	ldr r1, _080BD244 @ =gObjectEvents
 	adds r0, r1
 	ldrb r0, [r0, 0x1E]
 	bl MetatileBehavior_IsCyclingRoadPullDownTile
@@ -227,7 +227,7 @@ sub_80BD1E8: @ 80BD1E8
 	b _080BD270
 	.align 2, 0
 _080BD240: .4byte gPlayerAvatar
-_080BD244: .4byte gMapObjects
+_080BD244: .4byte gObjectEvents
 _080BD248:
 	movs r0, 0x2
 	strb r0, [r4, 0x2]
@@ -281,7 +281,7 @@ sub_80BD28C: @ 80BD28C
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _080BD2C4 @ =gMapObjects
+	ldr r1, _080BD2C4 @ =gObjectEvents
 	adds r5, r0, r1
 	ldrb r1, [r5, 0x1E]
 	adds r0, r4, 0
@@ -299,7 +299,7 @@ _080BD2B2:
 	bx r0
 	.align 2, 0
 _080BD2C0: .4byte gPlayerAvatar
-_080BD2C4: .4byte gMapObjects
+_080BD2C4: .4byte gObjectEvents
 	thumb_func_end sub_80BD28C
 
 	thumb_func_start sub_80BD2C8
@@ -313,7 +313,7 @@ sub_80BD2C8: @ 80BD2C8
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _080BD2FC @ =gMapObjects
+	ldr r1, _080BD2FC @ =gObjectEvents
 	adds r5, r0, r1
 	ldrb r1, [r5, 0x1E]
 	adds r0, r4, 0
@@ -327,7 +327,7 @@ sub_80BD2C8: @ 80BD2C8
 	b _080BD350
 	.align 2, 0
 _080BD2F8: .4byte gPlayerAvatar
-_080BD2FC: .4byte gMapObjects
+_080BD2FC: .4byte gObjectEvents
 _080BD300:
 	adds r0, r4, 0
 	bl sub_80BD3A0
@@ -425,7 +425,7 @@ sub_80BD3A0: @ 80BD3A0
 	lsls r4, r0, 3
 	adds r4, r0
 	lsls r4, 2
-	ldr r0, _080BD408 @ =gMapObjects
+	ldr r0, _080BD408 @ =gObjectEvents
 	adds r4, r0
 	ldrh r1, [r4, 0x10]
 	add r0, sp, 0x4
@@ -463,7 +463,7 @@ sub_80BD3A0: @ 80BD3A0
 	bx r1
 	.align 2, 0
 _080BD404: .4byte gPlayerAvatar
-_080BD408: .4byte gMapObjects
+_080BD408: .4byte gObjectEvents
 	thumb_func_end sub_80BD3A0
 
 	thumb_func_start sub_80BD40C
@@ -689,7 +689,7 @@ player_should_look_direction_be_enforced_upon_movement: @ 80BD58C
 	lsls r0, 24
 	cmp r0, 0
 	beq _080BD5C0
-	ldr r2, _080BD5B8 @ =gMapObjects
+	ldr r2, _080BD5B8 @ =gObjectEvents
 	ldr r0, _080BD5BC @ =gPlayerAvatar
 	ldrb r1, [r0, 0x5]
 	lsls r0, r1, 3
@@ -704,7 +704,7 @@ player_should_look_direction_be_enforced_upon_movement: @ 80BD58C
 	movs r0, 0
 	b _080BD5C2
 	.align 2, 0
-_080BD5B8: .4byte gMapObjects
+_080BD5B8: .4byte gObjectEvents
 _080BD5BC: .4byte gPlayerAvatar
 _080BD5C0:
 	movs r0, 0x1

asm/event_object_80688E4.s

@@ -5,8 +5,8 @@
 
 	.text
 
-	thumb_func_start FreezeMapObject
+	thumb_func_start FreezeObjectEvent
-FreezeMapObject: @ 80688E4
+FreezeObjectEvent: @ 80688E4
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldrh r1, [r5]
@@ -80,13 +80,13 @@ _0806896E:
 	pop {r4,r5}
 	pop {r1}
 	bx r1
-	thumb_func_end FreezeMapObject
+	thumb_func_end FreezeObjectEvent
 
-	thumb_func_start FreezeEventObjects
+	thumb_func_start FreezeObjectEvents
-FreezeEventObjects: @ 8068974
+FreezeObjectEvents: @ 8068974
 	push {r4,r5,lr}
 	movs r4, 0
-	ldr r5, _080689A8 @ =gMapObjects
+	ldr r5, _080689A8 @ =gObjectEvents
 _0806897A:
 	lsls r0, r4, 3
 	adds r0, r4
@@ -101,7 +101,7 @@ _0806897A:
 	cmp r4, r0
 	beq _08068998
 	adds r0, r1, 0
-	bl FreezeMapObject
+	bl FreezeObjectEvent
 _08068998:
 	adds r0, r4, 0x1
 	lsls r0, 24
@@ -112,17 +112,17 @@ _08068998:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080689A8: .4byte gMapObjects
+_080689A8: .4byte gObjectEvents
 _080689AC: .4byte gPlayerAvatar
-	thumb_func_end FreezeEventObjects
+	thumb_func_end FreezeObjectEvents
 
-	thumb_func_start FreezeMapObjectsExceptOne
+	thumb_func_start FreezeObjectEventsExceptOne
-FreezeMapObjectsExceptOne: @ 80689B0
+FreezeObjectEventsExceptOne: @ 80689B0
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
 	movs r4, 0
-	ldr r6, _080689EC @ =gMapObjects
+	ldr r6, _080689EC @ =gObjectEvents
 _080689BA:
 	cmp r4, r5
 	beq _080689DC
@@ -139,7 +139,7 @@ _080689BA:
 	cmp r4, r0
 	beq _080689DC
 	adds r0, r1, 0
-	bl FreezeMapObject
+	bl FreezeObjectEvent
 _080689DC:
 	adds r0, r4, 0x1
 	lsls r0, 24
@@ -150,9 +150,9 @@ _080689DC:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080689EC: .4byte gMapObjects
+_080689EC: .4byte gObjectEvents
 _080689F0: .4byte gPlayerAvatar
-	thumb_func_end FreezeMapObjectsExceptOne
+	thumb_func_end FreezeObjectEventsExceptOne
 
 	thumb_func_start npc_sync_anim_pause_bits
 npc_sync_anim_pause_bits: @ 80689F4
@@ -209,11 +209,11 @@ _08068A54: .4byte 0x00000101
 _08068A58: .4byte gSprites
 	thumb_func_end npc_sync_anim_pause_bits
 
-	thumb_func_start UnfreezeMapObjects
+	thumb_func_start UnfreezeObjectEvents
-UnfreezeMapObjects: @ 8068A5C
+UnfreezeObjectEvents: @ 8068A5C
 	push {r4,r5,lr}
 	movs r4, 0
-	ldr r5, _08068A88 @ =gMapObjects
+	ldr r5, _08068A88 @ =gObjectEvents
 _08068A62:
 	lsls r0, r4, 3
 	adds r0, r4
@@ -235,8 +235,8 @@ _08068A78:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08068A88: .4byte gMapObjects
+_08068A88: .4byte gObjectEvents
-	thumb_func_end UnfreezeMapObjects
+	thumb_func_end UnfreezeObjectEvents
 
 	thumb_func_start little_step
 little_step: @ 8068A8C
@@ -788,14 +788,14 @@ _08068E50: .4byte gUnknown_83A7202
 _08068E54: .4byte gUnknown_83A7208
 	thumb_func_end sub_8068DC4
 
-	thumb_func_start SetFieldObjectStepTimer
+	thumb_func_start SetObjectEventStepTimer
-SetFieldObjectStepTimer: @ 8068E58
+SetObjectEventStepTimer: @ 8068E58
 	strh r1, [r0, 0x34]
 	bx lr
-	thumb_func_end SetFieldObjectStepTimer
+	thumb_func_end SetObjectEventStepTimer
 
-	thumb_func_start RunFieldObjectStepTimer
+	thumb_func_start RunObjectEventStepTimer
-RunFieldObjectStepTimer: @ 8068E5C
+RunObjectEventStepTimer: @ 8068E5C
 	push {lr}
 	ldrh r1, [r0, 0x34]
 	subs r1, 0x1
@@ -810,7 +810,7 @@ _08068E6E:
 _08068E70:
 	pop {r1}
 	bx r1
-	thumb_func_end RunFieldObjectStepTimer
+	thumb_func_end RunObjectEventStepTimer
 
 	thumb_func_start obj_anim_image_set_and_seek
 obj_anim_image_set_and_seek: @ 8068E74
@@ -1099,7 +1099,7 @@ sub_8069058: @ 8069058
 	ldr r0, _08069090 @ =gSprites
 	adds r4, r0
 	adds r0, r5, 0
-	bl FieldObjectDirectionToImageAnimId
+	bl ObjectEventDirectionToImageAnimId
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -1130,7 +1130,7 @@ sub_8069094: @ 8069094
 	ldr r1, _080690F8 @ =gSprites
 	adds r4, r0, r1
 	adds r0, r5, 0
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	ldrh r3, [r4, 0x4]
 	lsls r3, 22
 	ldr r1, [r0, 0x10]
@@ -1441,7 +1441,7 @@ oe_exec_and_other_stuff: @ 80692C8
 	adds r2, r1, 0x4
 	adds r3, r1, 0
 	adds r3, 0x8
-	bl FieldObjectGetLocalIdAndMap
+	bl ObjectEventGetLocalIdAndMap
 	adds r0, r4, 0
 	bl FieldEffectStart
 	pop {r4}
@@ -1474,7 +1474,7 @@ DoRippleFieldEffect: @ 806930C
 	push {r4,lr}
 	adds r4, r1, 0
 	ldrb r0, [r0, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	ldr r2, _08069344 @ =gFieldEffectArguments
 	movs r3, 0x20
 	ldrsh r1, [r4, r3]

asm/field_camera.s

@@ -939,7 +939,7 @@ _0805AC54:
 	bl CameraMove
 	adds r0, r4, 0
 	adds r1, r5, 0
-	bl UpdateFieldObjectsForCameraUpdate
+	bl UpdateObjectEventsForCameraUpdate
 	ldr r6, _0805ACA8 @ =gUnknown_3000E90
 	lsls r4, 1
 	lsls r5, 1
@@ -987,7 +987,7 @@ sub_805ACB4: @ 805ACB4
 	asrs r0, 16
 	lsls r1, r5, 16
 	asrs r1, 16
-	bl UpdateFieldObjectsForCameraUpdate
+	bl UpdateObjectEventsForCameraUpdate
 	bl DrawWholeMapView
 	ldr r1, _0805ACE8 @ =gUnknown_300506C
 	lsls r4, 4

asm/field_control_avatar.s

@@ -901,12 +901,12 @@ _0806CF60:
 	lsrs r1, 16
 _0806CF7E:
 	ldrb r2, [r4, 0x4]
-	bl GetFieldObjectIdByXYZ
+	bl GetObjectEventIdByXYZ
 	lsls r0, 24
 	lsrs r3, r0, 24
 	cmp r3, 0x10
 	beq _0806CF9E
-	ldr r1, _0806CFA8 @ =gMapObjects
+	ldr r1, _0806CFA8 @ =gObjectEvents
 	lsls r2, r3, 3
 	adds r0, r2, r3
 	lsls r0, 2
@@ -920,7 +920,7 @@ _0806CF9E:
 	b _0806CFDE
 	.align 2, 0
 _0806CFA4: .4byte gDirectionToVectors
-_0806CFA8: .4byte gMapObjects
+_0806CFA8: .4byte gObjectEvents
 _0806CFAC:
 	movs r4, 0
 	ldr r1, _0806CFE4 @ =gUnknown_2031DEC
@@ -936,7 +936,7 @@ _0806CFBC:
 	adds r4, 0x1
 	cmp r4, 0x3
 	ble _0806CFB0
-	ldr r0, _0806CFE8 @ =gSelectedEventObject
+	ldr r0, _0806CFE8 @ =gSelectedObjectEvent
 	strb r3, [r0]
 	ldr r1, _0806CFEC @ =gSpecialVar_LastTalked
 	adds r0, r2, r3
@@ -947,14 +947,14 @@ _0806CFBC:
 	ldr r0, _0806CFF0 @ =gSpecialVar_Facing
 	strh r6, [r0]
 	adds r0, r3, 0
-	bl GetFieldObjectScriptPointerByFieldObjectId
+	bl GetObjectEventScriptPointerByObjectEventId
 _0806CFDE:
 	pop {r4-r6}
 	pop {r1}
 	bx r1
 	.align 2, 0
 _0806CFE4: .4byte gUnknown_2031DEC
-_0806CFE8: .4byte gSelectedEventObject
+_0806CFE8: .4byte gSelectedObjectEvent
 _0806CFEC: .4byte gSpecialVar_LastTalked
 _0806CFF0: .4byte gSpecialVar_Facing
 	thumb_func_end sub_806CF38
@@ -973,12 +973,12 @@ sub_806CFF4: @ 806CFF4
 	ldrh r0, [r4]
 	ldrh r1, [r4, 0x2]
 	ldrb r2, [r4, 0x4]
-	bl GetFieldObjectIdByXYZ
+	bl GetObjectEventIdByXYZ
 	lsls r0, 24
 	lsrs r5, r0, 24
 	cmp r5, 0x10
 	beq _0806D02A
-	ldr r2, _0806D098 @ =gMapObjects
+	ldr r2, _0806D098 @ =gObjectEvents
 	lsls r1, r5, 3
 	adds r0, r1, r5
 	lsls r0, 2
@@ -1011,12 +1011,12 @@ _0806D02A:
 	lsls r1, 16
 	lsrs r1, 16
 	ldrb r2, [r4, 0x4]
-	bl GetFieldObjectIdByXYZ
+	bl GetObjectEventIdByXYZ
 	lsls r0, 24
 	lsrs r5, r0, 24
 	cmp r5, 0x10
 	beq _0806D092
-	ldr r2, _0806D098 @ =gMapObjects
+	ldr r2, _0806D098 @ =gObjectEvents
 	lsls r1, r5, 3
 	adds r0, r1, r5
 	lsls r0, 2
@@ -1031,9 +1031,9 @@ _0806D078:
 	bne _0806D0A0
 	adds r0, r6, r5
 	lsls r0, 2
-	ldr r1, _0806D098 @ =gMapObjects
+	ldr r1, _0806D098 @ =gObjectEvents
 	adds r0, r1
-	bl FieldObjectCheckHeldMovementStatus
+	bl ObjectEventCheckHeldMovementStatus
 	lsls r0, 24
 	cmp r0, 0
 	bne _0806D0A0
@@ -1041,13 +1041,13 @@ _0806D092:
 	movs r0, 0
 	b _0806D0C8
 	.align 2, 0
-_0806D098: .4byte gMapObjects
+_0806D098: .4byte gObjectEvents
 _0806D09C: .4byte gDirectionToVectors
 _0806D0A0:
-	ldr r0, _0806D0D4 @ =gSelectedEventObject
+	ldr r0, _0806D0D4 @ =gSelectedObjectEvent
 	strb r5, [r0]
 	ldr r4, _0806D0D8 @ =gSpecialVar_LastTalked
-	ldr r1, _0806D0DC @ =gMapObjects
+	ldr r1, _0806D0DC @ =gObjectEvents
 	adds r0, r6, r5
 	lsls r0, 2
 	adds r0, r1
@@ -1057,7 +1057,7 @@ _0806D0A0:
 	mov r1, r8
 	strh r1, [r0]
 	adds r0, r5, 0
-	bl GetFieldObjectScriptPointerByFieldObjectId
+	bl GetObjectEventScriptPointerByObjectEventId
 	adds r1, r0, 0
 	ldrb r0, [r4]
 	bl GetRamScript
@@ -1069,9 +1069,9 @@ _0806D0C8:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_0806D0D4: .4byte gSelectedEventObject
+_0806D0D4: .4byte gSelectedObjectEvent
 _0806D0D8: .4byte gSpecialVar_LastTalked
-_0806D0DC: .4byte gMapObjects
+_0806D0DC: .4byte gObjectEvents
 _0806D0E0: .4byte gSpecialVar_Facing
 	thumb_func_end sub_806CFF4
 
@@ -1093,7 +1093,7 @@ sub_806D0E4: @ 806D0E4
 	lsrs r2, 16
 	ldrb r3, [r0, 0x4]
 	adds r0, r4, 0
-	bl FindInvisibleMapObjectByPosition
+	bl FindInvisibleObjectEventByPosition
 	adds r5, r0, 0
 	cmp r5, 0
 	beq _0806D164
@@ -2139,7 +2139,7 @@ sub_806D928: @ 806D928
 	lsrs r2, 16
 	ldrb r3, [r0, 0x4]
 	adds r0, r4, 0
-	bl FindInvisibleMapObjectByPosition
+	bl FindInvisibleObjectEventByPosition
 	cmp r0, 0
 	bne _0806D950
 	movs r0, 0
@@ -2809,7 +2809,7 @@ sub_806DE28: @ 806DE28
 	ldr r2, [r4]
 	ldrb r1, [r2, 0x5]
 	ldrb r2, [r2, 0x4]
-	bl RemoveFieldObjectByLocalIdAndMap
+	bl RemoveObjectEventByLocalIdAndMap
 	ldrb r0, [r5, 0x8]
 	ldr r2, [r4]
 	ldrb r1, [r2, 0x5]
@@ -2892,8 +2892,8 @@ sub_806DEC4: @ 806DEC4
 _0806DEE8: .4byte gMapHeader
 	thumb_func_end sub_806DEC4
 
-	thumb_func_start FindInvisibleMapObjectByPosition
+	thumb_func_start FindInvisibleObjectEventByPosition
-FindInvisibleMapObjectByPosition: @ 806DEEC
+FindInvisibleObjectEventByPosition: @ 806DEEC
 	push {r4-r7,lr}
 	lsls r1, 16
 	lsrs r7, r1, 16
@@ -2938,7 +2938,7 @@ _0806DF34:
 	pop {r4-r7}
 	pop {r1}
 	bx r1
-	thumb_func_end FindInvisibleMapObjectByPosition
+	thumb_func_end FindInvisibleObjectEventByPosition
 
 	thumb_func_start dive_warp
 dive_warp: @ 806DF3C
@@ -3079,8 +3079,8 @@ _0806E046:
 	bx r1
 	thumb_func_end sub_806DFB8
 
-	thumb_func_start GetFieldObjectScriptPointerForComparison
+	thumb_func_start GetObjectEventScriptPointerForComparison
-GetFieldObjectScriptPointerForComparison: @ 806E050
+GetObjectEventScriptPointerForComparison: @ 806E050
 	push {r4,r5,lr}
 	sub sp, 0x8
 	bl player_get_direction_upper_nybble
@@ -3106,7 +3106,7 @@ GetFieldObjectScriptPointerForComparison: @ 806E050
 	pop {r4,r5}
 	pop {r1}
 	bx r1
-	thumb_func_end GetFieldObjectScriptPointerForComparison
+	thumb_func_end GetObjectEventScriptPointerForComparison
 
 	thumb_func_start SetCableClubWarp
 SetCableClubWarp: @ 806E08C

asm/field_effect_helpers.s

@@ -105,7 +105,7 @@ _080DAE3C: .4byte gDummySpriteAffineAnimTable
 sub_80DAE40: @ 80DAE40
 	push {lr}
 	ldrb r0, [r0, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	ldrh r0, [r0, 0xA]
 	subs r0, 0x2
 	lsls r0, 16
@@ -127,7 +127,7 @@ npc_pal_op: @ 80DAE54
 	movs r0, 0
 	strh r0, [r4, 0x32]
 	ldrb r0, [r5, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	ldrb r1, [r0, 0xC]
 	movs r0, 0x80
 	ands r0, r1
@@ -176,7 +176,7 @@ npc_pal_op_B: @ 80DAEC4
 	lsls r1, 24
 	lsrs r4, r1, 24
 	ldrb r0, [r0, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	adds r2, r0, 0
 	ldrh r1, [r2, 0x4]
 	ldr r0, _080DAEF0 @ =0x000011ff
@@ -222,7 +222,7 @@ npc_pal_op_A: @ 80DAF20
 	lsls r1, 24
 	lsrs r4, r1, 24
 	ldrb r0, [r0, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	adds r2, r0, 0
 	ldrh r1, [r2, 0x4]
 	ldr r0, _080DAF4C @ =0x000011ff
@@ -253,7 +253,7 @@ sub_80DAF50: @ 80DAF50
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _080DAF98 @ =gMapObjects
+	ldr r1, _080DAF98 @ =gObjectEvents
 	adds r7, r0, r1
 	ldrb r1, [r7, 0x4]
 	lsls r0, r1, 4
@@ -281,7 +281,7 @@ _080DAF88:
 	strb r0, [r2]
 	b _080DB0AE
 	.align 2, 0
-_080DAF98: .4byte gMapObjects
+_080DAF98: .4byte gObjectEvents
 _080DAF9C: .4byte gSprites
 _080DAFA0: .4byte 0x00020001
 _080DAFA4:
@@ -432,7 +432,7 @@ _080DB0C0: .4byte 0xfffffc00
 	thumb_func_start sub_80DB0C4
 sub_80DB0C4: @ 80DB0C4
 	push {r4,lr}
-	ldr r0, _080DB10C @ =gUnknown_83A0010
+	ldr r0, _080DB10C @ =gFieldEffectObjectTemplatePointers
 	ldr r0, [r0, 0x20]
 	movs r1, 0
 	movs r2, 0
@@ -467,7 +467,7 @@ _080DB102:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_080DB10C: .4byte gUnknown_83A0010
+_080DB10C: .4byte gFieldEffectObjectTemplatePointers
 _080DB110: .4byte gSprites
 	thumb_func_end sub_80DB0C4
 
@@ -584,18 +584,18 @@ oei_shadow: @ 80DB1DC
 	ldrb r0, [r5]
 	ldrb r1, [r5, 0x4]
 	ldrb r2, [r5, 0x8]
-	bl GetFieldObjectIdByLocalIdAndMap
+	bl GetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	lsrs r0, 24
-	ldr r2, _080DB26C @ =gMapObjects
+	ldr r2, _080DB26C @ =gObjectEvents
 	lsls r1, r0, 3
 	adds r1, r0
 	lsls r1, 2
 	adds r1, r2
 	ldrb r0, [r1, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	adds r4, r0, 0
-	ldr r2, _080DB270 @ =gUnknown_83A0010
+	ldr r2, _080DB270 @ =gFieldEffectObjectTemplatePointers
 	ldr r1, _080DB274 @ =gUnknown_83FECD2
 	ldrb r0, [r4, 0xC]
 	lsls r0, 26
@@ -649,8 +649,8 @@ _080DB260:
 	bx r1
 	.align 2, 0
 _080DB268: .4byte gFieldEffectArguments
-_080DB26C: .4byte gMapObjects
+_080DB26C: .4byte gObjectEvents
-_080DB270: .4byte gUnknown_83A0010
+_080DB270: .4byte gFieldEffectObjectTemplatePointers
 _080DB274: .4byte gUnknown_83FECD2
 _080DB278: .4byte gSprites
 _080DB27C: .4byte gUnknown_83FECD6
@@ -671,7 +671,7 @@ oamc_shadow: @ 80DB280
 	lsls r2, 24
 	lsrs r2, 24
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	beq _080DB2AE
@@ -685,7 +685,7 @@ _080DB2AE:
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _080DB33C @ =gMapObjects
+	ldr r1, _080DB33C @ =gObjectEvents
 	adds r4, r0, r1
 	ldrb r0, [r4, 0x4]
 	lsls r1, r0, 4
@@ -748,7 +748,7 @@ _080DB334:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080DB33C: .4byte gMapObjects
+_080DB33C: .4byte gObjectEvents
 _080DB340: .4byte gSprites
 _080DB344: .4byte 0x00400001
 	thumb_func_end oamc_shadow
@@ -770,7 +770,7 @@ oei_grass_normal: @ 80DB348
 	movs r2, 0x8
 	movs r3, 0x8
 	bl sub_8063BC4
-	ldr r0, _080DB3E4 @ =gUnknown_83A0010
+	ldr r0, _080DB3E4 @ =gFieldEffectObjectTemplatePointers
 	ldr r0, [r0, 0x10]
 	mov r1, sp
 	movs r2, 0
@@ -830,7 +830,7 @@ _080DB3D4:
 	bx r1
 	.align 2, 0
 _080DB3E0: .4byte gFieldEffectArguments
-_080DB3E4: .4byte gUnknown_83A0010
+_080DB3E4: .4byte gFieldEffectObjectTemplatePointers
 _080DB3E8: .4byte gSprites
 	thumb_func_end oei_grass_normal
 
@@ -895,7 +895,7 @@ _080DB438:
 	adds r1, r4, 0
 	adds r2, r7, 0
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _080DB48C
@@ -929,7 +929,7 @@ _080DB4A0:
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _080DB4F0 @ =gMapObjects
+	ldr r1, _080DB4F0 @ =gObjectEvents
 	adds r2, r0, r1
 	ldr r0, [r2, 0x10]
 	ldr r1, [r5, 0x30]
@@ -966,7 +966,7 @@ _080DB4E4:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080DB4F0: .4byte gMapObjects
+_080DB4F0: .4byte gObjectEvents
 	thumb_func_end unc_grass_normal
 
 	thumb_func_start FldEff_JumpTallGrass
@@ -978,7 +978,7 @@ FldEff_JumpTallGrass: @ 80DB4F4
 	movs r2, 0x8
 	movs r3, 0xC
 	bl sub_8063BC4
-	ldr r0, _080DB55C @ =gUnknown_83A0010
+	ldr r0, _080DB55C @ =gFieldEffectObjectTemplatePointers
 	ldr r0, [r0, 0x28]
 	movs r2, 0
 	ldrsh r1, [r4, r2]
@@ -1022,7 +1022,7 @@ _080DB550:
 	bx r1
 	.align 2, 0
 _080DB558: .4byte gFieldEffectArguments
-_080DB55C: .4byte gUnknown_83A0010
+_080DB55C: .4byte gFieldEffectObjectTemplatePointers
 _080DB560: .4byte gSprites
 	thumb_func_end FldEff_JumpTallGrass
 
@@ -1120,7 +1120,7 @@ FldEff_LongGrass: @ 80DB5F4
 	movs r2, 0x8
 	movs r3, 0x8
 	bl sub_8063BC4
-	ldr r0, _080DB694 @ =gUnknown_83A0010
+	ldr r0, _080DB694 @ =gFieldEffectObjectTemplatePointers
 	ldr r0, [r0, 0x3C]
 	mov r1, sp
 	movs r2, 0
@@ -1181,7 +1181,7 @@ _080DB684:
 	bx r1
 	.align 2, 0
 _080DB690: .4byte gFieldEffectArguments
-_080DB694: .4byte gUnknown_83A0010
+_080DB694: .4byte gFieldEffectObjectTemplatePointers
 _080DB698: .4byte gSprites
 	thumb_func_end FldEff_LongGrass
 
@@ -1246,7 +1246,7 @@ _080DB6E8:
 	adds r1, r7, 0
 	adds r2, r6, 0
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _080DB73C
@@ -1280,7 +1280,7 @@ _080DB750:
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _080DB794 @ =gMapObjects
+	ldr r1, _080DB794 @ =gObjectEvents
 	adds r2, r0, r1
 	ldr r0, [r2, 0x10]
 	ldr r1, [r5, 0x30]
@@ -1309,7 +1309,7 @@ _080DB786:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080DB794: .4byte gMapObjects
+_080DB794: .4byte gObjectEvents
 	thumb_func_end unc_grass_tall
 
 	thumb_func_start FldEff_JumpLongGrass
@@ -1321,7 +1321,7 @@ FldEff_JumpLongGrass: @ 80DB798
 	movs r2, 0x8
 	movs r3, 0x8
 	bl sub_8063BC4
-	ldr r0, _080DB800 @ =gUnknown_83A0010
+	ldr r0, _080DB800 @ =gFieldEffectObjectTemplatePointers
 	ldr r0, [r0, 0x40]
 	movs r2, 0
 	ldrsh r1, [r4, r2]
@@ -1365,7 +1365,7 @@ _080DB7F4:
 	bx r1
 	.align 2, 0
 _080DB7FC: .4byte gFieldEffectArguments
-_080DB800: .4byte gUnknown_83A0010
+_080DB800: .4byte gFieldEffectObjectTemplatePointers
 _080DB804: .4byte gSprites
 	thumb_func_end FldEff_JumpLongGrass
 
@@ -1376,15 +1376,15 @@ sub_80DB808: @ 80DB808
 	ldrb r0, [r6]
 	ldrb r1, [r6, 0x4]
 	ldrb r2, [r6, 0x8]
-	bl GetFieldObjectIdByLocalIdAndMap
+	bl GetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	lsrs r0, 24
 	lsls r1, r0, 3
 	adds r1, r0
 	lsls r1, 2
-	ldr r0, _080DB8A0 @ =gMapObjects
+	ldr r0, _080DB8A0 @ =gObjectEvents
 	adds r5, r1, r0
-	ldr r0, _080DB8A4 @ =gUnknown_83A0010
+	ldr r0, _080DB8A4 @ =gFieldEffectObjectTemplatePointers
 	ldr r0, [r0, 0x78]
 	movs r1, 0
 	movs r2, 0
@@ -1446,8 +1446,8 @@ _080DB894:
 	bx r1
 	.align 2, 0
 _080DB89C: .4byte gFieldEffectArguments
-_080DB8A0: .4byte gMapObjects
+_080DB8A0: .4byte gObjectEvents
-_080DB8A4: .4byte gUnknown_83A0010
+_080DB8A4: .4byte gFieldEffectObjectTemplatePointers
 _080DB8A8: .4byte gSprites
 	thumb_func_end sub_80DB808
 
@@ -1468,11 +1468,11 @@ sub_80DB8AC: @ 80DB8AC
 	lsls r2, 24
 	lsrs r2, 24
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _080DB8EA
-	ldr r5, _080DB8F4 @ =gMapObjects
+	ldr r5, _080DB8F4 @ =gObjectEvents
 	mov r0, sp
 	ldrb r1, [r0]
 	lsls r0, r1, 3
@@ -1489,10 +1489,10 @@ _080DB8EA:
 	bl FieldEffectStop
 	b _080DB98E
 	.align 2, 0
-_080DB8F4: .4byte gMapObjects
+_080DB8F4: .4byte gObjectEvents
 _080DB8F8:
 	ldrb r0, [r1, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	mov r8, r0
 	mov r0, sp
 	ldrb r1, [r0]
@@ -1585,7 +1585,7 @@ FldEff_SandFootprints: @ 80DB9A0
 	movs r2, 0x8
 	movs r3, 0x8
 	bl sub_8063BC4
-	ldr r0, _080DBA0C @ =gUnknown_83A0010
+	ldr r0, _080DBA0C @ =gFieldEffectObjectTemplatePointers
 	ldr r0, [r0, 0x2C]
 	movs r2, 0
 	ldrsh r1, [r4, r2]
@@ -1629,7 +1629,7 @@ _080DB9FE:
 	bx r1
 	.align 2, 0
 _080DBA08: .4byte gFieldEffectArguments
-_080DBA0C: .4byte gUnknown_83A0010
+_080DBA0C: .4byte gFieldEffectObjectTemplatePointers
 _080DBA10: .4byte gSprites
 	thumb_func_end FldEff_SandFootprints
 
@@ -1642,7 +1642,7 @@ FldEff_DeepSandFootprints: @ 80DBA14
 	movs r2, 0x8
 	movs r3, 0x8
 	bl sub_8063BC4
-	ldr r0, _080DBA80 @ =gUnknown_83A0010
+	ldr r0, _080DBA80 @ =gFieldEffectObjectTemplatePointers
 	ldr r0, [r0, 0x5C]
 	movs r2, 0
 	ldrsh r1, [r4, r2]
@@ -1687,7 +1687,7 @@ _080DBA74:
 	bx r1
 	.align 2, 0
 _080DBA7C: .4byte gFieldEffectArguments
-_080DBA80: .4byte gUnknown_83A0010
+_080DBA80: .4byte gFieldEffectObjectTemplatePointers
 _080DBA84: .4byte gSprites
 	thumb_func_end FldEff_DeepSandFootprints
 
@@ -1700,7 +1700,7 @@ FldEff_BikeTireTracks: @ 80DBA88
 	movs r2, 0x8
 	movs r3, 0x8
 	bl sub_8063BC4
-	ldr r0, _080DBAF4 @ =gUnknown_83A0010
+	ldr r0, _080DBAF4 @ =gFieldEffectObjectTemplatePointers
 	ldr r0, [r0, 0x6C]
 	movs r2, 0
 	ldrsh r1, [r4, r2]
@@ -1745,7 +1745,7 @@ _080DBAE8:
 	bx r1
 	.align 2, 0
 _080DBAF0: .4byte gFieldEffectArguments
-_080DBAF4: .4byte gUnknown_83A0010
+_080DBAF4: .4byte gFieldEffectObjectTemplatePointers
 _080DBAF8: .4byte gSprites
 	thumb_func_end FldEff_BikeTireTracks
 
@@ -1833,15 +1833,15 @@ FldEff_Splash: @ 80DBB88
 	ldrb r0, [r6]
 	ldrb r1, [r6, 0x4]
 	ldrb r2, [r6, 0x8]
-	bl GetFieldObjectIdByLocalIdAndMap
+	bl GetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	lsrs r0, 24
 	lsls r1, r0, 3
 	adds r1, r0
 	lsls r1, 2
-	ldr r0, _080DBC20 @ =gMapObjects
+	ldr r0, _080DBC20 @ =gObjectEvents
 	adds r5, r1, r0
-	ldr r0, _080DBC24 @ =gUnknown_83A0010
+	ldr r0, _080DBC24 @ =gFieldEffectObjectTemplatePointers
 	ldr r0, [r0, 0x34]
 	movs r1, 0
 	movs r2, 0
@@ -1852,7 +1852,7 @@ FldEff_Splash: @ 80DBB88
 	cmp r4, 0x40
 	beq _080DBC12
 	ldrb r0, [r5, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	lsls r3, r4, 4
 	adds r3, r4
 	lsls r3, 2
@@ -1900,8 +1900,8 @@ _080DBC12:
 	bx r1
 	.align 2, 0
 _080DBC1C: .4byte gFieldEffectArguments
-_080DBC20: .4byte gMapObjects
+_080DBC20: .4byte gObjectEvents
-_080DBC24: .4byte gUnknown_83A0010
+_080DBC24: .4byte gFieldEffectObjectTemplatePointers
 _080DBC28: .4byte gSprites
 	thumb_func_end FldEff_Splash
 
@@ -1926,7 +1926,7 @@ sub_80DBC2C: @ 80DBC2C
 	lsls r2, 24
 	lsrs r2, 24
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	beq _080DBC66
@@ -1937,7 +1937,7 @@ _080DBC5C:
 	b _080DBCA6
 _080DBC66:
 	ldr r3, _080DBCB0 @ =gSprites
-	ldr r2, _080DBCB4 @ =gMapObjects
+	ldr r2, _080DBCB4 @ =gObjectEvents
 	mov r0, sp
 	ldrb r1, [r0]
 	lsls r0, r1, 3
@@ -1974,7 +1974,7 @@ _080DBCA6:
 	bx r0
 	.align 2, 0
 _080DBCB0: .4byte gSprites
-_080DBCB4: .4byte gMapObjects
+_080DBCB4: .4byte gObjectEvents
 	thumb_func_end sub_80DBC2C
 
 	thumb_func_start FldEff_JumpSmallSplash
@@ -1986,7 +1986,7 @@ FldEff_JumpSmallSplash: @ 80DBCB8
 	movs r2, 0x8
 	movs r3, 0xC
 	bl sub_8063BC4
-	ldr r0, _080DBD20 @ =gUnknown_83A0010
+	ldr r0, _080DBD20 @ =gFieldEffectObjectTemplatePointers
 	ldr r0, [r0, 0x38]
 	movs r2, 0
 	ldrsh r1, [r4, r2]
@@ -2030,7 +2030,7 @@ _080DBD14:
 	bx r1
 	.align 2, 0
 _080DBD1C: .4byte gFieldEffectArguments
-_080DBD20: .4byte gUnknown_83A0010
+_080DBD20: .4byte gFieldEffectObjectTemplatePointers
 _080DBD24: .4byte gSprites
 	thumb_func_end FldEff_JumpSmallSplash
 
@@ -2043,7 +2043,7 @@ oei_water_drop_tall: @ 80DBD28
 	movs r2, 0x8
 	movs r3, 0x8
 	bl sub_8063BC4
-	ldr r0, _080DBD90 @ =gUnknown_83A0010
+	ldr r0, _080DBD90 @ =gFieldEffectObjectTemplatePointers
 	ldr r0, [r0, 0x30]
 	movs r2, 0
 	ldrsh r1, [r4, r2]
@@ -2087,7 +2087,7 @@ _080DBD84:
 	bx r1
 	.align 2, 0
 _080DBD8C: .4byte gFieldEffectArguments
-_080DBD90: .4byte gUnknown_83A0010
+_080DBD90: .4byte gFieldEffectObjectTemplatePointers
 _080DBD94: .4byte gSprites
 	thumb_func_end oei_water_drop_tall
 
@@ -2098,15 +2098,15 @@ FldEff_FeetInFlowingWater: @ 80DBD98
 	ldrb r0, [r7]
 	ldrb r1, [r7, 0x4]
 	ldrb r2, [r7, 0x8]
-	bl GetFieldObjectIdByLocalIdAndMap
+	bl GetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	lsrs r0, 24
 	lsls r1, r0, 3
 	adds r1, r0
 	lsls r1, 2
-	ldr r0, _080DBE3C @ =gMapObjects
+	ldr r0, _080DBE3C @ =gObjectEvents
 	adds r6, r1, r0
-	ldr r0, _080DBE40 @ =gUnknown_83A0010
+	ldr r0, _080DBE40 @ =gFieldEffectObjectTemplatePointers
 	ldr r0, [r0, 0x34]
 	movs r1, 0
 	movs r2, 0
@@ -2117,7 +2117,7 @@ FldEff_FeetInFlowingWater: @ 80DBD98
 	cmp r5, 0x40
 	beq _080DBE2E
 	ldrb r0, [r6, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	adds r4, r0, 0
 	lsls r0, r5, 4
 	adds r0, r5
@@ -2171,8 +2171,8 @@ _080DBE2E:
 	bx r1
 	.align 2, 0
 _080DBE38: .4byte gFieldEffectArguments
-_080DBE3C: .4byte gMapObjects
+_080DBE3C: .4byte gObjectEvents
-_080DBE40: .4byte gUnknown_83A0010
+_080DBE40: .4byte gFieldEffectObjectTemplatePointers
 _080DBE44: .4byte gSprites
 _080DBE48: .4byte sub_80DBE50
 _080DBE4C: .4byte 0x0000ffff
@@ -2193,11 +2193,11 @@ sub_80DBE50: @ 80DBE50
 	lsls r2, 24
 	lsrs r2, 24
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _080DBE8A
-	ldr r2, _080DBE94 @ =gMapObjects
+	ldr r2, _080DBE94 @ =gObjectEvents
 	mov r0, sp
 	ldrb r1, [r0]
 	lsls r0, r1, 3
@@ -2214,7 +2214,7 @@ _080DBE8A:
 	bl FieldEffectStop
 	b _080DBEE2
 	.align 2, 0
-_080DBE94: .4byte gMapObjects
+_080DBE94: .4byte gObjectEvents
 _080DBE98:
 	ldrb r1, [r5, 0x4]
 	lsls r0, r1, 4
@@ -2263,7 +2263,7 @@ _080DBEEC: .4byte gSprites
 	thumb_func_start oei_ripples
 oei_ripples: @ 80DBEF0
 	push {r4,lr}
-	ldr r0, _080DBF44 @ =gUnknown_83A0010
+	ldr r0, _080DBF44 @ =gFieldEffectObjectTemplatePointers
 	ldr r0, [r0, 0x14]
 	ldr r4, _080DBF48 @ =gFieldEffectArguments
 	movs r2, 0
@@ -2305,7 +2305,7 @@ _080DBF3C:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_080DBF44: .4byte gUnknown_83A0010
+_080DBF44: .4byte gFieldEffectObjectTemplatePointers
 _080DBF48: .4byte gFieldEffectArguments
 _080DBF4C: .4byte gSprites
 	thumb_func_end oei_ripples
@@ -2317,15 +2317,15 @@ sub_80DBF50: @ 80DBF50
 	ldrb r0, [r6]
 	ldrb r1, [r6, 0x4]
 	ldrb r2, [r6, 0x8]
-	bl GetFieldObjectIdByLocalIdAndMap
+	bl GetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	lsrs r0, 24
 	lsls r1, r0, 3
 	adds r1, r0
 	lsls r1, 2
-	ldr r0, _080DBFE8 @ =gMapObjects
+	ldr r0, _080DBFE8 @ =gObjectEvents
 	adds r5, r1, r0
-	ldr r0, _080DBFEC @ =gUnknown_83A0010
+	ldr r0, _080DBFEC @ =gFieldEffectObjectTemplatePointers
 	ldr r0, [r0, 0x7C]
 	movs r1, 0
 	movs r2, 0
@@ -2387,8 +2387,8 @@ _080DBFDC:
 	bx r1
 	.align 2, 0
 _080DBFE4: .4byte gFieldEffectArguments
-_080DBFE8: .4byte gMapObjects
+_080DBFE8: .4byte gObjectEvents
-_080DBFEC: .4byte gUnknown_83A0010
+_080DBFEC: .4byte gFieldEffectObjectTemplatePointers
 _080DBFF0: .4byte gSprites
 	thumb_func_end sub_80DBF50
 
@@ -2407,11 +2407,11 @@ sub_80DBFF4: @ 80DBFF4
 	lsls r2, 24
 	lsrs r2, 24
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _080DC02E
-	ldr r5, _080DC038 @ =gMapObjects
+	ldr r5, _080DC038 @ =gObjectEvents
 	mov r0, sp
 	ldrb r1, [r0]
 	lsls r0, r1, 3
@@ -2428,10 +2428,10 @@ _080DC02E:
 	bl FieldEffectStop
 	b _080DC080
 	.align 2, 0
-_080DC038: .4byte gMapObjects
+_080DC038: .4byte gObjectEvents
 _080DC03C:
 	ldrb r0, [r1, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	mov r1, sp
 	ldrb r2, [r1]
 	lsls r1, r2, 3
@@ -2480,7 +2480,7 @@ FldEff_Unknown19: @ 80DC08C
 	movs r2, 0x8
 	movs r3, 0x8
 	bl sub_8063BC4
-	ldr r0, _080DC0F0 @ =gUnknown_83A0010
+	ldr r0, _080DC0F0 @ =gFieldEffectObjectTemplatePointers
 	ldr r0, [r0, 0x44]
 	movs r2, 0
 	ldrsh r1, [r4, r2]
@@ -2522,7 +2522,7 @@ _080DC0E4:
 	bx r1
 	.align 2, 0
 _080DC0EC: .4byte gFieldEffectArguments
-_080DC0F0: .4byte gUnknown_83A0010
+_080DC0F0: .4byte gFieldEffectObjectTemplatePointers
 _080DC0F4: .4byte gSprites
 	thumb_func_end FldEff_Unknown19
 
@@ -2535,7 +2535,7 @@ FldEff_Unknown20: @ 80DC0F8
 	movs r2, 0x8
 	movs r3, 0x8
 	bl sub_8063BC4
-	ldr r0, _080DC15C @ =gUnknown_83A0010
+	ldr r0, _080DC15C @ =gFieldEffectObjectTemplatePointers
 	ldr r0, [r0, 0x48]
 	movs r2, 0
 	ldrsh r1, [r4, r2]
@@ -2577,7 +2577,7 @@ _080DC150:
 	bx r1
 	.align 2, 0
 _080DC158: .4byte gFieldEffectArguments
-_080DC15C: .4byte gUnknown_83A0010
+_080DC15C: .4byte gFieldEffectObjectTemplatePointers
 _080DC160: .4byte gSprites
 	thumb_func_end FldEff_Unknown20
 
@@ -2590,7 +2590,7 @@ FldEff_Unknown21: @ 80DC164
 	movs r2, 0x8
 	movs r3, 0x8
 	bl sub_8063BC4
-	ldr r0, _080DC1C8 @ =gUnknown_83A0010
+	ldr r0, _080DC1C8 @ =gFieldEffectObjectTemplatePointers
 	ldr r0, [r0, 0x4C]
 	movs r2, 0
 	ldrsh r1, [r4, r2]
@@ -2632,7 +2632,7 @@ _080DC1BC:
 	bx r1
 	.align 2, 0
 _080DC1C4: .4byte gFieldEffectArguments
-_080DC1C8: .4byte gUnknown_83A0010
+_080DC1C8: .4byte gFieldEffectObjectTemplatePointers
 _080DC1CC: .4byte gSprites
 	thumb_func_end FldEff_Unknown21
 
@@ -2645,7 +2645,7 @@ FldEff_Unknown22: @ 80DC1D0
 	movs r2, 0x8
 	movs r3, 0x8
 	bl sub_8063BC4
-	ldr r0, _080DC234 @ =gUnknown_83A0010
+	ldr r0, _080DC234 @ =gFieldEffectObjectTemplatePointers
 	ldr r0, [r0, 0x50]
 	movs r2, 0
 	ldrsh r1, [r4, r2]
@@ -2687,7 +2687,7 @@ _080DC228:
 	bx r1
 	.align 2, 0
 _080DC230: .4byte gFieldEffectArguments
-_080DC234: .4byte gUnknown_83A0010
+_080DC234: .4byte gFieldEffectObjectTemplatePointers
 _080DC238: .4byte gSprites
 	thumb_func_end FldEff_Unknown22
 
@@ -2737,7 +2737,7 @@ oei_ash: @ 80DC270
 	movs r2, 0x8
 	movs r3, 0x8
 	bl sub_8063BC4
-	ldr r0, _080DC2F4 @ =gUnknown_83A0010
+	ldr r0, _080DC2F4 @ =gFieldEffectObjectTemplatePointers
 	ldr r0, [r0, 0x18]
 	mov r1, sp
 	movs r2, 0
@@ -2787,7 +2787,7 @@ _080DC2E6:
 	bx r1
 	.align 2, 0
 _080DC2F0: .4byte gFieldEffectArguments
-_080DC2F4: .4byte gUnknown_83A0010
+_080DC2F4: .4byte gFieldEffectObjectTemplatePointers
 _080DC2F8: .4byte gSprites
 	thumb_func_end oei_ash
 
@@ -2863,7 +2863,7 @@ sub_80DC348: @ 80DC348
 	movs r2, 0x32
 	ldrsh r1, [r4, r2]
 	bl CurrentMapDrawMetatileAt
-	ldr r2, _080DC3A0 @ =gMapObjects
+	ldr r2, _080DC3A0 @ =gObjectEvents
 	ldr r0, _080DC3A4 @ =gPlayerAvatar
 	ldrb r1, [r0, 0x5]
 	lsls r0, r1, 3
@@ -2880,7 +2880,7 @@ sub_80DC348: @ 80DC348
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080DC3A0: .4byte gMapObjects
+_080DC3A0: .4byte gObjectEvents
 _080DC3A4: .4byte gPlayerAvatar
 	thumb_func_end sub_80DC348
 
@@ -2915,7 +2915,7 @@ sub_80DC3D0: @ 80DC3D0
 	movs r2, 0x8
 	movs r3, 0x8
 	bl sub_8063BC4
-	ldr r0, _080DC440 @ =gUnknown_83A0010
+	ldr r0, _080DC440 @ =gFieldEffectObjectTemplatePointers
 	ldr r0, [r0, 0x1C]
 	movs r2, 0
 	ldrsh r1, [r4, r2]
@@ -2961,7 +2961,7 @@ _080DC42C:
 	bx r1
 	.align 2, 0
 _080DC43C: .4byte gFieldEffectArguments
-_080DC440: .4byte gUnknown_83A0010
+_080DC440: .4byte gFieldEffectObjectTemplatePointers
 _080DC444: .4byte gSprites
 _080DC448: .4byte 0x0000ffff
 	thumb_func_end sub_80DC3D0
@@ -3081,7 +3081,7 @@ sub_80DC4F8: @ 80DC4F8
 	lsls r4, r0, 3
 	adds r4, r0
 	lsls r4, 2
-	ldr r0, _080DC548 @ =gMapObjects
+	ldr r0, _080DC548 @ =gObjectEvents
 	adds r4, r0
 	ldrb r0, [r4, 0x4]
 	lsls r5, r0, 4
@@ -3112,7 +3112,7 @@ sub_80DC4F8: @ 80DC4F8
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080DC548: .4byte gMapObjects
+_080DC548: .4byte gObjectEvents
 _080DC54C: .4byte gSprites
 	thumb_func_end sub_80DC4F8
 
@@ -3393,7 +3393,7 @@ FldEff_Dust: @ 80DC740
 	movs r2, 0x8
 	movs r3, 0xC
 	bl sub_8063BC4
-	ldr r0, _080DC7A8 @ =gUnknown_83A0010
+	ldr r0, _080DC7A8 @ =gFieldEffectObjectTemplatePointers
 	ldr r0, [r0, 0x24]
 	movs r2, 0
 	ldrsh r1, [r4, r2]
@@ -3437,7 +3437,7 @@ _080DC79C:
 	bx r1
 	.align 2, 0
 _080DC7A4: .4byte gFieldEffectArguments
-_080DC7A8: .4byte gUnknown_83A0010
+_080DC7A8: .4byte gFieldEffectObjectTemplatePointers
 _080DC7AC: .4byte gSprites
 	thumb_func_end FldEff_Dust
 
@@ -3448,15 +3448,15 @@ FldEff_SandPile: @ 80DC7B0
 	ldrb r0, [r7]
 	ldrb r1, [r7, 0x4]
 	ldrb r2, [r7, 0x8]
-	bl GetFieldObjectIdByLocalIdAndMap
+	bl GetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	lsrs r0, 24
 	lsls r1, r0, 3
 	adds r1, r0
 	lsls r1, 2
-	ldr r0, _080DC860 @ =gMapObjects
+	ldr r0, _080DC860 @ =gObjectEvents
 	adds r6, r1, r0
-	ldr r0, _080DC864 @ =gUnknown_83A0010
+	ldr r0, _080DC864 @ =gFieldEffectObjectTemplatePointers
 	ldr r0, [r0, 0x74]
 	movs r1, 0
 	movs r2, 0
@@ -3467,7 +3467,7 @@ FldEff_SandPile: @ 80DC7B0
 	cmp r4, 0x40
 	beq _080DC854
 	ldrb r0, [r6, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	adds r5, r0, 0
 	lsls r0, r4, 4
 	adds r0, r4
@@ -3528,8 +3528,8 @@ _080DC854:
 	bx r1
 	.align 2, 0
 _080DC85C: .4byte gFieldEffectArguments
-_080DC860: .4byte gMapObjects
+_080DC860: .4byte gObjectEvents
-_080DC864: .4byte gUnknown_83A0010
+_080DC864: .4byte gFieldEffectObjectTemplatePointers
 _080DC868: .4byte gSprites
 	thumb_func_end FldEff_SandPile
 
@@ -3548,11 +3548,11 @@ sub_80DC86C: @ 80DC86C
 	lsls r2, 24
 	lsrs r2, 24
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _080DC8A6
-	ldr r2, _080DC8B0 @ =gMapObjects
+	ldr r2, _080DC8B0 @ =gObjectEvents
 	mov r0, sp
 	ldrb r1, [r0]
 	lsls r0, r1, 3
@@ -3569,7 +3569,7 @@ _080DC8A6:
 	bl FieldEffectStop
 	b _080DC926
 	.align 2, 0
-_080DC8B0: .4byte gMapObjects
+_080DC8B0: .4byte gObjectEvents
 _080DC8B4:
 	ldr r2, _080DC930 @ =gSprites
 	ldrb r1, [r1, 0x4]
@@ -3608,7 +3608,7 @@ _080DC8F6:
 	strh r6, [r4, 0x20]
 	strh r5, [r4, 0x22]
 	ldr r3, _080DC930 @ =gSprites
-	ldr r2, _080DC934 @ =gMapObjects
+	ldr r2, _080DC934 @ =gObjectEvents
 	mov r0, sp
 	ldrb r1, [r0]
 	lsls r0, r1, 3
@@ -3635,7 +3635,7 @@ _080DC926:
 	bx r0
 	.align 2, 0
 _080DC930: .4byte gSprites
-_080DC934: .4byte gMapObjects
+_080DC934: .4byte gObjectEvents
 	thumb_func_end sub_80DC86C
 
 	thumb_func_start FldEff_Bubbles
@@ -3647,7 +3647,7 @@ FldEff_Bubbles: @ 80DC938
 	movs r2, 0x8
 	movs r3, 0
 	bl sub_8063BC4
-	ldr r0, _080DC994 @ =gUnknown_83A0010
+	ldr r0, _080DC994 @ =gFieldEffectObjectTemplatePointers
 	adds r0, 0x88
 	ldr r0, [r0]
 	movs r2, 0
@@ -3685,7 +3685,7 @@ _080DC988:
 	bx r1
 	.align 2, 0
 _080DC990: .4byte gFieldEffectArguments
-_080DC994: .4byte gUnknown_83A0010
+_080DC994: .4byte gFieldEffectObjectTemplatePointers
 _080DC998: .4byte gSprites
 	thumb_func_end FldEff_Bubbles
 
@@ -3780,7 +3780,7 @@ ShowDisguiseFieldEffect: @ 80DCA10
 	ldrb r1, [r5, 0x4]
 	ldrb r2, [r5, 0x8]
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	beq _080DCA48
@@ -3791,7 +3791,7 @@ ShowDisguiseFieldEffect: @ 80DCA10
 	.align 2, 0
 _080DCA44: .4byte gFieldEffectArguments
 _080DCA48:
-	ldr r1, _080DCAC0 @ =gUnknown_83A0010
+	ldr r1, _080DCAC0 @ =gFieldEffectObjectTemplatePointers
 	lsls r0, r6, 2
 	adds r0, r1
 	ldr r0, [r0]
@@ -3853,7 +3853,7 @@ _080DCAB4:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_080DCAC0: .4byte gUnknown_83A0010
+_080DCAC0: .4byte gFieldEffectObjectTemplatePointers
 _080DCAC4: .4byte gSprites
 	thumb_func_end ShowDisguiseFieldEffect
 
@@ -3872,7 +3872,7 @@ sub_80DCAC8: @ 80DCAC8
 	lsls r2, 24
 	lsrs r2, 24
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	beq _080DCAF8
@@ -3882,7 +3882,7 @@ sub_80DCAC8: @ 80DCAC8
 	adds r0, r5, 0
 	bl FieldEffectStop
 _080DCAF8:
-	ldr r4, _080DCBB0 @ =gMapObjects
+	ldr r4, _080DCBB0 @ =gObjectEvents
 	mov r0, sp
 	ldrb r1, [r0]
 	lsls r0, r1, 3
@@ -3890,7 +3890,7 @@ _080DCAF8:
 	lsls r0, 2
 	adds r0, r4
 	ldrb r0, [r0, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	mov r1, sp
 	ldrb r2, [r1]
 	lsls r1, r2, 3
@@ -3975,7 +3975,7 @@ _080DCBA8:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080DCBB0: .4byte gMapObjects
+_080DCBB0: .4byte gObjectEvents
 _080DCBB4: .4byte gSprites
 	thumb_func_end sub_80DCAC8
 
@@ -4055,7 +4055,7 @@ FldEff_Sparkle: @ 80DCC1C
 	movs r2, 0x8
 	movs r3, 0x8
 	bl sub_8063BC4
-	ldr r0, _080DCC88 @ =gUnknown_83A0010
+	ldr r0, _080DCC88 @ =gFieldEffectObjectTemplatePointers
 	adds r0, 0x8C
 	ldr r0, [r0]
 	movs r2, 0
@@ -4095,7 +4095,7 @@ _080DCC7C:
 	bx r1
 	.align 2, 0
 _080DCC84: .4byte gFieldEffectArguments
-_080DCC88: .4byte gUnknown_83A0010
+_080DCC88: .4byte gFieldEffectObjectTemplatePointers
 _080DCC8C: .4byte gSprites
 	thumb_func_end FldEff_Sparkle
 
@@ -4217,14 +4217,14 @@ _080DCD5E:
 	lsls r0, r7, 3
 	adds r0, r7
 	lsls r0, 2
-	ldr r1, _080DCDF8 @ =gMapObjects
+	ldr r1, _080DCDF8 @ =gObjectEvents
 	adds r4, r0, r1
 	ldrb r0, [r4]
 	lsls r0, 31
 	cmp r0, 0
 	beq _080DCE00
 	ldrb r0, [r4, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	ldrb r1, [r4, 0x4]
 	lsls r0, r1, 4
 	adds r0, r1
@@ -4291,7 +4291,7 @@ _080DCDD8:
 	strb r0, [r2]
 	b _080DCE0A
 	.align 2, 0
-_080DCDF8: .4byte gMapObjects
+_080DCDF8: .4byte gObjectEvents
 _080DCDFC: .4byte gSprites
 _080DCE00:
 	adds r0, r7, 0x1

asm/field_ground_effect.s

@@ -10,7 +10,7 @@ GetAllGroundEffectFlags_OnSpawn: @ 8067B34
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
-	bl FieldObjectUpdateMetatileBehaviors
+	bl ObjectEventUpdateMetatileBehaviors
 	adds r0, r4, 0
 	adds r1, r5, 0
 	bl GetGroundEffectFlags_Reflection
@@ -42,7 +42,7 @@ GetAllGroundEffectFlags_OnBeginStep: @ 8067B7C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
-	bl FieldObjectUpdateMetatileBehaviors
+	bl ObjectEventUpdateMetatileBehaviors
 	adds r0, r4, 0
 	adds r1, r5, 0
 	bl GetGroundEffectFlags_Reflection
@@ -80,7 +80,7 @@ GetAllGroundEffectFlags_OnFinishStep: @ 8067BD4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
-	bl FieldObjectUpdateMetatileBehaviors
+	bl ObjectEventUpdateMetatileBehaviors
 	adds r0, r4, 0
 	adds r1, r5, 0
 	bl GetGroundEffectFlags_ShallowFlowingWater
@@ -110,8 +110,8 @@ GetAllGroundEffectFlags_OnFinishStep: @ 8067BD4
 	bx r0
 	thumb_func_end GetAllGroundEffectFlags_OnFinishStep
 
-	thumb_func_start FieldObjectUpdateMetatileBehaviors
+	thumb_func_start ObjectEventUpdateMetatileBehaviors
-FieldObjectUpdateMetatileBehaviors: @ 8067C24
+ObjectEventUpdateMetatileBehaviors: @ 8067C24
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x14
@@ -129,7 +129,7 @@ FieldObjectUpdateMetatileBehaviors: @ 8067C24
 	pop {r4}
 	pop {r0}
 	bx r0
-	thumb_func_end FieldObjectUpdateMetatileBehaviors
+	thumb_func_end ObjectEventUpdateMetatileBehaviors
 
 	thumb_func_start GetGroundEffectFlags_Reflection
 GetGroundEffectFlags_Reflection: @ 8067C4C
@@ -602,7 +602,7 @@ sub_8067F88: @ 8067F88
 	push {r5-r7}
 	adds r5, r0, 0
 	ldrb r0, [r5, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	movs r4, 0
 	movs r0, 0x1
 	mov r10, r0
@@ -828,8 +828,8 @@ _0806814E:
 	bx r1
 	thumb_func_end GetLedgeJumpDirection
 
-	thumb_func_start FieldObjectSetSpriteOamTableForLongGrass
+	thumb_func_start ObjectEventSetSpriteOamTableForLongGrass
-FieldObjectSetSpriteOamTableForLongGrass: @ 8068154
+ObjectEventSetSpriteOamTableForLongGrass: @ 8068154
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -873,7 +873,7 @@ _080681A8:
 	pop {r4-r6}
 	pop {r0}
 	bx r0
-	thumb_func_end FieldObjectSetSpriteOamTableForLongGrass
+	thumb_func_end ObjectEventSetSpriteOamTableForLongGrass
 
 	thumb_func_start IsZCoordMismatchAt
 IsZCoordMismatchAt: @ 80681B0
@@ -910,8 +910,8 @@ _080681E4:
 	bx r1
 	thumb_func_end IsZCoordMismatchAt
 
-	thumb_func_start FieldObjectUpdateZCoordAndPriority
+	thumb_func_start ObjectEventUpdateZCoordAndPriority
-FieldObjectUpdateZCoordAndPriority: @ 80681EC
+ObjectEventUpdateZCoordAndPriority: @ 80681EC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -920,7 +920,7 @@ FieldObjectUpdateZCoordAndPriority: @ 80681EC
 	cmp r0, 0
 	blt _0806823A
 	adds r0, r4, 0
-	bl FieldObjectUpdateZCoord
+	bl ObjectEventUpdateZCoord
 	ldr r1, _08068240 @ =gUnknown_83A708C
 	ldrb r2, [r4, 0xB]
 	lsls r2, 24
@@ -957,7 +957,7 @@ _0806823A:
 	.align 2, 0
 _08068240: .4byte gUnknown_83A708C
 _08068244: .4byte gUnknown_83A707C
-	thumb_func_end FieldObjectUpdateZCoordAndPriority
+	thumb_func_end ObjectEventUpdateZCoordAndPriority
 
 	thumb_func_start InitObjectPriorityByZCoord
 InitObjectPriorityByZCoord: @ 8068248
@@ -1012,8 +1012,8 @@ ZCoordToPriority: @ 8068294
 _080682A0: .4byte gUnknown_83A707C
 	thumb_func_end ZCoordToPriority
 
-	thumb_func_start FieldObjectUpdateZCoord
+	thumb_func_start ObjectEventUpdateZCoord
-FieldObjectUpdateZCoord: @ 80682A4
+ObjectEventUpdateZCoord: @ 80682A4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0x10
@@ -1055,7 +1055,7 @@ _080682F2:
 	pop {r4,r5}
 	pop {r0}
 	bx r0
-	thumb_func_end FieldObjectUpdateZCoord
+	thumb_func_end ObjectEventUpdateZCoord
 
 	thumb_func_start SetObjectSubpriorityByZCoord
 SetObjectSubpriorityByZCoord: @ 80682F8
@@ -1096,8 +1096,8 @@ _08068338: .4byte gSpriteCoordOffsetY
 _0806833C: .4byte gUnknown_83A706C
 	thumb_func_end SetObjectSubpriorityByZCoord
 
-	thumb_func_start FieldObjectUpdateSubpriority
+	thumb_func_start ObjectEventUpdateSubpriority
-FieldObjectUpdateSubpriority: @ 8068340
+ObjectEventUpdateSubpriority: @ 8068340
 	push {lr}
 	adds r2, r0, 0
 	ldrb r0, [r2, 0x3]
@@ -1111,7 +1111,7 @@ FieldObjectUpdateSubpriority: @ 8068340
 _08068356:
 	pop {r0}
 	bx r0
-	thumb_func_end FieldObjectUpdateSubpriority
+	thumb_func_end ObjectEventUpdateSubpriority
 
 	thumb_func_start AreZCoordsCompatible
 AreZCoordsCompatible: @ 806835C
@@ -1330,7 +1330,7 @@ GroundEffect_SandTracks: @ 80684D4
 	adds r4, r0, 0
 	adds r5, r1, 0
 	ldrb r0, [r4, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	ldr r1, _080684FC @ =gUnknown_83A709C
 	ldrb r0, [r0, 0xD]
 	lsls r0, 2
@@ -1353,7 +1353,7 @@ GroundEffect_DeepSandTracks: @ 8068500
 	adds r4, r0, 0
 	adds r5, r1, 0
 	ldrb r0, [r4, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	ldr r1, _08068528 @ =gUnknown_83A709C
 	ldrb r0, [r0, 0xD]
 	lsls r0, 2
@@ -1781,13 +1781,13 @@ DoGroundEffects_OnSpawn: @ 80687F0
 	movs r0, 0
 	str r0, [sp]
 	adds r0, r4, 0
-	bl FieldObjectUpdateZCoordAndPriority
+	bl ObjectEventUpdateZCoordAndPriority
 	adds r0, r4, 0
 	mov r1, sp
 	bl GetAllGroundEffectFlags_OnSpawn
 	adds r0, r4, 0
 	adds r1, r5, 0
-	bl FieldObjectSetSpriteOamTableForLongGrass
+	bl ObjectEventSetSpriteOamTableForLongGrass
 	ldr r2, [sp]
 	adds r0, r4, 0
 	adds r1, r5, 0
@@ -1820,13 +1820,13 @@ DoGroundEffects_OnBeginStep: @ 806883C
 	movs r0, 0
 	str r0, [sp]
 	adds r0, r4, 0
-	bl FieldObjectUpdateZCoordAndPriority
+	bl ObjectEventUpdateZCoordAndPriority
 	adds r0, r4, 0
 	mov r1, sp
 	bl GetAllGroundEffectFlags_OnBeginStep
 	adds r0, r4, 0
 	adds r1, r5, 0
-	bl FieldObjectSetSpriteOamTableForLongGrass
+	bl ObjectEventSetSpriteOamTableForLongGrass
 	adds r0, r4, 0
 	mov r1, sp
 	bl filters_out_some_ground_effects
@@ -1862,13 +1862,13 @@ DoGroundEffects_OnFinishStep: @ 8068890
 	movs r0, 0
 	str r0, [sp]
 	adds r0, r4, 0
-	bl FieldObjectUpdateZCoordAndPriority
+	bl ObjectEventUpdateZCoordAndPriority
 	adds r0, r4, 0
 	mov r1, sp
 	bl GetAllGroundEffectFlags_OnFinishStep
 	adds r0, r4, 0
 	adds r1, r5, 0
-	bl FieldObjectSetSpriteOamTableForLongGrass
+	bl ObjectEventSetSpriteOamTableForLongGrass
 	adds r0, r4, 0
 	mov r1, sp
 	bl FilterOutStepOnPuddleGroundEffectIfJumping

asm/field_screen_effect.s

@@ -942,10 +942,10 @@ _0807F542:
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _0807F580 @ =gMapObjects
+	ldr r1, _0807F580 @ =gObjectEvents
 	adds r0, r1
 	movs r1, 0x2
-	bl FieldObjectTurn
+	bl ObjectEventTurn
 	ldr r1, _0807F584 @ =gTasks
 	lsls r0, r6, 2
 	adds r0, r6
@@ -958,7 +958,7 @@ _0807F542:
 	.align 2, 0
 _0807F578: .4byte gUnknown_841B5B6
 _0807F57C: .4byte gPlayerAvatar
-_0807F580: .4byte gMapObjects
+_0807F580: .4byte gObjectEvents
 _0807F584: .4byte gTasks
 _0807F588:
 	lsls r4, r6, 2

asm/item_menu.s

@@ -5845,7 +5845,7 @@ _0810AD1E:
 	cmp r6, 0x1
 	bne _0810AD90
 	bl ScriptContext2_Enable
-	bl FreezeEventObjects
+	bl FreezeObjectEvents
 	bl sub_805C270
 	bl sub_805C780
 	ldr r2, _0810AD88 @ =gSpecialVar_ItemId

asm/link_rfu_3.s

@@ -10857,7 +10857,7 @@ _0811B294: .4byte gUnknown_203B06C
 sub_811B298: @ 811B298
 	push {lr}
 	bl ScriptContext2_Enable
-	bl ScriptFreezeMapObjects
+	bl ScriptFreezeObjectEvents
 	pop {r0}
 	bx r0
 	thumb_func_end sub_811B298
@@ -11348,7 +11348,7 @@ sub_811B64C: @ 811B64C
 	ldr r2, [r1]
 	ldrb r1, [r2, 0x5]
 	ldrb r2, [r2, 0x4]
-	bl RemoveFieldObjectByLocalIdAndMap
+	bl RemoveObjectEventByLocalIdAndMap
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -11369,7 +11369,7 @@ sub_811B66C: @ 811B66C
 	ldrb r1, [r2, 0x5]
 	ldrb r2, [r2, 0x4]
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _0811B6D0
@@ -11378,16 +11378,16 @@ sub_811B66C: @ 811B66C
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _0811B6C0 @ =gMapObjects
+	ldr r1, _0811B6C0 @ =gObjectEvents
 	adds r4, r0, r1
 	adds r0, r4, 0
-	bl FieldObjectIsMovementOverridden
+	bl ObjectEventIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	bne _0811B6D0
 	ldrb r1, [r5]
 	adds r0, r4, 0
-	bl FieldObjectSetHeldMovement
+	bl ObjectEventSetHeldMovement
 	lsls r0, 24
 	cmp r0, 0
 	bne _0811B6C4
@@ -11396,7 +11396,7 @@ sub_811B66C: @ 811B66C
 	.align 2, 0
 _0811B6B8: .4byte gUnknown_8457120
 _0811B6BC: .4byte gSaveBlock1Ptr
-_0811B6C0: .4byte gMapObjects
+_0811B6C0: .4byte gObjectEvents
 _0811B6C4:
 	ldr r0, _0811B6DC @ =gUnknown_8457138	"C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/rfu_union_tool.c"
 	ldr r1, _0811B6E0 @ =0x00000183
@@ -11428,7 +11428,7 @@ sub_811B6E8: @ 811B6E8
 	ldrb r1, [r2, 0x5]
 	ldrb r2, [r2, 0x4]
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _0811B748
@@ -11437,10 +11437,10 @@ sub_811B6E8: @ 811B6E8
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _0811B72C @ =gMapObjects
+	ldr r1, _0811B72C @ =gObjectEvents
 	adds r4, r0, r1
 	adds r0, r4, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	bne _0811B730
@@ -11449,7 +11449,7 @@ sub_811B6E8: @ 811B6E8
 	.align 2, 0
 _0811B724: .4byte gUnknown_8457120
 _0811B728: .4byte gSaveBlock1Ptr
-_0811B72C: .4byte gMapObjects
+_0811B72C: .4byte gObjectEvents
 _0811B730:
 	bl ScriptContext2_IsEnabled
 	lsls r0, 24
@@ -11460,7 +11460,7 @@ _0811B730:
 	b _0811B748
 _0811B742:
 	adds r0, r4, 0
-	bl FreezeMapObject
+	bl FreezeObjectEvent
 _0811B748:
 	movs r0, 0x1
 _0811B74A:

asm/macros.inc

@@ -119,6 +119,12 @@
 	.fill 4 @ padding
 	.endm
 
+	.macro overworld_frame ptr:req, width:req, height:req, frame:req
+	.4byte (\ptr + (\width * \height * \frame * 64) / 2)
+	.2byte (\width * \height * 64) / 2
+	.2byte 0 @ padding
+	.endm
+
 	.macro credits_entry number, text
 	.4byte \number
 	.4byte \text

asm/naming_screen.s

@@ -2789,7 +2789,7 @@ sub_809EF54: @ 809EF54
 	str r2, [sp]
 	movs r2, 0x38
 	movs r3, 0x25
-	bl AddPseudoEventObject
+	bl AddPseudoObjectEvent
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24

asm/overworld.s

@@ -3841,7 +3841,7 @@ CB2_ContinueSavedGame: @ 8056938
 	bl sub_8056420
 	bl set_current_map_header_from_sav1
 	bl sub_80550A8
-	bl UnfreezeMapObjects
+	bl UnfreezeObjectEvents
 	bl sub_8054E40
 	bl sub_80589E8
 	bl PlayTimeCounter_Start
@@ -4734,7 +4734,7 @@ sub_8057100: @ 8057100
 	thumb_func_start sub_8057114
 sub_8057114: @ 8057114
 	push {lr}
-	ldr r2, _08057138 @ =gMapObjects
+	ldr r2, _08057138 @ =gObjectEvents
 	ldr r3, _0805713C @ =gPlayerAvatar
 	ldrb r1, [r3, 0x5]
 	lsls r0, r1, 3
@@ -4750,7 +4750,7 @@ sub_8057114: @ 8057114
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08057138: .4byte gMapObjects
+_08057138: .4byte gObjectEvents
 _0805713C: .4byte gPlayerAvatar
 	thumb_func_end sub_8057114
 
@@ -4852,7 +4852,7 @@ _080571D8:
 	adds r4, r7
 	ldrb r3, [r4, 0x13]
 	adds r0, r5, 0
-	bl SpawnLinkPlayerMapObject
+	bl SpawnLinkPlayerObjectEvent
 	ldrb r1, [r4]
 	adds r0, r5, 0
 	bl sub_8058878
@@ -5126,7 +5126,7 @@ sub_8057430: @ 8057430
 	bl sub_8056420
 	bl set_current_map_header_from_sav1
 	bl sub_80550A8
-	bl UnfreezeMapObjects
+	bl UnfreezeObjectEvents
 	bl sub_8054E40
 	bl sub_80589E8
 	bl PlayTimeCounter_Start
@@ -7136,12 +7136,12 @@ _08058368: .4byte gUnknown_3005450
 _0805836C: .4byte 0x000008d2
 	thumb_func_end sub_805833C
 
-	thumb_func_start ZeroLinkPlayerMapObject
+	thumb_func_start ZeroLinkPlayerObjectEvent
-ZeroLinkPlayerMapObject: @ 8058370
+ZeroLinkPlayerObjectEvent: @ 8058370
 	movs r1, 0
 	str r1, [r0]
 	bx lr
-	thumb_func_end ZeroLinkPlayerMapObject
+	thumb_func_end ZeroLinkPlayerObjectEvent
 
 	thumb_func_start strange_npc_table_clear
 strange_npc_table_clear: @ 8058378
@@ -7156,18 +7156,18 @@ strange_npc_table_clear: @ 8058378
 _08058388: .4byte gUnknown_2031DEC
 	thumb_func_end strange_npc_table_clear
 
-	thumb_func_start ZeroMapObject
+	thumb_func_start ZeroObjectEvent
-ZeroMapObject: @ 805838C
+ZeroObjectEvent: @ 805838C
 	push {lr}
 	movs r1, 0
 	movs r2, 0x24
 	bl memset
 	pop {r0}
 	bx r0
-	thumb_func_end ZeroMapObject
+	thumb_func_end ZeroObjectEvent
 
-	thumb_func_start SpawnLinkPlayerMapObject
+	thumb_func_start SpawnLinkPlayerObjectEvent
-SpawnLinkPlayerMapObject: @ 805839C
+SpawnLinkPlayerObjectEvent: @ 805839C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -7200,12 +7200,12 @@ SpawnLinkPlayerMapObject: @ 805839C
 	lsls r5, r6, 3
 	adds r5, r6
 	lsls r5, 2
-	ldr r0, _08058444 @ =gMapObjects
+	ldr r0, _08058444 @ =gObjectEvents
 	adds r5, r0
 	adds r0, r4, 0
-	bl ZeroLinkPlayerMapObject
+	bl ZeroLinkPlayerObjectEvent
 	adds r0, r5, 0
-	bl ZeroMapObject
+	bl ZeroObjectEvent
 	movs r2, 0
 	movs r1, 0x1
 	movs r0, 0x1
@@ -7238,7 +7238,7 @@ SpawnLinkPlayerMapObject: @ 805839C
 	adds r0, r5, 0
 	mov r1, r9
 	mov r2, r10
-	bl InitLinkPlayerMapObjectPos
+	bl InitLinkPlayerObjectEventPos
 	pop {r3-r5}
 	mov r8, r3
 	mov r9, r4
@@ -7248,11 +7248,11 @@ SpawnLinkPlayerMapObject: @ 805839C
 	bx r0
 	.align 2, 0
 _08058440: .4byte gUnknown_2031DEC
-_08058444: .4byte gMapObjects
+_08058444: .4byte gObjectEvents
-	thumb_func_end SpawnLinkPlayerMapObject
+	thumb_func_end SpawnLinkPlayerObjectEvent
 
-	thumb_func_start InitLinkPlayerMapObjectPos
+	thumb_func_start InitLinkPlayerObjectEventPos
-InitLinkPlayerMapObjectPos: @ 8058448
+InitLinkPlayerObjectEventPos: @ 8058448
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r0, r1, 0
@@ -7278,11 +7278,11 @@ InitLinkPlayerMapObjectPos: @ 8058448
 	adds r0, 0x8
 	strh r0, [r4, 0xC]
 	adds r0, r4, 0
-	bl FieldObjectUpdateZCoord
+	bl ObjectEventUpdateZCoord
 	pop {r4}
 	pop {r0}
 	bx r0
-	thumb_func_end InitLinkPlayerMapObjectPos
+	thumb_func_end InitLinkPlayerObjectEventPos
 
 	thumb_func_start sub_8058488
 sub_8058488: @ 8058488
@@ -7300,7 +7300,7 @@ sub_8058488: @ 8058488
 	lsls r1, r0, 3
 	adds r1, r0
 	lsls r1, 2
-	ldr r0, _080584B4 @ =gMapObjects
+	ldr r0, _080584B4 @ =gObjectEvents
 	adds r1, r0
 	strb r2, [r1, 0x19]
 _080584AA:
@@ -7308,7 +7308,7 @@ _080584AA:
 	bx r0
 	.align 2, 0
 _080584B0: .4byte gUnknown_2031DEC
-_080584B4: .4byte gMapObjects
+_080584B4: .4byte gObjectEvents
 	thumb_func_end sub_8058488
 
 	thumb_func_start sub_80584B8
@@ -7322,7 +7322,7 @@ sub_80584B8: @ 80584B8
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _080584FC @ =gMapObjects
+	ldr r1, _080584FC @ =gObjectEvents
 	adds r4, r0, r1
 	ldrb r0, [r4, 0x4]
 	cmp r0, 0x40
@@ -7346,7 +7346,7 @@ _080584E4:
 	bx r0
 	.align 2, 0
 _080584F8: .4byte gUnknown_2031DEC
-_080584FC: .4byte gMapObjects
+_080584FC: .4byte gObjectEvents
 _08058500: .4byte gSprites
 	thumb_func_end sub_80584B8
 
@@ -7360,13 +7360,13 @@ sub_8058504: @ 8058504
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _08058520 @ =gMapObjects
+	ldr r1, _08058520 @ =gObjectEvents
 	adds r0, r1
 	ldrb r0, [r0, 0x4]
 	bx lr
 	.align 2, 0
 _0805851C: .4byte gUnknown_2031DEC
-_08058520: .4byte gMapObjects
+_08058520: .4byte gObjectEvents
 	thumb_func_end sub_8058504
 
 	thumb_func_start sub_8058524
@@ -7379,7 +7379,7 @@ sub_8058524: @ 8058524
 	lsls r0, r3, 3
 	adds r0, r3
 	lsls r0, 2
-	ldr r3, _08058548 @ =gMapObjects
+	ldr r3, _08058548 @ =gObjectEvents
 	adds r0, r3
 	ldrh r3, [r0, 0x10]
 	strh r3, [r1]
@@ -7388,7 +7388,7 @@ sub_8058524: @ 8058524
 	bx lr
 	.align 2, 0
 _08058544: .4byte gUnknown_2031DEC
-_08058548: .4byte gMapObjects
+_08058548: .4byte gObjectEvents
 	thumb_func_end sub_8058524
 
 	thumb_func_start sub_805854C
@@ -7401,13 +7401,13 @@ sub_805854C: @ 805854C
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _08058568 @ =gMapObjects
+	ldr r1, _08058568 @ =gObjectEvents
 	adds r0, r1
 	ldrb r0, [r0, 0x19]
 	bx lr
 	.align 2, 0
 _08058564: .4byte gUnknown_2031DEC
-_08058568: .4byte gMapObjects
+_08058568: .4byte gObjectEvents
 	thumb_func_end sub_805854C
 
 	thumb_func_start sub_805856C
@@ -7420,7 +7420,7 @@ sub_805856C: @ 805856C
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _0805858C @ =gMapObjects
+	ldr r1, _0805858C @ =gObjectEvents
 	adds r0, r1
 	ldrb r0, [r0, 0xB]
 	lsls r0, 28
@@ -7428,7 +7428,7 @@ sub_805856C: @ 805856C
 	bx lr
 	.align 2, 0
 _08058588: .4byte gUnknown_2031DEC
-_0805858C: .4byte gMapObjects
+_0805858C: .4byte gObjectEvents
 	thumb_func_end sub_805856C
 
 	thumb_func_start sub_8058590
@@ -7441,7 +7441,7 @@ sub_8058590: @ 8058590
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _080585B4 @ =gMapObjects
+	ldr r1, _080585B4 @ =gObjectEvents
 	adds r0, r1
 	adds r0, 0x21
 	movs r1, 0
@@ -7451,7 +7451,7 @@ sub_8058590: @ 8058590
 	bx lr
 	.align 2, 0
 _080585B0: .4byte gUnknown_2031DEC
-_080585B4: .4byte gMapObjects
+_080585B4: .4byte gObjectEvents
 	thumb_func_end sub_8058590
 
 	thumb_func_start GetLinkPlayerIdAt
@@ -7479,7 +7479,7 @@ _080585DA:
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _08058600 @ =gMapObjects
+	ldr r1, _08058600 @ =gObjectEvents
 	adds r1, r0, r1
 	movs r6, 0x10
 	ldrsh r0, [r1, r6]
@@ -7493,7 +7493,7 @@ _080585DA:
 	b _08058610
 	.align 2, 0
 _080585FC: .4byte gUnknown_2031DEC
-_08058600: .4byte gMapObjects
+_08058600: .4byte gObjectEvents
 _08058604:
 	adds r0, r2, 0x1
 	lsls r0, 24
@@ -7521,7 +7521,7 @@ sub_8058618: @ 8058618
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _0805864C @ =gMapObjects
+	ldr r1, _0805864C @ =gObjectEvents
 	adds r6, r0, r1
 	ldrb r0, [r5]
 	cmp r0, 0
@@ -7535,7 +7535,7 @@ sub_8058618: @ 8058618
 	b _08058674
 	.align 2, 0
 _08058648: .4byte gUnknown_2031DEC
-_0805864C: .4byte gMapObjects
+_0805864C: .4byte gObjectEvents
 _08058650:
 	ldr r4, _0805867C @ =gUnknown_826D374
 	ldr r1, _08058680 @ =gUnknown_826D33C
@@ -7629,7 +7629,7 @@ sub_80586CC: @ 80586CC
 	adds r0, r5, 0
 	mov r2, sp
 	adds r3, r6, 0
-	bl FieldObjectMoveDestCoords
+	bl ObjectEventMoveDestCoords
 	ldrb r0, [r4, 0x2]
 	ldrb r1, [r5, 0x19]
 	mov r2, sp
@@ -7653,7 +7653,7 @@ sub_80586CC: @ 80586CC
 	adds r0, r5, 0
 	bl npc_coords_shift
 	adds r0, r5, 0
-	bl FieldObjectUpdateZCoord
+	bl ObjectEventUpdateZCoord
 	movs r0, 0x1
 	b _0805872C
 _0805872A:
@@ -7780,7 +7780,7 @@ npc_080587EC: @ 80587EC
 	mov r12, r2
 	lsls r3, 16
 	movs r4, 0
-	ldr r0, _08058850 @ =gMapObjects
+	ldr r0, _08058850 @ =gObjectEvents
 	mov r9, r0
 	lsrs r2, r3, 16
 	mov r10, r2
@@ -7820,7 +7820,7 @@ _0805884A:
 	movs r0, 0x1
 	b _0805886A
 	.align 2, 0
-_08058850: .4byte gMapObjects
+_08058850: .4byte gObjectEvents
 _08058854:
 	adds r0, r4, 0x1
 	lsls r0, 24
@@ -7857,7 +7857,7 @@ sub_8058878: @ 8058878
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _080588B8 @ =gMapObjects
+	ldr r1, _080588B8 @ =gObjectEvents
 	adds r4, r0, r1
 	ldrb r0, [r2]
 	cmp r0, 0
@@ -7875,7 +7875,7 @@ sub_8058878: @ 8058878
 	b _080588C6
 	.align 2, 0
 _080588B4: .4byte gUnknown_2031DEC
-_080588B8: .4byte gMapObjects
+_080588B8: .4byte gObjectEvents
 _080588BC:
 	ldrb r0, [r4]
 	lsls r0, 30
@@ -7888,7 +7888,7 @@ _080588C6:
 	movs r2, 0
 	str r2, [sp]
 	movs r3, 0
-	bl AddPseudoEventObject
+	bl AddPseudoObjectEvent
 	strb r0, [r4, 0x4]
 	ldrb r1, [r4, 0x4]
 	lsls r0, r1, 4
@@ -7931,7 +7931,7 @@ SpriteCB_LinkPlayer: @ 805890C
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _08058974 @ =gMapObjects
+	ldr r1, _08058974 @ =gObjectEvents
 	adds r6, r0, r1
 	ldrh r0, [r6, 0xC]
 	strh r0, [r5, 0x20]
@@ -7958,7 +7958,7 @@ SpriteCB_LinkPlayer: @ 805890C
 	cmp r0, 0
 	bne _08058978
 	ldrb r0, [r6, 0x19]
-	bl FieldObjectDirectionToImageAnimId
+	bl ObjectEventDirectionToImageAnimId
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -7967,7 +7967,7 @@ SpriteCB_LinkPlayer: @ 805890C
 	b _0805898A
 	.align 2, 0
 _08058970: .4byte gUnknown_2031DEC
-_08058974: .4byte gMapObjects
+_08058974: .4byte gObjectEvents
 _08058978:
 	ldrb r0, [r6, 0x19]
 	bl get_go_image_anim_num

asm/script_movement.s

@@ -17,7 +17,7 @@ ScriptMovement_StartObjectMovementScript: @ 8097434
 	lsls r2, 24
 	lsrs r2, 24
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	beq _08097456
@@ -61,7 +61,7 @@ ScriptMovement_IsObjectMovementFinished: @ 809748C
 	lsls r2, 24
 	lsrs r2, 24
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _080974CE
@@ -480,7 +480,7 @@ _0809777C:
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _080977A8 @ =gMapObjects
+	ldr r1, _080977A8 @ =gObjectEvents
 	adds r0, r1
 	bl npc_sync_anim_pause_bits
 _08097792:
@@ -495,7 +495,7 @@ _08097792:
 	bx r0
 	.align 2, 0
 _080977A4: .4byte gTasks+0x8
-_080977A8: .4byte gMapObjects
+_080977A8: .4byte gObjectEvents
 	thumb_func_end UnfreezeObjects
 
 	thumb_func_start Task_80A244C
@@ -557,15 +557,15 @@ sub_80977F0: @ 80977F0
 	lsls r0, r4, 3
 	adds r0, r4
 	lsls r0, 2
-	ldr r1, _08097850 @ =gMapObjects
+	ldr r1, _08097850 @ =gObjectEvents
 	adds r4, r0, r1
 	adds r0, r4, 0
-	bl FieldObjectIsSpecialAnimActive
+	bl ObjectEventIsSpecialAnimActive
 	lsls r0, 24
 	cmp r0, 0
 	beq _08097838
 	adds r0, r4, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0809786A
@@ -577,13 +577,13 @@ _08097838:
 	adds r1, r5, 0
 	bl sub_80976A8
 	adds r0, r4, 0
-	bl FreezeMapObject
+	bl FreezeObjectEvent
 	b _0809786A
 	.align 2, 0
-_08097850: .4byte gMapObjects
+_08097850: .4byte gObjectEvents
 _08097854:
 	adds r0, r4, 0
-	bl FieldObjectSetHeldMovement
+	bl ObjectEventSetHeldMovement
 	lsls r0, 24
 	cmp r0, 0
 	bne _0809786A

asm/trainer_see.s

@@ -19,7 +19,7 @@ _08081B40:
 	b _08081B7A
 _08081B44:
 	movs r4, 0
-	ldr r5, _08081B80 @ =gMapObjects
+	ldr r5, _08081B80 @ =gObjectEvents
 _08081B48:
 	lsls r0, r4, 3
 	adds r0, r4
@@ -53,7 +53,7 @@ _08081B7A:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08081B80: .4byte gMapObjects
+_08081B80: .4byte gObjectEvents
 	thumb_func_end CheckForTrainersWantingBattle
 
 	thumb_func_start sub_8081B84
@@ -62,7 +62,7 @@ sub_8081B84: @ 8081B84
 	lsls r0, 24
 	lsrs r5, r0, 24
 	adds r0, r5, 0
-	bl GetFieldObjectScriptPointerByFieldObjectId
+	bl GetObjectEventScriptPointerByObjectEventId
 	adds r6, r0, 0
 	bl GetTrainerFlagFromScriptPointer
 	cmp r0, 0
@@ -70,7 +70,7 @@ sub_8081B84: @ 8081B84
 	lsls r4, r5, 3
 	adds r0, r4, r5
 	lsls r0, 2
-	ldr r1, _08081BE0 @ =gMapObjects
+	ldr r1, _08081BE0 @ =gObjectEvents
 	adds r0, r1
 	bl sub_8081BEC
 	lsls r0, 24
@@ -90,7 +90,7 @@ _08081BC0:
 	bl ConfigureAndSetUpOneTrainerBattle
 	adds r0, r4, r5
 	lsls r0, 2
-	ldr r1, _08081BE0 @ =gMapObjects
+	ldr r1, _08081BE0 @ =gObjectEvents
 	adds r0, r1
 	subs r1, r7, 0x1
 	lsls r1, 24
@@ -99,7 +99,7 @@ _08081BC0:
 	movs r0, 0x1
 	b _08081BE6
 	.align 2, 0
-_08081BE0: .4byte gMapObjects
+_08081BE0: .4byte gObjectEvents
 _08081BE4:
 	movs r0, 0
 _08081BE6:
@@ -590,7 +590,7 @@ _08081F54:
 	adds r3, r1, 0
 	adds r3, 0x8
 	adds r0, r4, 0
-	bl FieldObjectGetLocalIdAndMap
+	bl ObjectEventGetLocalIdAndMap
 	movs r0, 0
 	bl FieldEffectStart
 	ldrb r0, [r4, 0x18]
@@ -601,7 +601,7 @@ _08081F54:
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetHeldMovement
+	bl ObjectEventSetHeldMovement
 	ldrh r0, [r5, 0x8]
 	adds r0, 0x1
 _08081F82:
@@ -658,12 +658,12 @@ sub_8081FD0: @ 8081FD0
 	adds r5, r1, 0
 	adds r4, r2, 0
 	adds r0, r4, 0
-	bl FieldObjectIsMovementOverridden
+	bl ObjectEventIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _08081FEE
 	adds r0, r4, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _08082022
@@ -680,7 +680,7 @@ _08081FEE:
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetHeldMovement
+	bl ObjectEventSetHeldMovement
 	ldrh r0, [r5, 0xE]
 	subs r0, 0x1
 	strh r0, [r5, 0xE]
@@ -688,7 +688,7 @@ _08081FEE:
 _08082014:
 	adds r0, r4, 0
 	movs r1, 0x4A
-	bl FieldObjectSetHeldMovement
+	bl ObjectEventSetHeldMovement
 	ldrh r0, [r5, 0x8]
 	adds r0, 0x1
 	strh r0, [r5, 0x8]
@@ -705,12 +705,12 @@ sub_808202C: @ 808202C
 	adds r5, r1, 0
 	adds r4, r2, 0
 	adds r0, r4, 0
-	bl FieldObjectIsMovementOverridden
+	bl ObjectEventIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808204A
 	adds r0, r4, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _080820AC
@@ -740,15 +740,15 @@ _0808204A:
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _080820B8 @ =gMapObjects
+	ldr r1, _080820B8 @ =gObjectEvents
 	adds r4, r0, r1
 	adds r0, r4, 0
-	bl FieldObjectIsMovementOverridden
+	bl ObjectEventIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _080820A2
 	adds r0, r4, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _080820AC
@@ -764,7 +764,7 @@ _080820AC:
 	bx r1
 	.align 2, 0
 _080820B4: .4byte gPlayerAvatar
-_080820B8: .4byte gMapObjects
+_080820B8: .4byte gObjectEvents
 	thumb_func_end sub_808202C
 
 	thumb_func_start sub_80820BC
@@ -777,15 +777,15 @@ sub_80820BC: @ 80820BC
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _080820FC @ =gMapObjects
+	ldr r1, _080820FC @ =gObjectEvents
 	adds r4, r0, r1
 	adds r0, r4, 0
-	bl FieldObjectIsMovementOverridden
+	bl ObjectEventIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _080820E8
 	adds r0, r4, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _080820EE
@@ -799,7 +799,7 @@ _080820EE:
 	bx r1
 	.align 2, 0
 _080820F8: .4byte gPlayerAvatar
-_080820FC: .4byte gMapObjects
+_080820FC: .4byte gObjectEvents
 	thumb_func_end sub_80820BC
 
 	thumb_func_start sub_8082100
@@ -808,19 +808,19 @@ sub_8082100: @ 8082100
 	adds r5, r1, 0
 	adds r4, r2, 0
 	adds r0, r4, 0
-	bl FieldObjectIsMovementOverridden
+	bl ObjectEventIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808211E
 	adds r0, r4, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808212C
 _0808211E:
 	adds r0, r4, 0
 	movs r1, 0x67
-	bl FieldObjectSetHeldMovement
+	bl ObjectEventSetHeldMovement
 	ldrh r0, [r5, 0x8]
 	adds r0, 0x1
 	strh r0, [r5, 0x8]
@@ -836,7 +836,7 @@ sub_8082134: @ 8082134
 	push {r4,lr}
 	adds r4, r1, 0
 	adds r0, r2, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _08082148
@@ -855,19 +855,19 @@ sub_8082150: @ 8082150
 	adds r5, r1, 0
 	adds r4, r2, 0
 	adds r0, r4, 0
-	bl FieldObjectIsMovementOverridden
+	bl ObjectEventIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808216E
 	adds r0, r4, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808217C
 _0808216E:
 	adds r0, r4, 0
 	movs r1, 0x4A
-	bl FieldObjectSetHeldMovement
+	bl ObjectEventSetHeldMovement
 	ldrh r0, [r5, 0x8]
 	adds r0, 0x1
 	strh r0, [r5, 0x8]
@@ -884,7 +884,7 @@ sub_8082184: @ 8082184
 	adds r5, r1, 0
 	adds r4, r2, 0
 	adds r0, r4, 0
-	bl FieldObjectCheckHeldMovementStatus
+	bl ObjectEventCheckHeldMovementStatus
 	lsls r0, 24
 	cmp r0, 0
 	beq _080821CA
@@ -961,7 +961,7 @@ sub_80821DC: @ 80821DC
 	orrs r1, r2
 	strb r1, [r0, 0x5]
 	adds r0, r4, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	ldrb r0, [r4, 0x18]
 	lsls r0, 28
 	lsrs r0, 28
@@ -970,7 +970,7 @@ sub_80821DC: @ 80821DC
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetHeldMovement
+	bl ObjectEventSetHeldMovement
 	ldrh r0, [r5, 0x8]
 	adds r0, 0x1
 	strh r0, [r5, 0x8]
@@ -1024,8 +1024,8 @@ sub_808226C: @ 808226C
 	movs r0, 0x12
 	movs r1, 0x7
 	movs r2, 0x7F
-	bl SpawnSpecialFieldObjectParameterized
+	bl SpawnSpecialObjectEventParameterized
-	ldr r2, _080822C8 @ =gMapObjects
+	ldr r2, _080822C8 @ =gObjectEvents
 	lsls r1, r0, 3
 	adds r1, r0
 	lsls r1, 2
@@ -1046,7 +1046,7 @@ sub_808226C: @ 808226C
 	bx r1
 	.align 2, 0
 _080822C4: .4byte gSaveBlock1Ptr
-_080822C8: .4byte gMapObjects
+_080822C8: .4byte gObjectEvents
 	thumb_func_end sub_808226C
 
 	thumb_func_start sub_80822CC
@@ -1061,15 +1061,15 @@ sub_80822CC: @ 80822CC
 	ldrb r2, [r0, 0x4]
 	movs r0, 0x7F
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	mov r0, sp
 	ldrb r1, [r0]
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r4, _0808234C @ =gMapObjects
+	ldr r4, _0808234C @ =gObjectEvents
 	adds r0, r4
-	bl FieldObjectIsMovementOverridden
+	bl ObjectEventIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _08082312
@@ -1079,7 +1079,7 @@ sub_80822CC: @ 80822CC
 	adds r0, r1
 	lsls r0, 2
 	adds r0, r4
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808236E
@@ -1096,7 +1096,7 @@ _08082312:
 	lsls r4, r0, 3
 	adds r4, r0
 	lsls r4, 2
-	ldr r0, _0808234C @ =gMapObjects
+	ldr r0, _0808234C @ =gObjectEvents
 	adds r4, r0
 	movs r0, 0x2
 	bl sub_8063FB0
@@ -1104,21 +1104,21 @@ _08082312:
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetHeldMovement
+	bl ObjectEventSetHeldMovement
 	ldrh r0, [r5, 0x12]
 	adds r0, 0x1
 	strh r0, [r5, 0x12]
 	b _0808236E
 	.align 2, 0
 _08082348: .4byte gSaveBlock1Ptr
-_0808234C: .4byte gMapObjects
+_0808234C: .4byte gObjectEvents
 _08082350:
 	ldr r1, _08082378 @ =gFieldEffectArguments
 	adds r2, r1, 0x4
 	adds r3, r1, 0
 	adds r3, 0x8
 	adds r0, r6, 0
-	bl FieldObjectGetLocalIdAndMap
+	bl ObjectEventGetLocalIdAndMap
 	movs r0, 0
 	bl FieldEffectStart
 	movs r0, 0
@@ -1147,7 +1147,7 @@ sub_808237C: @ 808237C
 	ldrb r2, [r0, 0x4]
 	movs r0, 0x7F
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	movs r0, 0
 	bl FieldEffectActiveListContains
 	lsls r0, 24
@@ -1158,9 +1158,9 @@ sub_808237C: @ 808237C
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r4, _08082408 @ =gMapObjects
+	ldr r4, _08082408 @ =gObjectEvents
 	adds r0, r4
-	bl FieldObjectIsMovementOverridden
+	bl ObjectEventIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _080823CC
@@ -1170,7 +1170,7 @@ sub_808237C: @ 808237C
 	adds r0, r1
 	lsls r0, 2
 	adds r0, r4
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808242E
@@ -1187,7 +1187,7 @@ _080823CC:
 	lsls r4, r0, 3
 	adds r4, r0
 	lsls r4, 2
-	ldr r0, _08082408 @ =gMapObjects
+	ldr r0, _08082408 @ =gObjectEvents
 	adds r4, r0
 	movs r0, 0x1
 	bl sub_8063FB0
@@ -1195,14 +1195,14 @@ _080823CC:
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetHeldMovement
+	bl ObjectEventSetHeldMovement
 	ldrh r0, [r5, 0x12]
 	adds r0, 0x1
 	strh r0, [r5, 0x12]
 	b _0808242E
 	.align 2, 0
 _08082404: .4byte gSaveBlock1Ptr
-_08082408: .4byte gMapObjects
+_08082408: .4byte gObjectEvents
 _0808240C:
 	bl GetPlayerAvatarObjectId
 	lsls r0, 24
@@ -1213,7 +1213,7 @@ _0808240C:
 	ldrb r1, [r0, 0x5]
 	ldrb r2, [r0, 0x4]
 	movs r0, 0x7F
-	bl RemoveFieldObjectByLocalIdAndMap
+	bl RemoveObjectEventByLocalIdAndMap
 	movs r0, 0
 	strh r0, [r5, 0x12]
 	movs r0, 0x2
@@ -1249,7 +1249,7 @@ sub_808243C: @ 808243C
 	cmp r0, 0
 	bne _0808246E
 	ldr r0, [sp]
-	bl FieldObjectClearAnim
+	bl ObjectEventClearAnim
 	ldrh r0, [r4, 0x16]
 	adds r0, 0x1
 	strh r0, [r4, 0x16]
@@ -1560,7 +1560,7 @@ objc_exclamation_mark_probably: @ 80826A8
 	lsls r2, 24
 	lsrs r2, 24
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _080826DA
@@ -1579,7 +1579,7 @@ _080826DA:
 	bl FieldEffectStop
 	b _08082736
 _080826E8:
-	ldr r2, _0808272C @ =gMapObjects
+	ldr r2, _0808272C @ =gObjectEvents
 	mov r0, sp
 	ldrb r1, [r0]
 	lsls r0, r1, 3
@@ -1614,7 +1614,7 @@ _080826E8:
 	strh r0, [r4, 0x34]
 	b _08082736
 	.align 2, 0
-_0808272C: .4byte gMapObjects
+_0808272C: .4byte gObjectEvents
 _08082730: .4byte gSprites
 _08082734:
 	strh r2, [r4, 0x34]

berry_fix/payload/include/constants/vars.h

@@ -27,7 +27,7 @@
 // object gfx id vars
 // These 0x10 vars are used to dynamically control a event object's sprite.
 // For example, the rival's sprite id is dynamically set based on the player's gender.
-// See VarGetEventObjectGraphicsId().
+// See VarGetObjectEventGraphicsId().
 #define VAR_OBJ_GFX_ID_0           0x4010
 #define VAR_OBJ_GFX_ID_1           0x4011
 #define VAR_OBJ_GFX_ID_2           0x4012

berry_fix/payload/include/global.fieldmap.h

@@ -41,7 +41,7 @@ struct BackupMapLayout
     u16 *map;
 };
 
-struct EventObjectTemplate
+struct ObjectEventTemplate
 {
     /*0x00*/ u8 localId;
     /*0x01*/ u8 graphicsId;
@@ -101,12 +101,12 @@ struct BgEvent
 
 struct MapEvents
 {
-    u8 eventObjectCount;
+    u8 objectEventCount;
     u8 warpCount;
     u8 coordEventCount;
     u8 bgEventCount;
 
-    struct EventObjectTemplate *eventObjects;
+    struct ObjectEventTemplate *objectEvents;
     struct WarpEvent *warps;
     struct CoordEvent *coordEvents;
     struct BgEvent *bgEvents;
@@ -144,7 +144,7 @@ struct MapHeader
     /* 0x1B */ u8 battleType;
 };
 
-struct EventObject
+struct ObjectEvent
 {
     /*0x00*/ u32 active:1;
              u32 singleMovementActive:1;
@@ -206,7 +206,7 @@ struct EventObject
     /*size = 0x24*/
 };
 
-struct EventObjectGraphicsInfo
+struct ObjectEventGraphicsInfo
 {
     /*0x00*/ u16 tileTag;
     /*0x02*/ u16 paletteTag;
@@ -287,7 +287,7 @@ struct PlayerAvatar /* 0x202E858 */
     /*0x02*/ u8 runningState; // this is a static running state. 00 is not moving, 01 is turn direction, 02 is moving.
     /*0x03*/ u8 tileTransitionState; // this is a transition running state: 00 is not moving, 01 is transition between tiles, 02 means you are on the frame in which you have centered on a tile but are about to keep moving, even if changing directions. 2 is also used for a ledge hop, since you are transitioning.
     /*0x04*/ u8 spriteId;
-    /*0x05*/ u8 eventObjectId;
+    /*0x05*/ u8 objectEventId;
     /*0x06*/ bool8 preventStep;
     /*0x07*/ u8 gender;
     /*0x08*/ u8 acroBikeState; // 00 is normal, 01 is turning, 02 is standing wheelie, 03 is hopping wheelie
@@ -309,8 +309,8 @@ struct Camera
     s32 y;
 };
 
-extern struct EventObject gMapObjects[];
+extern struct ObjectEvent gObjectEvents[];
-extern u8 gSelectedEventObject;
+extern u8 gSelectedObjectEvent;
 extern struct MapHeader gMapHeader;
 extern struct PlayerAvatar gPlayerAvatar;
 

berry_fix/payload/include/global.h

@@ -666,8 +666,8 @@ struct SaveBlock1 /* 0x02025734 */
     /*0x972*/ u8 filler_972[0x6];
     /*0x978*/ u16 trainerRematchStepCounter;
     /*0x97A*/ u8 trainerRematches[100];
-    /*0x9E0*/ struct EventObject eventObjects[EVENT_OBJECTS_COUNT];
+    /*0x9E0*/ struct ObjectEvent objectEvents[EVENT_OBJECTS_COUNT];
-    /*0xC20*/ struct EventObjectTemplate eventObjectTemplates[64];
+    /*0xC20*/ struct ObjectEventTemplate objectEventTemplates[64];
     /*0x1220*/ u8 flags[FLAGS_COUNT];
     /*0x1340*/ u16 vars[VARS_COUNT];
     /*0x1540*/ u32 gameStats[NUM_GAME_STATS];

data/event_scripts.s

@@ -12,7 +12,7 @@
 #include "constants/spawn_points.h"
 #include "constants/field_effects.h"
 #include "constants/trainers.h"
-#include "constants/map_objects.h"
+#include "constants/object_events.h"
 #include "constants/fame_checker.h"
 #include "constants/seagallop.h"
 #include "constants/game_stat.h"

data/map_events.s

@@ -10,7 +10,7 @@
 #include "constants/vars.h"
 #include "constants/weather.h"
 @#include "constants/trainer_hill.h"
-#include "constants/map_objects.h"
+#include "constants/object_events.h"
     .include "asm/macros.inc"
     .include "constants/constants.inc"
     .include "constants/item_data_constants.inc"

data/maps/BirthIsland_Exterior/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_METEORITE",
+      "graphics_id": "OBJECT_EVENT_GFX_METEORITE",
       "x": 15,
       "y": 12,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "FLAG_HIDE_BIRTH_ISLAND_METEORITE"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_VAR_0",
+      "graphics_id": "OBJECT_EVENT_GFX_VAR_0",
       "x": 15,
       "y": 3,
       "elevation": 3,

data/maps/BirthIsland_Exterior/scripts.inc

@@ -10,7 +10,7 @@ BirthIsland_Exterior_MapScript3_165213:: @ 8165213
 
 BirthIsland_Exterior_MapScript1_165217:: @ 8165217
 	setworldmapflag FLAG_WORLD_MAP_BIRTH_ISLAND_EXTERIOR
-	setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_DEOXYS_N
+	setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_DEOXYS_N
 	setvar VAR_DEOXYS_INTERACTION_STEP_COUNTER, 0
 	setvar VAR_DEOXYS_INTERACTION_NUM, 0
 	checkflag FLAG_FOUGHT_DEOXYS

data/maps/BirthIsland_Harbor/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_SEAGALLOP",
+      "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP",
       "x": 8,
       "y": 9,
       "elevation": 0,
@@ -27,7 +27,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_SAILOR",
+      "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
       "x": 8,
       "y": 6,
       "elevation": 3,

data/maps/CeladonCity/map.json

@@ -25,7 +25,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
       "x": 48,
       "y": 15,
       "elevation": 3,
@@ -38,7 +38,7 @@
       "flag": "FLAG_HIDE_CELADON_ROCKETS"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_FAT_MAN",
+      "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN",
       "x": 38,
       "y": 14,
       "elevation": 3,
@@ -51,7 +51,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_POLIWRATH",
+      "graphics_id": "OBJECT_EVENT_GFX_POLIWRATH",
       "x": 36,
       "y": 14,
       "elevation": 3,
@@ -64,7 +64,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL",
+      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
       "x": 11,
       "y": 18,
       "elevation": 3,
@@ -77,7 +77,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
+      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
       "x": 18,
       "y": 22,
       "elevation": 3,
@@ -90,7 +90,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
+      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
       "x": 30,
       "y": 24,
       "elevation": 3,
@@ -103,7 +103,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2",
+      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2",
       "x": 26,
       "y": 19,
       "elevation": 3,
@@ -116,7 +116,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
       "x": 38,
       "y": 31,
       "elevation": 3,
@@ -129,7 +129,7 @@
       "flag": "FLAG_HIDE_CELADON_ROCKETS"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
+      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
       "x": 9,
       "y": 30,
       "elevation": 3,
@@ -142,7 +142,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
       "x": 52,
       "y": 22,
       "elevation": 3,
@@ -155,7 +155,7 @@
       "flag": "FLAG_TEMP_14"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
       "x": 40,
       "y": 35,
       "elevation": 0,
@@ -168,7 +168,7 @@
       "flag": "FLAG_TEMP_13"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_BOY",
+      "graphics_id": "OBJECT_EVENT_GFX_BOY",
       "x": 25,
       "y": 10,
       "elevation": 3,
@@ -194,7 +194,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
       "x": 5,
       "y": 3,
       "elevation": 3,
@@ -207,7 +207,7 @@
       "flag": "FLAG_HIDE_CELADON_CITY_ETHER"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
       "x": 47,
       "y": 24,
       "elevation": 3,

data/maps/CeladonCity_Condominiums_1F/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_MEOWTH",
+      "graphics_id": "OBJECT_EVENT_GFX_MEOWTH",
       "x": 1,
       "y": 9,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_CLEFAIRY",
+      "graphics_id": "OBJECT_EVENT_GFX_CLEFAIRY",
       "x": 5,
       "y": 13,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_NIDORAN_F",
+      "graphics_id": "OBJECT_EVENT_GFX_NIDORAN_F",
       "x": 5,
       "y": 8,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN",
+      "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN",
       "x": 2,
       "y": 9,
       "elevation": 3,

data/maps/CeladonCity_Condominiums_3F/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCKER",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
       "x": 0,
       "y": 10,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_MAN",
+      "graphics_id": "OBJECT_EVENT_GFX_MAN",
       "x": 3,
       "y": 8,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_SUPER_NERD",
+      "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD",
       "x": 4,
       "y": 10,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_FAT_MAN",
+      "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN",
       "x": 0,
       "y": 13,
       "elevation": 3,

data/maps/CeladonCity_Condominiums_RoofRoom/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_BLACKBELT",
+      "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
       "x": 3,
       "y": 5,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
       "x": 7,
       "y": 3,
       "elevation": 0,

data/maps/CeladonCity_DepartmentStore_1F/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_WORKER_F",
+      "graphics_id": "OBJECT_EVENT_GFX_WORKER_F",
       "x": 6,
       "y": 10,
       "elevation": 3,

data/maps/CeladonCity_DepartmentStore_2F/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_LASS",
+      "graphics_id": "OBJECT_EVENT_GFX_LASS",
       "x": 5,
       "y": 10,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_CLERK",
+      "graphics_id": "OBJECT_EVENT_GFX_CLERK",
       "x": 1,
       "y": 8,
       "elevation": 0,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_CLERK",
+      "graphics_id": "OBJECT_EVENT_GFX_CLERK",
       "x": 1,
       "y": 6,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_WOMAN_1",
+      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
       "x": 11,
       "y": 6,
       "elevation": 3,

data/maps/CeladonCity_DepartmentStore_3F/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_CLERK",
+      "graphics_id": "OBJECT_EVENT_GFX_CLERK",
       "x": 10,
       "y": 9,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_GBA_KID",
+      "graphics_id": "OBJECT_EVENT_GFX_GBA_KID",
       "x": 11,
       "y": 6,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_GBA_KID",
+      "graphics_id": "OBJECT_EVENT_GFX_GBA_KID",
       "x": 4,
       "y": 9,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_GBA_KID",
+      "graphics_id": "OBJECT_EVENT_GFX_GBA_KID",
       "x": 1,
       "y": 9,
       "elevation": 3,
@@ -66,7 +66,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL",
+      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
       "x": 9,
       "y": 14,
       "elevation": 3,

data/maps/CeladonCity_DepartmentStore_4F/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_MAN",
+      "graphics_id": "OBJECT_EVENT_GFX_MAN",
       "x": 6,
       "y": 6,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
       "x": 10,
       "y": 11,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_CLERK",
+      "graphics_id": "OBJECT_EVENT_GFX_CLERK",
       "x": 3,
       "y": 13,
       "elevation": 0,

data/maps/CeladonCity_DepartmentStore_5F/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
+      "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
       "x": 11,
       "y": 6,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_SAILOR",
+      "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
       "x": 6,
       "y": 8,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_CLERK",
+      "graphics_id": "OBJECT_EVENT_GFX_CLERK",
       "x": 1,
       "y": 7,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_CLERK",
+      "graphics_id": "OBJECT_EVENT_GFX_CLERK",
       "x": 1,
       "y": 6,
       "elevation": 3,

data/maps/CeladonCity_DepartmentStore_Roof/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M",
+      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M",
       "x": 9,
       "y": 5,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL",
+      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
       "x": 5,
       "y": 4,
       "elevation": 3,

data/maps/CeladonCity_GameCorner/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_WORKER_F",
+      "graphics_id": "OBJECT_EVENT_GFX_WORKER_F",
       "x": 4,
       "y": 2,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_WORKER_M",
+      "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
       "x": 6,
       "y": 2,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
+      "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
       "x": 1,
       "y": 6,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
+      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
       "x": 1,
       "y": 8,
       "elevation": 3,
@@ -66,7 +66,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_FISHER",
+      "graphics_id": "OBJECT_EVENT_GFX_FISHER",
       "x": 4,
       "y": 7,
       "elevation": 3,
@@ -79,7 +79,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_GYM_GUY",
+      "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY",
       "x": 7,
       "y": 10,
       "elevation": 3,
@@ -92,7 +92,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_WOMAN_1",
+      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
       "x": 7,
       "y": 8,
       "elevation": 3,
@@ -105,7 +105,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2",
+      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2",
       "x": 10,
       "y": 9,
       "elevation": 3,
@@ -118,7 +118,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
       "x": 13,
       "y": 7,
       "elevation": 3,
@@ -131,7 +131,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
+      "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
       "x": 16,
       "y": 10,
       "elevation": 3,
@@ -144,7 +144,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
       "x": 11,
       "y": 2,
       "elevation": 3,

data/maps/CeladonCity_GameCorner_PrizeRoom/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
+      "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
       "x": 2,
       "y": 6,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2",
+      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2",
       "x": 6,
       "y": 7,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_WORKER_M",
+      "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
       "x": 4,
       "y": 2,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_WORKER_M",
+      "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
       "x": 6,
       "y": 2,
       "elevation": 3,
@@ -66,7 +66,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_WORKER_M",
+      "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
       "x": 2,
       "y": 2,
       "elevation": 3,

data/maps/CeladonCity_Gym/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_LASS",
+      "graphics_id": "OBJECT_EVENT_GFX_LASS",
       "x": 3,
       "y": 11,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_BEAUTY",
+      "graphics_id": "OBJECT_EVENT_GFX_BEAUTY",
       "x": 9,
       "y": 10,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_PICNICKER",
+      "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
       "x": 10,
       "y": 7,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_BEAUTY",
+      "graphics_id": "OBJECT_EVENT_GFX_BEAUTY",
       "x": 2,
       "y": 6,
       "elevation": 3,
@@ -66,7 +66,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_BEAUTY",
+      "graphics_id": "OBJECT_EVENT_GFX_BEAUTY",
       "x": 5,
       "y": 4,
       "elevation": 3,
@@ -79,7 +79,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_LASS",
+      "graphics_id": "OBJECT_EVENT_GFX_LASS",
       "x": 7,
       "y": 4,
       "elevation": 3,
@@ -92,7 +92,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ERIKA",
+      "graphics_id": "OBJECT_EVENT_GFX_ERIKA",
       "x": 6,
       "y": 4,
       "elevation": 3,
@@ -105,7 +105,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F",
+      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F",
       "x": 8,
       "y": 7,
       "elevation": 3,
@@ -118,7 +118,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
       "x": 6,
       "y": 8,
       "elevation": 3,
@@ -131,7 +131,7 @@
       "flag": "FLAG_TEMP_12"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
       "x": 3,
       "y": 5,
       "elevation": 3,
@@ -144,7 +144,7 @@
       "flag": "FLAG_TEMP_13"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
       "x": 9,
       "y": 6,
       "elevation": 3,

data/maps/CeladonCity_Hotel/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN",
+      "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN",
       "x": 5,
       "y": 4,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_BEAUTY",
+      "graphics_id": "OBJECT_EVENT_GFX_BEAUTY",
       "x": 3,
       "y": 6,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_MAN",
+      "graphics_id": "OBJECT_EVENT_GFX_MAN",
       "x": 9,
       "y": 7,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY",
+      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY",
       "x": 2,
       "y": 6,
       "elevation": 3,

data/maps/CeladonCity_House1/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2",
+      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2",
       "x": 5,
       "y": 2,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
       "x": 2,
       "y": 4,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
       "x": 8,
       "y": 4,
       "elevation": 3,

data/maps/CeladonCity_PokemonCenter_1F/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_NURSE",
+      "graphics_id": "OBJECT_EVENT_GFX_NURSE",
       "x": 7,
       "y": 2,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
+      "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
       "x": 4,
       "y": 4,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F",
+      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F",
       "x": 10,
       "y": 6,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
       "x": 12,
       "y": 5,
       "elevation": 3,

data/maps/CeladonCity_PokemonCenter_2F/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 6,
       "y": 2,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 2,
       "y": 2,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 10,
       "y": 2,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN",
+      "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN",
       "x": 1,
       "y": 2,
       "elevation": 3,

data/maps/CeladonCity_Restaurant/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_CHEF",
+      "graphics_id": "OBJECT_EVENT_GFX_CHEF",
       "x": 12,
       "y": 7,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
+      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
       "x": 11,
       "y": 4,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_FAT_MAN",
+      "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN",
       "x": 9,
       "y": 4,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
+      "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
       "x": 1,
       "y": 2,
       "elevation": 0,
@@ -66,7 +66,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_WORKER_M",
+      "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
       "x": 3,
       "y": 7,
       "elevation": 0,

data/maps/CeruleanCave_1F/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
       "x": 7,
       "y": 3,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_NUGGET"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
       "x": 11,
       "y": 16,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_FULL_RESTORE"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
       "x": 25,
       "y": 5,
       "elevation": 4,
@@ -53,7 +53,7 @@
       "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_MAX_ELIXIR"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 7,
       "y": 21,
       "elevation": 3,
@@ -66,7 +66,7 @@
       "flag": "FLAG_TEMP_12"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 13,
       "y": 21,
       "elevation": 3,
@@ -79,7 +79,7 @@
       "flag": "FLAG_TEMP_13"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 5,
       "y": 20,
       "elevation": 3,
@@ -92,7 +92,7 @@
       "flag": "FLAG_TEMP_14"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 14,
       "y": 20,
       "elevation": 3,
@@ -105,7 +105,7 @@
       "flag": "FLAG_TEMP_15"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 11,
       "y": 21,
       "elevation": 3,
@@ -118,7 +118,7 @@
       "flag": "FLAG_TEMP_16"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 9,
       "y": 18,
       "elevation": 3,

data/maps/CeruleanCave_2F/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
       "x": 9,
       "y": 18,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_PP_UP"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
       "x": 29,
       "y": 16,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_ULTRA_BALL"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
       "x": 33,
       "y": 12,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_FULL_RESTORE"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 33,
       "y": 10,
       "elevation": 3,
@@ -66,7 +66,7 @@
       "flag": "FLAG_TEMP_12"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 33,
       "y": 9,
       "elevation": 3,
@@ -79,7 +79,7 @@
       "flag": "FLAG_TEMP_13"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 25,
       "y": 11,
       "elevation": 3,
@@ -92,7 +92,7 @@
       "flag": "FLAG_TEMP_14"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 28,
       "y": 20,
       "elevation": 3,
@@ -105,7 +105,7 @@
       "flag": "FLAG_TEMP_15"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 30,
       "y": 20,
       "elevation": 3,
@@ -118,7 +118,7 @@
       "flag": "FLAG_TEMP_16"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 9,
       "y": 13,
       "elevation": 3,
@@ -131,7 +131,7 @@
       "flag": "FLAG_TEMP_17"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 23,
       "y": 16,
       "elevation": 3,
@@ -144,7 +144,7 @@
       "flag": "FLAG_TEMP_18"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 13,
       "y": 6,
       "elevation": 3,
@@ -157,7 +157,7 @@
       "flag": "FLAG_TEMP_19"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 4,
       "y": 12,
       "elevation": 3,
@@ -170,7 +170,7 @@
       "flag": "FLAG_TEMP_1A"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 10,
       "y": 20,
       "elevation": 3,

data/maps/CeruleanCave_B1F/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
       "x": 31,
       "y": 9,
       "elevation": 4,
@@ -27,7 +27,7 @@
       "flag": "FLAG_HIDE_CERULEAN_CAVE_B1F_ULTRA_BALL"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
       "x": 32,
       "y": 2,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "FLAG_HIDE_CERULEAN_CAVE_B1F_MAX_REVIVE"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_MEWTWO",
+      "graphics_id": "OBJECT_EVENT_GFX_MEWTWO",
       "x": 7,
       "y": 12,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "FLAG_HIDE_MEWTWO"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 37,
       "y": 1,
       "elevation": 3,
@@ -66,7 +66,7 @@
       "flag": "FLAG_TEMP_12"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 38,
       "y": 2,
       "elevation": 3,
@@ -79,7 +79,7 @@
       "flag": "FLAG_TEMP_13"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 35,
       "y": 1,
       "elevation": 3,
@@ -92,7 +92,7 @@
       "flag": "FLAG_TEMP_14"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 37,
       "y": 4,
       "elevation": 3,
@@ -105,7 +105,7 @@
       "flag": "FLAG_TEMP_15"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 35,
       "y": 5,
       "elevation": 3,
@@ -118,7 +118,7 @@
       "flag": "FLAG_TEMP_16"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 2,
       "y": 2,
       "elevation": 3,
@@ -131,7 +131,7 @@
       "flag": "FLAG_TEMP_17"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 4,
       "y": 1,
       "elevation": 3,
@@ -144,7 +144,7 @@
       "flag": "FLAG_TEMP_18"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 6,
       "y": 1,
       "elevation": 3,
@@ -157,7 +157,7 @@
       "flag": "FLAG_TEMP_19"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 3,
       "y": 4,
       "elevation": 3,

data/maps/CeruleanCity/map.json

@@ -35,7 +35,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_POLICEMAN",
+      "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN",
       "x": 31,
       "y": 12,
       "elevation": 3,
@@ -48,7 +48,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
       "x": 33,
       "y": 6,
       "elevation": 3,
@@ -61,7 +61,7 @@
       "flag": "FLAG_HIDE_CERULEAN_ROCKET"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY",
+      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY",
       "x": 16,
       "y": 21,
       "elevation": 3,
@@ -74,7 +74,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
+      "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
       "x": 9,
       "y": 23,
       "elevation": 3,
@@ -87,7 +87,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_SLOWBRO",
+      "graphics_id": "OBJECT_EVENT_GFX_SLOWBRO",
       "x": 32,
       "y": 29,
       "elevation": 3,
@@ -100,7 +100,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_LASS",
+      "graphics_id": "OBJECT_EVENT_GFX_LASS",
       "x": 33,
       "y": 29,
       "elevation": 3,
@@ -113,7 +113,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
       "x": 34,
       "y": 22,
       "elevation": 3,
@@ -126,7 +126,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_BLUE",
+      "graphics_id": "OBJECT_EVENT_GFX_BLUE",
       "x": 22,
       "y": 0,
       "elevation": 3,
@@ -139,7 +139,7 @@
       "flag": "FLAG_HIDE_CERULEAN_RIVAL"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
       "x": 26,
       "y": 32,
       "elevation": 3,
@@ -165,7 +165,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_WOMAN_1",
+      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
       "x": 12,
       "y": 30,
       "elevation": 3,
@@ -178,7 +178,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M",
+      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M",
       "x": 1,
       "y": 13,
       "elevation": 3,

data/maps/CeruleanCity_BikeShop/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_MAN",
+      "graphics_id": "OBJECT_EVENT_GFX_MAN",
       "x": 9,
       "y": 3,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
       "x": 9,
       "y": 7,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
+      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
       "x": 5,
       "y": 5,
       "elevation": 3,

data/maps/CeruleanCity_Gym/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER",
+      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
       "x": 10,
       "y": 12,
       "elevation": 0,
@@ -27,7 +27,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_PICNICKER",
+      "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
       "x": 4,
       "y": 7,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_MISTY",
+      "graphics_id": "OBJECT_EVENT_GFX_MISTY",
       "x": 8,
       "y": 6,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_GYM_GUY",
+      "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY",
       "x": 7,
       "y": 16,
       "elevation": 3,

data/maps/CeruleanCity_House1/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
+      "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
       "x": 6,
       "y": 5,
       "elevation": 3,

data/maps/CeruleanCity_House2/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_HIKER",
+      "graphics_id": "OBJECT_EVENT_GFX_HIKER",
       "x": 1,
       "y": 2,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_LASS",
+      "graphics_id": "OBJECT_EVENT_GFX_LASS",
       "x": 7,
       "y": 6,
       "elevation": 3,

data/maps/CeruleanCity_House3/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
+      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
       "x": 2,
       "y": 2,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN",
+      "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN",
       "x": 7,
       "y": 5,
       "elevation": 3,

data/maps/CeruleanCity_House4/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
+      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
       "x": 5,
       "y": 3,
       "elevation": 3,

data/maps/CeruleanCity_House5/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2",
+      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2",
       "x": 7,
       "y": 4,
       "elevation": 3,

data/maps/CeruleanCity_Mart/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_CLERK",
+      "graphics_id": "OBJECT_EVENT_GFX_CLERK",
       "x": 2,
       "y": 3,
       "elevation": 0,
@@ -27,7 +27,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_WOMAN_1",
+      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
       "x": 9,
       "y": 2,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
       "x": 1,
       "y": 7,
       "elevation": 3,

data/maps/CeruleanCity_PokemonCenter_1F/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_NURSE",
+      "graphics_id": "OBJECT_EVENT_GFX_NURSE",
       "x": 7,
       "y": 2,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
+      "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
       "x": 12,
       "y": 5,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCKER",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
       "x": 5,
       "y": 4,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
       "x": 4,
       "y": 8,
       "elevation": 3,
@@ -66,7 +66,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_LASS",
+      "graphics_id": "OBJECT_EVENT_GFX_LASS",
       "x": 3,
       "y": 3,
       "elevation": 3,

data/maps/CeruleanCity_PokemonCenter_2F/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 6,
       "y": 2,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 2,
       "y": 2,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 10,
       "y": 2,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN",
+      "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN",
       "x": 1,
       "y": 2,
       "elevation": 3,

data/maps/CinnabarIsland/map.json

@@ -25,7 +25,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
+      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
       "x": 14,
       "y": 6,
       "elevation": 3,
@@ -38,7 +38,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
+      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
       "x": 11,
       "y": 11,
       "elevation": 3,
@@ -51,7 +51,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_BILL",
+      "graphics_id": "OBJECT_EVENT_GFX_BILL",
       "x": 20,
       "y": 7,
       "elevation": 3,
@@ -64,7 +64,7 @@
       "flag": "FLAG_HIDE_CINNABAR_BILL"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_SEAGALLOP",
+      "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP",
       "x": 23,
       "y": 7,
       "elevation": 1,

data/maps/CinnabarIsland_Gym/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_SUPER_NERD",
+      "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD",
       "x": 25,
       "y": 11,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
       "x": 25,
       "y": 4,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
       "x": 17,
       "y": 5,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_SUPER_NERD",
+      "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD",
       "x": 16,
       "y": 11,
       "elevation": 3,
@@ -66,7 +66,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
       "x": 16,
       "y": 18,
       "elevation": 3,
@@ -79,7 +79,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_SUPER_NERD",
+      "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD",
       "x": 4,
       "y": 19,
       "elevation": 3,
@@ -92,7 +92,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
       "x": 4,
       "y": 11,
       "elevation": 3,
@@ -105,7 +105,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_BLAINE",
+      "graphics_id": "OBJECT_EVENT_GFX_BLAINE",
       "x": 5,
       "y": 4,
       "elevation": 3,
@@ -118,7 +118,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_GYM_GUY",
+      "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY",
       "x": 24,
       "y": 20,
       "elevation": 3,

data/maps/CinnabarIsland_Mart/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_CLERK",
+      "graphics_id": "OBJECT_EVENT_GFX_CLERK",
       "x": 2,
       "y": 3,
       "elevation": 0,
@@ -27,7 +27,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
+      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
       "x": 6,
       "y": 2,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
       "x": 8,
       "y": 2,
       "elevation": 3,

data/maps/CinnabarIsland_PokemonCenter_1F/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_NURSE",
+      "graphics_id": "OBJECT_EVENT_GFX_NURSE",
       "x": 7,
       "y": 2,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F",
+      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F",
       "x": 2,
       "y": 4,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
+      "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
       "x": 9,
       "y": 7,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
       "x": 14,
       "y": 6,
       "elevation": 3,
@@ -92,7 +92,7 @@
       "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_BILL",
+      "graphics_id": "OBJECT_EVENT_GFX_BILL",
       "x": 11,
       "y": 5,
       "elevation": 3,

data/maps/CinnabarIsland_PokemonCenter_2F/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 6,
       "y": 2,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 2,
       "y": 2,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 10,
       "y": 2,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN",
+      "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN",
       "x": 1,
       "y": 2,
       "elevation": 3,

data/maps/CinnabarIsland_PokemonLab_Entrance/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
       "x": 2,
       "y": 4,
       "elevation": 3,

data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_BOY",
+      "graphics_id": "OBJECT_EVENT_GFX_BOY",
       "x": 11,
       "y": 8,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
       "x": 12,
       "y": 3,
       "elevation": 3,

data/maps/CinnabarIsland_PokemonLab_Lounge/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
       "x": 5,
       "y": 3,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2",
+      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2",
       "x": 4,
       "y": 6,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
+      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
       "x": 10,
       "y": 5,
       "elevation": 3,

data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_SUPER_NERD",
+      "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD",
       "x": 5,
       "y": 4,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
       "x": 10,
       "y": 3,
       "elevation": 3,

data/maps/DiglettsCave_NorthEntrance/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_HIKER",
+      "graphics_id": "OBJECT_EVENT_GFX_HIKER",
       "x": 4,
       "y": 4,
       "elevation": 3,

data/maps/DiglettsCave_SouthEntrance/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
+      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
       "x": 4,
       "y": 4,
       "elevation": 3,

data/maps/FiveIsland/map.json

@@ -25,7 +25,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_FISHER",
+      "graphics_id": "OBJECT_EVENT_GFX_FISHER",
       "x": 8,
       "y": 5,
       "elevation": 3,
@@ -38,7 +38,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER",
+      "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
       "x": 16,
       "y": 10,
       "elevation": 3,

data/maps/FiveIsland_Harbor/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_SEAGALLOP",
+      "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP",
       "x": 8,
       "y": 9,
       "elevation": 0,
@@ -27,7 +27,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_SAILOR",
+      "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
       "x": 8,
       "y": 6,
       "elevation": 3,

data/maps/FiveIsland_House1/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_WOMAN_3",
+      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3",
       "x": 10,
       "y": 2,
       "elevation": 3,

data/maps/FiveIsland_House2/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
+      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
       "x": 2,
       "y": 3,
       "elevation": 3,

data/maps/FiveIsland_LostCave_Room1/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_HIKER",
+      "graphics_id": "OBJECT_EVENT_GFX_HIKER",
       "x": 5,
       "y": 4,
       "elevation": 3,

data/maps/FiveIsland_LostCave_Room10/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
+      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
       "x": 5,
       "y": 5,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "FLAG_HIDE_LOST_CAVE_SELPHY"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
       "x": 5,
       "y": 2,
       "elevation": 3,

data/maps/FiveIsland_LostCave_Room11/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
       "x": 5,
       "y": 5,
       "elevation": 3,

data/maps/FiveIsland_LostCave_Room12/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
       "x": 5,
       "y": 5,
       "elevation": 3,

data/maps/FiveIsland_LostCave_Room13/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
       "x": 5,
       "y": 5,
       "elevation": 3,

data/maps/FiveIsland_LostCave_Room14/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
       "x": 5,
       "y": 5,
       "elevation": 3,

data/maps/FiveIsland_LostCave_Room4/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_WOMAN_1",
+      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
       "x": 6,
       "y": 4,
       "elevation": 3,

data/maps/FiveIsland_Meadow/map.json

@@ -25,7 +25,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCKET_F",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_F",
       "x": 18,
       "y": 18,
       "elevation": 3,
@@ -38,7 +38,7 @@
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
       "x": 17,
       "y": 5,
       "elevation": 3,
@@ -51,7 +51,7 @@
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
       "x": 11,
       "y": 27,
       "elevation": 3,
@@ -64,7 +64,7 @@
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
       "x": 8,
       "y": 9,
       "elevation": 3,
@@ -77,7 +77,7 @@
       "flag": "FLAG_TEMP_12"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+      "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
       "x": 19,
       "y": 12,
       "elevation": 3,
@@ -90,7 +90,7 @@
       "flag": "FLAG_TEMP_13"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
       "x": 12,
       "y": 11,
       "elevation": 3,
@@ -103,7 +103,7 @@
       "flag": "FLAG_HIDE_FIVE_ISLAND_MEADOW_MAX_POTION"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
       "x": 3,
       "y": 22,
       "elevation": 3,

data/maps/FiveIsland_MemorialPillar/map.json

@@ -20,7 +20,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_MAN",
+      "graphics_id": "OBJECT_EVENT_GFX_MAN",
       "x": 8,
       "y": 44,
       "elevation": 4,
@@ -33,7 +33,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCKER",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
       "x": 12,
       "y": 6,
       "elevation": 3,
@@ -46,7 +46,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCKER",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
       "x": 14,
       "y": 17,
       "elevation": 3,
@@ -59,7 +59,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCKER",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
       "x": 17,
       "y": 31,
       "elevation": 3,
@@ -72,7 +72,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
       "x": 4,
       "y": 47,
       "elevation": 3,

data/maps/FiveIsland_PokemonCenter_1F/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_NURSE",
+      "graphics_id": "OBJECT_EVENT_GFX_NURSE",
       "x": 7,
       "y": 2,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F",
+      "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F",
       "x": 9,
       "y": 4,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_CHEF",
+      "graphics_id": "OBJECT_EVENT_GFX_CHEF",
       "x": 4,
       "y": 8,
       "elevation": 3,

data/maps/FiveIsland_PokemonCenter_2F/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 6,
       "y": 2,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 2,
       "y": 2,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 10,
       "y": 2,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN",
+      "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN",
       "x": 1,
       "y": 2,
       "elevation": 3,

data/maps/FiveIsland_ResortGorgeous/map.json

@@ -20,7 +20,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_LASS",
+      "graphics_id": "OBJECT_EVENT_GFX_LASS",
       "x": 44,
       "y": 10,
       "elevation": 3,
@@ -33,7 +33,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_LASS",
+      "graphics_id": "OBJECT_EVENT_GFX_LASS",
       "x": 33,
       "y": 12,
       "elevation": 3,
@@ -46,7 +46,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_LASS",
+      "graphics_id": "OBJECT_EVENT_GFX_LASS",
       "x": 12,
       "y": 10,
       "elevation": 3,
@@ -59,7 +59,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
+      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
       "x": 23,
       "y": 9,
       "elevation": 3,
@@ -72,7 +72,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
+      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
       "x": 33,
       "y": 8,
       "elevation": 3,
@@ -85,7 +85,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
       "x": 33,
       "y": 3,
       "elevation": 3,
@@ -98,7 +98,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER",
+      "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
       "x": 56,
       "y": 7,
       "elevation": 1,
@@ -111,7 +111,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
+      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
       "x": 39,
       "y": 9,
       "elevation": 3,

data/maps/FiveIsland_ResortGorgeous_House/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
+      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
       "x": 4,
       "y": 4,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "FLAG_HIDE_RESORT_GORGEOUS_INSIDE_SELPHY"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
+      "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
       "x": 6,
       "y": 2,
       "elevation": 3,

data/maps/FiveIsland_RocketWarehouse/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
       "x": 15,
       "y": 11,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
       "x": 17,
       "y": 15,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCKET_F",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_F",
       "x": 27,
       "y": 16,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
       "x": 25,
       "y": 11,
       "elevation": 3,
@@ -66,7 +66,7 @@
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCKET_F",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_F",
       "x": 6,
       "y": 6,
       "elevation": 3,
@@ -79,7 +79,7 @@
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+      "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
       "x": 27,
       "y": 4,
       "elevation": 3,
@@ -92,7 +92,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
       "x": 8,
       "y": 25,
       "elevation": 3,
@@ -105,7 +105,7 @@
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_BIG_PEARL"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
       "x": 17,
       "y": 3,
       "elevation": 0,
@@ -118,7 +118,7 @@
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_TM36"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
       "x": 1,
       "y": 16,
       "elevation": 3,
@@ -131,7 +131,7 @@
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_PEARL"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
       "x": 4,
       "y": 5,
       "elevation": 3,

data/maps/FiveIsland_WaterLabyrinth/map.json

@@ -25,7 +25,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
+      "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
       "x": 14,
       "y": 11,
       "elevation": 3,
@@ -38,7 +38,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
+      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
       "x": 9,
       "y": 7,
       "elevation": 3,

data/maps/FourIsland/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
+      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
       "x": 16,
       "y": 13,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_DODUO",
+      "graphics_id": "OBJECT_EVENT_GFX_DODUO",
       "x": 12,
       "y": 9,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_NIDORAN_F",
+      "graphics_id": "OBJECT_EVENT_GFX_NIDORAN_F",
       "x": 13,
       "y": 7,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_NIDORAN_M",
+      "graphics_id": "OBJECT_EVENT_GFX_NIDORAN_M",
       "x": 14,
       "y": 7,
       "elevation": 3,
@@ -66,7 +66,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_PSYDUCK",
+      "graphics_id": "OBJECT_EVENT_GFX_PSYDUCK",
       "x": 17,
       "y": 9,
       "elevation": 3,
@@ -79,7 +79,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN",
+      "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN",
       "x": 26,
       "y": 19,
       "elevation": 3,
@@ -92,7 +92,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
       "x": 5,
       "y": 11,
       "elevation": 3,
@@ -105,7 +105,7 @@
       "flag": "FLAG_TEMP_12"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
       "x": 5,
       "y": 6,
       "elevation": 3,
@@ -118,7 +118,7 @@
       "flag": "FLAG_HIDE_FOUR_ISLAND_STAR_PIECE"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
       "x": 32,
       "y": 19,
       "elevation": 3,
@@ -131,7 +131,7 @@
       "flag": "FLAG_HIDE_FOUR_ISLAND_STARDUST"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_BLUE",
+      "graphics_id": "OBJECT_EVENT_GFX_BLUE",
       "x": 8,
       "y": 25,
       "elevation": 3,
@@ -144,7 +144,7 @@
       "flag": "FLAG_HIDE_FOUR_ISLAND_RIVAL"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_FAT_MAN",
+      "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN",
       "x": 36,
       "y": 13,
       "elevation": 3,
@@ -157,7 +157,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL",
+      "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
       "x": 31,
       "y": 21,
       "elevation": 3,

data/maps/FourIsland_Harbor/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_SEAGALLOP",
+      "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP",
       "x": 8,
       "y": 9,
       "elevation": 0,
@@ -27,7 +27,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_SAILOR",
+      "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
       "x": 8,
       "y": 6,
       "elevation": 3,

data/maps/FourIsland_House1/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_FAT_MAN",
+      "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN",
       "x": 8,
       "y": 3,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_FAT_MAN",
+      "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN",
       "x": 9,
       "y": 3,
       "elevation": 3,

data/maps/FourIsland_House2/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_MAN",
+      "graphics_id": "OBJECT_EVENT_GFX_MAN",
       "x": 4,
       "y": 4,
       "elevation": 3,

data/maps/FourIsland_IcefallCave_1F/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
       "x": 11,
       "y": 7,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_1F_ULTRA_BALL"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
       "x": 12,
       "y": 16,
       "elevation": 3,

data/maps/FourIsland_IcefallCave_B1F/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
       "x": 10,
       "y": 14,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_B1F_FULL_RESTORE"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
       "x": 21,
       "y": 7,
       "elevation": 3,

data/maps/FourIsland_IcefallCave_Back/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
       "x": 11,
       "y": 14,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "FLAG_HIDE_ICEFALL_CAVE_ROCKETS"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
       "x": 13,
       "y": 14,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "FLAG_HIDE_ICEFALL_CAVE_ROCKETS"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_LORELEI",
+      "graphics_id": "OBJECT_EVENT_GFX_LORELEI",
       "x": 12,
       "y": 16,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "FLAG_HIDE_ICEFALL_CAVE_LORELEI"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
       "x": 10,
       "y": 15,
       "elevation": 3,

data/maps/FourIsland_LoreleisHouse/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_LORELEI",
+      "graphics_id": "OBJECT_EVENT_GFX_LORELEI",
       "x": 7,
       "y": 4,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "FLAG_HIDE_LORELEI_IN_HER_HOUSE"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_WIGGLYTUFF",
+      "graphics_id": "OBJECT_EVENT_GFX_WIGGLYTUFF",
       "x": 0,
       "y": 2,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_SEEL",
+      "graphics_id": "OBJECT_EVENT_GFX_SEEL",
       "x": 10,
       "y": 3,
       "elevation": 0,
@@ -53,7 +53,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_PIKACHU",
+      "graphics_id": "OBJECT_EVENT_GFX_PIKACHU",
       "x": 9,
       "y": 3,
       "elevation": 0,
@@ -66,7 +66,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_SLOWPOKE",
+      "graphics_id": "OBJECT_EVENT_GFX_SLOWPOKE",
       "x": 7,
       "y": 2,
       "elevation": 3,
@@ -79,7 +79,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_SLOWBRO",
+      "graphics_id": "OBJECT_EVENT_GFX_SLOWBRO",
       "x": 6,
       "y": 2,
       "elevation": 3,
@@ -92,7 +92,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_PSYDUCK",
+      "graphics_id": "OBJECT_EVENT_GFX_PSYDUCK",
       "x": 6,
       "y": 4,
       "elevation": 0,
@@ -105,7 +105,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_MEOWTH",
+      "graphics_id": "OBJECT_EVENT_GFX_MEOWTH",
       "x": 9,
       "y": 4,
       "elevation": 0,
@@ -118,7 +118,7 @@
       "flag": "FLAG_HIDE_LORELEI_HOUSE_MEOWTH_DOLL"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_CHANSEY",
+      "graphics_id": "OBJECT_EVENT_GFX_CHANSEY",
       "x": 10,
       "y": 4,
       "elevation": 0,
@@ -131,7 +131,7 @@
       "flag": "FLAG_HIDE_LORELEI_HOUSE_CHANSEY_DOLL"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_JIGGLYPUFF",
+      "graphics_id": "OBJECT_EVENT_GFX_JIGGLYPUFF",
       "x": 0,
       "y": 3,
       "elevation": 3,
@@ -144,7 +144,7 @@
       "flag": "FLAG_HIDE_LORELEI_HOUSE_JIGGLYPUFF_DOLL"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_NIDORAN_F",
+      "graphics_id": "OBJECT_EVENT_GFX_NIDORAN_F",
       "x": 0,
       "y": 5,
       "elevation": 3,
@@ -157,7 +157,7 @@
       "flag": "FLAG_HIDE_LORELEIS_HOUSE_NIDORAN_F_DOLL"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_NIDORAN_M",
+      "graphics_id": "OBJECT_EVENT_GFX_NIDORAN_M",
       "x": 1,
       "y": 5,
       "elevation": 3,
@@ -170,7 +170,7 @@
       "flag": "FLAG_HIDE_LORELEIS_HOUSE_NIDORAN_M_DOLL"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_PIDGEOT",
+      "graphics_id": "OBJECT_EVENT_GFX_PIDGEOT",
       "x": 9,
       "y": 0,
       "elevation": 3,
@@ -183,7 +183,7 @@
       "flag": "FLAG_HIDE_LORELEIS_HOUSE_PIDGEOT_DOLL"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_FEAROW",
+      "graphics_id": "OBJECT_EVENT_GFX_FEAROW",
       "x": 10,
       "y": 0,
       "elevation": 3,
@@ -196,7 +196,7 @@
       "flag": "FLAG_HIDE_LORELEIS_HOUSE_FEAROW_DOLL"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_LAPRAS_DOLL",
+      "graphics_id": "OBJECT_EVENT_GFX_LAPRAS_DOLL",
       "x": 9,
       "y": 6,
       "elevation": 3,

data/maps/FourIsland_Mart/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_CLERK",
+      "graphics_id": "OBJECT_EVENT_GFX_CLERK",
       "x": 2,
       "y": 3,
       "elevation": 0,
@@ -27,7 +27,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
+      "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
       "x": 6,
       "y": 5,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_CAMPER",
+      "graphics_id": "OBJECT_EVENT_GFX_CAMPER",
       "x": 8,
       "y": 3,
       "elevation": 3,

data/maps/FourIsland_PokemonCenter_1F/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_NURSE",
+      "graphics_id": "OBJECT_EVENT_GFX_NURSE",
       "x": 7,
       "y": 2,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_MAN",
+      "graphics_id": "OBJECT_EVENT_GFX_MAN",
       "x": 10,
       "y": 6,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_WOMAN_3",
+      "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3",
       "x": 5,
       "y": 5,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
+      "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
       "x": 2,
       "y": 2,
       "elevation": 3,

data/maps/FourIsland_PokemonCenter_2F/map.json

@@ -14,7 +14,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 6,
       "y": 2,
       "elevation": 3,
@@ -27,7 +27,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 2,
       "y": 2,
       "elevation": 3,
@@ -40,7 +40,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+      "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
       "x": 10,
       "y": 2,
       "elevation": 3,
@@ -53,7 +53,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN",
+      "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN",
       "x": 1,
       "y": 2,
       "elevation": 3,